Skip to content

Commit 47f5be2

Browse files
aahillaahill
committed
fixing conflict
2 parents a0138d8 + 789a774 commit 47f5be2

File tree

6,689 files changed

+113653
-73045
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,689 files changed

+113653
-73045
lines changed

‎.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,7 @@
994994
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
995995
"articles/postgresql/.openpublishing.redirection.postgresql.json",
996996
"articles/purview/.openpublishing.redirection.purview.json",
997+
"articles/sap/.openpublishing.redirection.sap.json",
997998
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
998999
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
9991000
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",

‎.openpublishing.redirection.active-directory.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
5656
"redirect_document_id": false
5757
},
58+
{
59+
"source_path_from_root": "/articles/active-directory/saas-apps/trello-tutorial.md",
60+
"redirect_url": "/azure/active-directory/saas-apps/atlassian-cloud-tutorial",
61+
"redirect_document_id": false
62+
},
5863
{
5964
"source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
6065
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
@@ -4391,6 +4396,11 @@
43914396
"redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
43924397
"redirect_document_id": false
43934398
},
4399+
{
4400+
"source_path_from_root": "/articles/active-directory/reports-monitoring/recommendations-integrate-third-party-apps.md",
4401+
"redirect_url": "/azure/active-directory/reports-monitoring/overview-recommendations",
4402+
"redirect_document_id": false
4403+
},
43944404
{
43954405
"source_path_from_root": "/articles/active-directory/reports-monitoring/workbook-legacy authentication.md",
43964406
"redirect_url": "/azure/active-directory/reports-monitoring/workbook-legacy-authentication",
@@ -4411,11 +4421,21 @@
44114421
"redirect_url": "/azure/active-directory/reports-monitoring/howto-configure-prerequisites-for-reporting-api",
44124422
"redirect_document_id": false
44134423
},
4424+
{
4425+
"source_path_from_root": "/articles/active-directory/reports-monitoring/recommendation-integrate-third-party-apps.md",
4426+
"redirect_url": "/azure/active-directory/reports-monitoring/overview-recommendations",
4427+
"redirect_document_id": false
4428+
},
44144429
{
44154430
"source_path_from_root": "/articles/active-directory/reports-monitoring/concept-reporting-api.md",
44164431
"redirect_url": "/azure/active-directory/reports-monitoring/howto-configure-prerequisites-for-reporting-api",
44174432
"redirect_document_id": false
44184433
},
4434+
{
4435+
"source_path_from_root": "/articles/active-directory/reports-monitoring/reference-reports-latencies.md",
4436+
"redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-ad-sla-performance",
4437+
"redirect_document_id": false
4438+
},
44194439
{
44204440
"source_path_from_root": "/articles/active-directory/customize-branding.md",
44214441
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -10906,6 +10926,11 @@
1090610926
"redirect_url": "/azure/active-directory-b2c/enable-authentication-in-node-web-app-with-api",
1090710927
"redirect_document_id": false
1090810928
},
10929+
{
10930+
"source_path_from_root": "/articles/active-directory-b2c/tenant-management.md",
10931+
"redirect_url": "/azure/active-directory-b2c/tenant-management-add-administrator",
10932+
"redirect_document_id": false
10933+
},
1090910934
{
1091010935
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-arm.md",
1091110936
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-arm",
@@ -11075,6 +11100,11 @@
1107511100
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-data-inventory.md",
1107611101
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/product-data-billable-resources",
1107711102
"redirect_document_id": false
11103+
},
11104+
{
11105+
"source_path_from_root": "/articles/active-directory/governance/create-access-review-privileged-access-groups.md",
11106+
"redirect_url": "/azure/active-directory/governance/create-access-review-pim-for-groups",
11107+
"redirect_document_id": false
1107811108
}
1107911109
]
1108011110
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/azure-monitor/getting-started",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/azure-monitor/observability-data.md",
10+
"redirect_url": "/azure/azure-monitor/overview",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/azure-monitor/change/change-analysis-query.md",
1015
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
@@ -25,6 +30,36 @@
2530
"redirect_url": "/azure/azure-monitor/change/change-analysis",
2631
"redirect_document_id": false
2732
},
33+
{
34+
"source_path_from_root": "/articles/azure-monitor/app/javascript-react-plugin.md",
35+
"redirect_url": "/azure/azure-monitor/app/javascript-framework-extensions",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/azure-monitor/app/javascript-react-native-plugin.md",
40+
"redirect_url": "/azure/azure-monitor/app/javascript-framework-extensions",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-monitor/app/javascript-angular-plugin.md",
45+
"redirect_url": "/azure/azure-monitor/app/javascript-framework-extensions",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/azure-monitor/app/javascript-click-analytics-plugin.md",
50+
"redirect_url": "/azure/azure-monitor/app/javascript-feature-extensions",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-monitor/app/java-in-process-agent-redirect.md",
55+
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/azure-monitor/app/legacy-pricing.md",
60+
"redirect_url": "/azure/azure-monitor/best-practices-cost",
61+
"redirect_document_id": false
62+
},
2863
{
2964
"source_path_from_root": "/articles/azure-monitor/app/snapshot-debugger.md",
3065
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger",
@@ -3867,6 +3902,21 @@
38673902
"redirect_url": "/azure/azure-monitor/alerts/alerts-metric-create-templates",
38683903
"redirect_document_id": false
38693904
},
3905+
{
3906+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric-create-templates.md",
3907+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
3908+
"redirect_document_id": false
3909+
},
3910+
{
3911+
"source_path_from_root": "/articles/azure-monitor/alerts/action-groups-create-resource-manager-template.md",
3912+
"redirect_url": "/azure/azure-monitor/alerts/action-groups",
3913+
"redirect_document_id": false
3914+
},
3915+
{
3916+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-log-create-templates.md",
3917+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
3918+
"redirect_document_id": false
3919+
},
38703920
{
38713921
"source_path_from_root": "/articles/azure-monitor/platform/alerts-metric-logs.md",
38723922
"redirect_url": "/azure/azure-monitor/alerts/alerts-metric-logs",
@@ -4174,7 +4224,7 @@
41744224
},
41754225
{
41764226
"source_path_from_root": "/articles/azure-monitor/platform/autoscale-resource-log-schema.md",
4177-
"redirect_url": "/azure/azure-monitor/autoscale/autoscale-resource-log-schema",
4227+
"redirect_url": "/azure/azure-monitor/autoscale/autoscale-diagnostics",
41784228
"redirect_document_id": false
41794229
},
41804230
{
@@ -5681,6 +5731,21 @@
56815731
"source_path_from_root": "/articles/azure-monitor/app/windows-desktop.md",
56825732
"redirect_url": "https://github.com/Microsoft/appcenter",
56835733
"redirect_document_id": false
5734+
},
5735+
{
5736+
"source_path_from_root": "/articles/azure-monitor/alerts/proactive-performance-diagnostics.md",
5737+
"redirect_url": "https://azure.microsoft.com/updates/public-preview-alerts-based-smart-detection-for-application-insights/",
5738+
"redirect_document_id": false
5739+
},
5740+
{
5741+
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-resource-log-schema.md",
5742+
"redirect_url": "/azure/azure-monitor/autoscale/autoscale-diagnostics",
5743+
"redirect_document_id": false
5744+
},
5745+
{
5746+
"source_path_from_root": "/articles/azure-monitor/app/java-in-process-agent.md",
5747+
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
5748+
"redirect_document_id": false
56845749
}
56855750
]
56865751
}

