Merge pull request #77389 from MicrosoftDocs/master

5/21 AM Publish

Author: huypub

articles/active-directory/authentication/concept-password-ban-bad.md

@@ -74,7 +74,7 @@ Each of the above passwords does not specifically match the banned password "abc
 
 Substring matching is used on the normalized password to check for the user’s first and last name as well as the tenant name (note that tenant name matching is not done when validating passwords on an Active Directory domain controller).
 
-Example: assume that we have a user John Doe that wants to reset his password to “J0hn123fb”. After normalization, this password would become “john123fb”. Substring matching finds that the password contains the user’s first name “John”. Even though “J0hn123fb” was not specifically on either banned password list, substring matching found “John" in the password. Therefore this password would be rejected.
+Example: assume that we have a user, Pol, who wants to reset their password to “P0l123fb”. After normalization, this password would become “pol123fb”. Substring matching finds that the password contains the user’s first name “Pol”. Even though “P0l123fb” was not specifically on either banned password list, substring matching found “Pol" in the password. Therefore this password would be rejected.
 
 #### Score Calculation
 

articles/aks/acs-aks-migration.md

@@ -24,7 +24,7 @@ ACS and AKS differ in some key areas that affect migration. Before any migration
     * Unmanaged disks must be converted before you can attach them to AKS nodes.
     * Custom `StorageClass` objects for Azure disks must be changed from `unmanaged` to `managed`.
     * Any `PersistentVolumes` should use `kind: Managed`.
