Skip to content

Commit a39d7d5

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into onBGA
2 parents 5f541b5 + f29a953 commit a39d7d5

File tree

6,253 files changed

+106265
-49412
lines changed

Some content is hidden

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

6,253 files changed

+106265
-49412
lines changed

.openpublishing.publish.config.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,12 @@
429429
"branch": "cli-preview",
430430
"branch_mapping": {}
431431
},
432+
{
433+
"path_to_root": "terraform",
434+
"url": "https://github.com/Azure/terraform",
435+
"branch": "master",
436+
"branch_mapping": {}
437+
},
432438
{
433439
"path_to_root": "samples-qnamaker-nodejs",
434440
"url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-nodejs",
@@ -826,6 +832,8 @@
826832
".openpublishing.redirection.media-services.json",
827833
".openpublishing.redirection.security-benchmark.json",
828834
".openpublishing.redirection.synapse-analytics.json",
835+
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
836+
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
829837
"articles/azure-relay/.openpublishing.redirection.relay.json",
830838
"articles/communication-services/.openpublishing.redirection.communication-services.json",
831839
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
@@ -845,6 +853,7 @@
845853
"articles/purview/.openpublishing.redirection.purview.json",
846854
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
847855
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
848-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
856+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
857+
"articles/mysql/.openpublishing.redirection.mysql.json"
849858
]
850859
}

.openpublishing.redirection.active-directory.json

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
5+
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/active-directory/manage-apps/application-management-fundamentals.md",
10+
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
515
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
@@ -4230,6 +4240,26 @@
42304240
"redirect_url": "/azure/active-directory/governance/review-your-access",
42314241
"redirect_document_id": true
42324242
},
4243+
{
4244+
"source_path_from_root": "/azure/active-directory/governance/review-your-access.md",
4245+
"redirect_url": "/azure/active-directory/governance/self-access-review",
4246+
"redirect_document_id": false
4247+
},
4248+
{
4249+
"source_path_from_root": "/azure/active-directory/governance/entitlement-management-access-reviews-self-review.md",
4250+
"redirect_url": "/azure/active-directory/governance/self-access-review",
4251+
"redirect_document_id": false
4252+
},
4253+
{
4254+
"source_path_from_root": "/azure/active-directory/governance/manage-guest-access-with-access-reviews.md",
4255+
"redirect_url": "/azure/active-directory/governance/manage-access-review",
4256+
"redirect_document_id": false
4257+
},
4258+
{
4259+
"source_path_from_root": "/azure/active-directory/governance/manage-user-access-with-access-reviews.md",
4260+
"redirect_url": "/azure/active-directory/governance/manage-access-review",
4261+
"redirect_document_id": false
4262+
},
42334263
{
42344264
"source_path_from_root": "/articles/active-directory/cloud-provisioning/what-is-cloud-provisioning.md",
42354265
"redirect_url": "/azure/active-directory/cloud-sync/what-is-cloud-sync",
@@ -10509,6 +10539,11 @@
1050910539
"source_path": "articles/active-directory/privileged-identity-management/pim-resource-roles-start-access-review.md",
1051010540
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review",
1051110541
"redirect_document_id": false
10512-
}
10542+
},
10543+
{
10544+
"source_path_from_root": "/articles/active-directory-b2c/troubleshoot-custom-policies.md",
10545+
"redirect_url": "/azure/active-directory-b2c/troubleshoot",
10546+
"redirect_document_id": false
10547+
}
1051310548
]
1051410549
}

.openpublishing.redirection.iot-hub.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,16 @@
125125
"redirect_url": "/azure/iot-hub/about-iot-hub",
126126
"redirect_document_id": false
127127
},
128+
{
129+
"source_path_from_root": "/articles/iot-hub/about-iot-hub.md",
130+
"redirect_url": "/azure/iot-hub/iot-concepts-and-iot-hub",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path_from_root": "/articles/iot-hub/iot-concepts.md",
135+
"redirect_url": "/azure/iot-hub/iot-concepts-and-iot-hub",
136+
"redirect_document_id": false
137+
},
128138
{
129139
"source_path_from_root": "/articles/iot-hub/quickstart-send-telemetry-xamarinforms.md",
130140
"redirect_url": "/azure/iot-hub/about-iot-hub",
@@ -928,7 +938,6 @@
928938
"redirect_url": "/azure/iot-hub/tutorial-x509-scripts",
929939
"redirect_document_id": false
930940
},
931-
932941
{
933942
"source_path_from_root": "/articles/iot-hub/iot-hub-gateway-kit-c-iot-gateway-connect-device-to-cloud.md",
934943
"redirect_url": "https://github.com/Azure/iot-edge/tree/master/v1/doc/commercial_gateway_kit/iot-hub-gateway-kit-c-iot-gateway-connect-device-to-cloud.md",
@@ -995,7 +1004,11 @@
9951004
"redirect_url": "https://github.com/Azure/iot-edge/tree/master/v1/samples/simulated_device_cloud_upload/iot-hub-windows-iot-edge-simulated-device.md",
9961005
"redirect_document_id": false
9971006
},
998-
1007+
{
1008+
"source_path_from_root": "/articles/iot-hub/tutorial-firmware-update.md",
1009+
"redirect_url": "/azure/iot-hub-device-update/device-update-raspberry-pi",
1010+
"redirect_document_id": false
1011+
}
9991012

10001013
]
10011014
}

0 commit comments

Comments
 (0)