Merge pull request #111599 from BethWilke/branch119

Fixing merge errors

Author: PMEds28

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

@@ -27,9 +27,9 @@ Using the checkboxes, select the virtual machines you wish to onboard with Chang
 From the command bar, click **Services** and select either **Change tracking**, **Inventory**, or **Update Management**.
 
 > [!NOTE]
-> **Change tracking** and **Inventory** use the same solution, when one is enabled the other is enabled as well.
+> Change Tracking and Inventory use the same solution. When one is enabled, the other is enabled as well.
 
-The following image is for Update Management. Change tracking and Inventory have the same layout and behavior.
+The following image is for Update Management. Change Tracking and Inventory have the same layout and behavior.
 
 The list of virtual machines is filtered to show only the virtual machines that are in the same subscription and location. If your virtual machines are in more than three resource groups, the first three resource groups are selected.
 
@@ -101,7 +101,7 @@ Alternatively you can also unlink your workspace from your Automation Account fr
 
 ## Troubleshooting
 
-When onboarding multiple machines, there may be machines that show as **Cannot enable**. There are different reasons why some machines may not be enabled. The following sections show possible reasons for the **Cannot enable** state on a VM when attempting to onboard.
+When onboarding multiple machines, there may be machines that show as `Cannot enable`. There are different reasons why some machines may not be enabled. The following sections show possible reasons for the `Cannot enable` state on a VM when attempting to onboard.
 
 ### VM reports to a different workspace: '\<workspaceName\>'.  Change configuration to use it for enabling
 
@@ -142,7 +142,7 @@ When onboarding multiple machines, there may be machines that show as **Cannot e
 To remove a VM from Update Management:
 
 * In your Log Analytics workspace, remove the VM from the saved search for the Scope Configuration `MicrosoftDefaultScopeConfig-Updates`. Saved searches can be found under **General** in your workspace.
