Merge pull request #111832 from BethWilke/branch123

Fixing task 1707222

Author: megvanhuygen

articles/automation/change-tracking-file-contents.md

@@ -1,6 +1,6 @@
 ---
 title: View file content changes with Azure Automation
-description: Use the file content change feature of Change tracking to view the contents of a file that has changed.
+description: Use the file content change feature of Change Tracking to view the contents of a file that has changed.
 services: automation
 ms.subservice: change-inventory-management
 ms.date: 07/03/2018
@@ -14,9 +14,9 @@ File content tracking allows you to view the contents of a file before and after
 
 * A standard storage account using the Resource Manager deployment model is required for storing file content. Premium and classic deployment model storage accounts should not be used. For more information on storage accounts, see [About Azure storage accounts](../storage/common/storage-create-storage-account.md)
 
-* The storage account used can only have 1 Automation Account connected.
+* The storage account used can only have 1 Automation account connected.
 
-* [Change Tracking](automation-change-tracking.md) is enabled in your Automation Account.
+* [Change Tracking](automation-change-tracking.md) is enabled in your Automation account.
 
 ## Enable file content tracking
 
@@ -38,19 +38,19 @@ File content tracking allows you to view the contents of a file before and after
 
 The following steps walk you through turning on change tracking for a file:
 
-1. On the **Edit Settings** page of **Change Tracking**, select either **Windows Files** or **Linux Files** tab, and click **Add**
+1. On the Edit Settings page of **Change Tracking**, select either the **Windows Files** or the **Linux Files** tab, and click **Add**
 
-1. Fill out the information for the file path and select **True** under **Upload file content for all settings**. This setting enables file content tracking for that file path only.
+1. Fill out the information for the file path and select True under **Upload file content for all settings**. This setting enables file content tracking for that file path only.
 
    ![add a linux file](./media/change-tracking-file-contents/add-linux-file.png)
 
 ## Viewing the contents of a tracked file
 
-1. Once a change has been detected for the file or a file in the path, it shows in the portal. Select the file change from the list of changes. The **Change details** pane is displayed.
+1. Once a change has been detected for the file or a file in the path, it shows in the portal. Select the file change from the list of changes. The Change details pane is displayed.
 
    ![list changes](./media/change-tracking-file-contents/change-list.png)
 
-1. On the **Change details** page, you see the standard before and after file information, in the top left, click **View File Content Changes** to see the contents of the file.
+1. On the Change details pane, you see the standard before and after file information. Select **View File Content Changes** to see the contents of the file.
 
    ![change details](./media/change-tracking-file-contents/change-details.png)
 

articles/automation/change-tracking.md

@@ -1,58 +1,46 @@
 ---
-title: Composing DSC Configurations in Azure Automation State Configuration (DSC) using Composite Resources
-description: Learn how to compose configurations using composite resources in Azure Automation State Configuration (DSC)
+title: Composing DSC configurations in Azure Automation State Configuration using composite resources
+description: Learn how to compose configurations using composite resources in Azure Automation State Configuration.
 keywords: powershell dsc, desired state configuration, powershell dsc azure, composite resources
 services: automation
 ms.subservice: dsc
 ms.date: 08/21/2018
 ms.topic: conceptual
 ---
-# Composing DSC Configurations in Azure Automation State Configuration (DSC) using Composite Resources
+# Composing DSC configurations in Azure Automation State Configuration using composite resources
 
-When a resource needs to be managed with more than a single desired state configuration (DSC)
-configuration, the best path is to use [composite
-resources](/powershell/scripting/dsc/resources/authoringresourcecomposite). A composite resource is a nested and
-parameterized configuration being used as a DSC resource within another configuration. This allows
-the creation of complex configurations while allowing the underlying composite resources
-(parameterized configurations) to be individually managed and built.
+When you need to manage resource with more than a single desired state configuration (DSC), the best path is to use [composite resources](/powershell/scripting/dsc/resources/authoringresourcecomposite). A composite resource is a nested and parameterized configuration being used as a DSC resource within another configuration. Use of composite resources allows you to create complex configurations while allowing the underlying composite resources to be individually managed and built.
 
-Azure Automation enables the [import and compilation of composite
-resources](automation-dsc-compile.md).
-Once composite resources have been
-imported into your Automation account, you are able to use the **Compose configuration** experience
-in the **State Configuration (DSC)** page.
+Azure Automation enables the [import and compilation of composite resources](automation-dsc-compile.md). Once you've imported composite resources into your Automation account, you can use Azure Automation State Configuration through the **State Configuration (DSC** feature in the Azure portal.
 
 ## Composing a configuration from composite resources
 
 Before you can assign a configuration made from composite resources in the Azure portal, you must
