Skip to content

Commit ad7504d

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sanRE
2 parents 31f13be + fb33f67 commit ad7504d

File tree

1,098 files changed

+21600
-8323
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,098 files changed

+21600
-8323
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: 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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
4646
"redirect_document_id": false
4747
},
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+
},
4853
{
4954
"source_path_from_root": "/articles/azure-monitor/app/resource-manager-web-app.md",
5055
"redirect_url": "/previous-versions/azure/azure-monitor/app/resource-manager-web-app",

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

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/storage/tables/table-storage-design-encrypt-data.md",
5+
"redirect_url": "/previous-versions/azure/storage/tables/table-storage-design-encrypt-data",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/active-directory/external-identities/configure-saas-apps.md",
10+
"redirect_url": "/azure/active-directory/saas-apps/dropboxforbusiness-tutorial",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "articles/databox-online/azure-stack-edge-zero-touch-provisioning.md",
515
"redirect_url": "/azure/databox-online/azure-stack-edge-powershell-based-configuration",
@@ -11498,6 +11508,11 @@
1149811508
"redirect_url": "/azure/firewall/ftp-support",
1149911509
"redirect_document_id": false
1150011510
},
11511+
{
11512+
"source_path_from_root": "/articles/firewall/firewall-network-rule-logging.md",
11513+
"redirect_url": "/azure/firewall/firewall-diagnostics",
11514+
"redirect_document_id": false
11515+
},
1150111516
{
1150211517
"source_path_from_root": "/articles/security/governance-in-azure.md",
1150311518
"redirect_url": "/azure/governance/",
@@ -12505,12 +12520,12 @@
1250512520
},
1250612521
{
1250712522
"source_path_from_root": "/articles/security/fundamentals/iot-overview.md",
12508-
"redirect_url": "/azure/iot-fundamentals/iot-security-architecture",
12523+
"redirect_url": "/azure/iot/iot-security-architecture",
1250912524
"redirect_document_id": false
1251012525
},
1251112526
{
1251212527
"source_path_from_root": "/articles/security/fundamentals/iot-best-practices.md",
12513-
"redirect_url": "/azure/iot-fundamentals/iot-security-best-practices",
12528+
"redirect_url": "/azure/iot/iot-security-best-practices",
1251412529
"redirect_document_id": false
1251512530
},
1251612531
{
@@ -22445,6 +22460,11 @@
2244522460
"source_path": "articles/private-multi-access-edge-compute-mec/metaswitch-fusion-core-overview.md",
2244622461
"redirect_URL": "/azure/private-5g-core",
2244722462
"redirect_document_id": false
22463+
},
22464+
{
22465+
"source_path": "articles/private-5g-core/modify-site-plan.md",
22466+
"redirect_URL": "/azure/private-5g-core/modify-service-plan",
22467+
"redirect_document_id": false
2244822468
},
2244922469
{
2245022470
"source_path": "articles/communications-gateway/rotate-secrets.md",
@@ -22455,6 +22475,11 @@
2245522475
"source_path": "articles/batch/high-availability-disaster-recovery.md",
2245622476
"redirect_URL": "/azure/reliability/reliability-batch",
2245722477
"redirect_document_id": false
22478+
},
22479+
{
22480+
"source_path_from_root": "/articles/communication-services/concepts/bring-your-own-storage.md",
22481+
"redirect_url": "/azure/communication-services/concepts/call-automation/call-recording/bring-your-own-storage",
22482+
"redirect_document_id": false
2245822483
}
2245922484

2246022485
]

articles/active-directory/app-provisioning/application-provisioning-config-problem-scim-compatibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ Following the steps below will delete your existing customappsso job and create
269269

270270
11. In the results of the last step, copy the full "ID" string that begins with "scim". Optionally, reapply your old attribute-mappings by running the command below, replacing [new-job-id] with the new job ID you copied, and entering the JSON output from step #7 as the request body.
271271

272-
`POST https://graph.microsoft.com/beta/servicePrincipals/[object-id]/synchronization/jobs/[new-job-id]/schema`
272+
`PUT https://graph.microsoft.com/beta/servicePrincipals/[object-id]/synchronization/jobs/[new-job-id]/schema`
273273
`{ <your-schema-json-here> }`
274274

275275
12. Return to the first web browser window, and select the **Provisioning** tab for your application.

0 commit comments

Comments
 (0)