Skip to content

Commit c7a697a

Browse files
robswainrobswain
committed
resolve conflicts
2 parents 7d7b331 + d9aab2d commit c7a697a

File tree

5,467 files changed

+93887
-52555
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,467 files changed

+93887
-52555
lines changed

‎.openpublishing.publish.config.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@
6868
"branch": "master",
6969
"branch_mapping": {}
7070
},
71+
{
72+
"path_to_root": "ms-identity-docs-code-javascript",
73+
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-javascript",
74+
"branch": "main",
75+
"branch_mapping": {}
76+
},
7177
{
7278
"path_to_root": "_themes",
7379
"url": "https://github.com/Microsoft/templates.docs.msft",
@@ -374,6 +380,12 @@
374380
"branch": "master",
375381
"branch_mapping": {}
376382
},
383+
{
384+
"path_to_root": "ms-identity-docs-code-dotnet",
385+
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-dotnet",
386+
"branch": "main",
387+
"branch_mapping": {}
388+
},
377389
{
378390
"path_to_root": "remote-monitoring-webui",
379391
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -698,6 +710,12 @@
698710
"branch": "master",
699711
"branch_mapping": {}
700712
},
713+
{
714+
"path_to_root": "ms-identity-javascript-react-docs",
715+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-react-docs",
716+
"branch": "main",
717+
"branch_mapping": {}
718+
},
701719
{
702720
"path_to_root": "cognitive-services-quickstart-code",
703721
"url": "https://github.com/Azure-Samples/cognitive-services-quickstart-code",
@@ -884,6 +902,12 @@
884902
"branch": "main",
885903
"branch_mapping": {}
886904
},
905+
{
906+
"path_to_root": "ms-identity-python-webapp-tutorial",
907+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
908+
"branch": "0.5.0",
909+
"branch_mapping": {}
910+
},
887911
{
888912
"path_to_root": "ms-identity-node",
889913
"url": "https://github.com/Azure-Samples/ms-identity-node",

‎.openpublishing.redirection.active-directory.json

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"redirect_document_id": false
77
},
88
{
9-
"source_path_from_root": "/articles/active-directory/develop/configure-token-lifetimes.md",
10-
"redirect_url": "/azure/active-directory/develop/active-directory-saml-claims-customization",
9+
"source_path_from_root": "/articles/active-directory/develop/registration-config-change-token-lifetime-how-to.md",
10+
"redirect_url": "/azure/active-directory/develop/configure-token-lifetimes",
1111
"redirect_document_id": false
1212
},
1313
{
@@ -60,6 +60,11 @@
6060
"redirect_url": "/azure/active-directory/saas-apps/atlassian-cloud-tutorial",
6161
"redirect_document_id": false
6262
},
63+
{
64+
"source_path_from_root": "/articles/active-directory/saas-apps/easy-metrics-auth0-connector-tutorial.md",
65+
"redirect_url": "/azure/active-directory/saas-apps/easy-metrics-connector-tutorial",
66+
"redirect_document_id": false
67+
},
6368
{
6469
"source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
6570
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
@@ -135,7 +140,7 @@
135140
"redirect_url": "/azure/active-directory/saas-apps/f5-big-ip-headers-easy-button",
136141
"redirect_document_id": false
137142
},
138-
{
143+
{
139144
"source_path_from_root": "/articles/active-directory/saas-apps/tripactions-tutorial.md",
140145
"redirect_url": "/azure/active-directory/saas-apps/navan-tutorial",
141146
"redirect_document_id": false
@@ -7229,7 +7234,7 @@
72297234
{
72307235
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-add-role-to-user.md",
72317236
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7232-
"redirect_document_id": true
7237+
"redirect_document_id": false
72337238
},
72347239
{
72357240
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-change-default-settings.md",
@@ -7546,6 +7551,11 @@
75467551
"redirect_url": "/azure/active-directory/roles/view-assignments",
75477552
"redirect_document_id": false
75487553
},
7554+
{
7555+
"source_path_from_root": "/articles/active-directory/roles/groups-pim-eligible.md",
7556+
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7557+
"redirect_document_id": true
7558+
},
75497559
{
75507560
"source_path_from_root": "/articles/active-directory/users-groups-roles/directory-administrative-units.md",
75517561
"redirect_url": "/azure/active-directory/roles/administrative-units",
@@ -7663,8 +7673,8 @@
76637673
},
76647674
{
76657675
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-groups-pim-eligible.md",
7666-
"redirect_url": "/azure/active-directory/roles/groups-pim-eligible",
7667-
"redirect_document_id": true
7676+
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7677+
"redirect_document_id": false
76687678
},
76697679
{
76707680
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-groups-remove-assignment.md",

‎.openpublishing.redirection.api-management.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,16 @@
149149
"source_path_from_root": "/articles/api-management/validation-policies.md",
150150
"redirect_url": "/azure/api-management/api-management-policies#validation-policies",
151151
"redirect_document_id": false
152+
},
153+
{
154+
"source_path_from_root": "/articles/api-management/authorizations-how-to.md",
155+
"redirect_url": "/azure/api-management/authorizations-how-to-github",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path_from_root": "/articles/api-management/authorizations-reference.md",
160+
"redirect_url": "/azure/api-management/authorizations-configure-common-providers",
161+
"redirect_document_id": false
152162
}
153163
]
154164
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"redirections": [
3-
{
3+
{
4+
"source_path_from_root": "/articles/azure-monitor/snapshot-debugger/snapshot-collector-release-notes.md",
5+
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#release-notes-for-microsoftapplicationinsightssnapshotcollector",
6+
"redirect_document_id": false
7+
},
8+
{
49
"source_path_from_root": "/articles/azure-monitor/best-practices.md",
510
"redirect_url": "/azure/azure-monitor/getting-started",
611
"redirect_document_id": false
@@ -45,6 +50,26 @@
4550
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
4651
"redirect_document_id": false
4752
},
53+
{
54+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-runtime-exceptions.md",
55+
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-runtime-exceptions",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-performance.md",
60+
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-performance",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-users.md",
65+
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-users",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/azure-monitor/app/custom-data-correlation.md",
70+
"redirect_url": "/previous-versions/azure/azure-monitor/app/custom-data-correlation",
71+
"redirect_document_id": false
72+
},
4873
{
4974
"source_path_from_root": "/articles/azure-monitor/app/correlation.md",
5075
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",

‎.openpublishing.redirection.azure-resource-manager.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1919,6 +1919,11 @@
19191919
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-get-managed-group-resize-vm.md",
19201920
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
19211921
"redirect_document_id": false
1922-
}
1922+
},
1923+
{
1924+
"source_path_from_root": "/articles/governance/policy/tutorials/policy-as-code-github.md",
1925+
"redirect_url": "/azure/governance/policy/concepts/policy-as-code",
1926+
"redirect_document_id": false
1927+
}
19231928
]
19241929
}

