Skip to content

Commit 24f43da

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into patch-8
2 parents ae3eb51 + 221295a commit 24f43da

File tree

5,566 files changed

+122603
-49267
lines changed

Some content is hidden

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

5,566 files changed

+122603
-49267
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main" "master" "release-.*"]
2-
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml))" "includes/"]}
2+
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md))" "includes/"]}

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ AzureMigration.ps1
2323
!/.vscode/extensions.json
2424
.gitignore
2525
**/.vscode/settings.json
26-
27-
desktop.ini
26+
*.pdn
27+
articles/azure-cache-for-redis/media/cache-managed-identity/Screenshot 2022-01-20 092913.pdn

.openpublishing.publish.config.json

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,25 @@
788788
"url": "https://github.com/Azure/azure-docs-bicep-samples/",
789789
"branch": "main",
790790
"branch_mapping": {}
791-
}
791+
},
792+
{
793+
"path_to_root": "msdocs-python-flask-webapp-quickstart",
794+
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
795+
"branch": "main",
796+
"branch_mapping": {}
797+
},
798+
{
799+
"path_to_root": "msdocs-python-django-webapp-quickstart",
800+
"url": "https://github.com/Azure-Samples/msdocs-python-django-webapp-quickstart",
801+
"branch": "main",
802+
"branch_mapping": {}
803+
},
804+
{
805+
"path_to_root": "msdocs-nodejs-mongodb-azure-sample-app",
806+
"url": "https://github.com/Azure-Samples/msdocs-nodejs-mongodb-azure-sample-app",
807+
"branch": "main",
808+
"branch_mapping": {}
809+
}
792810
],
793811
"branch_target_mapping": {
794812
"live": [

.openpublishing.redirection.active-directory.json

Lines changed: 138 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
{
3434
"source_path_from_root": "/articles/active-directory/develop/registration-config-multi-tenant-application-add-to-gallery-how-to.md",
35-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
35+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
3636
"redirect_document_id": false
3737
},
3838
{
@@ -740,6 +740,111 @@
740740
"redirect_url": "/visualstudio/azure/vs-active-directory-webapi-what-happened",
741741
"redirect_document_id": false
742742
},
743+
{
744+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-javascript-auth-code-angular.md",
745+
"redirect_url": "/azure/active-directory/develop/single-page-app-quickstart?pivots=devlang-angular",
746+
"redirect_document_id": false
747+
},
748+
{
749+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-javascript-auth-code.md",
750+
"redirect_url": "/azure/active-directory/develop/single-page-app-quickstart?pivots=devlang-javascript",
751+
"redirect_document_id": false
752+
},
753+
{
754+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-javascript-auth-code-react.md",
755+
"redirect_url": "/azure/active-directory/develop/single-page-app-quickstart?pivots=devlang-react",
756+
"redirect_document_id": false
757+
},
758+
{
759+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-webapp.md",
760+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-aspnet",
761+
"redirect_document_id": false
762+
},
763+
{
764+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-core-webapp.md",
765+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-aspnet-core",
766+
"redirect_document_id": false
767+
},
768+
{
769+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-core-webapp-calls-graph.md",
770+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-aspnet-core",
771+
"redirect_document_id": false
772+
},
773+
{
774+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-webapp-msal.md",
775+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-msal",
776+
"redirect_document_id": false
777+
},
778+
{
779+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-webapp.md",
780+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-passport",
781+
"redirect_document_id": false
782+
},
783+
{
784+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-java-webapp.md",
785+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-java",
786+
"redirect_document_id": false
787+
},
788+
{
789+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-python-webapp.md",
790+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-python",
791+
"redirect_document_id": false
792+
},
793+
{
794+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-dotnet-native-aspnet.md",
795+
"redirect_url": "/azure/active-directory/develop/web-api-quickstart?pivots=devlang-aspnet",
796+
"redirect_document_id": false
797+
},
798+
{
799+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-core-web-api.md",
800+
"redirect_url": "/azure/active-directory/develop/web-api-quickstart?pivots=devlang-aspnet-core",
801+
"redirect_document_id": false
802+
},
803+
{
804+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-android.md",
805+
"redirect_url": "/azure/active-directory/develop/mobile-app-quickstart?pivots=devlang-android",
806+
"redirect_document_id": false
807+
},
808+
{
809+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-ios.md",
810+
"redirect_url": "/azure/active-directory/develop/mobile-app-quickstart?pivots=devlang-ios",
811+
"redirect_document_id": false
812+
},
813+
{
814+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-uwp.md",
815+
"redirect_url": "/azure/active-directory/develop/desktop-app-quickstart?pivots=devlang-uwp",
816+
"redirect_document_id": false
817+
},
818+
{
819+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-windows-desktop.md",
820+
"redirect_url": "/azure/active-directory/develop/desktop-app-quickstart?pivots=devlang-windows-desktop",
821+
"redirect_document_id": false
822+
},
823+
{
824+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-desktop.md",
825+
"redirect_url": "/azure/active-directory/develop/desktop-app-quickstart?pivots=devlang-nodejs-electron",
826+
"redirect_document_id": false
827+
},
828+
{
829+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-netcore-daemon.md",
830+
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-dotnet-core",
831+
"redirect_document_id": false
832+
},
833+
{
834+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-python-daemon.md",
835+
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-python",
836+
"redirect_document_id": false
837+
},
838+
{
839+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-console.md",
840+
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-nodejs",
841+
"redirect_document_id": false
842+
},
843+
{
844+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-java-daemon.md",
845+
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-java",
846+
"redirect_document_id": false
847+
},
743848
{
744849
"source_path_from_root": "/articles/active-directory/active-directory-application-proxy-connectors.md",
745850
"redirect_url": "/azure/active-directory/active-directory-application-proxy-connectors-azure-portal",
@@ -3170,34 +3275,39 @@
31703275
"redirect_url": "/azure/active-directory/develop/v2-conditional-access-dev-guide",
31713276
"redirect_document_id": false
31723277
},
3278+
{
3279+
"source_path_from_root": "/articles/active-directory/develop/v2-howto-app-gallery-listing.md",
3280+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
3281+
"redirect_document_id": false
3282+
},
31733283
{
31743284
"source_path_from_root": "/articles/active-directory/azuread-dev/howto-app-gallery-listing.md",
3175-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3285+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31763286
"redirect_document_id": false
31773287
},
31783288
{
31793289
"source_path_from_root": "/articles/active-directory/develop/howto-app-gallery-listing.md",
3180-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3290+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31813291
"redirect_document_id": false
31823292
},
31833293
{
31843294
"source_path_from_root": "/articles/active-directory/manage-apps/isv-choose-multi-tenant-federation.md",
3185-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3295+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31863296
"redirect_document_id": false
31873297
},
31883298
{
31893299
"source_path_from_root": "/articles/active-directory/manage-apps/isv-create-sso-documentation.md",
3190-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3300+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31913301
"redirect_document_id": false
31923302
},
31933303
{
31943304
"source_path_from_root": "/articles/active-directory/manage-apps/isv-sso-content.md",
3195-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3305+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31963306
"redirect_document_id": false
31973307
},
31983308
{
31993309
"source_path_from_root": "/articles/active-directory/manage-apps/isv-tenant-multi-tenant-app.md",
3200-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3310+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
32013311
"redirect_document_id": false
32023312
},
32033313
{
@@ -7080,6 +7190,21 @@
70807190
"redirect_url": "/azure/active-directory/reports-monitoring/overview-reports",
70817191
"redirect_document_id": false
70827192
},
7193+
{
7194+
"source_path_from_root": "/articles/active-directory/hybrid/how-to-connect-fed-hybrid-azure-ad-join-post-config-tasks.md",
7195+
"redirect_url": "/azure/active-directory/devices/howto-hybrid-azure-ad-join",
7196+
"redirect_document_id": true
7197+
},
7198+
{
7199+
"source_path_from_root": "/articles/active-directory/devices/hybrid-azuread-join-federated-domains.md",
7200+
"redirect_url": "/azure/active-directory/devices/howto-hybrid-azure-ad-join",
7201+
"redirect_document_id": false
7202+
},
7203+
{
7204+
"source_path_from_root": "/articles/active-directory/devices/hybrid-azuread-join-managed-domains.md",
7205+
"redirect_url": "/azure/active-directory/devices/howto-hybrid-azure-ad-join",
7206+
"redirect_document_id": false
7207+
},
70837208
{
70847209
"source_path_from_root": "/articles/active-directory/reporting-azure-monitor-diagnostics-azure-storage-account.md",
70857210
"redirect_url": "/azure/active-directory/reports-monitoring/quickstart-azure-monitor-route-logs-to-storage-account",
@@ -10681,6 +10806,12 @@
1068110806
"redirect_url": "/azure/active-directory/reports-monitoring/reference-basic-info-sign-in-logs",
1068210807
"redirect_document_id": false
1068310808
}
10809+
,
10810+
{
10811+
"source_path": "articles/active-directory/managed-identities-azure-resources/services-support-managed-identities.md",
10812+
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/managed-identities-status",
10813+
"redirect_document_id": false
10814+
}
1068410815

1068510816
]
1068610817
}

