Skip to content

Commit 215591b

Browse files
jaesonijaesoni
authored
Merge branch 'MicrosoftDocs:main' into conn-draining-ws
2 parents 9792339 + 7f0db61 commit 215591b

File tree

1,732 files changed

+52266
-37132
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,732 files changed

+52266
-37132
lines changed

‎.openpublishing.publish.config.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,13 @@
233233
{
234234
"path_to_root": "azure-functions-durable-js",
235235
"url": "https://github.com/Azure/azure-functions-durable-js",
236-
"branch": "main",
236+
"branch": "v2.x",
237+
"branch_mapping": {}
238+
},
239+
{
240+
"path_to_root": "azure-functions-durable-js-v3",
241+
"url": "https://github.com/Azure/azure-functions-durable-js",
242+
"branch": "v3.x",
237243
"branch_mapping": {}
238244
},
239245
{
@@ -760,7 +766,7 @@
760766
},
761767
{
762768
"path_to_root": "azure-spring-apps-reference-architecture",
763-
"url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
769+
"url": "https://github.com/Azure/azure-spring-apps-landing-zone-accelerator",
764770
"branch": "reference-architecture",
765771
"branch_mapping": {}
766772
},
@@ -996,7 +1002,7 @@
9961002
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
9971003
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
9981004
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
999-
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
1005+
"articles/iot/.openpublishing.redirection.iot.json",
10001006
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
10011007
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10021008
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",

‎.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7274,6 +7274,11 @@
72747274
{
72757275
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-require-mfa.md",
72767276
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-require-mfa",
7277+
"redirect_document_id": false
7278+
},
7279+
{
7280+
"source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-how-to-require-mfa.md",
7281+
"redirect_url": "/azure/active-directory/authentication/howto-mfa-getstarted",
72777282
"redirect_document_id": true
72787283
},
72797284
{

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"redirections": [
3-
{
4-
"source_path_from_root": "/articles/azure-monitor/snapshot-debugger/snapshot-debugger-troubleshoot.md",
5-
"redirect_url": "https://learn.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/snapshot-debugger-troubleshoot",
6-
"redirect_document_id": false
7-
},
8-
{
3+
{
94
"source_path_from_root": "/articles/azure-monitor/best-practices.md",
105
"redirect_url": "/azure/azure-monitor/getting-started",
116
"redirect_document_id": false
@@ -50,6 +45,11 @@
5045
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
5146
"redirect_document_id": false
5247
},
48+
{
49+
"source_path_from_root": "/articles/azure-monitor/app/console.md",
50+
"redirect_url": "/previous-versions/azure/azure-monitor/app/console",
51+
"redirect_document_id": false
52+
},
5353
{
5454
"source_path_from_root": "/articles/azure-monitor/app/resource-manager-web-app.md",
5555
"redirect_url": "/previous-versions/azure/azure-monitor/app/resource-manager-web-app",
@@ -6045,6 +6045,52 @@
60456045
"source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-api-reference.md",
60466046
"redirect_url": "/azure/azure-monitor/app/application-insights-asp-net-agent",
60476047
"redirect_document_id": false
6048+
},
6049+
{
6050+
"source_path_from_root": "/articles/azure-monitor/app/data-model.md",
6051+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6052+
"redirect_document_id": false
6053+
},
6054+
{
6055+
"source_path_from_root": "/articles/azure-monitor/app/data-model-request-telemetry.md",
6056+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6057+
"redirect_document_id": false
6058+
},
6059+
{
6060+
"source_path_from_root": "/articles/azure-monitor/app/data-model-dependency-telemetry.md",
6061+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6062+
"redirect_document_id": false
6063+
},
6064+
{
6065+
"source_path_from_root": "/articles/azure-monitor/app/data-model-exception-telemetry.md",
6066+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6067+
"redirect_document_id": false
6068+
},
6069+
{
6070+
"source_path_from_root": "/articles/azure-monitor/app/data-model-trace-telemetry.md",
6071+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6072+
"redirect_document_id": false
6073+
},
6074+
{
6075+
"source_path_from_root": "/articles/azure-monitor/app/data-model-event-telemetry.md",
6076+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6077+
"redirect_document_id": false
6078+
},
6079+
{
6080+
"source_path_from_root": "/articles/azure-monitor/app/data-model-metric-telemetry.md",
6081+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6082+
"redirect_document_id": false
6083+
},
6084+
{
6085+
"source_path_from_root": "/articles/azure-monitor/app/data-model-pageview-telemetry.md",
6086+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6087+
"redirect_document_id": false
6088+
},
6089+
{
6090+
"source_path_from_root": "/articles/azure-monitor/app/data-model-context.md",
6091+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6092+
"redirect_document_id": false
60486093
}
6094+
60496095
]
60506096
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1600,6 +1600,11 @@
16001600
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-portal",
16011601
"redirect_document_id": false
16021602
},
1603+
{
1604+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/publish-portal.md",
1605+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1606+
"redirect_document_id": false
1607+
},
16031608
{
16041609
"source_path_from_root": "/articles/managed-applications/publish-service-catalog-app.md",
16051610
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1881,4 +1886,4 @@
18811886
"redirect_document_id": false
18821887
}
18831888
]
1884-
}
1889+
}

‎.openpublishing.redirection.deployment-environments.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"source_path_from_root": "/articles/deployment-environments/tutorial-create-and-configure-projects.md",
1515
"redirect_url": "/azure/deployment-environments/quickstart-create-and-configure-projects",
1616
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/deployment-environments/how-to-configure-use-cli.md",
20+
"redirect_url": "https://aka.ms/CLI-reference",
21+
"redirect_document_id": false
1722
}
1823
]
1924
}

‎.openpublishing.redirection.dev-box.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path_from_root": "/articles/dev-box/quickstart-configure-dev-box-project.md",
1010
"redirect_url": "/azure/dev-box/quickstart-configure-dev-box-service",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/dev-box/cli-reference-subset.md",
15+
"redirect_url": "https://aka.ms/CLI-reference",
16+
"redirect_document_id": false
1217
}
1318
]
1419
}

0 commit comments

Comments
 (0)