Merge pull request #171494 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ttorble

articles/active-directory-b2c/customize-ui.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 06/27/2021
+ms.date: 09/06/2021
 ms.custom: "project-no-code, b2c-support"
 ms.author: mimart
 ms.subservice: B2C
@@ -206,11 +206,10 @@ Keep these things in mind when you configure company branding in Azure AD B2C:
 * The banner logo appears in the verification emails sent to your users when they initiate a sign-up user flow.
 
 
+::: zone pivot="b2c-user-flow"
 
 ## Enable company branding in user flow pages
 
-::: zone pivot="b2c-user-flow"
-
 Once you've configured company branding, enable it in your user flows.
 
 1. In the left menu of the Azure portal, select **Azure AD B2C**.
@@ -228,6 +227,8 @@ If you'd like to brand all pages in the user flow, set the page layout version f
 
 ::: zone pivot="b2c-custom-policy"
 
+## Enable company branding in custom policy pages
+
 Once you've configured company branding, enable it in your custom policy. Configure the [page layout version](contentdefinitions.md#migrating-to-page-layout) with page `contract` version for *all* of the content definitions in your custom policy. The format of the value must contain the word `contract`: _urn:com:microsoft:aad:b2c:elements:**contract**:page-name:version_. To specify a page layout in your custom policies that use an old **DataUri** value. For more information, learn how to [migrate to page layout](contentdefinitions.md#migrating-to-page-layout) with page version.
 
 The following example shows the content definitions with their corresponding the page contract, and *Ocean Blue* page template: 

articles/aks/api-server-authorized-ip-ranges.md

@@ -154,7 +154,7 @@ Add another IP address to the approved ranges with the following command.
 
 ```bash
 # Retrieve your IP address
-CURRENT_IP=$(dig @resolver1.opendns.com ANY myip.opendns.com +short)
+CURRENT_IP=$(dig +short "myip.opendns.com" "@resolver1.opendns.com")
 # Add to AKS approved list
 az aks update -g $RG -n $AKSNAME --api-server-authorized-ip-ranges $CURRENT_IP/32
 ```

articles/app-service/faq-app-service-linux.yml

@@ -120,7 +120,7 @@ sections:
       - question: |
           I'm using my own custom container. I want the platform to mount an SMB share to the `/home/` directory.
         answer: |
-          If `WEBSITES_ENABLE_APP_SERVICE_STORAGE` setting is **unspecified** or set to *false*, the `/home/` directory **will not be shared** across scale instances, and files written **will not persist** across restarts. Explicitly setting `WEBSITES_ENABLE_APP_SERVICE_STORAGE` to *true* will enable the mount.
+          If `WEBSITES_ENABLE_APP_SERVICE_STORAGE` setting is **unspecified** or set to *false*, the `/home/` directory **will not be shared** across scale instances, and files written **will not persist** across restarts. Explicitly setting `WEBSITES_ENABLE_APP_SERVICE_STORAGE` to *true* will enable the mount. Once this is set to true, if you wish to disable the mount, you need to explicitly set `WEBSITES_ENABLE_APP_SERVICE_STORAGE` to *false*.
       - question: |
           My custom container takes a long time to start, and the platform restarts the container before it finishes starting up.
         answer: |

articles/azure-monitor/alerts/alerts-classic-portal.md

@@ -4,12 +4,12 @@ description: Learn how to use Azure portal, CLI or PowerShell to create, view an
 author: yanivlavi
 ms.author: yalavi
 ms.topic: conceptual
-ms.date: 02/14/2021
+ms.date: 09/06/2021
 ---
 # Create, view, and manage classic metric alerts using Azure Monitor
 
 > [!WARNING]
