Skip to content

Commit 0b3e9ff

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into us1679050cz
2 parents b5bd27b + eaf6fe2 commit 0b3e9ff

File tree

256 files changed

+6530
-4737
lines changed

Some content is hidden

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

256 files changed

+6530
-4737
lines changed

.openpublishing.redirection.json

Lines changed: 519 additions & 508 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/boolean-transformations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 03/16/2020
12+
ms.date: 04/01/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -132,7 +132,7 @@ The following claims transformation demonstrates how to check the value of a boo
132132
<InputParameter Id="valueToCompareTo" DataType="boolean" Value="true" />
133133
</InputParameters>
134134
<OutputClaims>
135-
<OutputClaim ClaimTypeReferenceId="accountEnabled" TransformationClaimType="compareResult"/>
135+
<OutputClaim ClaimTypeReferenceId="accountEnabled" TransformationClaimType="compareResult"/>
136136
</OutputClaims>
137137
</ClaimsTransformation>
138138
```
@@ -163,6 +163,7 @@ Use this claim transformation to perform logical negation on a claim.
163163
<ClaimsTransformation Id="CheckWhetherEmailBePresented" TransformationMethod="NotClaims">
164164
<InputClaims>
165165
<InputClaim ClaimTypeReferenceId="userExists" TransformationClaimType="inputClaim" />
166+
</InputClaims>
166167
<OutputClaims>
167168
<OutputClaim ClaimTypeReferenceId="userExists" TransformationClaimType="outputClaim" />
168169
</OutputClaims>
@@ -198,7 +199,6 @@ The following claims transformation demonstrates how to `Or` two boolean ClaimTy
198199
<OutputClaim ClaimTypeReferenceId="presentTOSSelfAsserted" TransformationClaimType="outputClaim" />
199200
</OutputClaims>
200201
</ClaimsTransformation>
201-
</ClaimsTransformation>
202202
```
203203

204204
### Example

articles/active-directory-b2c/claimstransformations.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ For examples of claims transformations, see the following reference pages:
159159
- [Date](date-transformations.md)
160160
- [Integer](integer-transformations.md)
161161
- [JSON](json-transformations.md)
162+
- [Phone number](phone-number-claims-transformations.md)
162163
- [General](general-transformations.md)
163164
- [Social account](social-transformations.md)
164165
- [String](string-transformations.md)

articles/active-directory-b2c/ropc-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 02/27/2020
12+
ms.date: 04/01/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---

articles/active-directory-domain-services/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,5 @@
151151
href: https://azure.microsoft.com/pricing/details/active-directory-ds/
152152
- name: Azure AD feedback forum
153153
href: https://feedback.azure.com/forums/169401-azure-active-directory
154-
- name: Contact us
155-
href: contact-us.md
156154
- name: Use Azure AD Domain Services in Azure CSP subscriptions
157155
href: csp.md

articles/active-directory-domain-services/contact-us.md

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

articles/active-directory-domain-services/create-ou.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,31 @@ ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
1212
ms.topic: conceptual
13-
ms.date: 10/31/2019
13+
ms.date: 03/31/2020
1414
ms.author: iainfou
1515

1616
---
1717
# Create an Organizational Unit (OU) in an Azure AD Domain Services managed domain
1818

1919
Organizational units (OUs) in Active Directory Domain Services (AD DS) let you logically group objects such as user accounts, service accounts, or computer accounts. You can then assign administrators to specific OUs, and apply group policy to enforce targeted configuration settings.
2020

21-
Azure AD DS managed domains include two built-in OUs - *AADDC Computers* and *AADDC Users*. The *AADDC Computers* OU contains computer objects for all computers that are joined to the managed domain. The *AADDC Users* OU includes users and groups synchronized in from the Azure AD tenant. As you create and run workloads that use Azure AD DS, you may need to create service accounts for applications to authenticate themselves. To organize these service accounts, you often create a custom OU in the Azure AD DS managed domain and then create service accounts within that OU.
21+
Azure AD DS managed domains include the following two built-in OUs:
22+
23+
* *AADDC Computers* - contains computer objects for all computers that are joined to the managed domain.
24+
* *AADDC Users* - includes users and groups synchronized in from the Azure AD tenant.
25+
26+
As you create and run workloads that use Azure AD DS, you may need to create service accounts for applications to authenticate themselves. To organize these service accounts, you often create a custom OU in the Azure AD DS managed domain and then create service accounts within that OU.
2227

2328
In a hybrid environment, OUs created in an on-premises AD DS environment aren't synchronized to Azure AD DS. Azure AD DS managed domains use a flat OU structure. All user accounts and groups are stored in the *AADDC Users* container, despite being synchronized from different on-premises domains or forests, even if you've configured a hierarchical OU structure there.
2429

2530
This article shows you how to create an OU in your Azure AD DS managed domain.
2631

27-
[!INCLUDE [active-directory-ds-prerequisites.md](../../includes/active-directory-ds-prerequisites.md)]
28-
2932
## Before you begin
3033

3134
To complete this article, you need the following resources and privileges:
3235

3336
* An active Azure subscription.
34-
* If you dont have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
37+
* If you don't have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
3538
* An Azure Active Directory tenant associated with your subscription, either synchronized with an on-premises directory or a cloud-only directory.
3639
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3740
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.
@@ -64,19 +67,19 @@ To create a custom OU, you use the Active Directory Administrative Tools from a
6467
1. To create and manage OUs, select **Active Directory Administrative Center** from the list of administrative tools.
6568
1. In the left pane, choose your Azure AD DS managed domain, such as *aaddscontoso.com*. A list of existing OUs and resources is shown:
6669

67-
![Select your Azure AD DS managed domain in the Active Directory Administrative Center](./media/active-directory-domain-services-admin-guide/create-ou-adac-overview.png)
70+
![Select your Azure AD DS managed domain in the Active Directory Administrative Center](./media/create-ou/create-ou-adac-overview.png)
6871

6972
1. The **Tasks** pane is shown on the right side of the Active Directory Administrative Center. Under the domain, such as *aaddscontoso.com*, select **New > Organizational Unit**.
7073

71-
![Select the option to create a new OU in the Active Directory Administrative Center](./media/active-directory-domain-services-admin-guide/create-ou-adac-new-ou.png)
74+
![Select the option to create a new OU in the Active Directory Administrative Center](./media/create-ou/create-ou-adac-new-ou.png)
7275

7376
1. In the **Create Organizational Unit** dialog, specify a **Name** for the new OU, such as *MyCustomOu*. Provide a short description for the OU, such as *Custom OU for service accounts*. If desired, you can also set the **Managed By** field for the OU. To create the custom OU, select **OK**.
7477

75-
![Create a custom OU from the Active Directory Administrative Center](./media/active-directory-domain-services-admin-guide/create-ou-dialog.png)
78+
![Create a custom OU from the Active Directory Administrative Center](./media/create-ou/create-ou-dialog.png)
7679

7780
1. Back in the Active Directory Administrative Center, the custom OU is now listed and is available for use:
7881

79-
![Custom OU available for use in the Active Directory Administrative Center](./media/active-directory-domain-services-admin-guide/create-ou-done.png)
82+
![Custom OU available for use in the Active Directory Administrative Center](./media/create-ou/create-ou-done.png)
8083

8184
## Next steps
8285

0 commit comments

Comments
 (0)