Merge pull request #111523 from BethWilke/branch118

Fixing task 1707213

Author: American-Dipper

articles/automation/automation-connections.md

@@ -11,7 +11,7 @@ ms.topic: conceptual
 
 An Automation connection asset contains the information required to connect to an external service or application from a runbook or DSC configuration. This may include information required for authentication such as a username and password in addition to connection information such as a URL or a port. The value of a connection is keeping all of the properties for connecting to a particular application in one asset as opposed to creating multiple variables. The user can edit the values for a connection in one place, and you can pass the name of a connection to a runbook or DSC configuration in a single parameter. The properties for a connection can be accessed in the runbook or DSC configuration with the `Get-AutomationConnection` activity.
 
-When you create a connection, you must specify a *connection type*. The connection type is a template that defines a set of properties. The connection defines values for each property defined in its connection type. Connection types are added to Azure Automation in integration modules or created with the [Azure Automation API](/previous-versions/azure/reference/mt163818(v=azure.100)) if the integration module includes a connection type and is imported into your Automation account. Otherwise, you must create a metadata file to specify an Automation connection type. For more information regarding this, see [Integration Modules](automation-integration-modules.md).
+When you create a connection, you must specify a connection type. The connection type is a template that defines a set of properties. The connection defines values for each property defined in its connection type. Connection types are added to Azure Automation in integration modules or created with the [Azure Automation API](/previous-versions/azure/reference/mt163818(v=azure.100)) if the integration module includes a connection type and is imported into your Automation account. Otherwise, you must create a metadata file to specify an Automation connection type. For more information regarding this, see [Integration Modules](automation-integration-modules.md).
 
 >[!NOTE]
 >Secure assets in Azure Automation include credentials, certificates, connections, and encrypted variables. These assets are encrypted and stored in Azure Automation using a unique key that is generated for each Automation account. This key is stored in a system managed Key Vault. Before storing a secure asset, the key is loaded from Key Vault and then used to encrypt the asset. This process is managed by Azure Automation.

articles/automation/automation-dsc-onboarding.md

@@ -1,42 +1,46 @@
 ---
 title: Azure Automation State Configuration overview
-description: This article is an overview of Azure Automation State Configuration (DSC), its terms, and its known issues.
+description: An overview of Azure Automation State Configuration (DSC), its terms, and known issues
 keywords: powershell dsc, desired state configuration, powershell dsc azure
 services: automation
 ms.service: automation
 ms.subservice: dsc
 author: mgoedtel
 ms.author: magoedte
-ms.date: 04/15/2020
+ms.date: 11/06/2018
 ms.topic: conceptual
 manager: carmonm
 ---
-
 # State Configuration overview
 
-Azure Automation State Configuration is an Azure service that allows you to write, manage, and compile PowerShell Desired State Configuration (DSC) [configurations](/powershell/scripting/dsc/configurations/configurations). The service also imports [DSC resources](/powershell/scripting/dsc/resources/resources) and assigns configurations to target nodes, all in the cloud.
+Azure Automation State Configuration is an Azure service that allows you to write, manage, and
+compile PowerShell Desired State Configuration (DSC)
+[configurations](/powershell/scripting/dsc/configurations/configurations). The service also imports [DSC Resources](/powershell/scripting/dsc/resources/resources), and assigns configurations to target nodes, all in the cloud.
 
-## Why use Azure Automation State Configuration?
+## Why use Azure Automation State Configuration
 
 Azure Automation State Configuration provides several advantages over using DSC outside of Azure.
 
 ### Built-in pull server
 
-Azure Automation State Configuration provides a DSC pull server similar to the [Windows Feature DSC-Service](/powershell/scripting/dsc/pull-server/pullserver). Target nodes can automatically receive configurations, conform to the desired state, and report on their compliance. The built-in pull server in Azure Automation eliminates the need to set up and maintain your own pull server. Azure Automation can target virtual or physical Windows or Linux machines, in the cloud or on-premises.
+Azure Automation State Configuration provides a DSC pull server similar to the [Windows Feature DSC-Service](/powershell/scripting/dsc/pull-server/pullserver). Target nodes can automatically receive
+configurations, conform to the desired state, and report on their compliance. The built-in pull server in Azure Automation eliminates the need to set up and maintain your own pull server. Azure
+Automation can target virtual or physical Windows or Linux machines, in the cloud or on-premises.
 
