Skip to content

Commit 93b8475

Browse files
committed
update to main
2 parents 29752c8 + 8ef1c7c commit 93b8475

File tree

17,064 files changed

+236045
-360157
lines changed

Some content is hidden

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

17,064 files changed

+236045
-360157
lines changed

.github/workflows/stale.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
# start-date: '2021-03-19'
2424
stale-pr-message: >
2525
This pull request has been inactive for at least 14 days.
26-
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.
26+
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation?branch=main) for instructions.
2727
28-
[Get Help](https://review.docs.microsoft.com/help/contribute/help-options?branch=master)
28+
[Get Help](https://review.docs.microsoft.com/help/contribute/help-options?branch=main)
2929
3030
[Docs Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)
3131
32-
[Resolve Merge Conflict](https://review.docs.microsoft.com/help/contribute/resolve-merge-conflicts?branch=master)
32+
[Resolve Merge Conflict](https://review.docs.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
3333

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ AzureMigration.ps1
2424
.gitignore
2525
**/.vscode/settings.json
2626
*.pdn
27-
articles/azure-cache-for-redis/media/cache-managed-identity/Screenshot 2022-01-20 092913.pdn

.openpublishing.publish.config.json

Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
"locale": "en-us",
99
"monikers": [],
1010
"moniker_ranges": [],
11-
"xref_query_tags": [
12-
"/dotnet",
13-
"/python"
14-
],
11+
"xref_query_tags": ["/dotnet", "/python"],
1512
"open_to_public_contributors": true,
1613
"type_mapping": {
1714
"ZonePivotGroups": "Toc",
@@ -26,12 +23,8 @@
2623
"version": 0
2724
}
2825
],
29-
"notification_subscribers": [
30-
31-
],
32-
"sync_notification_subscribers": [
33-
34-
],
26+
"notification_subscribers": ["[email protected]"],
27+
"sync_notification_subscribers": ["[email protected]"],
3528
"branches_to_filter": [],
3629
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
3730
"git_repository_branch_open_to_public_contributors": "main",
@@ -441,6 +434,12 @@
441434
"branch": "main",
442435
"branch_mapping": {}
443436
},
437+
{
438+
"path_to_root": "azureml-examples-march-cli-preview",
439+
"url": "https://github.com/azure/azureml-examples",
440+
"branch": "march-cli-preview",
441+
"branch_mapping": {}
442+
},
444443
{
445444
"path_to_root": "terraform",
446445
"url": "https://github.com/Azure/terraform",
@@ -528,7 +527,7 @@
528527
{
529528
"path_to_root": "azure-sdk-for-go-samples",
530529
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
531-
"branch": "master",
530+
"branch": "main",
532531
"branch_mapping": {}
533532
},
534533
{
@@ -795,24 +794,36 @@
795794
"branch": "main",
796795
"branch_mapping": {}
797796
},
798-
{
797+
{
799798
"path_to_root": "active-directory-b2c-msal-node-sign-in-sign-out-webapp",
800799
"url": "https://github.com/Azure-Samples/active-directory-b2c-msal-node-sign-in-sign-out-webapp",
801800
"branch": "main",
802801
"branch_mapping": {}
803802
},
804-
{
803+
{
805804
"path_to_root": "active-directory-b2c-javascript-nodejs-webapi",
806805
"url": "https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi",
807806
"branch": "master",
808807
"branch_mapping": {}
809808
},
810-
{
809+
{
810+
"path_to_root": "ms-identity-b2c-javascript-spa",
811+
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
812+
"branch": "main",
813+
"branch_mapping": {}
814+
},
815+
{
811816
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
812817
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
813818
"branch": "master",
814819
"branch_mapping": {}
815820
},
821+
{
822+
"path_to_root": "ms-identity-javascript-v2",
823+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-v2",
824+
"branch": "master",
825+
"branch_mapping": {}
826+
},
816827
{
817828
"path_to_root": "msdocs-python-flask-webapp-quickstart",
818829
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -842,17 +853,30 @@
842853
"url": "https://github.com/Azure-Samples/msdocs-flask-postgresql-sample-app",
843854
"branch": "main",
844855
"branch_mapping": {}
856+
},
857+
{
858+
"path_to_root": "azuresignalr-samples",
859+
"url": "https://github.com/aspnet/AzureSignalR-samples",
860+
"branch": "main",
861+
"branch_mapping": {}
862+
},
863+
{
864+
"path_to_root": "azure-webpubsub",
865+
"url": "https://github.com/Azure/azure-webpubsub",
866+
"branch": "main",
867+
"branch_mapping": {}
868+
},
869+
{
870+
"path_to_root": "functions-sql-todo-sample",
871+
"url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
872+
"branch": "docs-snippets",
873+
"branch_mapping": {}
845874
}
875+
846876
],
847877
"branch_target_mapping": {
848-
"live": [
849-
"Publish",
850-
"PDF"
851-
],
852-
"main": [
853-
"Publish",
854-
"PDF"
855-
]
878+
"live": ["Publish", "PDF"],
879+
"main": ["Publish", "PDF"]
856880
},
857881
"need_generate_pdf_url_template": true,
858882
"targets": {
@@ -866,16 +890,15 @@
866890
"redirection_files": [
867891
".openpublishing.redirection.json",
868892
".openpublishing.redirection.active-directory.json",
869-
".openpublishing.redirection.azure-sql.json",
893+
".openpublishing.redirection.azure-blob.json",
870894
"articles/data-factory/.openpublishing.redirection.data-factory.json",
871895
".openpublishing.redirection.defender-for-cloud.json",
872896
".openpublishing.redirection.defender-for-iot.json",
873897
".openpublishing.redirection.healthcare-apis.json",
874898
".openpublishing.redirection.iot-hub.json",
875899
".openpublishing.redirection.key-vault.json",
876-
".openpublishing.redirection.media-services.json",
877-
".openpublishing.redirection.security-benchmark.json",
878900
".openpublishing.redirection.sql-database.json",
901+
".openpublishing.redirection.security-benchmark.json",
879902
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
880903
".openpublishing.redirection.azure-web-pubsub.json",
881904
".openpublishing.redirection.azure-monitor.json",
@@ -912,6 +935,7 @@
912935
"articles/mysql/.openpublishing.redirection.mysql.json",
913936
"articles/container-apps/.openpublishing.redirection.container-apps.json",
914937
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
915-
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
938+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
939+
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json"
916940
]
917941
}

0 commit comments

Comments
 (0)