-compose it. This can be done using **Compose configuration** on the **State Configuration (DSC)**
-page while on either the **Configurations** or **Compiled configurations** tabs.
+compose the configuration. Composition uses **Compose configuration** on the State Configuration (DSC)
+page while on either the **Configurations** or the **Compiled configurations** tab.
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. On the left, click **All resources** and then the name of your Automation account.
-1. On the **Automation account** page, select **State configuration (DSC)** under **Configuration Management**.
-1. On the **State configuration (DSC)** page, click either the **Configurations** or **Compiled configurations** tab, then click **Compose configuration** in the menu at the top of the page.
-1. On the **Basics** step, provide the new configuration name (required) and click anywhere on the row of each composite resource that you want to include in your new configuration, then click **Next** or click the **Source code** step. For the following steps, we selected **PSExecutionPolicy** and **RenameAndDomainJoin** composite resources.
+1. On the Automation account page, select **State configuration (DSC)** under **Configuration Management**.
+1. On the State configuration (DSC) page, click either the **Configurations** or the **Compiled configurations** tab, then click **Compose configuration** in the menu at the top of the page.
+1. On the **Basics** step, provide the new configuration name (required) and click anywhere on the row of each composite resource that you want to include in your new configuration, then click **Next** or click the **Source code** step. For the following steps, we selected `PSExecutionPolicy` and `RenameAndDomainJoin` composite resources.
    ![Screenshot of the basics step of the compose configuration page](./media/compose-configurationwithcompositeresources/compose-configuration-basics.png)
 1. The **Source code** step shows what the composed configuration of the selected composite resources looks like. You can see the merging of all parameters and how they are passed to the composite resource. When you are done reviewing the new source code, click **Next** or click the **Parameters** step.
    ![Screenshot of the source code step of the compose configuration page](./media/compose-configurationwithcompositeresources/compose-configuration-sourcecode.png)