-### Manage all your DSC artifacts
+### Management of all your DSC artifacts
 
 Azure Automation State Configuration brings the same management layer to [PowerShell Desired State Configuration](/powershell/scripting/dsc/overview/overview) as it offers for PowerShell scripting. From the Azure portal or from PowerShell, you can manage all your DSC configurations, resources, and target nodes.
 
 ![Screenshot of the Azure Automation page](./media/automation-dsc-overview/azure-automation-blade.png)
 
-### Import reporting data into Azure Monitor Logs
+### Import of reporting data into Azure Monitor logs
 
-Nodes that are managed with Azure Automation State Configuration send detailed reporting status data to the built-in pull server. You can configure Azure Automation State Configuration to send this data to your Log Analytics workspace. For more information, see [Forward Azure Automation State Configuration reporting data to Azure Monitor Logs](automation-dsc-diagnostics.md).
+Nodes that are managed with Azure Automation State Configuration send detailed reporting status data to the built-in pull server. You can configure Azure Automation State Configuration to send
+this data to your Log Analytics workspace. See [Forward Azure Automation State Configuration reporting data to Azure Monitor logs](automation-dsc-diagnostics.md).
 
-## Prerequisites
+## Prerequisites for using Azure Automation State Configuration
 
-Consider the following requirements when you use Azure Automation State Configuration for DSC.
+Please consider the following requirements when using Azure Automation State Configuration for DSC.
 
 ### Operating system requirements
 
@@ -52,17 +56,19 @@ For nodes running Windows, the following versions are supported:
 - Windows 7
 
 >[!NOTE]
