Merge branch 'master' into adfupdate1211

Author: Samantha-Yu

.openpublishing.redirection.json

@@ -1610,6 +1610,11 @@
       "redirect_url": "/azure/cosmos-db/create-sql-api-dotnet",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cosmos-db/spark-api-introduction.md",
+      "redirect_url": "/azure/cosmos-db/analytics-usecases",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cosmos-db/sql-api-python-application.md",
       "redirect_url": "/azure/cosmos-db/create-sql-api-python",
@@ -23069,6 +23074,16 @@
       "redirect_url": "/azure/storage/common/storage-quickstart-create-account",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/common/storage-quickstart-create-account.md",
+      "redirect_url": "/azure/storage/common/storage-account-create",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/storage/common/storage-account-manage.md",
+      "redirect_url": "/azure/storage/common/storage-account-keys-manage",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/storage/common/storage-account-options.md",
       "redirect_url": "/azure/storage/common/storage-account-overview",
@@ -24649,6 +24664,11 @@
       "redirect_url": "/azure/storage/common/storage-security-guide",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/common/storage-security-guide.md",
+      "redirect_url": "/azure/storage/blobs/security-recommendations",
+      "redirect_document_id": true
+    },    
     {
       "source_path": "articles/storage/storage-service-encryption-customer-managed-keys.md",
       "redirect_url": "/azure/storage/common/storage-service-encryption-customer-managed-keys",
@@ -39798,6 +39818,11 @@
       "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/home",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/move-your-project-to-azure.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/home",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/data-catalog/data-catalog-prerequisites.md",
       "redirect_url": "/azure/data-catalog/data-catalog-get-started",
@@ -43972,6 +43997,16 @@
       "source_path": "articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-access-storage.md",
       "redirect_url": "/azure/active-directory/managed-identities-azure-resources/overview",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/bandwidth-recommendations.md",
+      "redirect_url": "https://docs.microsoft.com/windows-server/remote/remote-desktop-services/network-guidance",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/troubleshoot-client-connection.md",
+      "redirect_url": "/azure/virtual-desktop/troubleshoot-client",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/TOC.yml

@@ -76,8 +76,11 @@
   items:
   - name: App integration
     items:
-    - name: Register an application
+    - name: Register an OIDC application
       href: tutorial-register-applications.md
+    - name: Register a SAML service provider
+      href: connect-with-saml-service-providers.md
+      displayName: SP, RP, service provider, connect
     - name: Add a web API application
       href: add-web-application.md
     - name: Add a native client application
@@ -168,6 +171,9 @@
         href: active-directory-b2c-ui-customization-custom.md
       - name: Customize the UI dynamically
         href: active-directory-b2c-ui-customization-custom-dynamic.md
+      - name: Custom email
+        href: custom-email.md
+        displayName: verification
       - name: Page layout
         href: page-layout.md
       - name: Enable JavaScript
@@ -196,8 +202,10 @@
         items:
         - name: ADFS
           href: active-directory-b2c-custom-setup-adfs2016-idp.md
+          displayName: SAML
         - name: Salesforce
           href: active-directory-b2c-setup-sf-app-custom.md
+          displayName: SAML
     - name: Tokens and session management
       items:
       - name: Customize tokens
@@ -289,6 +297,9 @@
             href: oauth1-technical-profile.md
           - name: OAuth2
             href: oauth2-technical-profile.md
+          - name: One-time password
+            href: one-time-password-technical-profile.md
+            displayName: otp
           - name: OpenID Connect
             href: openid-connect-technical-profile.md
           - name: REST
@@ -301,6 +312,11 @@
             href: active-directory-b2c-reference-sso-custom.md
           - name: Validation
             href: validation-technical-profile.md
+      - name: DisplayControls
+        href: display-controls.md
+        items:
+        - name: Verification
+          href: display-control-verification.md
       - name: UserJourneys
         href: userjourneys.md
       - name: RelyingParty

articles/active-directory-b2c/active-directory-b2c-devquickstarts-graph-dotnet.md

@@ -59,8 +59,9 @@ The *Read and write directory data* permission that you granted earlier does **N
 
 If you want to give your application the ability to delete users or update passwords, you need to grant it the *User administrator* role.
 
-1. Sign in to the [Azure portal](https://portal.azure.com) and switch to the directory that contains your Azure AD B2C tenant.
-1. Select **Azure AD B2C** in the left menu. Or, select **All services** and then search for and select **Azure AD B2C**.
+1. Sign in to the [Azure portal](https://portal.azure.com).
+1. Select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
+1. In the Azure portal, search for and select **Azure AD B2C**.
 1. Under **Manage**, select **Roles and administrators**.
 1. Select the **User administrator** role.
 1. Select **Add assignment**.

articles/active-directory-b2c/active-directory-b2c-get-started-custom.md

@@ -27,10 +27,10 @@ ms.subservice: B2C
 
 ## Add signing and encryption keys
 
-1. Sign in to the [Azure portal](https://portal.azure.com)
-1. Use the **Directory + subscription** filter in the top menu to select the directory that contains your Azure AD B2C tenant.
-1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
-1. On the Overview page, select **Identity Experience Framework** from the **Policies** pane.
+1. Sign in to the [Azure portal](https://portal.azure.com).
+1. Select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
+1. In the Azure portal, search for and select **Azure AD B2C**.
+1. On the overview page, under **Policies**, select **Identity Experience Framework**.
 
 ### Create the signing key
 
@@ -73,10 +73,9 @@ To register an application in your Azure AD B2C tenant, you can use the current
 
 #### [Applications](#tab/applications/)
 
-1. Select **All services** in the top-left corner of the Azure portal.
-1. In the search box, enter `Azure Active Directory`.
-1. Select **Azure Active Directory** in the search results.
-1. Under **Manage** in the left-hand menu, select **App registrations (Legacy)**.
+1. Sign in to the [Azure portal](https://portal.azure.com).
+1. In the Azure portal, search for and select **Azure Active Directory**.
+1. In the **Azure Active Directory** overview menu, under **Manage**, select **App registrations (Legacy)**.
 1. Select **New application registration**.
 1. For **Name**, enter `IdentityExperienceFramework`.
 1. For **Application type**, choose **Web app/API**.

articles/active-directory-b2c/active-directory-b2c-reference-password-complexity.md

@@ -34,9 +34,9 @@ If you are using custom policies, you can ([configure password complexity in a c
 ## Configure password complexity
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
-2. Make sure you're using the directory that contains your Azure AD B2C tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your tenant.
-3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
-4. Select **User flows**.
+2. Select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
+3. In the Azure portal, search for and select **Azure AD B2C**.
+4. Select **User flows (policies)**.
 2. Select a user flow, and click **Properties**.
 3. Under **Password complexity**, change the password complexity for this user flow to **Simple**, **Strong**, or **Custom**.
 

articles/active-directory-b2c/active-directory-b2c-setup-qq-app.md

@@ -43,9 +43,9 @@ To use a QQ account as an identity provider in Azure Active Directory B2C (Azure
 
 ## Configure QQ as an identity provider
 
-1. Sign in to the [Azure portal](https://portal.azure.com/) as the global administrator of your Azure AD B2C tenant.
-1. Make sure you're using the directory that contains your Azure AD B2C tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your tenant.
-1. Choose **All services** in the top-left corner of the Azure portal, search for and select **Azure AD B2C**.
+1. Sign in to the [Azure portal](https://portal.azure.com/).
+1. Select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
+1. In the Azure portal, search for and select **Azure AD B2C**.
 1. Select **Identity providers**, then select **QQ (Preview)**.
 1. Enter a **Name**. For example, *QQ*.
 1. For the **Client ID**, enter the APP ID of the QQ application that you created earlier.

articles/active-directory-b2c/b2clogin.md

@@ -89,7 +89,7 @@ For migrating Azure API Management APIs protected by Azure AD B2C, see the [Migr
 
 If you're using [MSAL.NET][msal-dotnet] v2 or earlier, set the **ValidateAuthority** property to `false` on client instantiation to allow redirects to *b2clogin.com*. This setting is not required for MSAL.NET v3 and above.
 
-```CSharp
+```csharp
 ConfidentialClientApplication client = new ConfidentialClientApplication(...); // Can also be PublicClientApplication
 client.ValidateAuthority = false; // MSAL.NET v2 and earlier **ONLY**
 ```

articles/active-directory-b2c/buildingblocks.md

@@ -1,5 +1,6 @@
 ---
-title: BuildingBlocks - Azure Active Directory B2C | Microsoft Docs
+title: BuildingBlocks
+titleSuffix: Azure AD B2C
 description: Specify the BuildingBlocks element of a custom policy in Azure Active Directory B2C.
 services: active-directory-b2c
 author: mmacy
@@ -8,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 09/10/2018
+ms.date: 12/10/2019
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -48,26 +49,29 @@ The **BuildingBlocks** element is added inside the [TrustFrameworkPolicy](trustf
     <Localization>
       ...
     </Localization>
+    <DisplayControls>
+      ...
+    </DisplayControls>
  </BuildingBlocks>
 ```
 
 The **BuildingBlocks** element contains the following elements that must be specified in the order defined:
 
-- [ClaimsSchema](claimsschema.md) - Defines the claim types that can be referenced as part of the policy. The claims schema is the place where you declare your claim types. A claim type is similar to a variable in many programmatic languages. You can use the claim type to collect data from the user of your application, receive claims from social identity providers, send and receive data from a custom REST API, or store any internal data used by your custom policy. 
+- [ClaimsSchema](claimsschema.md) - Defines the claim types that can be referenced as part of the policy. The claims schema is the place where you declare your claim types. A claim type is similar to a variable in many programmatic languages. You can use the claim type to collect data from the user of your application, receive claims from social identity providers, send and receive data from a custom REST API, or store any internal data used by your custom policy.
 
 - [Predicates and PredicateValidationsInput](predicates.md) - Enables you to perform a validation process to ensure that only properly formed data is entered into a claim.
- 
-- [ClaimsTransformations](claimstransformations.md) - Contains a list of claims transformations that can be used in your policy.  A claims transformation converts one claim into another. In the claims transformation, you specify a transform method, such as: 
-    - Changing the case of a string claim to the one specified. For example, changing a string from lowercase to uppercase.
-    - Comparing two claims and returning a claim with true indicating that the claims match, otherwise false.
-    - Creating a string claim from the provided parameter in the policy.
-    - Creating a random string using the random number generator.
-    - Formatting a claim according to the provided format string. This transformation uses the C# `String.Format` method.
-    
+
+- [ClaimsTransformations](claimstransformations.md) - Contains a list of claims transformations that can be used in your policy.  A claims transformation converts one claim into another. In the claims transformation, you specify a transform method, such as:
+  - Changing the case of a string claim to the one specified. For example, changing a string from lowercase to uppercase.
+  - Comparing two claims and returning a claim with true indicating that the claims match, otherwise false.
+  - Creating a string claim from the provided parameter in the policy.
+  - Creating a random string using the random number generator.
+  - Formatting a claim according to the provided format string. This transformation uses the C# `String.Format` method.
+
 - InputValidation - This element allows you to perform boolean aggregations that are similar to *and* and *or*.
 
 - [ContentDefinitions](contentdefinitions.md) - Contains URLs for HTML5 templates to use in your user journey. In a custom policy, a content definition defines the HTML5 page URI that's used for a specified step in the user journey. For example, the sign-in or sign-up, password reset, or error pages. You can modify the look and feel by overriding the LoadUri for the HTML5 file. Or you can create new content definitions according to your needs. This element may contain a localized resources reference using a localization ID.
 
 - [Localization](localization.md) - Allows you to support multiple languages. The localization support in policies allows you set up the list of supported languages in a policy and pick a default language. Language-specific strings and collections are also supported.
 
-
+- [DisplayControls](display-controls.md) - Defines the controls to be displayed on a page. Display controls have special functionality and interact with back-end validation technical profiles. Display controls are currently in **preview**.