Skip to content

Commit d25654d

Browse files
authored
Merge pull request #96536 from MicrosoftDocs/master
11/19 PM Publish
2 parents 8e31a82 + aca98bf commit d25654d

File tree

500 files changed

+2907
-2166
lines changed

Some content is hidden

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

500 files changed

+2907
-2166
lines changed

.openpublishing.redirection.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12374,17 +12374,17 @@
1237412374
},
1237512375
{
1237612376
"source_path": "articles/cosmos-db/logging.md",
12377-
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db.md",
12377+
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db",
1237812378
"redirect_document_id": false
1237912379
},
1238012380
{
1238112381
"source_path": "articles/cosmos-db/cosmos-db-azure-monitor-metrics.md",
12382-
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db.md",
12382+
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db",
1238312383
"redirect_document_id": false
1238412384
},
1238512385
{
1238612386
"source_path": "articles/cosmos-db/monitor-accounts.md",
12387-
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db.md",
12387+
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db",
1238812388
"redirect_document_id": false
1238912389
},
1239012390
{

articles/active-directory-b2c/active-directory-b2c-ui-customization-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,4 @@ In the Modify your sign-up or sign-in custom policy section, you configured the
202202
203203
## Next steps
204204
205-
For more information about UI elements that can be customized, see [reference guide for UI customization for built-in policies](active-directory-b2c-reference-ui-customization.md).
205+
For more information about UI elements that can be customized, see [reference guide for UI customization for user flows](active-directory-b2c-reference-ui-customization.md).

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
href: tutorial-configure-password-hash-sync.md
2424
- name: Create an advanced managed domain
2525
href: tutorial-create-instance-advanced.md
26+
- name: Create a forest trust (preview)
27+
href: tutorial-create-forest-trust.md
2628
- name: Samples
2729
items:
2830
- name: Create a managed domain using Azure PowerShell
@@ -33,6 +35,12 @@
3335
href: administration-concepts.md
3436
- name: Common deployment scenarios
3537
href: scenarios.md
38+
- name: Forests and trusts
39+
items:
40+
- name: Resource forests
41+
href: concepts-resource-forest.md
42+
- name: Forest trusts
43+
href: concepts-forest-trust.md
3644
- name: How Azure AD DS synchronization works
3745
href: synchronization.md
3846
- name: How password hash synchronization works

articles/active-directory-domain-services/administration-concepts.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,18 @@ For users synchronized from an on-premises AD DS environment using Azure AD Conn
5656
5757
Once appropriately configured, the usable password hashes are stored in the Azure AD DS managed domain. If you delete the Azure AD DS managed domain, any password hashes stored at that point are also deleted. Synchronized credential information in Azure AD can't be reused if you later create an Azure AD DS managed domain - you must reconfigure the password hash synchronization to store the password hashes again. Previously domain-joined VMs or users won't be able to immediately authenticate - Azure AD needs to generate and store the password hashes in the new Azure AD DS managed domain. For more information, see [Password hash sync process for Azure AD DS and Azure AD Connect][azure-ad-password-sync].
5858

59+
## Forests and trusts
60+
61+
A *forest* is a logical construct used by Active Directory Domain Services (AD DS) to group one or more *domains*. The domains then store objects for user or groups, and provide authentication services.
62+
63+
In Azure AD DS, the forest only contains one domain. On-premises AD DS forests often contain many domains. In large organizations, especially after mergers and acquisitions, you may end up with multiple on-premises forests that each then contain multiple domains.
64+
65+
By default, an Azure AD DS managed domain is created as a *user* forest. This type of forest synchronizes all objects from Azure AD, including any user accounts created in an on-premises AD DS environment. User accounts can directly authenticate against the Azure AD DS managed domain, such as to sign in to a domain-joined VM. A user forest works when the password hashes can be synchronized and users aren't using exclusive sign-in methods like smart card authentication.
66+
67+
In an Azure AD DS *resource* forest, users authenticate over a one-way forest *trust* from their on-premises AD DS. With this approach, the user objects and password hashes aren't synchronized to Azure AD DS. The user objects and credentials only exist in the on-premises AD DS. This approach lets enterprises host resources and application platforms in Azure that depend on classic authentication such LDAPS, Kerberos, or NTLM, but any authentication issues or concerns are removed. Azure AD DS resource forests are currently in preview.
68+
69+
For more information about forest types in Azure AD DS, see [What are resource forests?][concepts-forest] and [How do forest trusts work in Azure AD DS?][concepts-trust]
70+
5971
## Next steps
6072

6173
To get started, [create an Azure AD DS managed domain][create-instance].
@@ -66,3 +78,6 @@ To get started, [create an Azure AD DS managed domain][create-instance].
6678
[secure-domain]: secure-your-domain.md
6779
[azure-ad-password-sync]: ../active-directory/hybrid/how-to-connect-password-hash-synchronization.md#password-hash-sync-process-for-azure-ad-domain-services
6880
[create-instance]: tutorial-create-instance.md
81+
[tutorial-create-instance-advanced]: tutorial-create-instance-advanced.md
82+
[concepts-forest]: concepts-resource-forest.md
83+
[concepts-trust]: concepts-forest-trust.md

0 commit comments

Comments
 (0)