->Because the [Microsoft Hyper-V Server](/windows-server/virtualization/hyper-v/hyper-v-server-2016) standalone product SKU doesn't contain an implementation of DSC, it can't be managed by PowerShell DSC or Azure Automation State Configuration.
+>The [Microsoft Hyper-V Server](/windows-server/virtualization/hyper-v/hyper-v-server-2016) standalone product SKU does not contain an implementation of DSC. Thus it can't be managed by PowerShell DSC or Azure Automation State Configuration.
 
 For nodes running Linux, the DSC Linux extension supports all the Linux distributions listed under [Supported Linux Distributions](https://github.com/Azure/azure-linux-extensions/tree/master/DSC#4-supported-linux-distributions).
 
 ### DSC requirements
 
 For all Windows nodes running in Azure,
-[Windows Management Framework 5.1](https://docs.microsoft.com/powershell/scripting/wmf/setup/install-configure)
-is installed during onboarding. For nodes running Windows Server 2012 and Windows 7, [WinRM](https://docs.microsoft.com/powershell/scripting/dsc/troubleshooting/troubleshooting#winrm-dependency) is enabled.
+[WMF 5.1](https://docs.microsoft.com/powershell/scripting/wmf/setup/install-configure)
+is installed during onboarding. For nodes running Windows Server 2012 and Windows 7,
+[WinRM](https://docs.microsoft.com/powershell/scripting/dsc/troubleshooting/troubleshooting#winrm-dependency) is enabled.
 
-For all Linux nodes running in Azure, [PowerShell DSC for Linux](https://github.com/Microsoft/PowerShell-DSC-for-Linux)
+For all Linux nodes running in Azure,
+[PowerShell DSC for Linux](https://github.com/Microsoft/PowerShell-DSC-for-Linux)
 is installed during onboarding.
 
 ### <a name="network-planning"></a>Configuration of private networks
@@ -74,20 +80,23 @@ If your nodes are located in a private network, the following port and URLs are
 * Global URL of US Gov Virginia: ***.azure-automation.us**
 * Agent service: **https://\<workspaceId\>.agentsvc.azure-automation.net**
 
-If you are using DSC resources that communicate between nodes, such as the [WaitFor* resources](https://docs.microsoft.com/powershell/scripting/dsc/reference/resources/windows/waitForAllResource), you also need to allow communication between nodes. To understand these network requirements, see the documentation for each DSC resource.
+If you are using DSC resources that communicate between nodes,
+such as the [WaitFor* resources](https://docs.microsoft.com/powershell/scripting/dsc/reference/resources/windows/waitForAllResource),
+you also need to allow traffic between nodes. See the documentation for each DSC resource to understand these network requirements.
 
 #### Proxy support
 
-Proxy support for the DSC agent is available in Windows version 1809 and later. You enable this option by setting the values for `ProxyURL` and `ProxyCredential` in the [metaconfiguration script](automation-dsc-onboarding.md#generate-dsc-metaconfigurations) that's used to register nodes.
+Proxy support for the DSC agent is available in Windows version 1809 and later. This option is enabled by setting the values for `ProxyURL` and `ProxyCredential` in the [metaconfiguration script](automation-dsc-onboarding.md#generating-dsc-metaconfigurations)
+used to register nodes.
 
 >[!NOTE]
->Azure Automation State Configuration doesn't provide DSC proxy support for earlier versions of Windows.
+>Azure Automation State Configuration does not provide DSC proxy support for previous versions of Windows.
 
-For Linux nodes, the DSC agent supports a proxy server and uses the `http_proxy` variable to specify the URL.
+For Linux nodes, the DSC agent supports proxy and uses the `http_proxy` variable to determine the URL.
 
 #### Azure Automation State Configuration network ranges and namespace
 
-When you're defining exceptions, we recommend that you use the IP addresses listed in the following table. For IP addresses, you can download the [Microsoft Azure Datacenter IP Ranges](https://www.microsoft.com/download/details.aspx?id=41653) XML file from the Microsoft Download Center. This file contains the currently deployed ranges and any upcoming changes to the IP ranges. It is updated weekly.
+It's recommended to use the addresses listed below when defining exceptions. For IP addresses, you can download the [Microsoft Azure Datacenter IP Ranges](https://www.microsoft.com/download/details.aspx?id=41653). This file is updated weekly, and has the currently deployed ranges and any upcoming changes to the IP ranges.
 
 If you have an Automation account that's defined for a specific region, you can restrict communication to that regional datacenter. The following table provides the DNS record for each region:
 
@@ -107,18 +116,21 @@ If you have an Automation account that's defined for a specific region, you can
 | UK South | uks-jobruntimedata-prod-su1.azure-automation.net</br>uks-agentservice-prod-1.azure-automation.net |
 | US Gov Virginia | usge-jobruntimedata-prod-su1.azure-automation.us<br>usge-agentservice-prod-1.azure-automation.us |
 
+For a list of region IP addresses instead of region names, download the [Azure Datacenter IP address](https://www.microsoft.com/download/details.aspx?id=41653) XML file from the Microsoft Download Center.
+
 > [!NOTE]
 > The Azure Datacenter IP address XML file lists the IP address ranges that are used in the Microsoft Azure datacenters. The file includes compute, SQL, and storage ranges.
 >
->An updated file is posted weekly. The file reflects the currently deployed ranges and any upcoming changes to the IP ranges. New ranges that appear in the file aren't used in the datacenters for at least one week. It's a good idea to download a new XML file every week. Then, you can update your site to correctly identify services running in Azure. 
+>An updated file is posted weekly. The file reflects the currently deployed ranges and any upcoming changes to the IP ranges. New ranges that appear in the file aren't used in the datacenters for at least one week. It's a good idea to download the new XML file every week. Then update your site to correctly identify services running in Azure. 
 
-If you're an Azure ExpressRoute user, note that this file is used to update the Border Gateway Protocol (BGP) advertisement of Azure space in the first week of each month.
+Azure ExpressRoute users should note that this file is used to update the Border Gateway Protocol (BGP) advertisement of Azure space in the first week of each month.
 
 ## Next steps
 
-- To get started using DSC in Azure Automation State Configuration, see [Get started with Azure Automation State Configuration](automation-dsc-getting-started.md).
-- To learn how to onboard nodes, see [Onboard machines for management by Azure Automation State Configuration](automation-dsc-onboarding.md).
-- To learn about compiling DSC configurations so that you can assign them to target nodes, see [Compile configurations in Azure Automation State Configuration](automation-dsc-compile.md).
-- For a PowerShell cmdlet reference, see [Az.Automation](https://docs.microsoft.com/powershell/module/az.automation/?view=azps-3.7.0#automation).
+- To get started using DSC in Azure Automation State Configuration, see [Getting started with Azure Automation State Configuration](automation-dsc-getting-started.md).
+- To learn how to onboard nodes, see [Onboarding machines for management by Azure Automation State Configuration](automation-dsc-onboarding.md).
+- To learn about compiling DSC configurations so that you can assign them to target nodes, see [Compiling configurations in Azure Automation State Configuration](automation-dsc-compile.md).
+- For a PowerShell cmdlet reference, see [Az.Automation](https://docs.microsoft.com/powershell/module/az.automation/?view=azps-3.7.0#automation
+).
 - For pricing information, see [Azure Automation State Configuration pricing](https://azure.microsoft.com/pricing/details/automation/).
-- For an example of using Azure Automation State Configuration in a continuous deployment pipeline, see [Continuous deployment to virtual machines using Azure Automation State Configuration and Chocolatey](automation-dsc-cd-chocolatey.md).
+- To see an example of using Azure Automation State Configuration in a continuous deployment pipeline, see [Continuous deployment using Azure Automation State Configuration and Chocolatey](automation-dsc-cd-chocolatey.md).

articles/automation/automation-dsc-overview.md

@@ -40,10 +40,9 @@ Update-DscConfiguration -Wait -Verbose
 
 Similar functionality isn't currently available for Linux servers.
 The only option is to repeat the registration process.
-
 For Azure nodes, you can correct drift from the Azure portal
 or using Az module cmdlets. Details about this process are documented in 
-[Onboarding machines for management by Azure Automation State Configuration](automation-dsc-onboarding.md#onboard-vms-by-using-the-azure-portal).
+[Onboarding machines for management by Azure Automation State Configuration](automation-dsc-onboarding.md#onboard-a-vm-using-azure-portal).
 For hybrid nodes, you can correct drift using the included Python scripts.
 See [PowerShell DSC for Linux repo](https://github.com/Microsoft/PowerShell-DSC-for-Linux#performing-dsc-operations-from-the-linux-computer).
 

articles/automation/automation-dsc-remediate.md

@@ -62,7 +62,7 @@ sudo python onboarding.py --deregister --endpoint="<URL>" --key="<PrimaryAccessK
 ```
 
 > [!NOTE]
-> This code doesn't remove the Microsoft Monitoring Agent from the computer. It only removes the functionality and configuration of the Hybrid Runbook Worker role.
+> This code doesn't remove the Log Analytics agent for Linux from the computer. It only removes the functionality and configuration of the Hybrid Runbook Worker role.
 
 ## Remove a Hybrid Worker group
 
@@ -83,7 +83,7 @@ To remove a Hybrid Runbook Worker group, you first need to remove the Hybrid Run
 
 ### Hybrid Worker role
 
-For the Hybrid Runbook Worker to connect to and register with Azure Automation, it must have access to the port number and the URLs that are described in this section. This access is on top to the [ports and URLs required for Microsoft Monitoring Agent](../azure-monitor/platform/agent-windows.md) to connect to Azure Monitor logs.
+For the Hybrid Runbook Worker to connect to and register with Azure Automation, it must have access to the port number and the URLs that are described in this section. This access is on top to the [ports and URLs required for Log Analytics agent](../azure-monitor/platform/agent-windows.md) to connect to Azure Monitor logs.
 
 [!INCLUDE [azure-monitor-log-analytics-rebrand](../../includes/azure-monitor-log-analytics-rebrand.md)]
 

articles/automation/automation-hybrid-runbook-worker.md

@@ -70,7 +70,7 @@ Before you proceed, note the Log Analytics workspace that your Automation accoun
 
 1. Enable the Automation Hybrid Worker solution in Azure by using one of the following methods:
 
-   * Add the Automation Hybrid Worker solution to your subscription by using the procedure at [Add Azure Monitor logs solutions to your workspace](../log-analytics/log-analytics-add-solutions.md).
+   * Add the Automation Hybrid Worker solution to your subscription by using the procedure at [Add Azure Monitor log solutions to your workspace](../log-analytics/log-analytics-add-solutions.md).
    * Run the following cmdlet:
 
         ```azurepowershell-interactive