Skip to content

Commit c842688

Browse files
kengaderduskengaderdus
authored
Merge branch 'main' into azure-ad-b2c-go-local
2 parents 8a9798c + e9d0fce commit c842688

File tree

2,428 files changed

+68099
-45773
lines changed

Some content is hidden

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

2,428 files changed

+68099
-45773
lines changed

‎.openpublishing.publish.config.json

Lines changed: 14 additions & 2 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",
@@ -996,7 +1008,7 @@
9961008
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
9971009
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
9981010
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
999-
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
1011+
"articles/iot/.openpublishing.redirection.iot.json",
10001012
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
10011013
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10021014
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",

‎.openpublishing.redirection.active-directory.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4491,6 +4491,11 @@
44914491
"redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-ad-sla-performance",
44924492
"redirect_document_id": false
44934493
},
4494+
{
4495+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-profile-azure-portal.md",
4496+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-user-profile-info",
4497+
"redirect_document_id": false
4498+
},
44944499
{
44954500
"source_path_from_root": "/articles/active-directory/customize-branding.md",
44964501
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -7274,6 +7279,11 @@
72747279
{
72757280
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-require-mfa.md",
72767281
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-require-mfa",
7282+
"redirect_document_id": false
7283+
},
7284+
{
7285+
"source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-how-to-require-mfa.md",
7286+
"redirect_url": "/azure/active-directory/authentication/howto-mfa-getstarted",
72777287
"redirect_document_id": true
72787288
},
72797289
{

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 6 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",

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