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

Author: bandersmsft

.openpublishing.redirection.json

@@ -38602,7 +38602,7 @@
     },
     {
       "source_path": "articles/billing/billing-set-up-alerts.md",
-      "redirect_url": "/azure/billing/billing-getting-started",
+      "redirect_url": "/azure/cost-management-billing/costs/cost-mgt-alerts-monitor-usage-spending",
       "redirect_document_id": false
     },
     {

articles/active-directory/develop/quickstart-v2-windows-desktop.md

@@ -46,7 +46,7 @@ In this quickstart, you'll learn how to write a Windows desktop .NET (WPF) appli
 >      - In the **Supported account types** section, select **Accounts in any organizational directory and personal Microsoft accounts (for example, Skype, Xbox, Outlook.com)**.
 >      - Select **Register** to create the application.
 > 1. In the list of pages for the app, select **Authentication**.
-> 1. In the **Redirect URIs** | **Suggested Redirect URIs for public clients (mobile, desktop)** section, check **https://login.microsoftonline.com/common/oauth2/nativeclient**.
+> 1. In the **Redirect URIs** | **Suggested Redirect URIs for public clients (mobile, desktop)** section, use **https://login.microsoftonline.com/common/oauth2/nativeclient**.
 > 1. Select **Save**.
 
 > [!div class="sxs-lookup" renderon="portal"]
@@ -110,6 +110,7 @@ Then, initialize MSAL using the following code:
 ```csharp
 public static IPublicClientApplication PublicClientApp;
 PublicClientApplicationBuilder.Create(ClientId)
+                .WithRedirectUri("https://login.microsoftonline.com/common/oauth2/nativeclient")
                 .WithAuthority(AzureCloudInstance.AzurePublic, Tenant)
                 .Build();
 ```

articles/active-directory/identity-protection/howto-identity-protection-configure-notifications.md

@@ -24,6 +24,9 @@ Azure AD Identity Protection sends two types of automated notification emails to
 
 This article provides you with an overview of both notification emails.
 
+>[!NOTE]
+>Email notifications are available only in the public cloud and are not currently available in the US Government cloud.
+
 ## Users at risk detected email
 
 In response to a detected account at risk, Azure AD Identity Protection generates an email alert with **Users at risk detected** as subject. The email includes a link to the **[Users flagged for risk](../reports-monitoring/concept-user-at-risk.md)** report. As a best practice, you should immediately investigate the users at risk.

articles/aks/use-managed-identity.md

@@ -40,7 +40,7 @@ You must have the following resources installed:
 To install the aks-preview 0.4.14 extension or later, use the following Azure CLI commands:
 
 ```azurecli
-az extension update --name aks-preview
+az extension add --name aks-preview
 az extension list
 ```
 

articles/azure-functions/disable-function.md

@@ -11,6 +11,9 @@ This article explains how to disable a function in Azure Functions. To *disable*
 
 The recommended way to disable a function is by using an app setting in the format `AzureWebJobs.<FUNCTION_NAME>.Disabled`. You can create and modify this application setting in a number of ways, including by using the [Azure CLI](/cli/azure/) and from your function's **Manage** tab in the [Azure portal](https://portal.azure.com). 
 
+> [!NOTE]  
+> When you disable an HTTP triggered function by using the methods described in this article, the endpoint may still by accessible when running on your local computer.  
+
 ## Use the Azure CLI
 
 In the Azure CLI, you use the [`az functionapp config appsettings set`](/cli/azure/functionapp/config/appsettings#az-functionapp-config-appsettings-set) command to create and modify the app setting. The following command disables a function named `QueueTrigger` by creating an app setting named `AzureWebJobs.QueueTrigger.Disabled` set it to `true`. 

articles/azure-government/compliance/azure-services-in-fedramp-auditscope.md

@@ -272,5 +272,5 @@ This article provides a detailed list of in-scope cloud services across Azure Pu
 | [VPN Gateway](https://azure.microsoft.com/services/vpn-gateway/) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | [Web Apps (App Service)](https://azure.microsoft.com/services/app-service/web/) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 
-***** Some services such as the Azure portal and Azure Resource Manager do not store or process DoD CC SRG IIL 5 content, however still inherit the IIL5 control set.
+***** Some services such as the Azure portal and Azure Resource Manager do not store or process DoD CC SRG IL 5 content, however still inherit the IL5 control set.
 

articles/azure-monitor/platform/autoscale-best-practices.md

@@ -107,7 +107,7 @@ Similarly, when autoscale switches back to the default profile, it first checks
 
 ### Considerations for scaling when multiple rules are configured in a profile
 
-There are cases where you may have to set multiple rules in a profile. The following autoscale rules are used by services when multiple rules are set.
+There are cases where you may have to set multiple rules in a profile. The following autoscale rules are used by the autoscale engine when multiple rules are set.
 
 On *scale-out*, autoscale runs if any rule is met.
 On *scale-in*, autoscale require all rules to be met.
@@ -127,13 +127,13 @@ Then the follow occurs:
 On the other hand, if CPU is 25% and memory is 51% autoscale does **not** scale-in. In order to scale-in, CPU must be 29% and Memory 49%.
 
 ### Always select a safe default instance count
-The default instance count is important autoscale scales your service to that count when metrics are not available. Therefore, select a default instance count that's safe for your workloads.
+The default instance count is important because autoscale scales your service to that count when metrics are not available. Therefore, select a default instance count that's safe for your workloads.
 
 ### Configure autoscale notifications
 Autoscale will post to the Activity Log if any of the following conditions occur:
 
-* Autoscale issues a scale operation
-* Autoscale service successfully completes a scale action
+* Autoscale issues a scale operation.
+* Autoscale service successfully completes a scale action.
 * Autoscale service fails to take a scale action.
 * Metrics are not available for autoscale service to make a scale decision.
 * Metrics are available (recovery) again to make a scale decision.

articles/azure-monitor/platform/autoscale-webhook-email.md

@@ -14,8 +14,8 @@ Webhooks allow you to route the Azure alert notifications to other systems for p
 ## Email
 Email can be sent to any valid email address. Administrators and co-administrators of the subscription where the rule is running will also be notified.
 
-## Cloud Services and Web Apps
-You can opt-in from the Azure portal for Cloud Services and Server Farms (Web Apps).
+## Cloud Services and App Services
+You can opt-in from the Azure portal for Cloud Services and Server Farms (App Services).
 
 * Choose the **scale by** metric.
 

articles/backup/backup-azure-afs-automation.md

@@ -245,12 +245,12 @@ testAzureFS       ConfigureBackup      Completed            11/12/2018 2:15:26 P
 
 ## Important notice - Backup item identification for AFS backups
 
-This section outlines the changes in the Backup item retrieval for AFS backups from preview to GA.
+This section outlines an important change in AFS backup in preparation for GA.
 
-While enabling the backup for AFS, user supplies the customer friendly File share name as the entity name and a backup item is created. The backup item's 'name' is a unique identifier created by Azure Backup service. Usually the identifier involves user friendly name. But there has been a change in the way Azure services internally identify an azure file share uniquely. This means that the unique-name of the backup item for AFS backup will be a GUID and will not have any relation to the customer friendly name. In order to know the unique name of each item, just run the ```Get-AzRecoveryServicesBackupItem``` command with the relevant filters for backupManagementType and WorkloadType to get all the relevant items and then observe the name field in the returned PS object/response. It is always recommended to list items and then retrieve their unique name from 'name' field in response. Use this value to filter the items with the 'Name' parameter. Otherwise use the FriendlyName parameter to retrieve the item with it's customer friendly name/identifier.
+While enabling the backup for AFS, user supplies the customer friendly File share name as the entity name and a backup item is created. The backup item's 'name' is a unique identifier created by Azure Backup service. Usually the identifier involves user friendly name. But to handle the important scenario of soft-delete, where a file share can be deleted and another file-share can be created with the same name, the unique identity of Azure file share will now be an ID instead of customer friendly name. In order to know the unique identity/name of each item, just run the ```Get-AzRecoveryServicesBackupItem``` command with the relevant filters for backupManagementType and WorkloadType to get all the relevant items and then observe the name field in the returned PS object/response. It is always recommended to list items and then retrieve their unique name from 'name' field in response. Use this value to filter the items with the 'Name' parameter. Otherwise use the FriendlyName parameter to retrieve the item with it's customer friendly name/identifier.
 
 > [!WARNING]
-> Make sure the PS version is upgraded to the minimum version for 'Az.RecoveryServices 2.6.0' for AFS backups. With this version, the 'friendlyName' filter is available for ```Get-AzRecoveryServicesBackupItem``` command. Pass the azure file share name to friendlyName parameter. If you pass the azure file share name to the 'Name' parameter, this version throws a warning to pass this friendly name to the friendly name parameter. Not installing this minimum version might result in failure of existing scripts. Install the minimum version of PS with the following command.
+> Make sure the PS version is upgraded to the minimum version for 'Az.RecoveryServices 2.6.0' for AFS backups. With this version, the 'friendlyName' filter is available for ```Get-AzRecoveryServicesBackupItem``` command. Pass the Azure File Share name to friendlyName parameter. If you pass the Azure File Share name to the 'Name' parameter, this version throws a warning to pass this friendly name to the friendly name parameter. Not installing this minimum version might result in failure of existing scripts. Install the minimum version of PS with the following command.
 
 ```powershell
 Install-module -Name Az.RecoveryServices -RequiredVersion 2.6.0

articles/cognitive-services/LUIS/developer-reference-resource.md

@@ -71,7 +71,7 @@ Bot framework provides [several tools](https://github.com/microsoft/botbuilder-t
 * [LUIS CLI](https://github.com/microsoft/botbuilder-tools/blob/master/packages/LUIS) - Create and manage your LUIS.ai applications
 * [Dispatch](https://github.com/microsoft/botbuilder-tools/blob/master/packages/Dispatch)- manage parent and child apps
 * [LUISGen](https://github.com/microsoft/botbuilder-tools/blob/master/packages/LUISGen) - Auto generate backing C#/Typescript classes for your LUIS intents and entities.
-* [Bot emulator](https://github.com/Microsoft/BotFramework-Emulator/releases) - a desktop application that allows bot developers to test and debug bots built using the Bot Framework SDK
+* [Bot Framework emulator](https://github.com/Microsoft/BotFramework-Emulator/releases) - a desktop application that allows bot developers to test and debug bots built using the Bot Framework SDK
 
 
 ## Next steps
@@ -80,4 +80,4 @@ Bot framework provides [several tools](https://github.com/microsoft/botbuilder-t
 * [Reference documentation](https://docs.microsoft.com/azure/index#pivot=sdkstools) for all APIs and SDKs
 * [Bot framework](https://github.com/Microsoft/botbuilder-dotnet) and [Azure Bot Service](https://dev.botframework.com/)
 * [LUDown](https://github.com/microsoft/botbuilder-tools/blob/master/packages/Ludown)
-* [Cognitive Containers](../cognitive-services-container-support.md)
+* [Cognitive Containers](../cognitive-services-container-support.md)