-* AKS supports supports [multiple node pools](https://docs.microsoft.com/en-us/azure/aks/use-multiple-node-pools) (currently in preview).
+* AKS supports [multiple node pools](https://docs.microsoft.com/azure/aks/use-multiple-node-pools) (currently in preview).
 * Nodes based on Windows Server are currently in [preview in AKS](https://azure.microsoft.com/blog/kubernetes-on-azure/).
 * AKS supports a limited set of [regions](https://docs.microsoft.com/azure/aks/quotas-skus-regions).
 * AKS is a managed service with a hosted Kubernetes control plane. You might need to modify your applications if you've previously modified the configuration of your ACS masters.

articles/app-service/deploy-zip.md

@@ -92,7 +92,7 @@ For more information, see [Kudu documentation](https://github.com/projectkudu/ku
 
 ## Deploy WAR file
 
-To deploy a WAR file to App Service, send a POST request to https://<app_name>.scm.azurewebsites.net/api/wardeploy. The POST request must contain the .war file in the message body. The deployment credentials for your app are provided in the request by using HTTP BASIC authentication. 
+To deploy a WAR file to App Service, send a POST request to `https://<app_name>.scm.azurewebsites.net/api/wardeploy`. The POST request must contain the .war file in the message body. The deployment credentials for your app are provided in the request by using HTTP BASIC authentication.
 
 For the HTTP BASIC authentication, you need your App Service deployment credentials. To see how to set your deployment credentials, see [Set and reset user-level credentials](deploy-configure-credentials.md#userscope).
 
@@ -114,7 +114,7 @@ $password = "<deployment_password>"
 $filePath = "<war_file_path>"
 $apiUrl = "https://<app_name>.scm.azurewebsites.net/api/wardeploy"
 $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(("{0}:{1}" -f $username, $password)))
-Invoke-RestMethod -Uri $apiUrl -Headers @{Authorization=("Basic {0}" -f $base64AuthInfo)} -Method POST -InFile $filePath -ContentType "multipart/form-data"
+Invoke-RestMethod -Uri $apiUrl -Headers @{Authorization=("Basic {0}" -f $base64AuthInfo)} -Method POST -InFile $filePath -ContentType "application/octet-stream"
 ```
 
 [!INCLUDE [What happens to my app during deployment?](../../includes/app-service-deploy-atomicity.md)]

articles/app-service/manage-custom-dns-buy-domain.md

@@ -198,7 +198,9 @@ Navigate to the listed hostnames in the browser. In the example in the preceding
 
 ## Renew the domain
 
-The App Service domain you bought is valid for one year from the time of purchase. By default, the domain is configured to renew automatically by charging your payment method for the next year. If you want to turn off automatic renewal, or if you want to manually renew your domain, follow the steps here.
+The App Service domain you bought is valid for one year from the time of purchase. By default, the domain is configured to renew automatically by charging your payment method for the next year. You can manually renew your domain name.
+
+If you want to turn off automatic renewal, or if you want to manually renew your domain, follow the steps here.
 
 In the **App Services** tab, click the name of your app, select **Settings**, and then select **Custom domains**.
 
@@ -208,11 +210,25 @@ In the **App Service Domains** section, select the domain you want to configure.
 
 ![](./media/custom-dns-web-site-buydomains-web-app/dncmntask-cname-buydomains-select-domain.png)
 
-From the left navigation of the domain, select **Domain renewal**. To stop renewing your domain automatically, select **Off**, and then **Save**. 
+From the left navigation of the domain, select **Domain renewal**. To stop renewing your domain automatically, select **Off**, and then **Save**.
 
 ![](./media/custom-dns-web-site-buydomains-web-app/dncmntask-cname-buydomains-autorenew.png)
 
-To manually renew your domain, select **Renew domain**. However, this button is not active until 90 days before the domain's expiration.
+To manually renew your domain, select **Renew domain**. However, this button is not active until [90 days before the domain's expiration](#when-domain-expires).
+
+If your domain renewal is successful, you receive an email notification within 24 hours.
+
+## When domain expires
+
+Azure deals with expiring or expired App Service domains as follows:
+
+* If automatic renewal is disabled: 90 days before domain expiration, a renewal notification email is sent to you and the **Renew domain** button is activated in the portal.
+* If automatic renewal is enabled: On the day after your domain expiration date, Azure attempts to bill you for the domain name renewal.
+* If an error occurs during automatic renewal (for example, your card on file is expired), or if automatic renewal is disabled and you allow the domain to expire, Azure notifies you of the domain expiration and parks your domain name. You can [manually renew](#renew-the-domain) your domain.
+* On the 4th and 12th days day after expiration, Azure sends you additional notification emails. You can [manually renew](#renew-the-domain) your domain.
+* On the 19th day after expiration, your domain remains on hold but becomes subject to a redemption fee. You can call customer support to renew your domain name, subject to any applicable renewal and redemption fees.
+* On the 25th day after expiration, Azure puts your domain up for auction with a domain name industry auction service. You can call customer support to renew your domain name, subject to any applicable renewal and redemption fees.
+* On the 30th day after expiration, you're no longer able to redeem your domain.
 
 <a name="custom"></a>
 

articles/automation/TOC.yml

@@ -42,6 +42,8 @@
       href: automation-onboard-solutions-from-vm.md
     - name: Onboard from Automation account
       href: automation-onboard-solutions-from-automation-account.md
+    - name: Region mappings
+      href: how-to/region-mappings.md
   - name: Update Management
     items:
     - name: Update Management overview

articles/automation/automation-onboard-solutions-from-automation-account.md

@@ -26,27 +26,10 @@ Choose the Log Analytics workspace and Automation account and click **Enable** t
 
 ![Onboard Inventory solution](media/automation-onboard-solutions-from-automation-account/onboardsolutions.png)
 
-When enabling solutions, only certain regions are supported for linking a Log Analytics workspace and an Automation Account.
-
-The following table shows the supported mappings:
-
-|**Log Analytics Workspace Region**|**Azure Automation Region**|
-|---|---|
-|AustraliaSoutheast|AustraliaSoutheast|
-|CanadaCentral|CanadaCentral|
-|CentralIndia|CentralIndia|
-|EastUS<sup>1</sup>|EastUS2|
-|JapanEast|JapanEast|
-|SoutheastAsia|SoutheastAsia|
-|WestCentralUS<sup>2</sup>|WestCentralUS<sup>2</sup>|
-|WestEurope|WestEurope|
-|UKSouth|UKSouth|
-|USGovVirginia|USGovVirginia|
-|EastUS2EUAP<sup>1</sup>|CentralUSEUAP|
-
-<sup>1</sup> EastUS2EUAP and EastUS mappings for Log Analytics workspaces to Automation Accounts are not an exact region to region mapping but is the correct mapping.
-
-<sup>2</sup> Due to capacity restraints the region is not available when creating new resources. This includes Automation Accounts and Log Analytics workspaces. However, preexisting linked resources in the region should continue to work.
+> [!NOTE]
+> When enabling solutions, only certain regions are supported for linking a Log Analytics workspace and an Automation Account.
+>
+> For a list of the supported mapping pairs, see [Region mapping for Automation Account and Log Analytics workspace](how-to/region-mappings.md).
 
 The Change Tracking and Inventory solution provides the ability to [track changes](automation-vm-change-tracking.md) and [inventory](automation-vm-inventory.md) on your virtual machines. In this step, you enable the solution on a virtual machine.
 

articles/automation/automation-onboard-solutions-from-browse.md

@@ -14,9 +14,9 @@ ms.custom: mvc
 
 Azure Automation provides solutions to manage operating system security updates, track changes, and inventory what is installed on your computers. There are multiple ways to onboard machines, you can onboard the solution [from a virtual machine](automation-onboard-solutions-from-vm.md), from your [Automation account](automation-onboard-solutions-from-automation-account.md), when browsing virtual machines, or by [runbook](automation-onboard-solutions.md). This article covers onboarding these solutions when browsing virtual machines in Azure.
 
-## Log in to Azure
+## Sign in to Azure
 
-Log in to Azure at https://portal.azure.com
+Sign in to Azure at https://portal.azure.com
 
 ## Enable solutions
 
@@ -53,27 +53,10 @@ If the workspace selected is not linked to an Automation Account, you'll see the
 
 ![No workspace](media/automation-onboard-solutions-from-browse/no-workspace.png)
 
-When enabling solutions, only certain regions are supported for linking a Log Analytics workspace and an Automation Account.
-
-The following table shows the supported mappings:
-
-|**Log Analytics Workspace Region**|**Azure Automation Region**|
-|---|---|
-|AustraliaSoutheast|AustraliaSoutheast|
-|CanadaCentral|CanadaCentral|
-|CentralIndia|CentralIndia|
-|EastUS<sup>1</sup>|EastUS2|
-|JapanEast|JapanEast|
-|SoutheastAsia|SoutheastAsia|
-|WestCentralUS<sup>2</sup>|WestCentralUS<sup>2</sup>|
-|WestEurope|WestEurope|
-|UKSouth|UKSouth|
-|USGovVirginia|USGovVirginia|
-|EastUS2EUAP<sup>1</sup>|CentralUSEUAP|
-
-<sup>1</sup> EastUS2EUAP and EastUS mappings for Log Analytics workspaces to Automation Accounts are not an exact region to region mapping but is the correct mapping.
-
-<sup>2</sup> Due to capacity restraints the region is not available when creating new resources. This includes Automation Accounts and Log Analytics workspaces. However, preexisting linked resources in the region should continue to work.
+> [!NOTE]
+> When enabling solutions, only certain regions are supported for linking a Log Analytics workspace and an Automation Account.
+>
+> For a list of the supported mapping pairs, see [Region mapping for Automation Account and Log Analytics workspace](how-to/region-mappings.md).
 
 Deselect the checkbox next to any virtual machine that you don't want to enable. Virtual machines that can't be enabled are already deselected.
 
@@ -146,7 +129,7 @@ When onboarding multiple machines, there may be machines that show as **Cannot e
 
 **Cause**: Virtual machines that use the classic deployment model are not supported.
 
-**Solution**: Migrate the virtual machine to the resource manager deployment model. To learn how to do this, see [Migrate classic deployment model resources](../virtual-machines/windows/migration-classic-resource-manager-overview.md).
+**Solution**: Migrate the virtual machine to the Resource Manager deployment model. To learn how to do this, see [Migrate classic deployment model resources](../virtual-machines/windows/migration-classic-resource-manager-overview.md).
 
 ### VM is stopped. (deallocated)
 

articles/automation/automation-solution-vm-management.md

@@ -85,30 +85,6 @@ To deploy the Start/Stop VMs during off hours solution to a new Automation Accou
 | Microsoft.Automation/automationAccounts/write | Resource Group |
 | Microsoft.OperationalInsights/workspaces/write | Resource Group |
 
-### Region mappings
-
-When enabling Start/Stop VMs during off-hours, only certain regions are supported for linking a Log Analytics workspace and an Automation Account.
-
-The following table shows the supported mappings:
-
-|**Log Analytics Workspace Region**|**Azure Automation Region**|
-|---|---|
-|AustraliaSoutheast|AustraliaSoutheast|
-|CanadaCentral|CanadaCentral|
-|CentralIndia|CentralIndia|
-|EastUS<sup>1</sup>|EastUS2|
-|JapanEast|JapanEast|
-|SoutheastAsia|SoutheastAsia|
-|WestCentralUS<sup>2</sup>|WestCentralUS<sup>2</sup>|
-|WestEurope|WestEurope|
-|UKSouth|UKSouth|
-|USGovVirginia|USGovVirginia|
-|EastUS2EUAP<sup>1</sup>|CentralUSEUAP|
-
-<sup>1</sup> EastUS2EUAP and EastUS mappings for Log Analytics workspaces to Automation Accounts are not an exact region to region mapping but is the correct mapping.
-
-<sup>2</sup> Due to capacity restraints the region is not available when creating new resources. This includes Automation Accounts and Log Analytics workspaces. However, preexisting linked resources in the region should continue to work.
-
 ## Deploy the solution
 
 Perform the following steps to add the Start/Stop VMs during off-hours solution to your Automation account, and then configure the variables to customize the solution.
@@ -135,6 +111,11 @@ Perform the following steps to add the Start/Stop VMs during off-hours solution
    - Select a **Location**. Currently, the only locations available are **Australia Southeast**, **Canada Central**, **Central India**, **East US**, **Japan East**, **Southeast Asia**, **UK South**, **West Europe**, and **West US 2**.
    - Select a **Pricing tier**. Choose the **Per GB (Standalone)** option. Azure Monitor logs has updated [pricing](https://azure.microsoft.com/pricing/details/log-analytics/) and the Per GB tier is the only option.
 
+   > [!NOTE]
+   > When enabling solutions, only certain regions are supported for linking a Log Analytics workspace and an Automation Account.
+   >
+   > For a list of the supported mapping pairs, see [Region mapping for Automation Account and Log Analytics workspace](how-to/region-mappings.md).
+
 5. After providing the required information on the **Log Analytics workspace** page, click **Create**. You can track its progress under **Notifications** from the menu, which returns you to the **Add Solution** page when done.
 6. On the **Add Solution** page, select **Automation account**. If you're creating a new Log Analytics workspace, you can create a new Automation account to be associated with it, or select an existing Automation Account that is not already linked to a Log Analytics workspace. Select an existing Automation Account or click **Create an Automation account**, and on the **Add Automation account** page, provide the following information:
    - In the **Name** field, enter the name of the Automation account.

articles/automation/how-to/region-mappings.md

@@ -0,0 +1,57 @@
+---
+title: Azure Automation and Log Analytics workspace mappings
+description: This article describes the mappings allowed between an Automation Account and a Log Analytics Workspace to support solution
+services: automation
+ms.service: automation
+ms.subservice: process-automation
+author: georgewallace
+ms.author: gwallace
+ms.date: 05/20/2019
+ms.topic: conceptual
+manager: carmonm 
+---
+# Workspace mappings
+
+When enabling solutions like Update Management, Change Tracking and Inventory, or the Start/Stop VMs during off-hours solution, only certain regions are supported for linking a Log Analytics workspace and an Automation Account.
+
+## Supported mappings
+
+The following table shows the supported mappings:
+
+|**Log Analytics Workspace Region**|**Azure Automation Region**|
+|---|---|
+|**US**||
+|EastUS<sup>1</sup>|EastUS2|
+|WestUS2|WestUS2|
+|WestCentralUS<sup>2</sup>|WestCentralUS<sup>2</sup>|
+|**Canada**||
+|CanadaCentral|CanadaCentral|
+|**Asia Pacific**||
+|AustraliaSoutheast|AustraliaSoutheast|
+|SoutheastAsia|SoutheastAsia|
+|CentralIndia|CentralIndia|
+|JapanEast|JapanEast|
+|**Europe**||
+|UKSouth|UKSouth|
+|WestEurope|WestEurope|
+|**US Gov**||
+|USGovVirginia|USGovVirginia|
+
+<sup>1</sup> EastUS mapping for Log Analytics workspaces to Automation Accounts are not an exact region to region mapping but is the correct mapping.
+
+<sup>2</sup> Due to capacity restraints the region is not available when creating new resources. This includes Automation Accounts and Log Analytics workspaces. However, preexisting linked resources in the region should continue to work.
+
+## Next steps
+
+Learn how to onboard the following solutions:
+
+Update Management and Change Tracking and Inventory:
+
+* From a [virtual machine](../automation-onboard-solutions-from-vm.md)
+* From your [Automation account](../automation-onboard-solutions-from-automation-account.md)
+* When [browsing multiple machines](../automation-onboard-solutions-from-browse.md)
+* From a [runbook](../automation-onboard-solutions.md)
+
+Start/Stop VMs during off-hours
+
+* [Deploy Start/Stop VMs during off-hours](../automation-solution-vm-management.md)

articles/automation/manage-runas-account.md

@@ -6,7 +6,7 @@ ms.service: automation
 ms.subservice: shared-capabilities
 author: georgewallace
 ms.author: gwallace
-ms.date: 05/03/2019
+ms.date: 05/21/2019
 ms.topic: conceptual
 manager: carmonm
 ---
@@ -19,12 +19,12 @@ When you create a Run As account, it creates a new service principal user in Azu
 
 There are two types of Run As Accounts:
 
-* **Azure Run As Account** - This account is used to manage Resource Manager deployment model resources.
+* **Azure Run As Account** - This account is used to manage [Resource Manager deployment model](../azure-resource-manager/resource-manager-deployment-model.md) resources.
   * Creates an Azure AD application with a self-signed certificate, creates a service principal account for the application in Azure AD, and assigns the Contributor role for the account in your current subscription. You can change this setting to Owner or any other role. For more information, see [Role-based access control in Azure Automation](automation-role-based-access-control.md).
   * Creates an Automation certificate asset named *AzureRunAsCertificate* in the specified Automation account. The certificate asset holds the certificate private key that's used by the Azure AD application.
   * Creates an Automation connection asset named *AzureRunAsConnection* in the specified Automation account. The connection asset holds the applicationId, tenantId, subscriptionId, and certificate thumbprint.
 
-* **Azure Classic Run As Account** - This account is used to manage Classic deployment model resources.
+* **Azure Classic Run As Account** - This account is used to manage [Classic deployment model](../azure-resource-manager/resource-manager-deployment-model.md) resources.
   * Creates a management certificate in the subscription
   * Creates an Automation certificate asset named *AzureClassicRunAsCertificate* in the specified Automation account. The certificate asset holds the certificate private key used by the management certificate.
   * Creates an Automation connection asset named *AzureClassicRunAsConnection* in the specified Automation account. The connection asset holds the subscription name, subscriptionId, and certificate asset name.