Skip to content

Commit 2dc8975

Browse files
authored
Merge pull request #192007 from MicrosoftDocs/main
Merge main to live, 4AM
2 parents 9d3fd68 + e25f880 commit 2dc8975

File tree

356 files changed

+2585
-2015
lines changed

Some content is hidden

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

356 files changed

+2585
-2015
lines changed

articles/active-directory-domain-services/create-resource-forest-powershell.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ To complete this article, you need the following resources and privileges:
5151
* Install and configure Azure AD PowerShell.
5252
* If needed, follow the instructions to [install the Azure AD PowerShell module and connect to Azure AD](/powershell/azure/active-directory/install-adv2).
5353
* Make sure that you sign in to your Azure AD tenant using the [Connect-AzureAD][Connect-AzureAD] cmdlet.
54-
* You need [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS.
55-
* You need [Domain Services Contributor](/azure/role-based-access-control/built-in-roles#contributor) Azure role to create the required Azure AD DS resources.
54+
* You need [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS.
55+
* You need [Domain Services Contributor](../role-based-access-control/built-in-roles.md#contributor) Azure role to create the required Azure AD DS resources.
5656

5757
## Sign in to the Azure portal
5858

@@ -420,4 +420,4 @@ For more conceptual information about forest types in Azure AD DS, see [What are
420420
[Install-Script]: /powershell/module/powershellget/install-script
421421

422422
<!-- EXTERNAL LINKS -->
423-
[powershell-gallery]: https://www.powershellgallery.com/
423+
[powershell-gallery]: https://www.powershellgallery.com/

articles/active-directory-domain-services/migrate-from-classic-vnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ To prepare the managed domain for migration, complete the following steps:
198198
199199
1. Create a variable to hold the credentials for by the migration script using the [Get-Credential][get-credential] cmdlet.
200200
201-
The user account you specify needs [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS and [Domain Services Contributor](/azure/role-based-access-control/built-in-roles#contributor) Azure role to create the required Azure AD DS resources.
201+
The user account you specify needs [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS and [Domain Services Contributor](../role-based-access-control/built-in-roles.md#contributor) Azure role to create the required Azure AD DS resources.
202202
203203
When prompted, enter an appropriate user account and password:
204204
@@ -367,4 +367,4 @@ With your managed domain migrated to the Resource Manager deployment model, [cre
367367
[migration-benefits]: concepts-migration-benefits.md
368368

369369
<!-- EXTERNAL LINKS -->
370-
[powershell-script]: https://www.powershellgallery.com/packages/Migrate-Aadds/
370+
[powershell-script]: https://www.powershellgallery.com/packages/Migrate-Aadds/

articles/active-directory-domain-services/powershell-scoped-synchronization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ To complete this article, you need the following resources and privileges:
3232
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3333
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.
3434
* If needed, complete the tutorial to [create and configure an Azure Active Directory Domain Services managed domain][tutorial-create-instance].
35-
* You need [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Azure AD roles in your tenant to change the Azure AD DS synchronization scope.
35+
* You need [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Azure AD roles in your tenant to change the Azure AD DS synchronization scope.
3636

3737
## Scoped synchronization overview
3838

@@ -218,4 +218,4 @@ To learn more about the synchronization process, see [Understand synchronization
218218
[associate-azure-ad-tenant]: ../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md
219219

220220
<!-- EXTERNAL LINKS -->
221-
[Connect-AzureAD]: /powershell/module/azuread/connect-azuread
221+
[Connect-AzureAD]: /powershell/module/azuread/connect-azuread

articles/active-directory-domain-services/scoped-synchronization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To complete this article, you need the following resources and privileges:
3333
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3434
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.
3535
* If needed, complete the tutorial to [create and configure an Azure Active Directory Domain Services managed domain][tutorial-create-instance].
36-
* You need [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Azure AD roles in your tenant to change the Azure AD DS synchronization scope.
36+
* You need [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Azure AD roles in your tenant to change the Azure AD DS synchronization scope.
3737

3838
## Scoped synchronization overview
3939

@@ -91,4 +91,4 @@ To learn more about the synchronization process, see [Understand synchronization
9191
[concepts-sync]: synchronization.md
9292
[tutorial-create-instance]: tutorial-create-instance.md
9393
[create-azure-ad-tenant]: ../active-directory/fundamentals/sign-up-organization.md
94-
[associate-azure-ad-tenant]: ../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md
94+
[associate-azure-ad-tenant]: ../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md

articles/active-directory-domain-services/template-create-instance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ To complete this article, you need the following resources:
3030
* Install and configure Azure AD PowerShell.
3131
* If needed, follow the instructions to [install the Azure AD PowerShell module and connect to Azure AD](/powershell/azure/active-directory/install-adv2).
3232
* Make sure that you sign in to your Azure AD tenant using the [Connect-AzureAD][Connect-AzureAD] cmdlet.
33-
* You need [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS.
33+
* You need [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS.
3434
* You need Domain Services Contributor Azure role to create the required Azure AD DS resources.
3535

3636
## DNS naming requirements
@@ -357,4 +357,4 @@ To see the managed domain in action, you can [domain-join a Windows VM][windows-
357357
[Get-AzSubscription]: /powershell/module/Az.Accounts/Get-AzSubscription
358358
[cloud-shell]: ../cloud-shell/cloud-shell-windows-users.md
359359
[naming-prefix]: /windows-server/identity/ad-ds/plan/selecting-the-forest-root-domain
360-
[New-AzResourceGroupDeployment]: /powershell/module/Az.Resources/New-AzResourceGroupDeployment
360+
[New-AzResourceGroupDeployment]: /powershell/module/Az.Resources/New-AzResourceGroupDeployment

articles/active-directory-domain-services/tutorial-configure-ldaps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ To complete this tutorial, you need the following resources and privileges:
4444
* If needed, [create and configure an Azure Active Directory Domain Services managed domain][create-azure-ad-ds-instance].
4545
* The *LDP.exe* tool installed on your computer.
4646
* If needed, [install the Remote Server Administration Tools (RSAT)][rsat] for *Active Directory Domain Services and LDAP*.
47-
* You need [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Azure AD roles in your tenant to enable secure LDAP.
47+
* You need [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Azure AD roles in your tenant to enable secure LDAP.
4848

4949
## Sign in to the Azure portal
5050

@@ -338,4 +338,4 @@ In this tutorial, you learned how to:
338338
<!-- EXTERNAL LINKS -->
339339
[rsat]: /windows-server/remote/remote-server-administration-tools
340340
[ldap-query-basics]: /windows/desktop/ad/creating-a-query-filter
341-
[New-SelfSignedCertificate]: /powershell/module/pki/new-selfsignedcertificate
341+
[New-SelfSignedCertificate]: /powershell/module/pki/new-selfsignedcertificate

articles/active-directory-domain-services/tutorial-configure-networking.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ To complete this tutorial, you need the following resources and privileges:
3939
* If you don't have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
4040
* An Azure Active Directory tenant associated with your subscription, either synchronized with an on-premises directory or a cloud-only directory.
4141
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
42-
* You need [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS.
42+
* You need [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS.
4343
* You need Domain Services Contributor Azure role to create the required Azure AD DS resources.
4444
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.
4545
* If needed, the first tutorial [creates and configures an Azure Active Directory Domain Services managed domain][create-azure-ad-ds-instance].
@@ -165,4 +165,4 @@ To see this managed domain in action, create and join a virtual machine to the d
165165
[create-azure-ad-ds-instance]: tutorial-create-instance.md
166166
[create-join-windows-vm]: join-windows-vm.md
167167
[peering-overview]: ../virtual-network/virtual-network-peering-overview.md
168-
[network-considerations]: network-considerations.md
168+
[network-considerations]: network-considerations.md

articles/active-directory-domain-services/tutorial-create-forest-trust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To complete this tutorial, you need the following resources and privileges:
4949
5050
## Sign in to the Azure portal
5151

52-
In this tutorial, you create and configure the outbound forest trust from Azure AD DS using the Azure portal. To get started, first sign in to the [Azure portal](https://portal.azure.com). You need [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Azure AD roles in your tenant to modify an Azure AD DS instance.
52+
In this tutorial, you create and configure the outbound forest trust from Azure AD DS using the Azure portal. To get started, first sign in to the [Azure portal](https://portal.azure.com). You need [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Azure AD roles in your tenant to modify an Azure AD DS instance.
5353

5454
## Networking considerations
5555

articles/active-directory-domain-services/tutorial-create-instance-advanced.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ To complete this tutorial, you need the following resources and privileges:
3838
* If you don't have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
3939
* An Azure Active Directory tenant associated with your subscription, either synchronized with an on-premises directory or a cloud-only directory.
4040
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
41-
* You need [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS.
41+
* You need [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS.
4242
* You need Domain Services Contributor Azure role to create the required Azure AD DS resources.
4343

4444
Although not required for Azure AD DS, it's recommended to [configure self-service password reset (SSPR)][configure-sspr] for the Azure AD tenant. Users can change their password without SSPR, but SSPR helps if they forget their password and need to reset it.
@@ -266,4 +266,4 @@ To see this managed domain in action, create and join a virtual machine to the d
266266
[availability-zones]: ../availability-zones/az-overview.md
267267
[concepts-sku]: administration-concepts.md#azure-ad-ds-skus
268268

269-
<!-- EXTERNAL LINKS -->
269+
<!-- EXTERNAL LINKS -->

articles/active-directory-domain-services/tutorial-create-instance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ To complete this tutorial, you need the following resources and privileges:
3737
* If you don't have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
3838
* An Azure Active Directory tenant associated with your subscription, either synchronized with an on-premises directory or a cloud-only directory.
3939
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
40-
* You need [Application Administrator](/azure/active-directory/roles/permissions-reference#application-administrator) and [Groups Administrator](/azure/active-directory/roles/permissions-reference#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS.
40+
* You need [Application Administrator](../active-directory/roles/permissions-reference.md#application-administrator) and [Groups Administrator](../active-directory/roles/permissions-reference.md#groups-administrator) Azure AD roles in your tenant to enable Azure AD DS.
4141
* You need Domain Services Contributor Azure role to create the required Azure AD DS resources.
4242
* A virtual network with DNS servers that can query necessary infrastructure such as storage. DNS servers that can't perform general internet queries might block the ability to create a managed domain.
4343

@@ -217,4 +217,4 @@ Before you domain-join VMs and deploy applications that use the managed domain,
217217
[concepts-sku]: administration-concepts.md#azure-ad-ds-skus
218218

219219
<!-- EXTERNAL LINKS -->
220-
[naming-prefix]: /windows-server/identity/ad-ds/plan/selecting-the-forest-root-domain#selecting-a-prefix
220+
[naming-prefix]: /windows-server/identity/ad-ds/plan/selecting-the-forest-root-domain#selecting-a-prefix

0 commit comments

Comments
 (0)