Merge pull request #99181 from MicrosoftDocs/master

Merge master to live, 4:30 AM

Author: ShannonLeavitt

articles/active-directory-b2c/multi-factor-auth-technical-profile.md

@@ -59,6 +59,7 @@ The **InputClaims** element contains a list of claims to send to Azure MFA. You
 The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones before sending to the Azure MFA service.
 
 ### Output claims
+
 The Azure MFA protocol provider does not return any **OutputClaims**, thus there is no need to specify output claims. You can, however, include claims that aren't returned by the Azure MFA identity provider as long as you set the `DefaultValue` attribute.
 
 The **OutputClaimsTransformations** element may contain a collection of **OutputClaimsTransformation** elements that are used to modify the output claims or generate new ones.

articles/active-directory-b2c/phone-authentication.md

@@ -34,9 +34,13 @@ Start by updating the phone sign-up and sign-in custom policy files to work with
 
 The following steps assume that you've completed the [prerequisites](#prerequisites) and have already cloned the [custom policy starter pack][starter-pack] repository to your local machine.
 
-1. Find the [phone sign-up and sign-in custom policy files][starter-pack-phone] in your local clone of the starter pack repo, or download them directly. The XML policy files are located in the `active-directory-b2c-custom-policy-starterpack/scenarios/phone-number-passwordless` directory.
+1. Find the [phone sign-up and sign-in custom policy files][starter-pack-phone] in your local clone of the starter pack repo, or download them directly. The XML policy files are located in the following directory:
+
+    `active-directory-b2c-custom-policy-starterpack/scenarios/`**`phone-number-passwordless`**
+
 1. In each file, replace the string `yourtenant` with the name of your Azure AD B2C tenant. For example, if the name of your B2C tenant is *contosob2c*, all instances of `yourtenant.onmicrosoft.com` become `contosob2c.onmicrosoft.com`.