-1. On the **Parameters** step, the parameter that each composite resource has is exposed so that they can be provided. If a parameter has a description, it is displayed next to the parameter field. If a field is a **PSCredential** type parameter, the drop-down to configure provides a list of **Credential** objects in the current Automation account. A **+ Add a credential** option is also available. Once all required parameters have been provided, click **Save and compile**.
+1. On the **Parameters** step, the parameter for each composite resource is exposed so that values can be provided. If a parameter has a description, it is displayed next to the parameter field. If a parameter is of `PSCredential` type, the dropdown provides a list of **Credential** objects in the current Automation account. A **+ Add a credential** option is also available. Once all required parameters have been provided, click **Save and compile**.
    ![Screenshot of the parameters step of the compose configuration page](./media/compose-configurationwithcompositeresources/compose-configuration-parameters.png)
 
 Once the new configuration is saved, it is submitted for compilation. Status of the
 compilation job can be viewed like any imported configuration. For more information, see [Viewing a
 compilation job](automation-dsc-getting-started.md#viewing-a-compilation-job).
 
-When compilation has completed successfully, the new configuration appears in the **Compiled
-configurations** tab. Once it is visible in this tab, it can be assigned to a managed node using
-the steps in [Reassigning a node to a different node
-configuration](automation-dsc-getting-started.md#reassigning-a-node-to-a-different-node-configuration).
+When compilation has completed successfully, the new configuration appears in the **Compiled configurations** tab. Then you can assign the configuration to a managed node, using the steps in [Reassigning a node to a different node configuration](automation-dsc-getting-started.md#reassigning-a-node-to-a-different-node-configuration).
 
 ## Next steps
 
-- To get started, 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 PowerShell cmdlet reference, see [Azure Automation State Configuration cmdlets](/powershell/module/azurerm.automation/#automation)
-- For pricing information, see [Azure Automation State Configuration pricing](https://azure.microsoft.com/pricing/details/automation/)
-- 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)
+- To get started, 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 PowerShell cmdlet reference, see [Azure Automation State Configuration cmdlets](/powershell/module/azurerm.automation/#automation).
+- For pricing information, see [Azure Automation State Configuration pricing](https://azure.microsoft.com/pricing/details/automation/).
+- 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/compose-configurationwithcompositeresources.md

@@ -1,18 +1,19 @@
 ---
-title: Overview of the Azure Automation Grpahical runbook SDK
-description: This article describes how to use the Azure Automation Graphical Runbook SDK
+title: Use the Azure Automation graphical runbook SDK
+description: This article describes how to use the Azure Automation graphical runbook SDK.
 services: automation
 ms.subservice: process-automation
 ms.date: 07/20/2018
 ms.topic: conceptual
 ---
-# Use the Azure Automation Graphical runbook SDK
 
-[Graphical runbooks](automation-graphical-authoring-intro.md) are runbooks that help manage the complexities of the underlying Windows PowerShell or PowerShell Workflow code. The Microsoft Azure Automation Graphical Authoring SDK enables developers to create and edit Graphical Runbooks for use with the Azure Automation service. The following code snippets show the basic flow of creating a graphical runbook from your code.
+# Use the Azure Automation graphical runbook SDK
 
-## Pre-requisites
+[Graphical runbooks](automation-graphical-authoring-intro.md) help manage the complexities of the underlying Windows PowerShell or PowerShell Workflow code. The Microsoft Azure Automation graphical authoring SDK enables developers to create and edit graphical runbooks for use with Azure Automation. This article describes basic steps in creating a graphical runbook from your code.
 
-To start, import the `Microsoft.Azure.Automation.GraphicalRunbook.Model` package into your project.
+## Prerequisites
+
+Import the `Microsoft.Azure.Automation.GraphicalRunbook.Model` package into your project.
 
 ## Create a runbook object instance
 
@@ -83,7 +84,7 @@ var initializeRunbookVariable = runbook.AddActivity(
  });
 ```
 
-Activities are implemented by the following classes in the `Orchestrator.GraphRunbook.Model` namespace:
+Activities are implemented by the following classes in the `Orchestrator.GraphRunbook.Model` namespace.
 
 |Class  |Activity  |
 |---------|---------|
@@ -93,9 +94,9 @@ Activities are implemented by the following classes in the `Orchestrator.GraphRu
 |WorkflowScriptActivity     | Executes a block of PowerShell or PowerShell Workflow code (depending on the runbook type) in the context of the runbook. This is a powerful tool, but do not overuse it: the UI will show this script block as text; the execution engine will treat the provided block as a black box, and will make no attempts to analyze its content, except for a basic syntax check. If you just need to invoke a single PowerShell command, prefer CommandActivity.        |
 
 > [!NOTE]
-> Do not derive your own activities from the provided classes: Azure Automation will not be able to use runbooks with custom activity types.
+> Don't derive your own activities from the provided classes. Azure Automation can't use runbooks with custom activity types.
 
-CommandActivity and InvokeRunbookActivity parameters must be provided as value descriptors, not direct values. Value descriptors specify how the actual parameter values should be produced. The following value descriptors are currently provided:
+You must provide `CommandActivity` and `InvokeRunbookActivity` parameters as value descriptors, not direct values. Value descriptors specify how to produce the actual parameter values. The following value descriptors are currently provided:
 
 
 |Descriptor  |Definition  |
@@ -109,7 +110,7 @@ CommandActivity and InvokeRunbookActivity parameters must be provided as value d
 |PowerShellExpressionValueDescriptor     | Specifies a free-form PowerShell expression that will be evaluated just before invoking the activity.  <br/>This is a powerful tool, but do not overuse it: the UI will show this expression as text; the execution engine will treat the provided block as a black box, and will make no attempts to analyze its content, except for a basic syntax check. When possible, prefer more specific value descriptors.      |
 
 > [!NOTE]
-> Do not derive your own value descriptors from the provided classes: Azure Automation will not be able to use runbooks with custom value descriptor types.
+> Don't derive your own value descriptors from the provided classes. Azure Automation can't use runbooks with custom value descriptor types.
 
 Instantiate links connecting activities and add them to the runbook:
 
@@ -130,10 +131,9 @@ Use `Orchestrator.GraphRunbook.Model.Serialization.RunbookSerializer` to seriali
 var serialized = RunbookSerializer.Serialize(runbook);
 ```
 
-This string can be saved to a file with the **.graphrunbook** extension, and this file can be imported into Azure Automation.
-The serialized format may change in the future versions of `Orchestrator.GraphRunbook.Model.dll`. We promise backward compatibility: any runbook serialized with an older version of `Orchestrator.GraphRunbook.Model.dll` can be deserialized by any newer version. Forward compatibility is not guaranteed: a runbook serialized with a newer version may not be deserializable by older versions.
+You can save this string to a file with the **.graphrunbook** extension. The corresponding runbook can be imported into Azure Automation.
+The serialized format might change in the future versions of `Orchestrator.GraphRunbook.Model.dll`. We promise backward compatibility: any runbook serialized with an older version of `Orchestrator.GraphRunbook.Model.dll` can be deserialized by any newer version. Forward compatibility is not guaranteed: a runbook serialized with a newer version may not be deserializable by older versions.
 
 ## Next steps
 
-To learn more about Graphical Runbooks in Azure Automation, see [Graphical Authoring introduction](automation-graphical-authoring-intro.md)
-
+To learn more about graphical runbooks in Azure Automation, see [Graphical authoring introduction](automation-graphical-authoring-intro.md).