‎.openpublishing.redirection.healthcare-apis.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,11 @@
634634
"redirect_document_id": false
635635
},
636636
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-calculated-functions-mappings.md",
637-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontenttemplate-mappings",
637+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-mappings",
638+
"redirect_document_id": false
639+
},
640+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-calculatedcontenttemplate-mappings.md",
641+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-mappings",
638642
"redirect_document_id": false
639643
},
640644
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings.md",

‎.openpublishing.redirection.json

Lines changed: 102 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,40 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/virtual-machines/h-series-retirement.md",
5+
"redirect_url": "/previous-versions/azure/virtual-machines/h-series-retirement",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/security/develop/security-code-analysis-customize.md",
10+
"redirect_url": "/previous-versions/azure/security/develop/security-code-analysis-customize",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/security/develop/security-code-analysis-faq.yml",
15+
"redirect_url": "/previous-versions/azure/security/develop/security-code-analysis-faq",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/security/develop/security-code-analysis-onboard.md",
20+
"redirect_url": "/previous-versions/azure/security/develop/security-code-analysis-onboard",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/security/develop/security-code-analysis-overview.md",
25+
"redirect_url": "/previous-versions/azure/security/develop/security-code-analysis-overview",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/security/develop/security-code-analysis-releases.md",
30+
"redirect_url": "/previous-versions/azure/security/develop/security-code-analysis-releases",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/security/develop/yaml-configuration.md",
35+
"redirect_url": "/previous-versions/azure/security/develop/yaml-configuration",
36+
"redirect_document_id": false
37+
},
338
{
439
"source_path": "articles/vmware-cloudsimple/access-cloudsimple-portal.md",
540
"redirect_url": "/previous-versions/azure/vmware-cloudsimple/access-cloudsimple-portal",
@@ -13206,7 +13241,7 @@
1320613241
},
1320713242
{
1320813243
"source_path_from_root": "/articles/logic-apps/logic-apps-monitor-your-logic-apps-oms.md",
13209-
"redirect_url": "/azure/logic-apps/monitor-logic-apps-log-analytics",
13244+
"redirect_url": "/azure/logic-apps/monitor-workflows-collect-diagnostic-data",
1321013245
"redirect_document_id": false
1321113246
},
1321213247
{
@@ -13304,6 +13339,12 @@
1330413339
"redirect_url": "/connectors/custom-connectors/submit-certification",
1330513340
"redirect_document_id": false
1330613341
},
13342+
{
13343+
"source_path_from_root": "/articles/logic-apps/monitor-logic-apps-log-analytics.md",
13344+
"redirect_url": "/azure/logic-apps/monitor-workflows-collect-diagnostic-data",
13345+
"redirect_document_id": true
13346+
},
13347+
1330713348
{
1330813349
"source_path_from_root": "/articles/connectors/connectors-create-api-sharepointonline.md",
1330913350
"redirect_url": "/azure/connectors/connectors-create-api-sharepoint",
@@ -13414,16 +13455,6 @@
1341413455
"redirect_url": "/azure/logic-apps/logic-apps-exception-handling",
1341513456
"redirect_document_id": false
1341613457
},
13417-
{
13418-
"source_path_from_root": "/articles/machine-learning/tutorial-power-bi-automated-model.md",
13419-
"redirect_url": "/azure/machine-learning/tutorial-power-bi-custom-model",
13420-
"redirect_document_id": false
13421-
},
13422-
{
13423-
"source_path_from_root": "/articles/machine-learning/tutorial-power-bi-designer-model.md",
13424-
"redirect_url": "/azure/machine-learning/tutorial-power-bi-custom-model",
13425-
"redirect_document_id": false
13426-
},
1342713458
{
1342813459
"source_path_from_root": "/articles/event-grid/cli-samples.md",
1342913460
"redirect_url": "/azure/event-grid/scripts/event-grid-cli-subscribe-custom-topic",
@@ -14079,6 +14110,26 @@
1407914110
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
1408014111
"redirect_document_id": ""
1408114112
},
14113+
{
14114+
"source_path_from_root": "/articles/search/cognitive-search-tutorial-aml-designer-custom-skill.md",
14115+
"redirect_url": "/previous-versions/azure/search/cognitive-search-tutorial-aml-designer-custom-skill",
14116+
"redirect_document_id": false
14117+
},
14118+
{
14119+
"source_path_from_root": "/articles/search/cognitive-search-tutorial-aml-custom-skill.md",
14120+
"redirect_url": "/previous-versions/azure/search/cognitive-search-tutorial-aml-custom-skill",
14121+
"redirect_document_id": false
14122+
},
14123+
{
14124+
"source_path_from_root": "/articles/search/cognitive-search-custom-skill-form.md",
14125+
"redirect_url": "/previous-versions/azure/search/cognitive-search-custom-skill-form",
14126+
"redirect_document_id": false
14127+
},
14128+
{
14129+
"source_path_from_root": "/articles/search/cognitive-search-custom-skill-python.md",
14130+
"redirect_url": "/previous-versions/azure/search/cognitive-search-custom-skill-python",
14131+
"redirect_document_id": false
14132+
},
1408214133
{
1408314134
"source_path_from_root": "/articles/search/search-get-started-vs-code.md",
1408414135
"redirect_url": "/previous-versions/azure/search/search-get-started-vs-code",
@@ -22620,6 +22671,46 @@
2262022671
"source_path": "articles/load-balancer/protect-load-balancer-with-ddos-standard.md",
2262122672
"redirect_URL": "/azure/load-balancer/tutorial-protect-load-balancer",
2262222673
"redirect_document_id": false
22674+
},
22675+
{
22676+
"source_path": "articles/load-balancer/tutorial-protect-load-balancer.md",
22677+
"redirect_URL": "/azure/load-balancer/tutorial-protect-load-balancer-ddos",
22678+
"redirect_document_id": false
22679+
},
22680+
{
22681+
"source_path": "articles/bastion/tutorial-protect-bastion-host.md",
22682+
"redirect_URL": "/azure/bastion/tutorial-protect-bastion-host-ddos",
22683+
"redirect_document_id": false
22684+
},
22685+
{
22686+
"source_path": "articles/firewall/tutorial-protect-firewall.md",
22687+
"redirect_URL": "/azure/firewall/tutorial-protect-firewall-ddos",
22688+
"redirect_document_id": false
22689+
},
22690+
{
22691+
"source_path": "articles/route-server/tutorial-protect-route-server.md",
22692+
"redirect_URL": "/azure/route-server/tutorial-protect-route-server-ddos",
22693+
"redirect_document_id": false
22694+
},
22695+
{
22696+
"source_path": "articles/external-attack-surface-management/data-connections-overview.md",
22697+
"redirect_URL": "/azure/external-attack-surface-management/index",
22698+
"redirect_document_id": true
22699+
},
22700+
{
22701+
"source_path": "articles/virtual-network/nat-gateway/tutorial-protect-nat-gateway.md",
22702+
"redirect_URL": "/azure/virtual-network/nat-gateway/tutorial-protect-nat-gateway-ddos",
22703+
"redirect_document_id": false
22704+
},
22705+
{
22706+
"source_path": "articles/application-gateway/tutorial-protect-application-gateway.md",
22707+
"redirect_URL": "/azure/application-gateway/tutorial-protect-application-gateway-ddos",
22708+
"redirect_document_id": false
22709+
},
22710+
{
22711+
"source_path": "articles/virtual-machines/workloads/sap/index.md",
22712+
"redirect_URL": "/azure/sap/workloads/get-started",
22713+
"redirect_document_id": false
2262322714
}
2262422715
]
2262522716
}

‎.openpublishing.redirection.virtual-desktop.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@
105105
"redirect_url": "/azure/virtual-desktop/troubleshoot-client-windows",
106106
"redirect_document_id": true
107107
},
108+
{
109+
"source_path_from_root": "/articles/private-5g-core/disconnected-mode.md",
110+
"redirect_url": "/azure/private-5g-core/azure-stack-edge-disconnects",
111+
"redirect_document_id": true
112+
},
108113
{
109114
"source_path_from_root": "/articles/virtual-desktop/virtual-desktop-fall-2019/connect-windows-7-10-2019.md",
110115
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/connect-windows-2019",
@@ -124,6 +129,11 @@
124129
"source_path_from_root": "/articles/virtual-desktop/deploy-windows-7-virtual-machine.md",
125130
"redirect_url": "/azure/virtual-desktop/deploy-windows-server-virtual-machine",
126131
"redirect_document_id": false
132+
},
133+
{
134+
"source_path_from_root": "/articles/virtual-desktop/powershell-module.md",
135+
"redirect_url": "/azure/virtual-desktop/cli-powershell",
136+
"redirect_document_id": true
127137
}
128138
]
129139
}

0 commit comments

Comments
 (0)