Merge pull request #115522 from BethWilke/branch170

Fixing 1716590, 1716594, 1717932

Author: v-albemi

articles/automation/automation-alert-metric.md

@@ -1,11 +1,11 @@
 ---
 title: Monitor Azure Automation runbooks with metric alerts
-description: This article walks you through monitoring Azure Automation runbooks based off of metrics
+description: This article tells how to monitor runbooks based on metrics.
 services: automation
 ms.date: 11/01/2018
 ms.topic: article
 ---
-# Monitoring runbooks with metric alerts
+# Monitor runbooks with metric alerts
 
 In this article, you learn how to create alerts based on the completion status of runbooks.
 
@@ -61,7 +61,7 @@ In the Azure portal, navigate to your Automation account. Under **Monitoring**,
 > [!NOTE]
 > When adding an email address to an Action Group, a notification email is sent stating the address has been added to an Action Group.
 
-## Notification
+## Receive notification
 
 When the alert criteria is met, the action group runs the action defined. In this article's example, an email is sent. The following image is an example of an email you receive after the alert is triggered:
 

articles/automation/automation-security-overview.md

@@ -1,26 +1,22 @@
 ---
-title: Intro to authentication in Azure Automation
-description: This article provides an overview of Automation security and the different authentication methods available for Automation Accounts in Azure Automation.
+title: Azure Automation account authentication overview
+description: This article provides an overview of Azure Automation security and authentication methods for Automation accounts.
 keywords: automation security, secure automation; automation authentication
 services: automation
 ms.subservice: process-automation
 ms.date: 04/23/2020
 ms.topic: conceptual
 ---
 
-# Introduction to authentication in Azure Automation
+# Azure Automation account authentication overview
 
-Azure Automation allows you to automate tasks against resources in Azure, on-premises, and with other cloud providers such as Amazon Web Services (AWS). In order for a runbook to perform its required actions, it must have permissions to securely access the resources with the minimal rights required within the subscription.
-
-This article will cover the various authentication scenarios supported by Azure Automation and how to get started based on the environment or environments you need to manage.  
-
-## Automation Account overview
+Azure Automation allows you to automate tasks against resources in Azure, on-premises, and with other cloud providers such as Amazon Web Services (AWS). For a runbook to perform its required actions, it must have permissions to securely access the resources with the minimal rights required within the subscription.
 
 When you start Azure Automation for the first time, you must create at least one Automation account. Automation accounts allow you to isolate your Automation resources (runbooks, assets, configurations) from the resources contained in other Automation accounts. You can use Automation accounts to separate resources into separate logical environments. For example, you might use one account for development, another for production, and another for your on-premises environment. An Azure Automation account is different from your Microsoft account or accounts created in your Azure subscription.
 
 The Automation resources for each Automation account are associated with a single Azure region, but Automation accounts can manage all the resources in your subscription. The main reason to create Automation accounts in different regions would be if you have policies that require data and resources to be isolated to a specific region.
 
