Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-build-cogserv-containers

Author: v-alje

.openpublishing.redirection.json

@@ -87,6 +87,7 @@ Yes. Each Azure AD Domain Services managed domain includes two domain controller
 * [Can I modify or add DNS records in my managed domain?](#can-i-modify-or-add-dns-records-in-my-managed-domain)
 * [What is the password lifetime policy on a managed domain?](#what-is-the-password-lifetime-policy-on-a-managed-domain)
 * [Does Azure AD Domain Services provide AD account lockout protection?](#does-azure-ad-domain-services-provide-ad-account-lockout-protection)
+* [Can I configure Distributed File System (DFS) and replication within Azure AD Domain Services?](#can-i-configure-distributed-file-system-and-replication-within-azure-ad-domain-services)
 
 ### Can I connect to the domain controller for my managed domain using Remote Desktop?
 No. You don't have permissions to connect to domain controllers for the managed domain using Remote Desktop. Members of the *AAD DC Administrators* group can administer the managed domain using AD administration tools such as the Active Directory Administration Center (ADAC) or AD PowerShell. These tools are installed using the *Remote Server Administration Tools* feature on a Windows server joined to the managed domain. For more information, see [Create a management VM to configure and administer an Azure AD Domain Services managed domain](tutorial-create-management-vm.md).
@@ -115,6 +116,9 @@ The default password lifetime on an Azure AD Domain Services managed domain is 9
 ### Does Azure AD Domain Services provide AD account lockout protection?
 Yes. Five invalid password attempts within 2 minutes on the managed domain cause a user account to be locked out for 30 minutes. After 30 minutes, the user account is automatically unlocked. Invalid password attempts on the managed domain don't lock out the user account in Azure AD. The user account is locked out only within your Azure AD Domain Services managed domain. For more information, see [Password and account lockout policies on managed domains](password-policy.md).
 
+### Can I configure Distributed File System and replication within Azure AD Domain Services?
+No. Distributed File System (DFS) and replication aren't available when using Azure AD Domain Services.
+
 ## Billing and availability
 
 * [Is Azure AD Domain Services a paid service?](#is-azure-ad-domain-services-a-paid-service)

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

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: B2B
 ms.topic: conceptual
-ms.date: 02/27/2019
+ms.date: 05/07/2020
 
 ms.author: mimart
 author: msmimart
@@ -47,10 +47,13 @@ The domain you want to federate with must ***not*** be DNS-verified in Azure AD.
 
 ### Authentication URL
 Direct federation is only allowed for policies where the authentication URL’s domain matches the target domain, or where the authentication URL is one of these allowed identity providers (this list is subject to change):
+
 -	accounts.google.com
 -	pingidentity.com
 -	login.pingone.com
 -	okta.com
+-	oktapreview.com
+-	okta-emea.com
 -	my.salesforce.com
 -	federation.exostar.com
 -	federation.exostartest.com

articles/active-directory/b2b/direct-federation.md

@@ -22,6 +22,9 @@ With Conditional Access policies, you can specify access requirements to website
 
 When you access a site or service directly, the impact of a related policy is typically easy to assess. For example, if you have a policy that requires multi-factor authentication (MFA) for SharePoint Online configured, MFA is enforced for each sign-in to the SharePoint web portal. However, it is not always straight-forward to assess the impact of a policy because there are cloud apps with dependencies to other cloud apps. For example, Microsoft Teams can provide access to resources in SharePoint Online. So, when you access Microsoft Teams in our current scenario, you are also subject to the SharePoint MFA policy. 
 
+> [!TIP]
+> Using the [Office 365 (preview)](concept-conditional-access-cloud-apps.md#office-365-preview) app will target all Office apps to avoid issues with service dependencies in the Office stack.
+
 ## Policy enforcement 
 
 If you have a service dependency configured, the policy may be applied using early-bound or late-bound enforcement. 

articles/active-directory/conditional-access/service-dependencies.md

@@ -1,6 +1,7 @@
 ---
-title: Configure endpoints
-description: How to find the authentication endpoints for a custom application you are developing or registering with Azure AD.
+title: Get the endpoints for an Azure AD app registration
+titleSuffix: Microsoft identity platform
+description: How to find the authentication endpoints for a custom application you're developing or registering with Azure AD.
 services: active-directory
 author: rwike77
 manager: CelesteDG
@@ -10,26 +11,24 @@ ms.subservice: develop
 ms.custom: aaddev 
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 07/15/2019
+ms.date: 05/07/2020
 ms.author: ryanwi
-
 ---
 
-# How to configure endpoints
+# How to discover endpoints
 
 You can find the authentication endpoints for your application in the [Azure portal](https://portal.azure.com).
 
--   Navigate to the [Azure portal](https://portal.azure.com).
-
--   From the left navigation pane, click **Azure Active Directory**.
-
--   Click **App Registrations** and choose **Endpoints**.
+1. Sign in to the [Azure portal](https://portal.azure.com).
+1. Select **Azure Active Directory**.
+1. Under **Manage**, select **App registrations**, and then select **Endpoints** in the top menu.
 
--   This open up the **Endpoints** page, which list all the authentication endpoints for your tenant.
-
--   Use the endpoint specific to the authentication protocol you are using, in conjunction with the application ID to craft the authentication request specific to your application.
+    The **Endpoints** page is displayed, showing the authentication endpoints for your tenant.
+    
+    Use the endpoint that matches the authentication protocol you're using in conjunction with the **Application (client) ID** to craft the authentication request specific to your application.
 
 **National clouds** (for example Azure AD China, Germany, and US Government) have their own app registration portal and Azure AD authentication endpoints. Learn more in the [National clouds overview](authentication-national-cloud.md).
 
 ## Next steps
-[Azure Active Directory developer's guide](https://docs.microsoft.com/azure/active-directory/develop/active-directory-developers-guide)
+
+For more information about endpoints in the different Azure environments, see the [National clouds overview](authentication-national-cloud.md).

articles/active-directory/develop/registration-config-how-to.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.subservice: fundamentals
 ms.topic: conceptual
-ms.date: 09/18/2018
+ms.date: 05/07/2020
 ms.author: ajburnle
 ms.reviewer: kexia
 ms.custom: "it-pro, seodec18, fasttrack-edit"
@@ -48,17 +48,17 @@ Your custom branding won't immediately appear when your users go to sites such a
 
         - **Language.** The language is automatically set as your default and can't be changed.
 
-        - **Sign-in page background image.** Select a .png or .jpg image file to appear as the background for your sign-in pages. 
+        - **Sign-in page background image.** Select a .png or .jpg image file to appear as the background for your sign-in pages. The image will be anchored to the center of the browser, and will scale to the size of the viewable space. You can't select an image larger than 1920x1080 pixels in size or that has a file size more than 300 KB.
 
-            The image can't be larger than 1920x1080 pixels in size and must have a file size of less than 300 KB.
+            It's recommended to use images without a strong subject focus, e.g., an opaque white box appears in the center of the screen, and could cover any part of the image depending on the dimensions of the viewable space.
 
         - **Banner logo.** Select a .png or .jpg version of your logo to appear on the sign-in page after the user enters a username and on the **My Apps** portal page.
 
             The image can't be taller than 60 pixels or wider than 280 pixels. We recommend using a transparent image since the background might not match your logo background. We also recommend not adding padding around the image or it might make your logo look small.
 
         - **Username hint.** Type the hint text that appears to users if they forget their username. This text must be Unicode, without links or code, and can't exceed 64 characters. If guests sign in to your app, we suggest not adding this hint.
 
-        - **Sign-in page text.** Type the text that appears on the bottom of the sign-in page. You can use this text to communicate additional information, such as the phone number to your help desk or a legal statement. This text must be Unicode and not exceed 256 characters. We also suggest not including links or HTML tags.
+        - **Sign-in page text.** Type the text that appears on the bottom of the sign-in page. You can use this text to communicate additional information, such as the phone number to your help desk or a legal statement. This text must be Unicode and not exceed 256 characters.
 
     - **Advanced settings**
 

articles/active-directory/fundamentals/customize-branding.md

@@ -59,6 +59,11 @@
     href: tutorial-kubernetes-app-update.md
   - name: 7 - Upgrade cluster
     href: tutorial-kubernetes-upgrade-cluster.md
+- name: Samples
+  items:
+  - name: Azure Policy built-ins
+    displayName: samples, policies, definitions
+    href: ./policy-samples.md
 - name: Concepts
   items:
   - name: Clusters and workloads

articles/aks/TOC.yml

@@ -0,0 +1,34 @@
+---
+title: Built-in policy definitions for Azure Kubernetes Service
+description: Lists Azure Policy built-in policy definitions for Azure Kubernetes Service. These built-in policy definitions provide common approaches to managing your Azure resources.
+ms.date: 04/30/2020
+ms.topic: sample
+ms.custom: subject-policy-samples
+---
+# Azure Policy built-in policy definitions for Azure Kubernetes Service
+
+This page is an index of [Azure Policy](../governance/policy/overview.md) built-in policy
+definitions for Azure Kubernetes Service. For additional Azure Policy built-ins for other services,
+see [Azure Policy built-in definitions](../governance/policy/samples/built-in-policies.md).
+
+The name of each built-in policy definition links to the policy definition in the Azure portal. Use
+the link in the **GitHub** column to view the source on the
+[Azure Policy GitHub repo](https://github.com/Azure/azure-policy).
+
+## Microsoft.Kubernetes
+
+[!INCLUDE [azure-policy-samples-rp-aks-kubernetes](../../includes/policy/samples/byrp/microsoft.kubernetes.md)]
+
+## Microsoft.ContainerService
+
+[!INCLUDE [azure-policy-samples-rp-aks-containerservice](../../includes/policy/samples/byrp/microsoft.containerservice.md)]
+
+## AKS Engine
+
+[!INCLUDE [azure-policy-samples-rp-aks-aksengine](../../includes/policy/samples/byrp/aks-engine.md)]
+
+## Next steps
+
+- See the built-ins on the [Azure Policy GitHub repo](https://github.com/Azure/azure-policy).
+- Review the [Azure Policy definition structure](../governance/policy/concepts/definition-structure.md).
+- Review [Understanding policy effects](../governance/policy/concepts/effects.md).

articles/aks/policy-samples.md

@@ -3,7 +3,7 @@ title: Create a Windows Server container on an Azure Kubernetes Service (AKS) cl
 description: Learn how to quickly create a Kubernetes cluster, deploy an application in a Windows Server container in Azure Kubernetes Service (AKS) using the Azure CLI.
 services: container-service
 ms.topic: article
-ms.date: 04/14/2020
+ms.date: 05/06/2020
 
 
 #Customer intent: As a developer or cluster operator, I want to quickly create an AKS cluster and deploy a Windows Server container so that I can see how to run applications running on a Windows Server container using the managed Kubernetes service in Azure.
@@ -21,18 +21,6 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
 
 [!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
 
-
-### Install aks-preview CLI extension
-
-To use Windows Server containers, you need the *aks-preview* CLI extension version 0.4.12 or higher. Install the *aks-preview* Azure CLI extension using the [az extension add][az-extension-add] command, then check for any available updates using the [az extension update][az-extension-update] command::
-
-```azurecli-interactive
-# Install the aks-preview extension
-az extension add --name aks-preview
-# Update the extension to make sure you have the latest version installed
-az extension update --name aks-preview
-```
-
 ### Limitations
 
 The following limitations apply when you create and manage AKS clusters that support multiple node pools:
@@ -90,9 +78,6 @@ az aks create \
     --enable-addons monitoring \
     --kubernetes-version 1.16.7 \
     --generate-ssh-keys \
-    --enable-vmss \
-    --vm-set-type VirtualMachineScaleSets \
-    --load-balancer-sku standard \
     --network-plugin azure
 ```
 

articles/aks/windows-container-cli.md

@@ -4,7 +4,7 @@ description: This article describes how to code model refreshes for Azure Analys
 author: chrislound
 ms.service: analysis-services
 ms.topic: conceptual
-ms.date: 10/30/2019
+ms.date: 05/07/2020
 ms.author: chlound
 
 ---
@@ -55,15 +55,15 @@ The Service Principal you create must have server administrator permissions on t
 
     ![Create credential](./media/analysis-services-refresh-azure-automation/6.png)
 
-2. Enter the details for the credential.  For the **User name**, enter the **SPN ClientId**, for the **Password**, enter the **SPN Secret**.
+2. Enter the details for the credential. In **User name**, enter the service principal Application Id (appid), and then in **Password**, enter the service principal Secret.
 
     ![Create credential](./media/analysis-services-refresh-azure-automation/7.png)
 
 3. Import the Automation Runbook
 
     ![Import Runbook](./media/analysis-services-refresh-azure-automation/8.png)
 
-4. Browse for the **Refresh-Model.ps1** file, provide a **Name** and **description**, and then click **Create**.
+4. Browse for the **Refresh-Model.ps1** file, provide a **Name** and **Description**, and then click **Create**.
 
     ![Import Runbook](./media/analysis-services-refresh-azure-automation/9.png)