Skip to content

Commit b81b6f1

Browse files
authored
Merge branch 'MicrosoftDocs:main' into saudi-launch-update
2 parents 332b3d7 + 6c3b932 commit b81b6f1

File tree

100 files changed

+2479
-752
lines changed

Some content is hidden

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

100 files changed

+2479
-752
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@
100100
"redirect_url": "/azure/active-directory/saas-apps/easy-metrics-connector-tutorial",
101101
"redirect_document_id": false
102102
},
103+
{
104+
"source_path_from_root": "/articles/active-directory/saas-apps/gainsight-saml-tutorial.md",
105+
"redirect_url": "/azure/active-directory/saas-apps/gainsight-tutorial",
106+
"redirect_document_id": false
107+
},
103108
{
104109
"source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
105110
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
@@ -1613,17 +1618,17 @@
16131618
{
16141619
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-protect-web-api-dotnet-core-prepare-api.md",
16151620
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-protect-web-api-dotnet-core-build-app",
1616-
"redirect_document_id": false
1621+
"redirect_document_id": false
16171622
},
16181623
{
16191624
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-protect-web-api-dotnet-core-protect-endpoints.md",
16201625
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-protect-web-api-dotnet-core-build-app",
1621-
"redirect_document_id": false
1626+
"redirect_document_id": false
16221627
},
16231628
{
16241629
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-protect-web-api-dotnet-core-test-api.md",
16251630
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-protect-web-api-dotnet-core-test-api",
1626-
"redirect_document_id": false
1631+
"redirect_document_id": false
16271632
},
16281633
{
16291634
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sign-in-overview.md",
@@ -1633,17 +1638,17 @@
16331638
{
16341639
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sign-in-prepare-app.md",
16351640
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-browserless-app-dotnet-sign-in-build-app",
1636-
"redirect_document_id": false
1641+
"redirect_document_id": false
16371642
},
16381643
{
16391644
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sign-in-prepare-tenant.md",
16401645
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-browserless-app-dotnet-sign-in-prepare-tenant",
1641-
"redirect_document_id": false
1646+
"redirect_document_id": false
16421647
},
16431648
{
16441649
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sign-in-sign-in.md",
16451650
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-browserless-app-dotnet-sign-in-build-app",
1646-
"redirect_document_id": false
1651+
"redirect_document_id": false
16471652
},
16481653
{
16491654
"source_path_from_root": "/articles/active-directory/external-identities/delegate-invitations.md",
@@ -1678,17 +1683,17 @@
16781683
{
16791684
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-node-sign-in-overview.md",
16801685
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-node-sign-in-prepare-tenant",
1681-
"redirect_document_id": true
1686+
"redirect_document_id": true
16821687
},
16831688
{
16841689
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-node-sign-in-prepare-tenant.md",
16851690
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-node-sign-in-prepare-tenant",
1686-
"redirect_document_id": false
1691+
"redirect_document_id": false
16871692
},
16881693
{
16891694
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-node-sign-in-prepare-app.md",
16901695
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-node-sign-in-prepare-tenant",
1691-
"redirect_document_id": false
1696+
"redirect_document_id": false
16921697
},
16931698
{
16941699
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-node-sign-in-sign-in-out.md",
@@ -1703,32 +1708,32 @@
17031708
{
17041709
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-daemon-node-call-api-prepare-app.md",
17051710
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-daemon-node-call-api-prepare-tenant",
1706-
"redirect_document_id": false
1711+
"redirect_document_id": false
17071712
},
17081713
{
17091714
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-daemon-node-call-api-prepare-tenant.md",
17101715
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-daemon-node-call-api-prepare-tenant",
1711-
"redirect_document_id": false
1716+
"redirect_document_id": false
17121717
},
17131718
{
17141719
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-daemon-node-call-api-call-api.md",
17151720
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-daemon-node-call-api-prepare-tenant",
1716-
"redirect_document_id": false
1721+
"redirect_document_id": false
17171722
},
17181723
{
17191724
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-dotnet-sign-in-prepare-tenant.md",
17201725
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-dotnet-sign-in-prepare-tenant",
1721-
"redirect_document_id": false
1726+
"redirect_document_id": false
17221727
},
17231728
{
17241729
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-dotnet-sign-in-prepare-app.md",
17251730
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-dotnet-sign-in-prepare-app",
1726-
"redirect_document_id": false
1731+
"redirect_document_id": false
17271732
},
17281733
{
17291734
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-dotnet-sign-in-sign-out.md",
17301735
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-dotnet-sign-in-sign-out",
1731-
"redirect_document_id": false
1736+
"redirect_document_id": false
17321737
},
17331738
{
17341739
"source_path_from_root": "/articles/active-directory/external-identities/conditional-access.md",
@@ -13511,7 +13516,7 @@
1351113516
"redirect_document_id": false
1351213517
},
1351313518
{
13514-
"source_path_from_root": "/articles/active-directory/external-identities/customers/sample-single-page-application-angular.md",
13519+
"source_path_from_root": "/articles/active-directory/external-identities/customers/sample-single-page-application-angular.md",
1351513520
"redirect_url": "/azure/active-directory/external-identities/customers/sample-single-page-app-angular-sign-in",
1351613521
"redirect_document_id": false
1351713522
},
@@ -13540,7 +13545,8 @@
1354013545
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-single-page-app-react-sign-in-sign-out",
1354113546
"redirect_document_id": false
1354213547
},
13543-
{ "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-whatis.md",
13548+
{
13549+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-whatis.md",
1354413550
"redirect_url": "/azure/active-directory/fundamentals/whatis",
1354513551
"redirect_document_id": false
1354613552
},
@@ -13637,6 +13643,6 @@
1363713643
"redirect_url": "/azure/active-directory/governance/licensing-fundamentals",
1363813644
"redirect_document_id": false
1363913645
}
13640-
13646+
1364113647
]
1364213648
}

.openpublishing.redirection.json

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7698,6 +7698,26 @@
76987698
"redirect_url": "/azure/azure-arc/servers/policy-reference",
76997699
"redirect_document_id": false
77007700
},
7701+
{
7702+
"source_path_from_root": "/articles/azure-arc/vmware-vsphere/disaster-recovery.md",
7703+
"redirect_url": "/azure/azure-arc/vmware-vsphere/recover-from-resource-bridge-deletion",
7704+
"redirect_document_id": false
7705+
},
7706+
{
7707+
"source_path_from_root": "/articles/azure-arc/vmware-vsphere/day2-operations-resource-bridge.md",
7708+
"redirect_url": "/azure/azure-arc/vmware-vsphere/administer-arc-vmware",
7709+
"redirect_document_id": false
7710+
},
7711+
{
7712+
"source_path_from_root": "/articles/azure-arc/vmware-vsphere/manage-access-to-arc-vmware-resources.md",
7713+
"redirect_url": "/azure/azure-arc/vmware-vsphere/setup-and-manage-self-service-access",
7714+
"redirect_document_id": false
7715+
},
7716+
{
7717+
"source_path_from_root": "/articles/azure-arc/vmware-vsphere/manage-vmware-vms-in-azure.md",
7718+
"redirect_url": "/azure/azure-arc/vmware-vsphere/perform-vm-ops-through-azure",
7719+
"redirect_document_id": false
7720+
},
77017721
{
77027722
"source_path_from_root": "/articles/redis-cache/index.md",
77037723
"redirect_url": "/azure/azure-cache-for-redis/",
@@ -24207,9 +24227,11 @@
2420724227
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-single-page-app-vanillajs-sign-in-sign-out.md",
2420824228
"redirect_url": "/azure/active-directory/external-identities/customers/tutorial-single-page-app-vanillajs-sign-in-sign-out",
2420924229
"redirect_document_id": false
24230+
},
24231+
{
24232+
"source_path_from_root": "/articles/bastion/bastion-connect-vm-rdp-linux.md",
24233+
"redirect_url": "/azure/bastion/bastion-connect-vm-ssh-linux",
24234+
"redirect_document_id": false
2421024235
}
24211-
24212-
24213-
2421424236
]
2421524237
}

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ There are two ways to enable Azure AD login for your Windows VM:
9494
- Azure Cloud Shell, when you're creating a Windows VM or using an existing Windows VM.
9595

9696
> [!NOTE]
97-
> If a device object with the same displayMame as the hostname of a VM where an extension is installed exists, the VM fails to join Azure AD with a hostname duplication error. Avoid duplication by [modifying the hostname](../../virtual-network/virtual-networks-viewing-and-modifying-hostnames.md#modify-a-hostname).
97+
> If a device object with the same displayName as the hostname of a VM where an extension is installed exists, the VM fails to join Azure AD with a hostname duplication error. Avoid duplication by [modifying the hostname](../../virtual-network/virtual-networks-viewing-and-modifying-hostnames.md#modify-a-hostname).
9898
9999
### Azure portal
100100

articles/active-directory/saas-apps/gainsight-saml-tutorial.md

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)