Merge branch 'master' into mlearned-aks-private-clusters-911-charlies

Author: mlearned

articles/active-directory-b2c/TOC.yml

@@ -168,6 +168,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
@@ -289,6 +292,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 +307,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/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**.