-All of the tasks that you perform against resources using Azure Resource Manager and the Azure cmdlets in Azure Automation must authenticate to Azure using Azure Active Directory organizational identity credential-based authentication. Run As accounts in Azure Automation provide authentication for managing resources in Azure using the Azure cmdlets. When you create a Run As account, it creates a new service principal user in Azure Active Directory (AD) and assigns the Contributor role to this user at the subscription level. For runbooks that use Hybrid Runbook Workers on Azure virtual machines, you can use [runbook authentication with managed identities](automation-hrw-run-runbooks.md#runbook-auth-managed-identities) instead of Run As accounts to authenticate to your Azure resources.
+All tasks that you perform against resources using Azure Resource Manager and the Azure cmdlets in Azure Automation must authenticate to Azure using Azure Active Directory (Azure AD) organizational identity credential-based authentication. Run As accounts in Azure Automation provide authentication for managing resources in Azure using the Azure cmdlets. When you create a Run As account, it creates a new service principal user in Azure AD and assigns the Contributor role to this user at the subscription level. For runbooks that use Hybrid Runbook Workers on Azure virtual machines, you can use [runbook authentication with managed identities](automation-hrw-run-runbooks.md#runbook-auth-managed-identities) instead of Run As accounts to authenticate to your Azure resources.
 
 The service principal for a Run as Account does not have permissions to read Azure AD by default. If you want to add permissions to read or manage Azure AD, you'll need to grant the permissions on the service principal under **API permissions**. To learn more, see [Add permissions to access web APIs](../active-directory/develop/quickstart-configure-app-access-web-apis.md#add-permissions-to-access-web-apis).
 
@@ -31,7 +27,5 @@ Runbooks running on a Hybrid Runbook Worker in your data center or against compu
 ## Next steps
 
 * [Create an Automation account from the Azure portal](automation-create-standalone-account.md).
-
 * [Create an Automation account using Azure Resource Manager template](automation-create-account-template.md).
-
 * [Authenticate with Amazon Web Services (AWS)](automation-config-aws-account.md).

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

@@ -193,11 +193,11 @@ Selecting the solution displays the **Start-Stop-VM[workspace]** solution page.
 
 You can perform further analysis of the job records by clicking the donut tile. The solution dashboard shows job history and predefined log search queries. Switch to the log analytics advanced portal to search based on your search queries.
 
-## Update the solution
+## Update the feature
 
-If you've deployed a previous version of this solution, delete it from your account before deploying an updated release. Follow the steps to [remove the solution](#remove-the-solution) and then follow the steps to [deploy the solution](automation-solution-vm-management-enable.md).
+If you've deployed a previous version of this solution, delete it from your account before deploying an updated release. Follow the steps to [remove the solution](#remove-the-feature) and then follow the steps to [deploy the solution](automation-solution-vm-management-enable.md).
 
-## Remove the solution
+## Remove the feature
 
 If you no longer need to use the solution, you can delete it from the Automation account. Deleting the solution only removes the runbooks. It does not delete the schedules or variables that were created when the solution was added. Remove these assets manually if you aren't using them with other runbooks.
 

articles/automation/automation-update-management.md

@@ -1,12 +1,12 @@
 ---
-title: Update Management in Azure Automation
-description: This article describes the Update Management feature that manages updates for your Windows and Linux machines.
+title: Azure Automation Update Management overview
+description: Overview of the Update Management feature that manages updates for your Windows and Linux machines
 services: automation
 ms.subservice: update-management
 ms.date: 05/04/2020
 ms.topic: conceptual
 ---
-# Update Management in Azure Automation
+# Update Management overview
 
 You can use Update Management in Azure Automation to manage operating system updates for your Windows and Linux machines in Azure, in on-premises environments, and in other cloud environments. You can quickly assess the status of available updates on all agent machines and manage the process of installing required updates for servers.
 

articles/automation/how-to/move-account.md

@@ -1,6 +1,6 @@
 ---
 title: Move your Azure Automation account to another subscription
-description: This article describes how to move your Automation account to another subscription.
+description: This article tells how to move your Automation account to another subscription.
 services: automation
 ms.service: automation
 ms.subservice: process-automation
@@ -16,29 +16,26 @@ Azure Automation allows you to move some resources to a new resource group or su
 
 The Automation account is one of the resources that you can move. In this article, you'll learn to move Automation accounts to another resource or subscription. The high-level steps for moving your Automation account are:
 
-1. Remove your solutions.
+1. Disable your features.
 2. Unlink your workspace.
 3. Move the Automation account.
 4. Delete and re-create the Run As accounts.
-5. Re-enable your solutions.
+5. Re-enable your features.
 
->[!NOTE]
->In this article, you work with the Azure PowerShell Az module. You can still use the AzureRM module. To learn more about 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 by using [How to update Azure PowerShell modules in Azure Automation](../automation-update-azure-modules.md).
+## Disable features
 
-## Remove solutions
-
-To unlink your workspace from your Automation account, you must remove these solutions from your workspace:
+To unlink your workspace from your Automation account, you must disable the feature resources in your workspace:
 
 - Change Tracking and Inventory
 - Update Management
-- Start/Stop VMs during off hours
+- Start/Stop VMs during off-hours
 
 1. In the Azure portal, locate your resource group.
-2. Find each solution, and select **Delete** on the **Delete Resources** page.
+2. Find each feature, and select **Delete** on the Delete Resources page.
 
-    ![Screenshot of deleting solutions from the Azure portal](../media/move-account/delete-solutions.png)
+    ![Screenshot of deleting feature resources from the Azure portal](../media/move-account/delete-solutions.png)
 
-If you prefer, you can delete the solutions by using the [Remove-AzResource](https://docs.microsoft.com/powershell/module/Az.Resources/Remove-AzResource?view=azps-3.7.0) cmdlet:
+If you prefer, you can delete the resources by using the [Remove-AzResource](https://docs.microsoft.com/powershell/module/Az.Resources/Remove-AzResource?view=azps-3.7.0) cmdlet:
 
 ```azurepowershell-interactive
 $workspaceName = <myWorkspaceName>
@@ -48,34 +45,34 @@ Remove-AzResource -ResourceType 'Microsoft.OperationsManagement/solutions' -Reso
 Remove-AzResource -ResourceType 'Microsoft.OperationsManagement/solutions' -ResourceName "Start-Stop-VM($workspaceName)" -ResourceGroupName $resourceGroupName
 ```
 
-### Remove alert rules for the "Start/Stop VMs during off hours" solution
+### Remove alert rules for Start/Stop VMs during off-hours
 
-For this solution, you also need to remove the alert rules created by the solution.
+For Start/Stop VMs during off-hours, you also need to remove the alert rules created by the feature.
 
 1. In the Azure portal, go to your resource group and select **Monitoring** > **Alerts** > **Manage alert rules**.
 
    ![Screenshot of Alerts page, showing selection of Manage alert rules](../media/move-account/alert-rules.png)
 
-2. On the **Rules** page, you should see a list of the alerts configured in that resource group. The solution creates these rules:
+2. On the Rules page, you should see a list of the alerts configured in that resource group. The feature creates these rules:
 
     * AutoStop_VM_Child
     * ScheduledStartStop_Parent
     * SequencedStartStop_Parent
 
 3. Select the rules one at a time, and select **Delete** to remove them.
 
-    ![Screenshot of the Rules page, requesting confirmation of deletion for selected rules](../media/move-account/delete-rules.png)
+    ![Screenshot of Rules page, requesting confirmation of deletion for selected rules](../media/move-account/delete-rules.png)
 
     > [!NOTE]
-    > If you don't see any alert rules on the **Rules** page, change the **Status** field to **Disabled** to show disabled alerts. You might have disabled them.
+    > If you don't see any alert rules on the Rules page, change the **Status** field to **Disabled** to show disabled alerts. 
 
-4. When you remove the alert rules, you must remove the action group created for the "Start/Stop VMs during off hours" solution notifications. In the Azure portal, select **Monitor** > **Alerts** > **Manage action groups**.
+4. When you remove the alert rules, you must remove the action group created for Start/Stop VMs during off-hours notifications. In the Azure portal, select **Monitor** > **Alerts** > **Manage action groups**.
 
 5. Select **StartStop_VM_Notification**. 
 
 6. On the action group page, select **Delete**.
 
-    ![Screenshot of the Action group page](../media/move-account/delete-action-group.png)
+    ![Screenshot of Action group page](../media/move-account/delete-action-group.png)
 
 If you prefer, you can delete your action group by using the [Remove-AzActionGroup](https://docs.microsoft.com/powershell/module/az.monitor/remove-azactiongroup?view=azps-3.7.0) cmdlet:
 
@@ -91,7 +88,7 @@ Now you can unlink your workspace:
 
 2. Select **Unlink workspace** to unlink the workspace from your Automation account.
 
-    ![Screenshot of unlinking a workspace from an Automation account](../media/move-account/unlink-workspace.png)
+    ![Screenshot of Unlinking a workspace from an Automation account](../media/move-account/unlink-workspace.png)
 
 ## Move your Automation account
 
@@ -118,27 +115,27 @@ You can now move your Automation account and its runbooks.
 
 3. After you've deleted the Run As accounts, select **Create** under **Azure Run As account**. 
 
-4. On the **Add Azure Run As account** page, select **Create** to create the Run As account and service principal. 
+4. On the Add Azure Run As account page, select **Create** to create the Run As account and service principal. 
 
 5. Repeat the steps above with the Azure Classic Run As account.
 
-## Enable solutions
+## Enable features
 
-After you re-create the Run As accounts, you must re-enable the solutions that you removed before the move: 
+After you re-create the Run As accounts, you must re-enable the features that you disabled before the move: 
 
-1. To turn on the "Change Tracking and Inventory" solution, select **Change Tracking and Inventory** in your Automation account. Choose the Log Analytics workspace that you moved over, and select **Enable**.
+1. To turn on Change Tracking and Inventory, select **Change Tracking and Inventory** in your Automation account. Choose the Log Analytics workspace that you moved over, and select **Enable**.
 
-2. Repeat step 1 for the "Update Management" solution.
+2. Repeat step 1 for Update Management.
 
-    ![Screenshot of re-enabling solutions in your moved Automation account](../media/move-account/reenable-solutions.png)
+    ![Screenshot of Re-enabling features in your moved Automation account](../media/move-account/reenable-solutions.png)
 
-3. Machines that are onboarded with your solutions are visible when you've connected the existing Log Analytics workspace. To turn on the "Start/Stop VMs during off hours" solution, you must redeploy the solution. Under **Related Resources**, select **Start/Stop VMs** > **Learn more about and enable the solution** > **Create** to start the deployment.
+3. Machines that are enabled with your features are visible when you've connected the existing Log Analytics workspace. To turn on the Start/Stop VMs during off-hours feature, you must re-enable it. Under **Related Resources**, select **Start/Stop VMs** > **Learn more about and enable the solution** > **Create** to start the deployment.
 
-4. On the **Add Solution** page, choose your Log Analytics workspace and Automation account.
+4. On the Add Solution page, choose your Log Analytics workspace and Automation account.
 
     ![Screenshot of Add Solution menu](../media/move-account/add-solution-vm.png)
 
-5. Configure the solution as described in [Start/Stop VMs during off hours solution in Azure Automation](../automation-solution-vm-management.md).
+5. Configure the feature as described in [Start/Stop VMs during off-hours overview](../automation-solution-vm-management.md).
 
 ## Verify the move