‎.openpublishing.redirection.defender-for-iot.json

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,44 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-on-premises-management-console.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/activate-deploy-management",
6+
"redirect_document_id": false
7+
}, {
8+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-sensor.md",
9+
"redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/activate-deploy-sensor",
10+
"redirect_document_id": false
11+
}, {
12+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-deploy-certificates.md",
13+
"redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/activate-deploy-sensor#deploy-an-ssltls-certificate",
14+
"redirect_document_id": false
15+
}, {
16+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-enhance-port-and-vlan-name-resolution.md",
17+
"redirect_url": "/azure/defender-for-iot/organizations/how-to-control-what-traffic-is-monitored#customize-port-and-vlan-names",
18+
"redirect_document_id": false
19+
}, {
20+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-gain-insight-into-global-regional-and-local-threats.md",
21+
"redirect_url": "/azure/defender-for-iot/organizations/monitor-zero-trust",
22+
"redirect_document_id": false
23+
}, {
24+
"source_path_from_root": "/articles/defender-for-iot/organizations/traffic-mirroring/configure-mirror-tap.md",
25+
"redirect_url": "/azure/defender-for-iot/organizations/best-practices/traffic-mirroring-methods#active-or-passive-aggregation-tap",
26+
"redirect_document_id": false
27+
}, {
28+
"source_path_from_root": "/articles/defender-for-iot/organizations/pre-deployment-checklist.md",
29+
"redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/ot-deploy-path",
30+
"redirect_document_id": false
31+
},
32+
{
33+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md",
34+
"redirect_url": "/azure/defender-for-iot/organizations/how-to-troubleshoot-sensor",
35+
"redirect_document_id": false
36+
},
37+
{
38+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-set-up-your-network.md",
39+
"redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-prepare-deploy",
40+
"redirect_document_id": false
41+
},
342
{
443
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-device-notifications.md",
544
"redirect_url": "/azure/defender-for-iot/organizations/how-to-work-with-the-sensor-device-map#manage-device-notifications-from-an-ot-sensor-device-map",
@@ -136,7 +175,7 @@
136175
},
137176
{
138177
"source_path_from_root": "/articles/defender-for-iot/how-to-set-up-your-network.md",
139-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-set-up-your-network",
178+
"redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-prepare-deploy",
140179
"redirect_document_id": false
141180
},
142181
{
@@ -151,7 +190,7 @@
151190
},
152191
{
153192
"source_path_from_root": "/articles/defender-for-iot/how-to-activate-and-set-up-your-on-premises-management-console.md",
154-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-activate-and-set-up-your-on-premises-management-console",
193+
"redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/activate-deploy-management",
155194
"redirect_document_id": false
156195
},
157196
{
@@ -256,7 +295,7 @@
256295
},
257296
{
258297
"source_path_from_root": "/articles/defender-for-iot/how-to-gain-insight-into-global-regional-and-local-threats.md",
259-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-gain-insight-into-global-regional-and-local-threats",
298+
"redirect_url": "/azure/defender-for-iot/organizations/monitor-zero-trust",
260299
"redirect_document_id": false
261300
},
262301
{
@@ -677,5 +716,3 @@
677716
]
678717
}
679718

