Skip to content

Commit e3cb8da

Browse files
tynevitynevi
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 3872463 + 59fffec commit e3cb8da

File tree

226 files changed

+2334
-737
lines changed

Some content is hidden

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

226 files changed

+2334
-737
lines changed

‎.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12957,7 +12957,12 @@
1295712957
},
1295812958
{
1295912959
"source_path": "articles/virtual-machines/virtual-machines-windows-cli-options.md",
12960-
"redirect_url": "/azure/virtual-machines/windows/cli-options",
12960+
"redirect_url": "/cli/azure/install-azure-cli-windows",
12961+
"redirect_document_id": false
12962+
},
12963+
{
12964+
"source_path": "articles/virtual-machines/windows/cli-options.md",
12965+
"redirect_url": "/cli/azure/install-azure-cli-windows",
1296112966
"redirect_document_id": false
1296212967
},
1296312968
{

‎articles/active-directory-domain-services/TOC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Azure AD Domain Services Documentation](index.md)
1+
# [Azure AD Domain Services Documentation](index.yml)
22

33
# Overview
44
## [What is Azure AD Domain Services?](active-directory-ds-overview.md)

‎articles/active-directory-domain-services/index.md

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

‎articles/active-directory-domain-services/index.yml

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
### YamlMime:YamlDocument
2+
documentType: LandingData
3+
title: Azure AD Domain Services documentation
4+
metadata:
5+
title: Azure AD Domain Services documentation
6+
description: Learn how to use Active Directory Domain Services to join Azure virtual machines to a domain without using domain controllers. Tutorials and other documentation show you how to manage virtual machines using group policies.
7+
keywords: Azure AD, Azure, domain join, group policy, LDAP, Kerberos, domain controller, DC, lift and shift
8+
author: mahesh-unnikrishnan
9+
ms.author: maheshu
10+
manager: mtillman
11+
ms.date: 6/1/2018
12+
ms.topic: landing-page
13+
ms.devlang: na
14+
ms.service: active-directory
15+
ms.component: domains
16+
sections:
17+
- items:
18+
- type: markdown
19+
text: Learn how to use Active Directory Domain Services to join Azure virtual machines to a domain without using domain controllers. Tutorials and other documentation show you how to manage virtual machines using group policies.
20+
- items:
21+
- type: list
22+
style: cards
23+
className: cardsM
24+
columns: 2
25+
items:
26+
- href: active-directory-ds-overview.md
27+
html: <p>Read about what Azure AD Domain Services can do for you.</p>
28+
image:
29+
src: https://docs.microsoft.com/en-us/media/common/i_investigate.svg
30+
title: What is Azure AD Domain Services?
31+
- href: active-directory-ds-getting-started.md
32+
html: <p>Create your own managed domain with this simple walkthrough.</p>
33+
image:
34+
src: https://docs.microsoft.com/en-us/media/common/i_deploy.svg
35+
title: Get started
36+
- href: active-directory-ds-contact-us.md
37+
html: <p>Receive help when you need it.</p>
38+
image:
39+
src: https://docs.microsoft.com/en-us/media/common/i_support.svg
40+
title: Get support
41+
- href: https://azure.microsoft.com/en-us/updates/?product=active-directory-ds
42+
html: <p>See new features in Azure AD Domain Services.</p>
43+
image:
44+
src: https://docs.microsoft.com/en-us/media/common/i_whats-new.svg
45+
title: What's new
46+
47+
- title: Videos
48+
items:
49+
- type: markdown
50+
text: ">[!VIDEO https://www.youtube.com/embed/T1Nd9APNceQ]"
51+
52+
- title: Planning articles
53+
items:
54+
- type: list
55+
style: unordered
56+
items:
57+
- html: <a href="active-directory-ds-comparison.md">Decide if the service is right for you?</a>
58+
- html: <a href="active-directory-ds-features.md">Features of Azure AD Domain Services</a>
59+
- html: <a href="active-directory-ds-scenarios.md">How can you use the service?</a>
60+
- html: <a href="active-directory-ds-synchronization.md">Understand how synchronization works in Azure AD Domain Services</a>
61+
- html: <a href="https://azure.microsoft.com/en-us/pricing/details/active-directory-ds/">Pricing of Azure AD Domain Services</a>
62+
63+
- title: Applications and Azure AD Domain Services
64+
items:
65+
- type: list
66+
style: unordered
67+
items:
68+
- html: <a href="active-directory-ds-deploy-azure-app-proxy.md">Deploy Azure AD App Proxy</a>
69+
- html: <a href="active-directory-ds-enable-sharepoint-profile-sync.md">Profile synchronization for SharePoint Server</a>
70+
- html: <a href="active-directory-ds-enable-kcd.md">Configure Kerberos Constrained Delegation</a>
71+
72+
- title: How-to articles
73+
items:
74+
- type: list
75+
style: unordered
76+
items:
77+
- html: <a href="active-directory-ds-check-health.md">Check a managed domain’s health </a>
78+
- html: <a href="active-directory-ds-csp.md">Azure CSP Subscriptions and Azure AD Domain Services</a>
79+
- html: <a href="active-directory-ds-admin-guide-administer-dns.md">Administer DNS</a>
80+
- html: <a href="active-directory-ds-networking.md">Select a Virtual network</a>
81+
- html: <a href="active-directory-ds-admin-guide-configure-secure-ldap.md">Configure Secure LDAP</a>
82+
- html: <a href="active-directory-ds-admin-guide-create-ou.md">Create an OU</a>
83+
- html: <a href="active-directory-ds-admin-guide-administer-group-policy.md">Administer Group Policy</a>
84+
85+
- title: Troubleshooting articles
86+
items:
87+
- type: list
88+
style: unordered
89+
items:
90+
- html: <a href="active-directory-ds-troubleshooting.md">Troubleshooting guide</a>
91+
- html: <a href="active-directory-ds-troubleshoot-alerts.md">Troubleshooting alerts on your managed domain</a>
92+
- html: <a href="active-directory-ds-faqs.md">Frequently Asked Questions</a>
93+
- html: <a href="https://azure.microsoft.com/en-us/support/options/">Get support</a>
94+
95+
- title: Other resources
96+
items:
97+
- type: list
98+
style: unordered
99+
items:
100+
- html: <a href="https://feedback.azure.com/forums/169401-azure-active-directory/">Give feedback on Azure AD Domain Services at UserVoice</a>
101+
- html: <a href="https://azure.microsoft.com/en-us/roadmap/?category=security-identity">Azure Roadmap</a>
102+
- html: <a href="https://docs.microsoft.com/en-us/azure/active-directory-domain-services/active-directory-ds-contact-us">Contact Us</a>

