Merge pull request #41973 from MicrosoftDocs/master

Checking to see if master --> live PR results in error

Author: huypub

.openpublishing.redirection.json

@@ -21765,10 +21765,20 @@
             "redirect_url": "/azure/active-directory/manage-apps/what-is-single-sign-on",
             "redirect_document_id": true
         },
+        {
+            "source_path": "articles/active-directory/active-directory-application-proxy-gdpr.md",
+            "redirect_url": "/azure/active-directory/manage-apps/application-proxy-remove-personal-data",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/azure-maps/search-categories.md",
             "redirect_url": "/azure/azure-maps/supported-search-categories",
             "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/cognitive-services/LUIS/luis-concept-intro-to-luis.md",
+            "redirect_url": "/azure/cognitive-services/LUIS/home",
+            "redirect_document_id": true
         }
 
     ]

articles/active-directory-domain-services/active-directory-ds-getting-started-admingroup.md

@@ -13,7 +13,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 09/26/2017
+ms.date: 05/23/2018
 ms.author: maheshu
 
 ---
@@ -37,16 +37,19 @@ The wizard automatically creates the administrative group in your Azure AD direc
 
 3. When you are done, click **OK** to move on to the **Summary** page of the wizard.
 
-4. On the **Summary** page of the wizard, review the configuration settings for the managed domain. You can go back to any step of the wizard to make changes, if necessary. When you are done, click **OK** to create the new managed domain.
+
+## Deploy your managed domain
+
+1. On the **Summary** page of the wizard, review the configuration settings for the managed domain. You can go back to any step of the wizard to make changes, if necessary. When you are done, click **OK** to create the new managed domain.
 
     ![Summary](./media/getting-started/domain-services-blade-summary.png)
 
-5. You see a notification that shows the progress of your Azure AD Domain Services deployment. Click the notification to see detailed progress for the deployment.
+2. You see a notification that shows the progress of your Azure AD Domain Services deployment. Click the notification to see detailed progress for the deployment.
 
     ![Notification - deployment in progress](./media/getting-started/domain-services-blade-deployment-in-progress.png)
 
 
-## Provision your managed domain
+## Check the deployment status of your managed domain
 The process of provisioning your managed domain can take up to an hour.
 
 1. While your deployment is in progress, you can search for 'domain services' in the **Search resources** search box. Select **Azure AD Domain Services** from the search result. The **Azure AD Domain Services** blade lists the managed domain that is being provisioned.

articles/active-directory-domain-services/active-directory-ds-getting-started-dns.md

@@ -13,30 +13,22 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: get-started-article
-ms.date: 09/26/2017
+ms.date: 05/23/2018
 ms.author: maheshu
 
 ---
 # Enable Azure Active Directory Domain Services
 
 ## Task 4: update DNS settings for the Azure virtual network
-In the preceding configuration tasks, you have successfully enabled Azure Active Directory Domain Services for your directory. The next task is to ensure that computers within the virtual network can connect and consume these services. In this article, you update the DNS server settings for your virtual network to point to the two IP addresses where Azure Active Directory Domain Services is available on the virtual network.
+In the preceding configuration tasks, you have successfully enabled Azure Active Directory Domain Services for your directory. Next, enable computers within the virtual network to connect and consume these services. In this article, you update the DNS server settings for your virtual network to point to the two IP addresses where Azure Active Directory Domain Services is available on the virtual network.
 
-To update the DNS server setting for the virtual network in which you have enabled Azure Active Directory Domain Services, complete the following steps:
+To update the DNS server settings for the virtual network in which you have enabled Azure Active Directory Domain Services, complete the following steps:
 
 1. The **Overview** tab lists a set of **Required configuration steps** to be performed after your managed domain is fully provisioned. The first configuration step is **Update DNS server settings for your virtual network**.
 
-    ![Domain Services - Overview tab after fully provisioned](./media/getting-started/domain-services-provisioned-overview.png)
+    ![Domain Services - Overview tab](./media/getting-started/domain-services-provisioned-overview.png)
 
-2. When your domain is fully provisioned, two IP addresses are displayed in this tile. Each of these IP addresses represents a domain controller for your managed domain.
-
-3. To copy the first IP address to clipboard, click the copy button next to it. Then click the **Configure DNS servers** button.
-
-4. Paste the first IP address into the **Add DNS server** textbox in the **DNS servers** blade. Scroll horizontally to the left to copy the second IP address and paste it into the **Add DNS server** textbox.
-
-    ![Domain Services - update DNS](./media/getting-started/domain-services-update-dns.png)
-
-5. Click **Save** when you are done to update the DNS servers for the virtual network.
+2. Click the **Configure** button to update the DNS server settings for the virtual network.
 
 > [!NOTE]
 > Virtual machines in the network only get the new DNS settings after a restart. If you need them to get the updated DNS settings right away, trigger a restart either by the portal, PowerShell, or the CLI.

articles/active-directory-domain-services/active-directory-ds-getting-started-network.md

@@ -13,7 +13,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 02/05/2018
+ms.date: 05/23/2018
 ms.author: maheshu
 
 ---