680-
681-

‎.openpublishing.redirection.healthcare-apis.json

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,11 +586,19 @@
586586
"redirect_document_id": false
587587
},
588588
{ "source_path_from_root": "/articles/healthcare-apis/iot/iot-data-flow.md",
589-
"redirect_url": "/azure/healthcare-apis/iot/understand-service",
589+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-data-processing-stages",
590590
"redirect_document_id": false
591591
},
592592
{ "source_path_from_root": "/articles/healthcare-apis/iot/data-flow.md",
593-
"redirect_url": "/azure/healthcare-apis/iot/understand-service",
593+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-data-processing-stages",
594+
"redirect_document_id": false
595+
},
596+
{ "source_path_from_root": "/articles/healthcare-apis/iot/understand-service.md",
597+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-data-processing-stages",
598+
"redirect_document_id": false
599+
},
600+
{ "source_path_from_root": "/articles/healthcare-apis/iot/overview-of-device-message-processing-stages.md",
601+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-data-processing-stages",
594602
"redirect_document_id": false
595603
},
596604
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-device-mappings.md",
@@ -602,7 +610,11 @@
602610
"redirect_document_id": false
603611
},
604612
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-fhir-mappings.md",
605-
"redirect_url": "/azure/healthcare-apis/iot/how-to-configure-fhir-mappings",
613+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-fhir-destination-mapping",
614+
"redirect_document_id": false
615+
},
616+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-configure-fhir-mappings.md",
617+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-fhir-destination-mapping",
606618
"redirect_document_id": false
607619
},
608620
{ "source_path_from_root": "/articles/healthcare-apis/iot/iot-connector-machine-learning.md",
@@ -650,7 +662,11 @@
650662
"redirect_document_id": false
651663
},
652664
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings.md",
653-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontenttemplate-mappings",
665+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-mappings",
666+
"redirect_document_id": false
667+
},
668+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iotjsonpathcontenttemplate-mappings.md",
669+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-mappings",
654670
"redirect_document_id": false
655671
},
656672
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-button.md",

‎.openpublishing.redirection.iot-hub-device-update.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
"source_path_from_root": "/articles/iot-hub-device-update/migration-pp-to-ppr.md",
55
"redirect_url": "/azure/iot-hub-device-update/migration-public-preview-refresh-to-ga",
66
"redirect_document_id": true
7+
},
8+
{
9+
"source_path_from_root": "/articles/iot-hub-device-update/connected-cache-configure.md",
10+
"redirect_url": "/azure/iot-hub-device-update/connected-cache-disconnected-device-update",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/iot-hub-device-update/connected-cache-industrial-iot-nested.md",
15+
"redirect_url": "/azure/iot-hub-device-update/connected-cache-nested-level",
16+
"redirect_document_id": false
717
}
818
]
919
}

0 commit comments

Comments
 (0)