Skip to content

Commit 318f2d3

Browse files
Merge branch 'MicrosoftDocs:main' into 17201017
2 parents f36a705 + 2ad536b commit 318f2d3

File tree

4,177 files changed

+104826
-67065
lines changed

Some content is hidden

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

4,177 files changed

+104826
-67065
lines changed

.openpublishing.publish.config.json

Lines changed: 17 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
{
@@ -536,6 +542,12 @@
536542
"branch": "main",
537543
"branch_mapping": {}
538544
},
545+
{
546+
"path_to_root": "azure-cosmos-db-mongodb-mern-web-app",
547+
"url": "https://github.com/Azure-samples/msdocs-azure-cosmos-db-mongodb-mern-web-app/",
548+
"branch": "main",
549+
"branch_mapping": {}
550+
},
539551
{
540552
"path_to_root": "azure-cosmos-spark",
541553
"url": "https://github.com/Azure/azure-cosmosdb-spark",
@@ -760,7 +772,7 @@
760772
},
761773
{
762774
"path_to_root": "azure-spring-apps-reference-architecture",
763-
"url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
775+
"url": "https://github.com/Azure/azure-spring-apps-landing-zone-accelerator",
764776
"branch": "reference-architecture",
765777
"branch_mapping": {}
766778
},
@@ -949,6 +961,7 @@
949961
".openpublishing.redirection.azure-australia.json",
950962
".openpublishing.redirection.azure-databricks.json",
951963
".openpublishing.redirection.azure-hpc.json",
964+
".openpublishing.redirection.azure-kubernetes-service.json",
952965
".openpublishing.redirection.azure-monitor.json",
953966
".openpublishing.redirection.azure-percept.json",
954967
".openpublishing.redirection.azure-productivity.json",
@@ -970,6 +983,7 @@
970983
".openpublishing.redirection.security-benchmark.json",
971984
".openpublishing.redirection.sql-database.json",
972985
".openpublishing.redirection.virtual-desktop.json",
986+
".openpublishing.redirection.devops-project.json",
973987
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
974988
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
975989
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
@@ -996,7 +1010,7 @@
9961010
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
9971011
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
9981012
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
999-
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
1013+
"articles/iot/.openpublishing.redirection.iot.json",
10001014
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
10011015
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10021016
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",

.openpublishing.redirection.active-directory.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
7676
"redirect_document_id": false
7777
},
78+
{
79+
"source_path_from_root": "/articles/active-directory/saas-apps/teamzskill-tutorial.md",
80+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
81+
"redirect_document_id": false
82+
},
7883
{
7984
"source_path_from_root": "/articles/active-directory/saas-apps/usertesting-tutorial.md",
8085
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -95,6 +100,11 @@
95100
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
96101
"redirect_document_id": false
97102
},
103+
{
104+
"source_path_from_root": "/articles/active-directory/governance/manage-lifecycle-workflows.md",
105+
"redirect_url": "/azure/active-directory/governance/understanding-lifecycle-workflows",
106+
"redirect_document_id": false
107+
},
98108
{
99109
"source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
100110
"redirect_url": "/graph/api/resources/identitygovernance-workflow",
@@ -4486,6 +4496,11 @@
44864496
"redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-ad-sla-performance",
44874497
"redirect_document_id": false
44884498
},
4499+
{
4500+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-profile-azure-portal.md",
4501+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-user-profile-info",
4502+
"redirect_document_id": false
4503+
},
44894504
{
44904505
"source_path_from_root": "/articles/active-directory/customize-branding.md",
44914506
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -7269,6 +7284,11 @@
72697284
{
72707285
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-require-mfa.md",
72717286
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-require-mfa",
7287+
"redirect_document_id": false
7288+
},
7289+
{
7290+
"source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-how-to-require-mfa.md",
7291+
"redirect_url": "/azure/active-directory/authentication/howto-mfa-getstarted",
72727292
"redirect_document_id": true
72737293
},
72747294
{
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/aks/stop-api-upgrade.md",
5+
"redirect_url": "/azure/aks/upgrade-cluster",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 62 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",
@@ -5812,6 +5812,16 @@
58125812
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
58135813
"redirect_document_id": false
58145814
},
5815+
{
5816+
"source_path_from_root": "/articles/azure-monitor/logs/logicapp-flow-connector.md",
5817+
"redirect_url": "/azure/connectors/connectors-azure-monitor-logs",
5818+
"redirect_document_id": false
5819+
},
5820+
{
5821+
"source_path_from_root": "/articles/azure-monitor/app/automate-with-logic-apps.md",
5822+
"redirect_url": "/azure/connectors/connectors-azure-application-insights",
5823+
"redirect_document_id": false
5824+
},
58155825
{
58165826
"source_path_from_root": "/articles/azure-monitor/insights/solutions.md",
58175827
"redirect_url": "/previous-versions/azure/azure-monitor/insights/solutions",
@@ -6045,6 +6055,52 @@
60456055
"source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-api-reference.md",
60466056
"redirect_url": "/azure/azure-monitor/app/application-insights-asp-net-agent",
60476057
"redirect_document_id": false
6058+
},
6059+
{
6060+
"source_path_from_root": "/articles/azure-monitor/app/data-model.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-request-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-dependency-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-exception-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-trace-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-event-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-metric-telemetry.md",
6091+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6092+
"redirect_document_id": false
6093+
},
6094+
{
6095+
"source_path_from_root": "/articles/azure-monitor/app/data-model-pageview-telemetry.md",
6096+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6097+
"redirect_document_id": false
6098+
},
6099+
{
6100+
"source_path_from_root": "/articles/azure-monitor/app/data-model-context.md",
6101+
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
6102+
"redirect_document_id": false
60486103
}
6104+
60496105
]
60506106
}

.openpublishing.redirection.azure-productivity.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@
144144
"source_path": "articles/lab-services/quick-create-lab-template.md",
145145
"redirect_url": "/azure/lab-services/how-to-create-lab-template",
146146
"redirect_document_id": true
147+
},
148+
{
149+
"source_path": "articles/lab-services/classroom-labs-faq.yml",
150+
"redirect_url": "/azure/lab-services/lab-services-overview",
151+
"redirect_document_id": false
147152
}
148153
]
149154
}

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1410,6 +1410,11 @@
14101410
"redirect_url": "/azure/azure-resource-manager/managed-applications/concepts-custom-role-definition",
14111411
"redirect_document_id": false
14121412
},
1413+
{
1414+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/concepts-custom-role-definition.md",
1415+
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
1416+
"redirect_document_id": false
1417+
},
14131418
{
14141419
"source_path_from_root": "/articles/managed-applications/concepts-managed-applications-built-in-policy.md",
14151420
"redirect_url": "/azure/azure-resource-manager/managed-applications/concepts-built-in-policy",
@@ -1600,6 +1605,11 @@
16001605
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-portal",
16011606
"redirect_document_id": false
16021607
},
1608+
{
1609+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/publish-portal.md",
1610+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1611+
"redirect_document_id": false
1612+
},
16031613
{
16041614
"source_path_from_root": "/articles/managed-applications/publish-service-catalog-app.md",
16051615
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1881,4 +1891,4 @@
18811891
"redirect_document_id": false
18821892
}
18831893
]
1884-
}
1894+
}

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,11 @@
809809
"source_path_from_root": "/articles/defender-for-cloud/faq-azure-monitor-logs.yml",
810810
"redirect_url": "/azure/defender-for-cloud/faq-data-collection-agents",
811811
"redirect_document_id": true
812+
},
813+
{
814+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
815+
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",
816+
"redirect_document_id": true
812817
}
813818
]
814819
}

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