-> This article describes how to create older classic metric alerts. Azure Monitor now supports [newer near-real time metric alerts and a new alerts experience](./alerts-overview.md). Classic alerts are [retired](./monitoring-classic-retirement.md) for public cloud users, though still in limited use until **31 May 2021**. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
+> This article describes how to create older classic metric alerts. Azure Monitor now supports [newer near-real time metric alerts and a new alerts experience](./alerts-overview.md). Classic alerts are [retired](./monitoring-classic-retirement.md) for public cloud users. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
 >
 
 Classic metric alerts in Azure Monitor provide a way to get notified when one of your metrics cross a threshold. Classic metric alerts is an older functionality that allows for alerting only on non-dimensional metrics. There is an existing newer functionality called Metric alerts which has improved functionality over classic metric alerts. You can learn more about the new metric alerts functionality in [metric alerts overview](./alerts-metric-overview.md). In this article, we will describe how to create, view and manage classic metric alert rules through Azure portal, Azure CLI and PowerShell.
@@ -129,4 +129,4 @@ This sections shows how to use PowerShell commands create, view and manage class
 ## Next steps
 
 - [Create a classic metric alert with a Resource Manager template](./alerts-enable-template.md).
-- [Have a classic metric alert notify a non-Azure system using a webhook](./alerts-webhooks.md).
+- [Have a classic metric alert notify a non-Azure system using a webhook](./alerts-webhooks.md).

articles/azure-monitor/alerts/alerts-classic.overview.md

@@ -8,7 +8,7 @@ ms.date: 02/14/2021
 # What are classic alerts in Microsoft Azure?
 
 > [!NOTE]
-> This article describes how to create older classic metric alerts. Azure Monitor now supports [newer near-real time metric alerts and a new alerts experience](./alerts-overview.md). Classic alerts are [retired](./monitoring-classic-retirement.md) for public cloud users, though still in limited use until **31 May 2021**. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
+> This article describes how to create older classic metric alerts. Azure Monitor now supports [newer near-real time metric alerts and a new alerts experience](./alerts-overview.md). Classic alerts are [retired](./monitoring-classic-retirement.md) for public cloud users. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
 >
 
 Alerts allow you to configure conditions over data and become notified when the conditions match the latest monitoring data.
@@ -90,4 +90,4 @@ Get information about alert rules and configuring them by using:
 * Configure [Activity Log Alerts via Resource Manager](./alerts-activity-log.md)
 * Review the [activity log alert webhook schema](activity-log-alerts-webhook.md)
 * Learn more about [Action groups](./action-groups.md)
-* Configure [newer Alerts](alerts-metric.md)
+* Configure [newer Alerts](alerts-metric.md)

articles/azure-monitor/alerts/alerts-enable-template.md

@@ -4,12 +4,12 @@ description: Learn how to use a Resource Manager template to create a classic me
 author: rboucher
 ms.author: robb
 ms.topic: conceptual
-ms.date: 02/14/2021
+ms.date: 09/06/2021
 ---
 # Create a classic metric alert with a Resource Manager template
 
 > [!WARNING]
-> This article describes how to create older classic metric alerts. Azure Monitor now supports [newer near-real time metric alerts and a new alerts experience](./alerts-overview.md). Classic alerts are [retired](./monitoring-classic-retirement.md) for public cloud users, though still in limited use until **31 May 2021**. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
+> This article describes how to create older classic metric alerts. Azure Monitor now supports [newer near-real time metric alerts and a new alerts experience](./alerts-overview.md). Classic alerts are [retired](./monitoring-classic-retirement.md) for public cloud users. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
 >
 
 This article shows how you can use an [Azure Resource Manager template](../../azure-resource-manager/templates/syntax.md) to configure Azure classic metric alerts. This enables you to automatically set up alerts on your resources when they are created to ensure that all resources are monitored correctly.
@@ -394,4 +394,4 @@ An alert on a Resource Manager template is most often useful when creating an al
 ## Next Steps
 * [Read more about Alerts](./alerts-overview.md)
 * [Add Diagnostic Settings](../essentials/resource-manager-diagnostic-settings.md) to your Resource Manager template
