Skip to content

Commit 82a9857

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-fix
2 parents 12a548c + 6be9a20 commit 82a9857

File tree

94 files changed

+1089
-227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1089
-227
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,12 @@
962962
"branch": "main",
963963
"branch_mapping": {}
964964
},
965+
{
966+
"path_to_root": "msdocs-tomcat-mysql-sample-app",
967+
"url": "https://github.com/Azure-Samples/msdocs-tomcat-mysql-sample-app",
968+
"branch": "main",
969+
"branch_mapping": {}
970+
},
965971
{
966972
"path_to_root": "azuresignalr-samples",
967973
"url": "https://github.com/aspnet/AzureSignalR-samples",

articles/ai-services/language-service/custom-named-entity-recognition/includes/roles-for-resource-and-storage.md

Lines changed: 1 addition & 1 deletion

articles/ai-services/language-service/includes/custom/roles-for-resource-and-storage.md

Lines changed: 1 addition & 1 deletion

articles/ai-services/language-service/question-answering/how-to/encrypt-data-at-rest.md

Lines changed: 1 addition & 1 deletion

articles/app-service/configure-authentication-provider-google.md

Lines changed: 2 additions & 2 deletions
41.1 KB
19.6 KB
21.9 KB
62.8 KB
59.3 KB

0 commit comments

Comments
 (0)