‎articles/active-directory/active-directory-conditional-access-app-based-mfa.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ author: MarkusVi
88
manager: mtillman
99
ms.assetid:
1010
ms.service: active-directory
11+
ms.component: protection
1112
ms.topic: quickstart
1213
ms.devlang: na
1314
ms.topic: article

‎articles/active-directory/active-directory-conditional-access-azure-authenticator-app.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ editor: ''
99

1010
ms.assetid: b7ceca0d-5c9d-45c4-942c-b3a9b6bad36c
1111
ms.service: active-directory
12+
ms.component: protection
1213
ms.workload: identity
1314
ms.tgt_pltfrm: na
1415
ms.devlang: na

‎articles/active-directory/active-directory-conditional-access-azure-portal-get-started.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ manager: mtillman
99

1010
ms.assetid:
1111
ms.service: active-directory
12+
ms.component: protection
1213
ms.devlang: na
1314
ms.topic: article
1415
ms.tgt_pltfrm: na

‎articles/active-directory/active-directory-conditional-access-azure-portal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ editor: ''
1010

1111
ms.assetid: 8c1d978f-e80b-420e-853a-8bbddc4bcdad
1212
ms.service: active-directory
13+
ms.component: protection
1314
ms.devlang: na
1415
ms.topic: article
1516
ms.tgt_pltfrm: na

‎articles/active-directory/active-directory-conditional-access-best-practices.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ editor: ''
1010

1111
ms.assetid: 8c1d978f-e80b-420e-853a-8bbddc4bcdad
1212
ms.service: active-directory
13+
ms.component: protection
1314
ms.devlang: na
1415
ms.topic: article
1516
ms.tgt_pltfrm: na

‎articles/active-directory/active-directory-conditional-access-conditions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ editor: ''
1010

1111
ms.assetid: 8c1d978f-e80b-420e-853a-8bbddc4bcdad
1212
ms.service: active-directory
13+
ms.component: protection
1314
ms.devlang: na
1415
ms.topic: article
1516
ms.tgt_pltfrm: na

0 commit comments

Comments
 (0)