Merge https://github.com/cynthn/azure-docs-pr into 49785

Author: Cynthia Nottingham

.openpublishing.redirection.json

@@ -8472,7 +8472,12 @@
     },
     {
       "source_path": "articles/app-service-web/web-sites-traffic-manager-custom-domain-name.md",
-      "redirect_url": "/azure/app-service/web-sites-traffic-manager-custom-domain-name",
+      "redirect_url": "/azure/app-service/configure-domain-traffic-manager",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service/web-sites-traffic-manager-custom-domain-name.md",
+      "redirect_url": "/azure/app-service/configure-domain-traffic-manager",
       "redirect_document_id": false
     },
     {

articles/active-directory-domain-services/faqs.md

@@ -10,7 +10,7 @@ ms.service: active-directory
 ms.subservice: domain-services
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 01/21/2020
+ms.date: 03/09/2020
 ms.author: iainfou
 
 ---
@@ -32,6 +32,7 @@ This page answers frequently asked questions about Azure Active Directory Domain
 * [Can I add domain controllers to an Azure AD Domain Services managed domain?](#can-i-add-domain-controllers-to-an-azure-ad-domain-services-managed-domain)
 * [Can guest users invited to my directory use Azure AD Domain Services?](#can-guest-users-invited-to-my-directory-use-azure-ad-domain-services)
 * [Can I move an existing Azure AD Domain Services managed domain to a different subscription, resource group, region, or virtual network?](#can-i-move-an-existing-azure-ad-domain-services-managed-domain-to-a-different-subscription-resource-group-region-or-virtual-network)
+* [Does Azure AD Domain Services include high availability options?](#does-azure-ad-domain-services-include-high-availability-options)
 
 ### Can I create multiple managed domains for a single Azure AD directory?
 No. You can only create a single managed domain serviced by Azure AD Domain Services for a single Azure AD directory.
@@ -71,6 +72,10 @@ No. Guest users invited to your Azure AD directory using the [Azure AD B2B](../a
 ### Can I move an existing Azure AD Domain Services managed domain to a different subscription, resource group, region, or virtual network?
 No. After you create an Azure AD Domain Services managed domain, you can't then move the instance to a different resource group, virtual network, subscription, etc. Take care to select the most appropriate subscription, resource group, region, and virtual network when you deploy the Azure AD DS instance.
 
+### Does Azure AD Domain Services include high availability options?
+
+Yes. Each Azure AD Domain Services managed domain includes two domain controllers. You don't manage or connect to these domain controllers, they're part of the managed service. If you deploy Azure AD Domain Services into a region that supports Availability Zones, the domain controllers are distributed across zones. In regions that don't support Availability Zones, the domain controllers are distributed across Availability Sets. You have no configuration options or management control over this distribution. For more information, see [Availability options for virtual machines in Azure](../virtual-machines/windows/availability.md).
+
 ## Administration and operations
 
 * [Can I connect to the domain controller for my managed domain using Remote Desktop?](#can-i-connect-to-the-domain-controller-for-my-managed-domain-using-remote-desktop)

articles/active-directory-domain-services/manage-group-policy.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: domain-services
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 10/31/2019
+ms.date: 03/09/2020
 ms.author: iainfou
 
 ---
@@ -38,7 +38,11 @@ To complete this article, you need the following resources and privileges:
 * A user account that's a member of the *Azure AD DC administrators* group in your Azure AD tenant.
 
 > [!NOTE]
-> As there's [no access to domain controllers in Azure AD DS](faqs.md#can-i-connect-to-the-domain-controller-for-my-managed-domain-using-remote-desktop), you can't create and use a Central Store for group policy administrative templates in a managed domain. [Sysvol isn't included in on-premises Azure AD Connect synchronization](synchronization.md#what-isnt-synchronized-to-azure-ad-ds), so you also can't create an on-premises Central Store and synchronize it to Azure AD DS through Azure AD.
+> You can use Group Policy Administrative Templates by copying the new templates to the management workstation. Copy the *.admx* files into `%SYSTEMROOT%\PolicyDefinitions` and copy the locale-specific *.adml* files to `%SYSTEMROOT%\PolicyDefinitions\[Language-CountryRegion]`, where `Language-CountryRegion` matches the language and region of the *.adml* files.
+>
+> For example, copy the English, United States version of the *.adml* files into the `\en-us` folder.
+>
+> Alternatively, you can centrally store your Group Policy Administrative Template on the domain controllers that are part of the Azure AD DS managed domain. For more information, see [How to create and manage the Central Store for Group Policy Administrative Templates in Windows](https://support.microsoft.com/help/3087759/how-to-create-and-manage-the-central-store-for-group-policy-administra).
 
 ## Install Group Policy Management tools
 

articles/active-directory/authentication/howto-authentication-passwordless-security-key-on-premises.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: conceptual
-ms.date: 01/30/2020
+ms.date: 03/09/2020
 
 ms.author: iainfou
 author: iainfoulds
@@ -47,6 +47,7 @@ Organizations must also meet the following software requirements.
 
 - Devices must be running Windows 10 Insider Build 18945 or newer.
 - You must have version 1.4.32.0 or later of [Azure AD Connect](../hybrid/how-to-connect-install-roadmap.md#install-azure-ad-connect).
+  - For more information on the available Azure AD hybrid authentication options, see [Choose the right authentication method for your Azure Active Directory hybrid identity solution](../../security/fundamentals/choose-ad-authn.md) and [Select which installation type to use for Azure AD Connect](../hybrid/how-to-connect-install-select-installation.md).
 - Your Windows Server domain controllers must have the following patches installed:
     - For Windows Server 2016 - https://support.microsoft.com/help/4534307/windows-10-update-kb4534307
 	- For Windows Server 2019 - https://support.microsoft.com/help/4534321/windows-10-update-kb4534321
@@ -197,4 +198,4 @@ Make sure enough domain controllers are patched to respond in time to service yo
 
 ## Next steps
 
-[Learn more about passwordless](concept-authentication-passwordless.md)
+[Learn more about passwordless](concept-authentication-passwordless.md)

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

@@ -405,7 +405,7 @@ Windows Defender ATP and EDR | View and investigate alerts. When you turn on rol
 Users with this role can open support requests with Microsoft for Azure and Office 365 services, and views the service dashboard and message center in the [Azure portal](https://portal.azure.com) and [Microsoft 365 admin center](https://admin.microsoft.com). More information at [About admin roles](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d).
 
 > [!NOTE]
-> In the Microsoft Graph API and Azure AD PowerShell, this role is identified as "Service Support Administrator." It is "Service Administrator" in the [Azure portal](https://portal.azure.com), the [Microsoft 365 admin center](https://admin.microsoft.com), and the Intune portal.
+> Previously, this role was called "Service Administrator" in [Azure portal](https://portal.azure.com) and [Microsoft 365 admin center](https://admin.microsoft.com). We have renamed it to "Service Support Administrator" to align with the exsiting name in Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell.
 
 ### [SharePoint Administrator](#sharepoint-service-administrator-permissions)
 
@@ -1737,7 +1737,7 @@ Search Editor | Search editor | 8835291a-918c-4fd7-a9ce-faa49f0cf7d9
 Security Administrator | Security administrator | 194ae4cb-b126-40b2-bd5b-6091b380977d
 Security Operator | Security operator | 5f2222b1-57c3-48ba-8ad5-d4759f1fde6f
 Security Reader | Security reader | 5d6b6bb7-de71-4623-b4af-96380a352509
-Service Support Administrator | Service administrator | f023fd81-a637-4b56-95fd-791ac0226033
+Service Support Administrator | Service support administrator | f023fd81-a637-4b56-95fd-791ac0226033
 SharePoint Service Administrator | SharePoint administrator | f28a1f50-f6e7-4571-818b-6a12f2af6b6c
 Teams Communications Administrator | Teams Communications Administrator | baf37b3a-610e-45da-9e62-d9d1e5e8914b
 Teams Communications Support Engineer | Teams Communications Support Engineer | f70938a0-fc10-4177-9e90-2178f8765737

articles/api-management/index.yml

@@ -1,56 +1,79 @@
-### YamlMime:YamlDocument
-documentType: LandingData
+### YamlMime:Landing
+
 title: API Management documentation
+summary: Learn how to use API Management to publish APIs to external, partner, and employee developers securely and at scale. Shows you how to create and manage modern API gateways for existing back-end services hosted anywhere.
+
 metadata:
-  title: Azure API Management documentation - Tutorials, API Reference | Microsoft Docs
-  description: Learn how to use API Management to publish APIs to external, partner, and employee developers securely and at scale. Tutorials, API references, and other documentation show you how to create and manage modern API gateways for existing back-end services hosted anywhere.
+  title: API Management documentation
+  description: Learn how to use API Management to publish APIs to external, partner, and employee developers securely and at scale. Shows you how to create and manage modern API gateways for existing back-end services hosted anywhere.
   services: api-management
-  author: georgewallace
-  manager: gwallace
   ms.service: api-management
   ms.topic: landing-page
-  ms.date: 11/15/2017
+  author: georgewallace
   ms.author: gwallace
-abstract:
-  description: Learn how to use API Management to publish APIs to external, partner, and employee developers securely and at scale. Tutorials, API references, and other documentation show you how to create and manage modern API gateways for existing back-end services hosted anywhere.
-sections:
-- title: 5-minute quickstarts
-  items:
-  - type: paragraph
-    text: Create an API Management instance.
-  - type: list
-    style: icon48
-    items: 
-    - image: 
-        src: https://docs.microsoft.com/azure/sql-database/media/index/portal.svg
-      text: Create an instance - Portal
-      href: /azure/api-management/get-started-create-service-instance
-    - image: 
-        src: https://docs.microsoft.com/azure/sql-database/media/index/logo_powershell.svg
-      text: Create an instance - PowerShell
-      href: /azure/api-management/powershell-create-service-instance
-- title: Step-by-step tutorials
-  items:
-  - type: paragraph
-    text: Learn how to manage API Management.
-  - type: list
-    style: ordered
-    items:
-    - html: <a href="/azure/api-management/import-and-publish">Import and publish your first API</a>
-    - html: <a href="/azure/api-management/api-management-howto-add-products">Create and publish a product</a>
-    - html: <a href="/azure/api-management/mock-api-responses">Mock API responses</a>
-    - html: <a href="/azure/api-management/transform-api">Transform and protect your API</a>
-    - html: <a href="/azure/api-management/api-management-howto-use-azure-monitor">Monitor published APIs</a>
-    - html: <a href="/azure/api-management/api-management-howto-api-inspector">Debug your APIs using request tracing</a>
-    - html: <a href="/azure/api-management/api-management-get-started-revise-api">Use revisions to make non-breaking changes safely</a>
-    - html: <a href="/azure/api-management/api-management-get-started-publish-versions">Publish multiple versions of your API</a>
-    - html: <a href="/azure/api-management/api-management-customize-styles">Customize the style of the Developer portal pages</a>
-- title: Samples
-  items:
-  - type: list
-    style: unordered
-    className: spaced noBullet
-    items:
-    - html: <a href="/azure/api-management/policy-samples">Policy</a>
-    - html: <a href="/azure/api-management/powershell-samples">Azure PowerShell</a>
-    - html: <a href="https://docs.microsoft.com/azure/architecture/reference-architectures/enterprise-integration/basic-enterprise-integration">Reference Architecture</a>
+  ms.date: 03/08/2020
+
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
+
+landingContent:
+  # Card
+  - title: About API Management
+    linkLists:
+      - linkListType: overview
+        links:
+          - text: What is API Management?
+            url: api-management-key-concepts.md
+          - text: Features availability
+            url: api-management-features.md
+
+  # Card (optional)
+  - title: Create an instance
+    linkLists:
+      - linkListType: quickstart
+        links:
+          - text: Azure portal
+            url: get-started-create-service-instance.md
+          - text: Azure PowerShell
+            url: powershell-create-service-instance.md
+
+  # Card
+  - title: Manage API Management
+    linkLists:
+      - linkListType: tutorial
+        links:
+          - text: 1. Import and publish your first API
+            url: import-and-publish.md
+          - text: 2. Create and publish a product
+            url: api-management-howto-add-products.md
+          - text: 3. Mock API responses
+            url: mock-api-responses.md
+          - text: 4. Transform and protect your API
+            url: transform-api.md
+          - text: 5. Monitor published APIs
+            url: api-management-howto-use-azure-monitor.md
+          - text: 6. Debug your APIs using request tracing
+            url: api-management-howto-api-inspector.md
+          - text: 7. Use revisions to make non-breaking changes safely
+            url: api-management-get-started-revise-api.md
+          - text: 8. Publish multiple versions of your API
+            url: api-management-get-started-publish-versions.md
+          - text: 9. Customize the style of the Developer portal pages
+            url: api-management-customize-styles.md
+
+  # Card
+  - title: Samples
+    linkLists:
+      - linkListType: sample
+        links:
+          - text: Policy
+            url: policy-samples.md
+          - text: Azure PowerShell
+            url: powershell-samples.md
+
+  # Card
+  - title: Architecture
+    linkLists:
+      - linkListType: architecture
+        links:
+          - text: Basic enterprise integration
+            url: https://docs.microsoft.com/azure/architecture/reference-architectures/enterprise-integration/basic-enterprise-integration

articles/app-service-mobile/TOC.yml

@@ -166,7 +166,7 @@
       - name: Map your own custom domain
         href: ../app-service/app-service-web-tutorial-custom-domain.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json
       - name: Custom domains with Traffic Manager
-        href: ../app-service/web-sites-traffic-manager-custom-domain-name.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json
+        href: ../app-service/configure-domain-traffic-manager.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json
     - name: Clone an existing app
       href: ../app-service/app-service-web-app-cloning.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json
     - name: Azure Virtual Network