-* Remove the [Microsoft Monitoring agent](../azure-monitor/learn/quick-collect-windows-computer.md#clean-up-resources) or the [Log Analytics agent for Linux](../azure-monitor/learn/quick-collect-linux-computer.md#clean-up-resources).
+* Remove the [Log Analytics agent for Windows](../azure-monitor/learn/quick-collect-windows-computer.md#clean-up-resources) or the [Log Analytics agent for Linux](../azure-monitor/learn/quick-collect-linux-computer.md#clean-up-resources).
 
 ## Next steps
 

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

@@ -19,38 +19,38 @@ Sign in to the Azure portal at https://portal.azure.com.
 
 First, enable one or all three of the solutions on your VM:
 
-1. In the [Azure portal](https://portal.azure.com), from the left-hand pane select **Virtual machines** or search for and select **Virtual machines** from the **Home** page.
-2. Select the VM for which you want to enable a solution for.
-3. On the VM page, under **Operations**, select **Update management**, **Inventory**, or **Change tracking**. The virtual machine can exist in any region no matter the location of your Automation account. When onboarding a solution from a VM, you need to have the `Microsoft.OperationalInsights/workspaces/read` permission to determine if the VM is onboarded to a workspace. To learn about additional permissions that are required, see [permissions needed to onboard machines](automation-role-based-access-control.md#onboarding).
+1. In the [Azure portal](https://portal.azure.com), select **Virtual machines** or search for and select **Virtual machines** from the Home page.
+2. Select the VM for which you want to enable a solution.
+3. On the VM page, under **Operations**, select **Update management**, **Inventory**, or **Change tracking**. The virtual machine can exist in any region, no matter the location of your Automation account. When onboarding a solution from a VM, you need to have the `Microsoft.OperationalInsights/workspaces/read` permission to determine if the VM is onboarded to a workspace. To learn about additional permissions that are required, see [permissions needed to onboard machines](automation-role-based-access-control.md#onboarding). To learn how to onboard multiple machines at once, see [Onboard Update Management, Change Tracking, and Inventory solutions](automation-onboard-solutions-from-automation-account.md).
 
-To learn how to onboard multiple machines at once, see [Onboard Update Management, Change Tracking, and Inventory solutions](automation-onboard-solutions-from-automation-account.md).
-
-Select the Azure Log Analytics workspace and Automation account, and then select **Enable** to enable the solution. The solution takes up to 15 minutes to enable.
+4. Select the Azure Log Analytics workspace and Automation account, and then click **Enable** to enable the solution. The solution takes up to 15 minutes to enable.
 
 ![Onboard the Update Management solution](media/automation-tutorial-update-management/manageupdates-update-enable.png)
 
-Go to the other solutions, and then select **Enable**. The Log Analytics workspace and Automation account drop-down lists are disabled because these solutions use the same workspace and Automation account as the previously enabled solution.
+5. Go to the other solutions, and then select **Enable**. The Log Analytics workspace and Automation account drop-down lists are disabled because these solutions use the same workspace and Automation account as the previously enabled solution.
 
 > [!NOTE]
-> **Change tracking** and **Inventory** use the same solution. When one of these solutions is enabled, the other is also enabled.
+> Change tracking and Inventory use the same solution. When one of these solutions is enabled, the other is also enabled.
 
 ## Scope configuration
 
-Each solution uses a scope configuration in the workspace to target the computers that get the solution. The scope configuration is a group of one or more saved searches that are used to limit the scope of the solution to specific computers. To access the scope configurations, in your Automation account, under **Related resources**, select **Workspace**. In the workspace, under **Workspace data sources**, select **Scope Configurations**.
-
-If the selected workspace doesn't already have the Update Management or Change Tracking solutions, the following scope configurations are created:
+Each solution uses a scope configuration in the workspace to target the computers that get the solution. The scope configuration is a group of one or more saved searches that are used to limit the scope of the solution to specific computers. To access the scope configurations:
 
-* **MicrosoftDefaultScopeConfig-ChangeTracking**
+1. In your Automation account, under **Related resources**, select **Workspace**. 
+2. In the workspace, under **Workspace data sources**, select **Scope Configurations**.
+3. If the selected workspace doesn't already have the Update Management or Change Tracking solution, the following scope configurations are created:
 
-* **MicrosoftDefaultScopeConfig-Updates**
+    * `MicrosoftDefaultScopeConfig-ChangeTracking`
+    * `MicrosoftDefaultScopeConfig-Updates`
 
-If the selected workspace already has the solution, the solution isn't redeployed and the scope configuration isn't added.
+    If the selected workspace already has the solution, the solution isn't redeployed and the scope configuration isn't added.
 
-Select the ellipses (**...**) on any of the configurations, and then select **Edit**. In the **Edit scope configuration** pane, select **Select Computer Groups**. The **Computer Groups** pane shows the saved searches that are used to create the scope configuration.
+4. Select the ellipses (**...**) on any of the configurations, and then click **Edit**. 
+5. In the **Edit scope configuration** pane, select **Select Computer Groups**. The **Computer Groups** pane shows the saved searches that are used to create the scope configuration.
 
 ## Saved searches
 
-When a computer is added to the Update Management, Change Tracking, or Inventory solutions, the computer is added to one of two saved searches in your workspace. The saved searches are queries that contain the computers that are targeted for these solutions.
+When a computer is added to the Update Management, Change Tracking, or Inventory solution, the computer is added to one of two saved searches in your workspace. The saved searches are queries that contain the computers that are targeted for these solutions.
 
 Go to your workspace. Under **General**, select **Saved searches**. The two saved searches that are used by these solutions are shown in the following table:
 
@@ -78,7 +78,7 @@ After you remove these solutions, you can perform the following steps to unlink
 > [!NOTE]
 > Some solutions including earlier versions of the Azure SQL monitoring solution may have created automation assets and may also need to be removed prior to unlinking the workspace.
 
-1. From the Azure portal, open your Automation account, and on the Automation account page  select **Linked workspace** under the section **Related Resources** on the left.
+1. From the Azure portal, open your Automation account and select **Linked workspace** under the section **Related Resources** on the left.
 
 2. On the Unlink workspace page, click **Unlink workspace**.
 
@@ -107,7 +107,7 @@ Alternatively you can also unlink your workspace from your Automation Account fr
 To remove a VM from Update Management:
 
 * In your Log Analytics workspace, remove the VM from the saved search for the Scope Configuration `MicrosoftDefaultScopeConfig-Updates`. Saved searches can be found under **General** in your workspace.
-* Remove the [Microsoft Monitoring agent](../azure-monitor/learn/quick-collect-windows-computer.md#clean-up-resources) or the [Log Analytics agent for Linux](../azure-monitor/learn/quick-collect-linux-computer.md#clean-up-resources).
+* Remove the [Log Analytics agent for Windows](../azure-monitor/learn/quick-collect-windows-computer.md#clean-up-resources) or the [Log Analytics agent for Linux](../azure-monitor/learn/quick-collect-linux-computer.md#clean-up-resources).
 
 ## Next steps
 

articles/automation/automation-onboard-solutions.md

@@ -17,6 +17,9 @@ In this tutorial, you learn how to automatically onboard Update, Change Tracking
 > * Import the onboarding runbook
 > * Start the runbook
 
+>[!NOTE]
+>This article has been updated to use the new Azure PowerShell Az module. You can still use the AzureRM module, which will continue to receive bug fixes until at least December 2020. To learn more about the new Az module and AzureRM compatibility, see [Introducing the new Azure PowerShell Az module](https://docs.microsoft.com/powershell/azure/new-azureps-module-az?view=azps-3.5.0). For Az module installation instructions on your Hybrid Runbook Worker, see [Install the Azure PowerShell Module](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-3.5.0). For your Automation account, you can update your modules to the latest version using [How to update Azure PowerShell modules in Azure Automation](automation-update-azure-modules.md).
+
 ## Prerequisites
 
 To complete this tutorial, the following are required:
@@ -82,8 +85,9 @@ It's required to update to the latest Azure modules and import the [Az.Operation
 3. Click **Yes** to update all existing Azure modules to the latest version.
 
 ![Update modules](media/automation-onboard-solutions/update-modules.png)
+A
 
-### Install AzureRM.OperationalInsights module
+### Install Az.OperationalInsights module
 
 1. In the Automation account, select **Modules** under **Shared Resources**. 
 2. Select **Browse gallery** to open up the module gallery. 

articles/automation/automation-quickstart-create-account.md

@@ -10,28 +10,35 @@ ms.custom: mvc
 
 # Create an Azure Automation account
 
-Azure Automation accounts can be created through Azure. This method provides a browser-based user interface for creating and configuring Automation accounts and related resources. This quickstart steps through creating an Automation account and running a runbook in the account.
+You can create an Azure Automation account through Azure, using the Azure portal, a browser-based user interface allowing access to a number of resources. One Automation account can manage resources across all regions and subscriptions for a given tenant. 
 
-If you don't have an Azure subscription, create a [free Azure account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
+This quickstart guides you in creating an Automation account and running a runbook in the account. If you don't have an Azure subscription, create a [free Azure account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
 
 ## Sign in to Azure
 
-[Sign in to Azure](https://portal.azure.com)
+[Sign in to Azure](https://portal.azure.com).
 
 ## Create Automation account
 
-1. Click the **Create a resource** button found on the upper left-hand corner of Azure.
+1. Choose a name for your Azure account. Automation account names are unique per region and resource group. Names for Automation accounts that have been deleted might not be immediately available.
 
-1. Select **IT & Management Tools**, and then select **Automation**.
+    > [!NOTE]
+    > You can't change the account name once it has been entered in the user interface. 
+
+2. Click the **Create a resource** button found on the upper left corner of Azure portal.
 
-1. Enter the account information. For **Create Azure Run As account**, choose **Yes** so that the artifacts to simplify authentication to Azure are enabled automatically. It is important to note, that when creating an Automation Account, the name cannot be changed after it is chosen. *Automation Account names are unique per region and resource group. Names for Automation Accounts that were deleted may not be immediately available.* One Automation Account can manage resources across all regions and subscriptions for a given tenant. When complete, click **Create**, to start the Automation account deployment.
+3. Select **IT & Management Tools**, and then select **Automation**.
+
+4. Enter the account information, including the selected account name. For **Create Azure Run As account**, choose **Yes** so that the artifacts to simplify authentication to Azure are enabled automatically. When the information is complete, click **Create** to start the Automation account deployment.
 
     ![Enter information about your Automation account in the page](./media/automation-quickstart-create-account/create-automation-account-portal-blade.png)  
 
     > [!NOTE]
-    > For an updated list of locations that you can deploy an Automation Account to see, [Products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=automation&regions=all).
+    > For an updated list of locations that you can deploy an Automation account to, see [Products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=automation&regions=all).
+
+5. When the deployment has completed, click **All Services**.
 
-1. When the deployment has completed, click **All Services**, select **Automation Accounts** and select the Automation Account you created.
+6. Select **Automation Accounts** and then choose the Automation account you've created.
 
     ![Automation account overview](./media/automation-quickstart-create-account/automation-account-overview.png)
 

articles/automation/automation-quickstart-create-runbook.md

@@ -16,27 +16,27 @@ If you don't have an Azure subscription, create a [free Azure account](https://a
 
 ## Sign in to Azure
 
-Sign in to Azure at https://portal.azure.com
+Sign in to Azure at https://portal.azure.com.
 
 ## Create runbook
 
 First, create a runbook. The sample runbook created in this quickstart outputs `Hello World` by default.
 
 1. Open your Automation account.
 
-1. Click **Runbooks** under **PROCESS AUTOMATION**. The list of runbooks is displayed.
+1. Click **Runbooks** under **Process Automation**. The list of runbooks is displayed.
 
-1. Click the **Create a runbook** button found at the top of the list
+1. Click **Create a runbook** at the top of the list.
 
-1. Enter "Hello-World" for the runbook **Name**, and select **PowerShell** for **Runbook type**. Click **Create**.
+1. Enter `Hello-World` for the runbook name in the **Name** field, and select **PowerShell** for the **Runbook type** field. 
 
    ![Enter information about your Automation runbook in the page](./media/automation-quickstart-create-runbook/automation-create-runbook-configure.png)
 
-1. The runbook is created and the **Edit PowerShell Runbook** page opens.
+1. Click **Create**. The runbook is created and the Edit PowerShell Runbook page opens.
 
     ![Author PowerShell script in the runbook editor](./media/automation-quickstart-create-runbook/automation-edit-runbook-empty.png)
 
-1. Type or copy and paste the following code into the edit pane. It creates an optional input parameter called "Name" with a default value of "World", and outputs a string that uses this input value:
+1. Type or copy and paste the following code into the edit pane. It creates an optional input parameter called `Name` with a default value of `World`, and outputs a string that uses this input value:
 
    ```powershell-interactive
    param
@@ -48,39 +48,39 @@ First, create a runbook. The sample runbook created in this quickstart outputs `
    "Hello $Name!"
    ```
 
-1. Click **Save**, to save a draft copy of the runbook.
+1. Click **Save** to save a draft copy of the runbook.
 
     ![Author PowerShell script in the runbook editor](./media/automation-quickstart-create-runbook/automation-edit-runbook.png)
 
 ## Test the runbook
 
-Once the runbook is created, you test the runbook to validate that it works.
+Once the runbook is created, you must test the runbook to validate that it works.
 
-1. Click **Test pane** to open the **Test** page.
+1. Click **Test pane** to open the Test pane.
 
 1. Enter a value for **Name**, and click **Start**. The test job starts and the job status and output display.
 
     ![Runbook test job](./media/automation-quickstart-create-runbook/automation-test-runbook.png)
 
-1. Close the **Test** page by clicking the **X** in the upper right corner. Select **OK** in the popup that appears.
+1. Close the Test pane by clicking the **X** in the upper right corner. Select **OK** in the popup that appears.
 
-1. In the **Edit PowerShell Runbook** page, click **Publish** to publish the runbook as the official version of the runbook in the account.
+1. In the Edit PowerShell Runbook page, click **Publish** to publish the runbook as the official version of the runbook in the account.
 
    ![Runbook test job](./media/automation-quickstart-create-runbook/automation-hello-world-runbook-job.png)
 
 ## Run the runbook
 
 Once the runbook is published, the overview page is shown.
 
-1. In the runbook overview page, click **Start** to open the **Start Runbook** configuration page for this runbook.
+1. In the runbook overview page, click **Start** to open the Start Runbook configuration page for this runbook.
 
    ![Runbook test job](./media/automation-quickstart-create-runbook/automation-hello-world-runbook-start.png)
 
-1. Leave **Name** blank, so that the default value is used, and click **OK**. The runbook job is submitted, and the job page appears.
+1. Leave **Name** blank, so that the default value is used, and click **OK**. The runbook job is submitted, and the Job page appears.
 
    ![Runbook test job](./media/automation-quickstart-create-runbook/automation-job-page.png)
 
-1. When the **Job status** is **Running** or **Completed**, click **Output** to open the **Output** pane and view the runbook output.
+1. When the **Job status** is set to **Running** or **Completed**, click **Output** to open the Output pane and view the runbook output.
 
    ![Runbook test job](./media/automation-quickstart-create-runbook/automation-hello-world-runbook-job-output.png)