Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into normesta-monitor-2

Author: normesta

.openpublishing.redirection.json

@@ -11992,12 +11992,17 @@
     },
     {
       "source_path": "articles/blockchain-workbench/hyperledger-fabric-single-member-blockchain.md",
-      "redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-blockchain",
+      "redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/blockchain/templates/hyperledger-fabric-single-member-blockchain.md",
-      "redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-blockchain",
+      "redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/blockchain/templates/hyperledger-fabric-consortium-blockchain.md",
+      "redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service",
       "redirect_document_id": false
     },
     {
@@ -21025,6 +21030,186 @@
       "redirect_url": "/azure/iot-fundamentals/iot-security-ground-up",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/develop/active-directory-acs-migration.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/active-directory-acs-migration",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/active-directory-authentication-libraries.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/active-directory-authentication-libraries",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/active-directory-devhowto-adal-error-handling.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/active-directory-devhowto-adal-error-handling",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/app-types.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/app-types",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/azure-ad-endpoint-comparison.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/azure-ad-federation-metadata.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/azure-ad-federation-metadata",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/conditional-access-dev-guide.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/conditional-access-dev-guide",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-app-gallery-listing.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-app-gallery-listing",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-get-appsource-certified.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-get-appsource-certified",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-reactivate-disabled-acs-namespaces.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-reactivate-disabled-acs-namespaces",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-v1-debug-saml-sso-issues.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-v1-debug-saml-sso-issues",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-v1-enable-sso-android.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-v1-enable-sso-android",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/howto-v1-enable-sso-ios.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/howto-v1-enable-sso-ios",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/native-app.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/native-app",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-android.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-android",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-angularjs-spa.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/authentication-flows-app-scenarios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-aspnet-webapp.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-aspnet-webapp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-dotnet.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-windows-desktop",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-dotnet-webapi.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-dotnet-native-aspnet",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-ios.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-ios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-netcore-daemon.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/quickstart-v2-netcore-daemon",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-nodejs-webapi.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/authentication-flows-app-scenarios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/quickstart-v1-xamarin.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/develop/authentication-flows-app-scenarios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/sample-v1-code.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/sample-v1-code",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/service-to-service.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/service-to-service",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/single-page-application.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/single-page-application",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-authentication-scenarios.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-authentication-scenarios",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-oauth2-client-creds-grant-flow.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-oauth2-client-creds-grant-flow",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-oauth2-implicit-grant-flow.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-oauth2-implicit-grant-flow",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-oauth2-on-behalf-of-flow.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-oauth2-on-behalf-of-flow",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-overview.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-overview",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-permissions-and-consent.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-permissions-and-consent",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-protocols-oauth-code.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-protocols-oauth-code",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/v1-protocols-openid-connect-code.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/v1-protocols-openid-connect-code",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/web-api.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/web-api",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/active-directory/develop/web-app.md",
+      "redirect_url": "https://docs.microsoft.com/azure/active-directory/azuread-dev/web-app",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/active-directory/active-directory-app-gallery-listing.md",
       "redirect_url": "/azure/active-directory/develop/active-directory-app-gallery-listing",
@@ -24510,6 +24695,11 @@
       "redirect_url": "/azure/virtual-machines/workloads/sap/high-availability-multi-sid",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/virtual-machines/virtual-machines-azure-slave-plugin-for-hudson-classic.md",
+      "redirect_url": "/azure/virtual-machines/",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/virtual-machines/virtual-machines-windows-sap-planning-guide.md",
       "redirect_url": "/azure/virtual-machines/workloads/sap/planning-guide",
@@ -26520,6 +26710,26 @@
       "redirect_url": "/azure/storage/common/storage-designing-ha-apps-with-ragrs",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/common/storage-redundancy-lrs.md",
+      "redirect_url": "/azure/storage/common/storage-redundancy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/common/storage-redundancy-grs.md",
+      "redirect_url": "/azure/storage/common/storage-redundancy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/common/storage-redundancy-zrs.md",
+      "redirect_url": "/azure/storage/common/storage-redundancy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/common/storage-redundancy-gzrs.md",
+      "redirect_url": "/azure/storage/common/storage-redundancy",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/storage-disaster-recovery-guidance.md",
       "redirect_url": "/azure/storage/common/storage-disaster-recovery-guidance",
@@ -41709,6 +41919,11 @@
       "source_path": "articles/virtual-machines/windows/classic/capture-image-classic.md",
       "redirect_url": "/previous-versions/azure/virtual-machines/windows/classic/capture-image-classic",
       "redirect_document_id": false
+    },
+	{
+      "source_path": "articles/virtual-machines/virtual-machines-availability-set-supportability.md",
+      "redirect_url": "/azure/virtual-machines/troubleshooting/virtual-machines-availability-set-supportability",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/virtual-machines/windows/classic/configure-availability-classic.md",
@@ -47896,6 +48111,11 @@
       "redirect_url": "/azure/mysql/concepts-azure-ad-authentication",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/active-directory/authentication/tutorial-mfa-applications.md",
+      "redirect_url": "/azure/active-directory/authentication/tutorial-enable-azure-mfa",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/load-balancer/quickstart-create-basic-load-balancer-portal.md",
       "redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",
@@ -48025,14 +48245,21 @@
       "source_path": "articles/cognitive-services/Computer-vision/vs-computer-vision-connected-service.md",
       "redirect_url": "/azure/cognitive-services/computer-vision/",
       "redirect_document_id": false
-    },    {
+    },
+    {
       "source_path": "articles/cognitive-services/Face/vs-face-connected-service.md",
       "redirect_url": "/azure/cognitive-services/face/",
       "redirect_document_id": false
-    },    {
+    },
+    {
       "source_path": "articles/cognitive-services/text-analytics/vs-text-connected-service.md",
       "redirect_url": "/azure/cognitive-services/text-analytics/",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/media-services/previous/media-services-configure-fmle-live-encoder.md",
+      "redirect_url": "/azure/media-services/previous/media-services-configure-wirecast-live-encoder/",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/TOC.yml

@@ -182,8 +182,6 @@
       - name: Custom email
         href: custom-email.md
         displayName: verification
-      - name: Page layout
-        href: page-layout.md
       - name: Enable JavaScript
         href: javascript-samples.md
       - name: Password complexity
@@ -383,6 +381,8 @@
     href: custom-policy-developer-notes.md
   - name: Code samples
     href: https://azure.microsoft.com/resources/samples/?service=active-directory-b2c
+  - name: Page layout versions
+    href: page-layout.md
   - name: Cookie definitions
     href: cookie-definitions.md
     displayName: cookies, SameSite
@@ -421,4 +421,4 @@
     href: support-options.md
     displayName: technical
   - name: Videos
-    href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory-b2c
+    href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory-b2c

articles/active-directory-b2c/analytics-with-application-insights.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.topic: conceptual
 ms.workload: identity
-ms.date: 10/12/2018
+ms.date: 02/11/2020
 ms.author: marsma
 ms.subservice: B2C
 
@@ -154,7 +154,7 @@ Add the profiles to the *TrustFrameworkExtensions.xml* file from the starter pac
       <InputClaims>
         <!-- Properties of an event are added through the syntax {property:NAME}, where NAME is property being added to the event. DefaultValue can be either a static value or a value that's resolved by one of the supported DefaultClaimResolvers. -->
         <InputClaim ClaimTypeReferenceId="PolicyId" PartnerClaimType="{property:Policy}" DefaultValue="{Policy:PolicyId}" />
-        <InputClaim ClaimTypeReferenceId="CorrelationId" PartnerClaimType="{property:JourneyId}" />
+        <InputClaim ClaimTypeReferenceId="CorrelationId" PartnerClaimType="{property:JourneyId}" DefaultValue="{Context:CorrelationId}" />
         <InputClaim ClaimTypeReferenceId="Culture" PartnerClaimType="{property:Culture}" DefaultValue="{Culture:RFC5646}" />
       </InputClaims>
     </TechnicalProfile>

articles/active-directory-b2c/azure-monitor.md

@@ -44,7 +44,7 @@ You authorize a user or group in your Azure AD B2C directory (the **Service Prov
 
 This is the resource group containing the destination Azure storage account, event hub, or Log Analytics workspace to receive data from Azure Monitor. You specify the resource group name when you deploy the Azure Resource Manager template.
 
-[Create a resource group](../azure-resource-manager/management/manage-resource-groups-portal.md#create-resource-groups) or choose an existing one the Azure Active Directory (Azure AD) tenant that contains your Azure subscription, *not* the directory that contains your Azure AD B2C tenant.
+[Create a resource group](../azure-resource-manager/management/manage-resource-groups-portal.md#create-resource-groups) or choose an existing one in the Azure Active Directory (Azure AD) tenant that contains your Azure subscription, *not* the directory that contains your Azure AD B2C tenant.
 
 This example uses a resource group named *azure-ad-b2c-monitor* in the *Central US* region.