@@ -29,7 +29,7 @@ The next configuration task is to create an Azure virtual network and a dedicate
 
 1. Click **Virtual network** to select a virtual network.
     > [!NOTE]
-    > **Classic virtual networks are not supported for new deployments.** Classic virtual networks are not supported for new deployments. Existing managed domains deployed in classic virtual networks continue to be supported. We will provide the ability to migrate an existing managed domain from a classic virtual network to a Resource Manager virtual network in the near future.
+    > **Classic virtual networks are not supported for new deployments.** Classic virtual networks are not supported for new deployments. Existing managed domains deployed in classic virtual networks continue to be supported. Microsoft will enable you to migrate an existing managed domain from a classic virtual network to a Resource Manager virtual network in the near future.
     >
 
 2. On the **Choose virtual network** page, you see all existing virtual networks. You see only the virtual networks that belong to the resource group and Azure location you have selected on the **Basics** wizard page.
@@ -39,7 +39,7 @@ The next configuration task is to create an Azure virtual network and a dedicate
   > **You cannot move your managed domain to a different virtual network after you enable Azure AD Domain Services.** Pick the right virtual network to enable your managed domain. After you create a managed domain, you cannot move it to a different virtual network, without deleting the managed domain. We recommend reviewing the [networking considerations for Azure Active Directory Domain Services](active-directory-ds-networking.md) before you proceed.  
   >
 
-4. **Create virtual network:** Click **Create new** to create a new virtual network. We highly recommend using a dedicated subnet for Azure AD Domain Services. For example, create a subnet with the name 'DomainServices', making it easy for other administrators to understand what is deployed within the subnet. Click **OK** when you're done.
+4. **Create virtual network:** Click **Create new** to create a new virtual network. Use a dedicated subnet for Azure AD Domain Services. For example, create a subnet with the name 'DomainServices', making it easy for other administrators to understand what is deployed within the subnet. Click **OK** when you're done.
 
     ![Pick virtual network](./media/getting-started/domain-services-blade-network-pick-vnet.png)
 
@@ -54,7 +54,7 @@ The next configuration task is to create an Azure virtual network and a dedicate
   > **Guidelines for selecting a subnet**
   > 1. Use a dedicated subnet for Azure AD Domain Services. Do not deploy any other virtual machines to this subnet. This configuration enables you to configure network security groups (NSGs) for your workloads/virtual machines without disrupting your managed domain. For details, see [networking considerations for Azure Active Directory Domain Services](active-directory-ds-networking.md).
   2. Do not select the Gateway subnet for deploying Azure AD Domain Services, because it is not a supported configuration.
-  3. Ensure that the subnet you've selected has sufficient available address space - at least 3-5 available IP addresses and exists in the private IP address space.
+  3. The subnet you've selected must have at least 3-5 available IP addresses in its address space.
   >
 
 6. When you are done, click **OK** to proceed to the **Administrator group** page of the wizard.

articles/active-directory-domain-services/active-directory-ds-getting-started.md

@@ -13,13 +13,23 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 10/26/2017
+ms.date: 05/23/2018
 ms.author: maheshu
 
 ---
 # Enable Azure Active Directory Domain Services using the Azure portal
 This article shows how to enable Azure Active Directory Domain Services (Azure AD DS) using the Azure portal.
 
+## Before you begin
+To complete the tasks listed in this article, you need:
+
+* A valid **Azure subscription**.
+* An **Azure AD directory** - either synchronized with an on-premises directory or a cloud-only directory.
+* The **Azure subscription must be associated with the Azure AD directory**.
+* You need **global administrator** privileges in your Azure AD directory to enable Azure AD Domain Services.
+
+
+## Enable Azure AD Domain Services
 To launch the **Enable Azure AD Domain Services** wizard, complete the following steps:
 
 1. Go to the [Azure portal](https://portal.azure.com).
@@ -36,7 +46,7 @@ To launch the **Enable Azure AD Domain Services** wizard, complete the following
 
 
 ## Task 1: configure basic settings
-In the **Basics** page of the wizard, you can specify the DNS domain name for the managed domain. You can also choose the resource group and Azure location to which the managed domain should be deployed.
+In the **Basics** page of the wizard, specify the DNS domain name for the managed domain. You can also choose the resource group and Azure location to which the managed domain should be deployed.
 
 ![Configure basics](./media/getting-started/domain-services-blade-basics.png)
 
@@ -56,11 +66,11 @@ In the **Basics** page of the wizard, you can specify the DNS domain name for th
 
 2. Select the Azure **Subscription** in which you would like to create the managed domain.
 
-3. Select the **Resource group** to which the managed domain should belong. You can choose either the **Create new** or **Use existing** options to select the resource group.
+3. Select the **Resource group** to which the managed domain should belong. Choose either the **Create new** or **Use existing** options to select the resource group.
 
 4. Choose the Azure **Location** in which the managed domain should be created. On the **Network** page of the wizard, you see only virtual networks that belong to the location you have selected.
 
-5. When you are done, click **OK** to move on to the **Network** page of the wizard.
+5. Click **OK** to move on to the **Network** page of the wizard.
 
 
 ## Next step