.openpublishing.redirection.azure-productivity.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,31 @@
44
"source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
55
"redirect_url": "/azure/lab-services/get-started-manage-labs",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
10+
"redirect_url": "/azure/devtest-labs/samples-powershell",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
15+
"redirect_url": "/azure/devtest-labs/samples-powershell",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
20+
"redirect_url": "/azure/devtest-labs/samples-powershell",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
25+
"redirect_url": "/azure/devtest-labs/samples-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
30+
"redirect_url": "/azure/devtest-labs/samples-powershell",
31+
"redirect_document_id": false
732
}
833
]
934
}

.openpublishing.redirection.data-factory.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,16 @@
2525
"redirect_url": "/azure/data-factory/transform-data-using-custom-activity",
2626
"redirect_document_id": false
2727
}
28+
,
29+
{
30+
"source_path_from_root": "/articles/data-factory/blog.md",
31+
"redirect_url": "https://techcommunity.microsoft.com/t5/Azure-Data-Factory/bg-p/AzureDataFactoryBlog",
32+
"redirect_document_id": false
33+
},
34+
{
35+
"source_path_from_root": "/articles/data-factory/pricing.md",
36+
"redirect_url": "https://azure.microsoft.com/pricing/details/data-factory/",
37+
"redirect_document_id": false
38+
}
2839
]
2940
}

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,21 @@
1010
"redirect_url": "/azure/defender-for-cloud/upcoming-changes",
1111
"redirect_document_id": false
1212
},
13+
{
14+
"source_path_from_root": "/articles/security-center/policy-reference.md",
15+
"redirect_url": "/azure/defender-for-cloud/policy-reference",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/security-center/security-center-policy-definitions.md",
20+
"redirect_url": "/azure/defender-for-cloud/policy-reference",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-introduction.md#what-is-hash-reputation-analysis-for-malware",
25+
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-introduction#what-kind-of-alerts-does-microsoft-defender-for-storage-provide",
26+
"redirect_document_id": false
27+
},
1328
{
1429
"source_path_from_root": "/articles/security-center/release-notes-archive.md",
1530
"redirect_url": "/azure/defender-for-cloud/release-notes-archive",

.openpublishing.redirection.healthcare-apis.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@
374374
},
375375
{
376376
"source_path_from_root": "/articles/healthcare-apis/data-transformation/move-to-synapse.md",
377-
"redirect_url": "/azure/healthcare-apis/fhir/move-to-synapse",
377+
"redirect_url": "/azure/healthcare-apis/fhir/copy-to-synapse",
378378
"redirect_document_id": true
379379
},
380380
{
@@ -429,7 +429,7 @@
429429
},
430430
{
431431
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/access-fhir-postman-tutorial.md",
432-
"redirect_url": "/azure/healthcare-apis/use-postman",
432+
"redirect_url": "/azure/healthcare-apis/fhir/use-postman",
433433
"redirect_document_id": true
434434
},
435435
{

0 commit comments

Comments
 (0)