-* For the JSON syntax and properties, see [Microsoft.Insights/alertrules](/azure/templates/microsoft.insights/alertrules) template reference.
+* For the JSON syntax and properties, see [Microsoft.Insights/alertrules](/azure/templates/microsoft.insights/alertrules) template reference.

articles/azure-monitor/alerts/alerts-understand-migration.md

@@ -2,13 +2,13 @@
 title: Understand migration for Azure Monitor alerts
 description: Understand how the alerts migration works and troubleshoot problems.
 ms.topic: conceptual
-ms.date: 02/14/2021
+ms.date: 09/06/2021
 ms.author: yalavi
 author: yalavi
 ---
 # Understand migration options to newer alerts
 
-Classic alerts are [retired](./monitoring-classic-retirement.md) for public cloud users, though still in limited use until **31 May 2021**. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
+Classic alerts are [retired](./monitoring-classic-retirement.md) for public cloud users. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
 
 This article explains how the manual migration and voluntary migration tool work, which will be used to migrate remaining alert rules. It also describes solutions for some common problems.
 
@@ -221,4 +221,4 @@ As part of the migration, new metric alerts and new action groups will be create
 ## Next steps
 
 - [How to use the migration tool](alerts-using-migration-tool.md)
-- [Prepare for the migration](alerts-prepare-migration.md)
+- [Prepare for the migration](alerts-prepare-migration.md)

articles/azure-monitor/alerts/alerts-webhooks.md

@@ -4,12 +4,12 @@ description: Learn how to reroute Azure metric alerts to other, non-Azure system
 author: harelbr
 ms.author: harelbr
 ms.topic: conceptual
-ms.date: 02/14/2021
+ms.date: 09/06/2021
 ---
 # Call a webhook with a classic metric alert in Azure Monitor
 
 > [!WARNING]
-> This article describes how to use older classic metric alerts. Azure Monitor now supports [newer near-real time metric alerts and a new alerts experience](./alerts-overview.md). Classic alerts are [retired](./monitoring-classic-retirement.md) for public cloud users, though still in limited use until **31 May 2021**. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
+> This article describes how to use older classic metric alerts. Azure Monitor now supports [newer near-real time metric alerts and a new alerts experience](./alerts-overview.md). Classic alerts are [retired](./monitoring-classic-retirement.md) for public cloud users. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
 >
 
 You can use webhooks to route an Azure alert notification to other systems for post-processing or custom actions. You can use a webhook on an alert to route it to services that send SMS messages, to log bugs, to notify a team via chat or messaging services, or for various other actions.

articles/azure-monitor/alerts/monitoring-classic-retirement.md

@@ -11,7 +11,7 @@ ms.author: yalavi
 
 Azure Monitor is a unified monitoring stack that supports ‘One Metric’ and ‘One Alerts’ across Azure resources. See more information in this [blog post](https://azure.microsoft.com/blog/new-full-stack-monitoring-capabilities-in-azure-monitor/). The new Azure monitoring and alerting platforms has been built to be faster, smarter, and extensible – keeping pace with the growing expanse of cloud computing and in-line with Microsoft Intelligent Cloud philosophy.
 
-With the new Azure monitoring and alerting platform in place, classic alerts in Azure Monitor are retired for public cloud users, though still in limited use until **31 May 2021**. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
+With the new Azure monitoring and alerting platform in place, classic alerts in Azure Monitor are retired for public cloud users. Classic alerts for Azure Government cloud and Azure China 21Vianet will retire on **29 February 2024**.
 
  ![Classic alert in Azure portal](media/monitoring-classic-retirement/monitor-alert-screen2.png) 
 
@@ -62,4 +62,4 @@ The following are examples of cases where you'll incur a charge for your alert r
 ## Next steps
 
 * Learn about the [new unified Azure Monitor](../overview.md).
-* Learn more about the new [Azure Alerts](./alerts-overview.md).
+* Learn more about the new [Azure Alerts](./alerts-overview.md).