Skip to content

Commit 6f986db

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-pc-migration-pre
2 parents 8fb766e + b3b6947 commit 6f986db

File tree

171 files changed

+2456
-1254
lines changed

Some content is hidden

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

171 files changed

+2456
-1254
lines changed

.openpublishing.redirection.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32264,11 +32264,6 @@
3226432264
"redirect_url": "/azure/expressroute/expressroute-security-controls",
3226532265
"redirect_document_id": false
3226632266
},
32267-
{
32268-
"source_path": "articles/key-vault/key-vault-security-controls.md",
32269-
"redirect_url": "/azure/key-vault/security-baseline",
32270-
"redirect_document_id": false
32271-
},
3227232267
{
3227332268
"source_path": "articles/key-vault/automation-manage-key-vault.md",
3227432269
"redirect_url": "/azure/key-vault/",
@@ -50558,6 +50553,10 @@
5055850553
"source_path": "articles/aks/use-cosmosdb-osba-mongo-app.md",
5055950554
"redirect_url": "/azure/aks/",
5056050555
"redirect_document_id": false
50556+
},
50557+
{
50558+
"source_path": "articles/cognitive-services/speech-service/ship-application.md",
50559+
"redirect_url": "/azure/cognitive-services/speech-service/speech-sdk"
5056150560
}
5056250561
]
5056350562
}

articles/active-directory-domain-services/change-sku.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: daveba
88
ms.service: active-directory
99
ms.subservice: domain-services
1010
ms.workload: identity
11-
ms.topic: conceptual
11+
ms.topic: how-to
1212
ms.date: 01/31/2020
1313
ms.author: iainfou
1414

@@ -26,7 +26,7 @@ This article shows you how to change the SKU for an existing Azure AD DS managed
2626
To complete this article, you need the following resources and privileges:
2727

2828
* An active Azure subscription.
29-
* If you dont have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
29+
* If you don't have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
3030
* An Azure Active Directory tenant associated with your subscription, either synchronized with an on-premises directory or a cloud-only directory.
3131
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3232
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.

articles/active-directory-domain-services/check-health.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 8999eec3-f9da-40b3-997a-7a2587911e96
99
ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
12-
ms.topic: conceptual
12+
ms.topic: how-to
1313
ms.date: 01/21/2020
1414
ms.author: iainfou
1515

articles/active-directory-domain-services/compare-identity-solutions.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@ Although the three Active Directory-based identity solutions share a common name
2323

2424
* **Active Directory Domain Services (AD DS)** - Enterprise-ready lightweight directory access protocol (LDAP) server that provides key features such as identity and authentication, computer object management, group policy, and trusts.
2525
* AD DS is a central component in many organizations with an on-premises IT environment, and provides core user account authentication and computer management features.
26+
* For more information, see [Active Directory Domain Services overview in the Windows Server documentation][overview-adds].
2627
* **Azure Active Directory (Azure AD)** - Cloud-based identity and mobile device management that provides user account and authentication services for resources such as Office 365, the Azure portal, or SaaS applications.
2728
* Azure AD can be synchronized with an on-premises AD DS environment to provide a single identity to users that works natively in the cloud.
29+
* For more information about Azure AD, see [What is Azure Active Directory?][whatis-azuread]
2830
* **Azure Active Directory Domain Services (Azure AD DS)** - Provides managed domain services with a subset of fully-compatible traditional AD DS features such as domain join, group policy, LDAP, and Kerberos / NTLM authentication.
2931
* Azure AD DS integrates with Azure AD, which itself can synchronize with an on-premises AD DS environment. This ability extends central identity use cases to traditional web applications that run in Azure as part of a lift-and-shift strategy.
3032

3133
This overview article compares and contrasts how these identity solutions can work together, or would be used independently, depending on the needs of your organization.
3234

35+
To get started, [create an Azure AD DS managed domain using the Azure portal][tutorial-create].
36+
3337
## Azure AD DS and self-managed AD DS
3438

3539
If you have applications and services that need access to traditional authentication mechanisms such as Kerberos or NTLM, there are two ways to provide Active Directory Domain Services in the cloud:
@@ -116,3 +120,5 @@ To get started with using Azure AD DS, [create an Azure AD DS managed domain usi
116120
[manage-gpos]: manage-group-policy.md
117121
[tutorial-ldaps]: tutorial-configure-ldaps.md
118122
[tutorial-create]: tutorial-create-instance.md
123+
[whatis-azuread]: ../active-directory/fundamentals/active-directory-whatis.md
124+
[overview-adds]: /windows-server/identity/ad-ds/get-started/virtual-dc/active-directory-domain-services-overview

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: e6faeddd-ef9e-4e23-84d6-c9b3f7d16567
99
ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
12-
ms.topic: conceptual
12+
ms.topic: how-to
1313
ms.date: 03/30/2020
1414
ms.author: iainfou
1515

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 52602ad8-2b93-4082-8487-427bdcfa8126
99
ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
12-
ms.topic: conceptual
12+
ms.topic: how-to
1313
ms.date: 03/31/2020
1414
ms.author: iainfou
1515

articles/active-directory-domain-services/delete-aadds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 89e407e1-e1e0-49d1-8b89-de11484eee46
99
ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
12-
ms.topic: conceptual
12+
ms.topic: how-to
1313
ms.date: 03/30/2020
1414
ms.author: iainfou
1515

articles/active-directory-domain-services/deploy-azure-app-proxy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 938a5fbc-2dd1-4759-bcce-628a6e19ab9d
99
ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
12-
ms.topic: conceptual
12+
ms.topic: how-to
1313
ms.date: 03/31/2020
1414
ms.author: iainfou
1515

articles/active-directory-domain-services/deploy-kcd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 938a5fbc-2dd1-4759-bcce-628a6e19ab9d
99
ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
12-
ms.topic: conceptual
12+
ms.topic: how-to
1313
ms.date: 03/30/2020
1414
ms.author: iainfou
1515

articles/active-directory-domain-services/deploy-sp-profile-sync.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 938a5fbc-2dd1-4759-bcce-628a6e19ab9d
99
ms.service: active-directory
1010
ms.subservice: domain-services
1111
ms.workload: identity
12-
ms.topic: conceptual
12+
ms.topic: how-to
1313
ms.date: 01/21/2020
1414
ms.author: iainfou
1515

@@ -25,7 +25,7 @@ This article shows you how to configure Azure AD DS to allow the SharePoint Serv
2525
To complete this article, you need the following resources and privileges:
2626

2727
* An active Azure subscription.
28-
* If you dont have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
28+
* If you don't have an Azure subscription, [create an account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
2929
* An Azure Active Directory tenant associated with your subscription, either synchronized with an on-premises directory or a cloud-only directory.
3030
* If needed, [create an Azure Active Directory tenant][create-azure-ad-tenant] or [associate an Azure subscription with your account][associate-azure-ad-tenant].
3131
* An Azure Active Directory Domain Services managed domain enabled and configured in your Azure AD tenant.

0 commit comments

Comments
 (0)