-1. Complete the steps in the [Add application IDs to the custom policy](active-directory-b2c-get-started-custom.md#add-application-ids-to-the-custom-policy) section of [Get started with custom policies in Azure Active Directory B2C](active-directory-b2c-get-started-custom.md). That is, update the files in the `/phone-number-passwordless` directory with the **Application (client) IDs** of the two applications you registered when completing the prerequisites, *IdentityExperienceFramework* and *ProxyIdentityExperienceFramework*.
+
+1. Complete the steps in the [Add application IDs to the custom policy](active-directory-b2c-get-started-custom.md#add-application-ids-to-the-custom-policy) section of [Get started with custom policies in Azure Active Directory B2C](active-directory-b2c-get-started-custom.md). In this case, update `/phone-number-passwordless/`**`Phone_Email_Base.xml`** with the **Application (client) IDs** of the two applications you registered when completing the prerequisites, *IdentityExperienceFramework* and *ProxyIdentityExperienceFramework*.
 
 ## Upload the policy files
 
@@ -56,8 +60,8 @@ As you upload each file, Azure adds the prefix `B2C_1A_`.
 
 ## Test the custom policy
 
-1. Under **Custom policies**, select **SignUpOrSignInWithPhoneOrEmail**.
-1. Under **Select application**, select the *webapp1* application that registered when completing the prerequisites.
+1. Under **Custom policies**, select **B2C_1A_SignUpOrSignInWithPhoneOrEmail**.
+1. Under **Select application**, select the *webapp1* application that you registered when completing the prerequisites.
 1. For **Select reply url**, choose `https://jwt.ms`.
 1. Select **Run now** and sign up using an email address or a phone number.
 1. Select **Run now** once again and sign in with the same account to confirm that you have the correct configuration.
@@ -68,6 +72,11 @@ You can find the phone sign-up and sign-in custom policy starter pack (and other
 
 [Azure-Samples/active-directory-b2c-custom-policy-starterpack/scenarios/phone-number-passwordless][starter-pack-phone]
 
+The starter pack policy files use multi-factor authentication technical profiles and phone number claims transformations:
+
+* [Define an Azure Multi-Factor Authentication technical profile](multi-factor-auth-technical-profile.md)
+* [Define phone number claims transformations](phone-number-claims-transformations.md)
+
 <!-- LINKS - External -->
 [starter-pack]: https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack
 [starter-pack-phone]: https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/phone-number-passwordless

articles/active-directory/fundamentals/whats-new.md

@@ -154,7 +154,7 @@ For more information, see [Change request and approval settings for an access pa
 
 ---
 
-### Updates to the My Apps page along with new workspaces (General Availability)
+### Updates to the My Apps page along with new workspaces (Public Preview)
 
 **Type:** New feature  
 **Service category:** My Apps  

articles/aks/http-application-routing.md

@@ -47,12 +47,13 @@ az aks enable-addons --resource-group myResourceGroup --name myAKSCluster --addo
 After the cluster is deployed or updated, use the [az aks show][az-aks-show] command to retrieve the DNS zone name. This name is needed to deploy applications to the AKS cluster.
 
 ```azurecli
-$ az aks show --resource-group myResourceGroup --name myAKSCluster --query addonProfiles.httpApplicationRouting.config.HTTPApplicationRoutingZoneName -o table
+az aks show --resource-group myResourceGroup --name myAKSCluster --query addonProfiles.httpapplicationrouting.config.HTTPApplicationRoutingZoneName -o table
+```
 
 Result
------------------------------------------------------
+
 9f9c1fe7-21a1-416d-99cd-3543bb92e4c3.eastus.aksapp.io
-```
+
 
 ## Deploy HTTP routing: Portal
 

articles/automation/automation-first-runbook-textual-powershell.md

@@ -24,7 +24,7 @@ To complete this tutorial, you need the following prerequisites:
 * Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or sign up for a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
 * [Automation account](automation-quickstart-create-account.md) to hold the runbook and authenticate to Azure resources. This account must have permission to start and stop the virtual machine.
 * An Azure virtual machine. You stop and start this machine so it shouldn't be a production VM.
-* You may need to [update your Azure modules](automation-update-azure-modules.md) based on the cmdlets you use.
+* You may need to [import](https://docs.microsoft.com/en-us/azure/automation/shared-resources/modules)/[update your Azure modules](automation-update-azure-modules.md) based on the cmdlets you use.
 
 ## Create new runbook
 

articles/azure-cache-for-redis/TOC.yml

@@ -1,5 +1,5 @@
 - name: Azure Cache for Redis Documentation
-  href: index.md
+  href: index.yml
 - name: Overview
   items:
   - name: About Azure Cache for Redis

articles/azure-cache-for-redis/cache-faq.md

@@ -2,12 +2,10 @@
 title: Azure Cache for Redis FAQ
 description: Learn the answers to common questions, patterns, and best practices for Azure Cache for Redis
 author: yegu-ms
-
+ms.author: yegu
 ms.service: cache
 ms.topic: conceptual
 ms.date: 04/29/2019
-ms.author: yegu
-
 ---
 # Azure Cache for Redis FAQ
 Learn the answers to common questions, patterns, and best practices for Azure Cache for Redis.
@@ -467,7 +465,7 @@ Unlike traditional caches that deal only with key-value pairs, Redis is popular
 
 Another key aspect to Redis success is the healthy, vibrant open- source ecosystem built around it. This is reflected in the diverse set of Redis clients available across multiple languages. This ecosystem and wide range of clients allow Azure Cache for Redis to be used by nearly any workload you would build inside of Azure.
 
-For more information about getting started with Azure Cache for Redis, see [How to Use Azure Cache for Redis](cache-dotnet-how-to-use-azure-redis-cache.md) and [Azure Cache for Redis documentation](index.md).
+For more information about getting started with Azure Cache for Redis, see [How to Use Azure Cache for Redis](cache-dotnet-how-to-use-azure-redis-cache.md) and [Azure Cache for Redis documentation](index.yml).
 
 ### Managed Cache service
 [Managed Cache service was retired November 30, 2016.](https://azure.microsoft.com/blog/azure-managed-cache-and-in-role-cache-services-to-be-retired-on-11-30-2016/)