Skip to content

Commit d33c30e

Browse files
author
Larry Franks
committed
Merge branch 'main' of github.com:MicrosoftDocs/azure-docs-pr into main
2 parents dcdf8db + d93b63e commit d33c30e

File tree

314 files changed

+5166
-3544
lines changed

Some content is hidden

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

314 files changed

+5166
-3544
lines changed

‎.openpublishing.publish.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,7 @@
970970
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
971971
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
972972
".openpublishing.redirection.baremetal-infrastructure.json",
973-
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"
973+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
974+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json"
974975
]
975976
}

‎.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
50+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
51+
"redirect_document_id": false
52+
},
4853
{
4954
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
5055
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",

‎.openpublishing.redirection.defender-for-iot.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/tutorial-getting-started-eiot-sensor.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-frequently-asked-questions.md",
510
"redirect_url": "/azure/defender-for-iot/organizations/faqs-general",

‎.openpublishing.redirection.json

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
"source_path_from_root": "/articles/api-management/developer-portal-use-community-widgets.md",
1010
"redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",
1111
"redirect_document_id": false
12-
},
12+
},
1313
{
1414
"source_path": "articles/sentinel/whats-new-archive.md",
1515
"redirect_url": "/azure/sentinel/whats-new",
16-
"redirect_document_id": false
16+
"redirect_document_id": false
1717
},
1818
{
1919
"source_path": "articles/backup/sap-hana-db-manage.md",
2020
"redirect_url": "/azure/backup/sap-hana-database-manage",
21-
"redirect_document_id": false
21+
"redirect_document_id": false
2222
},
2323
{
2424
"source_path": "articles/backup/sap-hana-db-restore.md",
2525
"redirect_url": "/azure/backup/sap-hana-database-restore",
26-
"redirect_document_id": false
26+
"redirect_document_id": false
2727
},
2828
{
2929
"source_path": "articles/backup/sap-hana-db-about.md",
@@ -93,32 +93,32 @@
9393
{
9494
"source_path": "articles/site-recovery/switch-replication-appliance-preview.md",
9595
"redirect_url": "/azure/site-recovery/switch-replication-appliance-modernized",
96-
"redirect_document_id": false
96+
"redirect_document_id": false
9797
},
9898
{
9999
"source_path": "articles/site-recovery/upgrade-mobility-service-preview.md",
100100
"redirect_url": "/azure/site-recovery/upgrade-mobility-service-modernized",
101-
"redirect_document_id": false
101+
"redirect_document_id": false
102102
},
103103
{
104104
"source_path": "articles/site-recovery/vmware-azure-set-up-replication-tutorial-preview.md",
105105
"redirect_url": "/azure/site-recovery/vmware-azure-set-up-replication-tutorial-modernized",
106-
"redirect_document_id": false
106+
"redirect_document_id": false
107107
},
108108
{
109109
"source_path": "articles/site-recovery/vmware-azure-architecture-preview.md",
110110
"redirect_url": "/azure/site-recovery/vmware-azure-architecture-modernized",
111-
"redirect_document_id": false
111+
"redirect_document_id": false
112112
},
113113
{
114114
"source_path": "articles/physical-server-azure-architecture-preview.md",
115115
"redirect_url": "/azure/physical-server-azure-architecture-modernized",
116-
"redirect_document_id": false
116+
"redirect_document_id": false
117117
},
118118
{
119119
"source_path": "articles/vmware-azure-tutorial-failover-failback-preview.md",
120120
"redirect_url": "/azure/vmware-azure-tutorial-failover-failback-modernized",
121-
"redirect_document_id": false
121+
"redirect_document_id": false
122122
},
123123
{
124124
"source_path": "articles/automanage/automanage-virtual-machines.md",
@@ -790,7 +790,7 @@
790790
},
791791
{
792792
"source_path_from_root": "/articles/aks/concepts-diagnostics.md",
793-
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
793+
"redirect_url": "/azure/aks/aks-diagnostics",
794794
"redirect_document_id": false
795795
},
796796
{
@@ -6353,12 +6353,12 @@
63536353
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
63546354
"redirect_document_id": false
63556355
},
6356-
{
6356+
{
63576357
"source_path_from_root": "/articles/storage/blobs/anonymous-read-access-client.md",
63586358
"redirect_url": "/azure/storage/blobs/anonymous-read-access-prevent",
63596359
"redirect_document_id": false
63606360
},
6361-
{
6361+
{
63626362
"source_path_from_root": "/articles/storage/common/storage-auth-abac-attributes.md",
63636363
"redirect_url": "/azure/storage/blobs/storage-auth-abac-attributes",
63646364
"redirect_document_id": false
@@ -10493,21 +10493,6 @@
1049310493
"redirect_url": "/azure/cloud-services/diagnostics-performance-counters",
1049410494
"redirect_document_id": false
1049510495
},
10496-
{
10497-
"source_path_from_root": "/articles/cloud-shell/features-powershell.md",
10498-
"redirect_url": "/azure/cloud-shell/features",
10499-
"redirect_document_id": false
10500-
},
10501-
{
10502-
"source_path_from_root": "/articles/cloud-shell/index.md",
10503-
"redirect_url": "/azure/cloud-shell/overview",
10504-
"redirect_document_id": false
10505-
},
10506-
{
10507-
"source_path_from_root": "/articles/cloud-shell/persisting-shell-storage-powershell.md",
10508-
"redirect_url": "/azure/cloud-shell/persisting-shell-storage",
10509-
"redirect_document_id": false
10510-
},
1051110496
{
1051210497
"source_path_from_root": "/articles/jenkins/azure-container-agents-plugin-run-container-as-an-agent.md",
1051310498
"redirect_url": "/azure/container-instances/container-instances-jenkins",
@@ -25437,7 +25422,7 @@
2543725422
"source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-cli-sample-copy-managed-disks-to-same-or-different-subscription.md",
2543825423
"redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-cli-sample-copy-managed-disks-to-same-or-different-subscription",
2543925424
"redirect_document_id": false
25440-
},
25425+
},
2544125426
{
2544225427
"source_path_from_root": "/articles/virtual-machines/disks-cross-tenant-cmk.md",
2544325428
"redirect_url": "/azure/virtual-machines/disks-cross-tenant-customer-managed-keys",
@@ -29494,11 +29479,6 @@
2949429479
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell",
2949529480
"redirect_document_id": false
2949629481
},
29497-
{
29498-
"source_path_from_root": "/articles/cloud-shell/example-terraform-bash.md",
29499-
"redirect_url": "/azure/developer/terraform/quickstart-configure",
29500-
"redirect_document_id": false
29501-
},
2950229482
{
2950329483
"source_path_from_root": "/articles/aks/managed-cluster-snapshot.md",
2950429484
"redirect_url": "/azure/aks/intro-kubernetes",

‎.openpublishing.redirection.security-benchmark.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,11 +386,6 @@
386386
"redirect_url": "/security/benchmark/azure/baselines/batch-security-baseline",
387387
"redirect_document_id": false
388388
},
389-
{
390-
"source_path_from_root": "/articles/cloud-shell/security-baseline.md",
391-
"redirect_url": "/security/benchmark/azure/baselines/cloud-shell-security-baseline",
392-
"redirect_document_id": false
393-
},
394389
{
395390
"source_path_from_root": "/articles/cognitive-services/security-baseline.md",
396391
"redirect_url": "/security/benchmark/azure/baselines/cognitive-services-security-baseline",

‎articles/active-directory/authentication/concept-authentication-phone-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ With phone call verification during SSPR or Azure AD Multi-Factor Authentication
5252

5353
## Office phone verification
5454

55-
With phone call verification during SSPR or Azure AD Multi-Factor Authentication, an automated voice call is made to the phone number registered by the user. To complete the sign-in process, the user is prompted to press # on their keypad.
55+
With office phone call verification during SSPR or Azure AD Multi-Factor Authentication, an automated voice call is made to the phone number registered by the user. To complete the sign-in process, the user is prompted to press # on their keypad.
5656

5757
## Troubleshooting phone options
5858

0 commit comments

Comments
 (0)