Skip to content

Commit b18810e

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into 2021_tiersplit
2 parents f1b89ef + 16d239d commit b18810e

File tree

1,526 files changed

+73564
-19712
lines changed

Some content is hidden

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

1,526 files changed

+73564
-19712
lines changed

.openpublishing.publish.config.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,13 @@
800800
"url": "https://github.com/Azure-Samples/msdocs-python-django-webapp-quickstart",
801801
"branch": "main",
802802
"branch_mapping": {}
803-
}
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+
}
804810
],
805811
"branch_target_mapping": {
806812
"live": [
@@ -825,7 +831,7 @@
825831
".openpublishing.redirection.json",
826832
".openpublishing.redirection.active-directory.json",
827833
".openpublishing.redirection.azure-sql.json",
828-
".openpublishing.redirection.data-factory.json",
834+
"articles/data-factory/.openpublishing.redirection.data-factory.json",
829835
".openpublishing.redirection.defender-for-cloud.json",
830836
".openpublishing.redirection.defender-for-iot.json",
831837
".openpublishing.redirection.healthcare-apis.json",

.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: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)