Skip to content

Commit 3ed4ddd

Browse files
hansgschossmannhansgschossmann
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs into johanng/clarifymoduleuse
2 parents 686a1a2 + f45eddf commit 3ed4ddd

File tree

4,172 files changed

+107228
-41192
lines changed

Some content is hidden

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

4,172 files changed

+107228
-41192
lines changed

‎.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: 27 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
{
@@ -3170,34 +3170,39 @@
31703170
"redirect_url": "/azure/active-directory/develop/v2-conditional-access-dev-guide",
31713171
"redirect_document_id": false
31723172
},
3173+
{
3174+
"source_path_from_root": "/articles/active-directory/develop/v2-howto-app-gallery-listing.md",
3175+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
3176+
"redirect_document_id": false
3177+
},
31733178
{
31743179
"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",
3180+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31763181
"redirect_document_id": false
31773182
},
31783183
{
31793184
"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",
3185+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31813186
"redirect_document_id": false
31823187
},
31833188
{
31843189
"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",
3190+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31863191
"redirect_document_id": false
31873192
},
31883193
{
31893194
"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",
3195+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31913196
"redirect_document_id": false
31923197
},
31933198
{
31943199
"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",
3200+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31963201
"redirect_document_id": false
31973202
},
31983203
{
31993204
"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",
3205+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
32013206
"redirect_document_id": false
32023207
},
32033208
{
@@ -7080,6 +7085,21 @@
70807085
"redirect_url": "/azure/active-directory/reports-monitoring/overview-reports",
70817086
"redirect_document_id": false
70827087
},
7088+
{
7089+
"source_path_from_root": "/articles/active-directory/hybrid/how-to-connect-fed-hybrid-azure-ad-join-post-config-tasks.md",
7090+
"redirect_url": "/azure/active-directory/devices/howto-hybrid-azure-ad-join",
7091+
"redirect_document_id": true
7092+
},
7093+
{
7094+
"source_path_from_root": "/articles/active-directory/devices/hybrid-azuread-join-federated-domains.md",
7095+
"redirect_url": "/azure/active-directory/devices/howto-hybrid-azure-ad-join",
7096+
"redirect_document_id": false
7097+
},
7098+
{
7099+
"source_path_from_root": "/articles/active-directory/devices/hybrid-azuread-join-managed-domains.md",
7100+
"redirect_url": "/azure/active-directory/devices/howto-hybrid-azure-ad-join",
7101+
"redirect_document_id": false
7102+
},
70837103
{
70847104
"source_path_from_root": "/articles/active-directory/reporting-azure-monitor-diagnostics-azure-storage-account.md",
70857105
"redirect_url": "/azure/active-directory/reports-monitoring/quickstart-azure-monitor-route-logs-to-storage-account",

‎.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.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)