Skip to content

Commit 48b218f

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ss3
2 parents a54513c + ec20547 commit 48b218f

File tree

6,397 files changed

+118760
-73382
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,397 files changed

+118760
-73382
lines changed

.openpublishing.publish.config.json

Lines changed: 11 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,7 +832,10 @@
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",
838+
"articles/communication-services/.openpublishing.redirection.communication-services.json",
830839
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
831840
"articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
832841
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
@@ -844,6 +853,7 @@
844853
"articles/purview/.openpublishing.redirection.purview.json",
845854
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
846855
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
847-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
856+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
857+
"articles/mysql/.openpublishing.redirection.mysql.json"
848858
]
849859
}

.openpublishing.redirection.active-directory.json

Lines changed: 10526 additions & 21 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.healthcare-apis.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,6 @@
177177
"redirect_url": "/azure/healthcare-apis/fhir/register-service-azure-ad-client-app",
178178
"redirect_document_id": true
179179
},
180-
{
181-
"source_path_from_root": "/articles/healthcare-apis/security-controls-policy.md",
182-
"redirect_url": "/azure/healthcare-apis/fhir/security-controls-policy",
183-
"redirect_document_id": true
184-
},
185180
{
186181
"source_path_from_root": "/articles/healthcare-apis/tutorial-web-app-fhir-server.md",
187182
"redirect_url": "/azure/healthcare-apis/fhir/tutorial-web-app-fhir-server",
@@ -334,7 +329,7 @@
334329
},
335330
{
336331
"source_path_from_root": "/articles/healthcare-apis/fhir/partner-ecosystem.md",
337-
"redirect_url": "/azure/healthcare-apis/azure-api-for-fhir/partner-ecosystem",
332+
"redirect_url": "/azure/healthcare-apis/azure-api-for-fhir/fhir-features-supported",
338333
"redirect_document_id": true
339334
},
340335
{
@@ -456,6 +451,11 @@
456451
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/access-fhir-postman-tutorial.md",
457452
"redirect_url": "/azure/healthcare-apis/use-postman",
458453
"redirect_document_id": true
459-
}
454+
},
455+
{
456+
"source_path_from_root": "/articles/healthcare-apis/fhir/security-controls-policy.md",
457+
"redirect_url": "/azure/healthcare-apis/security-controls-policy",
458+
"redirect_document_id": true
459+
},
460460
]
461461
}

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