Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: tynevi

.openpublishing.publish.config.json

@@ -40,6 +40,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "resourcemanager-templates",
+      "url": "https://github.com/Azure/azure-docs-json-samples",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "_themes",
       "url": "https://github.com/Microsoft/templates.docs.msft",
@@ -376,7 +382,7 @@
   "need_generate_pdf_url_template": true,
   "targets": {
     "Pdf": {
-      "template_folder": "_themes.pdf"	
+      "template_folder": "_themes.pdf"
     }
   }
 }

articles/active-directory-domain-services/active-directory-ds-admin-guide-configure-secure-ldap-enable-ldaps.md

@@ -3,7 +3,7 @@ title: Enable Secure LDAP (LDAPS) in Azure AD Domain Services | Microsoft Docs
 description: Enable Secure LDAP (LDAPS) for an Azure AD Domain Services managed domain
 services: active-directory-ds
 documentationcenter: ''
-author: eringreenlee
+author: iainfoulds
 manager: daveba
 editor: curtand
 
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.date: 08/01/2018
-ms.author: ergreenl
+ms.author: iainfou
 
 ---
 # Enable secure LDAP (LDAPS) for an Azure AD Domain Services managed domain

articles/active-directory-domain-services/active-directory-ds-admin-guide-configure-secure-ldap-export-pfx.md

@@ -3,7 +3,7 @@ title: Create a .PFX file with the secure LDAP (LDAPS) certificate for an Azure
 description: Create a secure LDAP certificate for an Azure AD Domain Services manage domain
 services: active-directory-ds
 documentationcenter: ''
-author: MikeStephens-MS
+author: iainfoulds
 manager: daveba
 editor: curtand
 
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.date: 05/13/2019
-ms.author: mstephen
+ms.author: iainfou
 ---
 # Create a .PFX file with the secure LDAP (LDAPS) certificate for a managed domain
 

articles/active-directory-domain-services/active-directory-ds-compare-with-azure-ad-join.md

@@ -3,7 +3,7 @@ title: 'Compare Azure AD Join and Azure Active Directory Domain Services | Micro
 description: Deciding between Azure AD Join and Azure AD Domain Services
 services: active-directory-ds
 documentationcenter: ''
-author: MikeStephens-MS
+author: iainfoulds
 manager: daveba
 editor: curtand
 
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.date: 05/20/2019
-ms.author: mstephen
+ms.author: iainfou
 ---
 
 # Choose between Azure Active Directory join and Azure Active Directory Domain Services

articles/active-directory-domain-services/active-directory-ds-features.md

@@ -3,7 +3,7 @@ title: 'Azure Active Directory Domain Services: Features | Microsoft Docs'
 description: Features of Azure Active Directory Domain Services
 services: active-directory-ds
 documentationcenter: ''
-author: MikeStephens-MS
+author: iainfoulds
 manager: daveba
 editor: curtand
 
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.date: 05/10/2019
-ms.author: mstephen
+ms.author: iainfou
 
 ---
 # Azure AD Domain Services

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

@@ -3,7 +3,7 @@ title: 'Azure Active Directory Domain Services: Getting Started | Microsoft Docs
 description: Enable Azure Active Directory Domain Services using the Azure portal
 services: active-directory-ds
 documentationcenter: ''
-author: MikeStephens-MS
+author: iainfoulds
 manager: daveba
 editor: curtand
 
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.date: 05/20/2019
-ms.author: mstephen
+ms.author: iainfou
 
 ---
 # Enable Azure Active Directory Domain Services using the Azure portal

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

@@ -3,7 +3,7 @@ title: 'Azure Active Directory Domain Services: Update DNS settings for the Azur
 description: Getting started with Azure Active Directory Domain Services
 services: active-directory-ds
 documentationcenter: ''
-author: eringreenlee
+author: iainfoulds
 manager: daveba
 editor: curtand
 
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.date: 05/30/2018
-ms.author: ergreenl
+ms.author: iainfou
 
 ---
 # Enable Azure Active Directory Domain Services

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

@@ -3,7 +3,7 @@ title: 'Azure Active Directory Domain Services: Getting Started | Microsoft Docs
 description: Enable Azure Active Directory Domain Services using the Azure portal
 services: active-directory-ds
 documentationcenter: ''
-author: MikeStephens-MS
+author: iainfoulds
 manager: daveba
 editor: curtand
 
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.date: 05/22/2019
-ms.author: mstephen
+ms.author: iainfou
 
 ---
 # Enable Azure Active Directory Domain Services using the Azure portal

articles/active-directory-domain-services/active-directory-ds-getting-started-password-sync-synced-tenant.md

@@ -3,7 +3,7 @@ title: 'Azure AD Domain Services: Enable password synchronization | Microsoft Do
 description: Getting started with Azure Active Directory Domain Services
 services: active-directory-ds
 documentationcenter: ''
-author: MikeStephens-MS
+author: iainfoulds
 manager: daveba
 editor: curtand
 
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.date: 05/10/2019
-ms.author: mstephen
+ms.author: iainfou
 
 ---
 # Enable password synchronization to Azure Active Directory Domain Services

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

@@ -3,7 +3,7 @@ title: 'Azure Active Directory Domain Services: Enable password hash synchroniza
 description: Getting started with Azure Active Directory Domain Services
 services: active-directory-ds
 documentationcenter: ''
-author: MikeStephens-MS
+author: iainfoulds
 manager: daveba
 editor: curtand
 
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.date: 05/10/2019
-ms.author: mstephen
+ms.author: iainfou
 
 ---
 # Enable password hash synchronization to Azure Active Directory Domain Services