Second pass

Author: DCtheGeek

Diff for: articles/automation/automation-create-alert-triggered-runbook.md

@@ -39,7 +39,7 @@ As described in the preceding section, each type of alert has a different schema
 
 This example uses an alert from a VM. It retrieves the VM data from the payload, and then uses that information to stop the VM. The connection must be set up in the Automation account where the runbook is run. When using alerts to trigger runbooks, it is important to check the alert status in the runbook that is triggered. The runbook triggers each time the alert changes state. Alerts have multiple states, with the two most common being Activated and Resolved. Check for state in your runbook logic to ensure that the runbook does not run more than once. The example in this article shows how to look for alerts with state Activated only.
 
-The runbook uses the connection asset `AzureRunAsConnection` [Run As account](automation-create-runas-account.md) to authenticate with Azure to perform the management action against the VM.
+The runbook uses the connection asset `AzureRunAsConnection` [Run As account](./manage-runas-account.md) to authenticate with Azure to perform the management action against the VM.
 
 Use this example to create a runbook called **Stop-AzureVmInResponsetoVMAlert**. You can modify the PowerShell script, and use it with many different resources.
 
@@ -186,7 +186,7 @@ Alerts use action groups, which are collections of actions that are triggered by
 ## Next steps
 
 * To start a runbook using a webhook, see [Start a runbook from a webhook](automation-webhooks.md).
-* To discover different ways to start a runbook, see [Start a runbook](automation-starting-a-runbook.md).
+* To discover different ways to start a runbook, see [Start a runbook](./start-runbooks.md).
 * To create an activity log alert, see [Create activity log alerts](../azure-monitor/platform/activity-log-alerts.md?toc=%2fazure%2fautomation%2ftoc.json).
 * To learn how to create a near real-time alert, see [Create an alert rule in the Azure portal](../azure-monitor/platform/alerts-metric.md?toc=/azure/azure-monitor/toc.json).
 * For a PowerShell cmdlet reference, see [Az.Automation](/powershell/module/az.automation/?view=azps-3.7.0#automation).

Diff for: articles/automation/automation-deploy-template-runbook.md

@@ -10,9 +10,9 @@ keywords: powershell,  runbook, json, azure automation
 
 # Deploy an Azure Resource Manager template in a PowerShell runbook
 
-You can write an [Azure Automation PowerShell runbook](automation-first-runbook-textual-powershell.md)
+You can write an [Azure Automation PowerShell runbook](./learn/automation-tutorial-runbook-textual-powershell.md)
 that deploys an Azure resource by using an 
-[Azure Resource Management template](../azure-resource-manager/resource-manager-create-first-template.md). Use of the template allows you to use Azure Automation and Azure Storage to automate deployment of your Azure resources. You can maintain your Resource Manager
+[Azure Resource Management template](../azure-resource-manager/templates/quickstart-create-templates-use-the-portal.md). Use of the template allows you to use Azure Automation and Azure Storage to automate deployment of your Azure resources. You can maintain your Resource Manager
 templates in a central, secure location, such as Azure Storage.
 
 In this article, we create a PowerShell runbook that uses a Resource Manager template stored in
@@ -21,8 +21,8 @@ In this article, we create a PowerShell runbook that uses a Resource Manager tem
 ## Prerequisites
 
 * Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or [sign up for a free account](https://azure.microsoft.com/free/).
-* [Automation account](automation-sec-configure-azure-runas-account.md) to hold the runbook and authenticate to Azure resources.  This account must have permission to start and stop the virtual machine.
-* [Azure Storage account](../storage/common/storage-create-storage-account.md) in which to store the Resource Manager template
+* [Automation account](./manage-runas-account.md) to hold the runbook and authenticate to Azure resources.  This account must have permission to start and stop the virtual machine.
+* [Azure Storage account](../storage/common/storage-account-create.md) in which to store the Resource Manager template
 * Azure PowerShell installed on a local machine. See [Install the Azure PowerShell Module](/powershell/azure/install-az-ps?view=azps-3.5.0) for information about how to get Azure PowerShell.
 
 ## Create the Resource Manager template
@@ -198,7 +198,7 @@ Publish-AzAutomationRunbook @publishParams
 Now we start the runbook by calling the 
 [Start-AzAutomationRunbook](/powershell/module/Az.Automation/Start-AzAutomationRunbook?view=azps-3.7.0)
 cmdlet. For information about how to start a runbook in the Azure portal, see
-[Starting a runbook in Azure Automation](automation-starting-a-runbook.md).
+[Starting a runbook in Azure Automation](./start-runbooks.md).
 
 Run the following commands in the PowerShell console:
 

Diff for: articles/automation/automation-dsc-compile.md

@@ -60,7 +60,7 @@ $CompilationJob | Get-AzAutomationDscCompilationJobOutput –Stream Any
 
 ### Declare basic parameters
 
-Parameter declaration in DSC configurations, including parameter types and properties, works the same as in Azure Automation runbooks. See [Starting a runbook in Azure Automation](automation-starting-a-runbook.md) to learn more about runbook parameters.
+Parameter declaration in DSC configurations, including parameter types and properties, works the same as in Azure Automation runbooks. See [Starting a runbook in Azure Automation](./start-runbooks.md) to learn more about runbook parameters.
 
 The following example uses `FeatureName` and `IsPresent` parameters to determine the values of properties in the **ParametersExample.sample** node configuration, generated during compilation.
 
@@ -184,10 +184,10 @@ Start-AzAutomationDscCompilationJob -ResourceGroupName 'MyResourceGroup' -Automa
 Asset references are the same in both Azure Automation State Configuration and runbooks. For more information, see the
 following:
 
-- [Certificates](automation-certificates.md)
+- [Certificates](./shared-resources/certificates.md)
 - [Connections](automation-connections.md)
-- [Credentials](automation-credentials.md)
-- [Variables](automation-variables.md)
+- [Credentials](./shared-resources/credentials.md)
+- [Variables](./shared-resources/variables.md)
 
 #### Credential assets
 

Diff for: articles/automation/automation-dsc-diagnostics.md

@@ -100,7 +100,7 @@ the alert rule.
    If you have set up logs from more than one Automation account or subscription to your workspace, you can group your alerts by subscription and Automation account. Derive the Automation account name from the `Resource` field in the search of the `DscNodeStatusData` records.
 1. To open the **Create rule** screen, click **New Alert Rule** at the top of the page. 
 
-For more information on the options to configure the alert, see [Create an alert rule](../monitoring-and-diagnostics/monitor-alerts-unified-usage.md).
+For more information on the options to configure the alert, see [Create an alert rule](../azure-monitor/platform/alerts-metric.md).
 
 ### Find failed DSC resources across all nodes
 
@@ -194,5 +194,5 @@ Azure Automation diagnostics create two categories of records in Azure Monitor l
 - For a PowerShell cmdlet reference, see [Az.Automation](/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/).
 - To see an example of using Azure Automation State Configuration in a continuous deployment pipeline, see [Set up continuous deployment with Chocolatey](automation-dsc-cd-chocolatey.md).
-- To learn more about how to construct different search queries and review the Automation State Configuration logs with Azure Monitor logs, see [Log searches in Azure Monitor logs](../log-analytics/log-analytics-log-searches.md).
-- To learn more about Azure Monitor logs and data collection sources, see [Collecting Azure storage data in Azure Monitor logs overview](../azure-monitor/platform/collect-azure-metrics-logs.md).
+- To learn more about how to construct different search queries and review the Automation State Configuration logs with Azure Monitor logs, see [Log searches in Azure Monitor logs](../azure-monitor/log-query/log-query-overview.md).
+- To learn more about Azure Monitor logs and data collection sources, see [Collecting Azure storage data in Azure Monitor logs overview](../azure-monitor/platform/resource-logs.md#collect-to-log-analytics-workspace).

Diff for: articles/automation/automation-dsc-getting-started.md

@@ -21,8 +21,8 @@ article, you can use the [Azure Automation Managed Node template](https://github
 
 To complete the examples in this article, the following are required:
 
-- An Azure Automation account. For instructions on creating an Azure Automation Run As account, see [Azure Run As Account](automation-sec-configure-azure-runas-account.md).
-- An Azure Resource Manager VM (not Classic) running a [supported operating system](automation-dsc-overview.md#operating-system-requirements). For instructions on creating a VM, see [Create your first Windows virtual machine in the Azure portal](../virtual-machines/virtual-machines-windows-hero-tutorial.md)
+- An Azure Automation account. For instructions on creating an Azure Automation Run As account, see [Azure Run As Account](./manage-runas-account.md).
+- An Azure Resource Manager VM (not Classic) running a [supported operating system](automation-dsc-overview.md#operating-system-requirements). For instructions on creating a VM, see [Create your first Windows virtual machine in the Azure portal](../virtual-machines/windows/quick-create-portal.md)
 
 ## Create a DSC configuration
 

Diff for: articles/automation/automation-edit-textual-runbook.md

@@ -51,7 +51,7 @@ This article provides detailed steps for performing different functions with thi
 1. In the Canvas control of the textual editor, position the cursor where you want to place the code for the child runbook.
 2. Expand the **Assets** node in the Library control.
 3. Expand the node for the desired asset type.
-4. Right-click the asset name to insert and select **Add to canvas**. For [variable assets](automation-variables.md), select either **Add "Get Variable" to canvas** or **Add "Set Variable" to canvas**, depending on whether you want to get or set the variable.
+4. Right-click the asset name to insert and select **Add to canvas**. For [variable assets](./shared-resources/variables.md), select either **Add "Get Variable" to canvas** or **Add "Set Variable" to canvas**, depending on whether you want to get or set the variable.
 5. Note that the code for the asset is inserted into the runbook.
 
 ## Edit an Azure Automation runbook using Windows PowerShell
@@ -90,9 +90,9 @@ Publish-AzAutomationRunbook -Name $runbookName -AutomationAccountName $automatio
 * [Manage runbooks in Azure Automation](manage-runbooks.md).
 * [Learning PowerShell workflow](automation-powershell-workflow.md).
 * [Graphical authoring in Azure Automation](automation-graphical-authoring-intro.md).
-* [Certificates](automation-certificates.md).
+* [Certificates](./shared-resources/certificates.md).
 * [Connections](automation-connections.md).
-* [Credentials](automation-credentials.md).
-* [Schedules](automation-schedules.md).
-* [Variables](automation-variables.md).
+* [Credentials](./shared-resources/credentials.md).
+* [Schedules](./shared-resources/schedules.md).
+* [Variables](./shared-resources/variables.md).
 * [PowerShell cmdlet reference](/powershell/module/az.automation/?view=azps-3.7.0#automation).

Diff for: articles/automation/automation-enable-changes-from-auto-acct.md

@@ -16,7 +16,7 @@ This article describes how you can use your Automation account to enable the [Ch
 ## Prerequisites
 
 * Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or sign up for a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
-* [Automation account](automation-offering-get-started.md) to manage machines.
+* [Automation account](./index.yml) to manage machines.
 * A [virtual machine](../virtual-machines/windows/quick-create-portal.md).
 
 ## Sign in to Azure
@@ -70,4 +70,4 @@ Manually installed machines or machines already reporting to your workspace must
 ## Next steps
 
 * To work with the feature, see [Manage Change Tracking and Inventory](change-tracking-file-contents.md).
-* To troubleshoot general problems with the feature, see [Troubleshoot Change Tracking and Inventory issues](troubleshoot/change-tracking.md).
+* To troubleshoot general problems with the feature, see [Troubleshoot Change Tracking and Inventory issues](troubleshoot/change-tracking.md).

Diff for: articles/automation/automation-enable-changes-from-browse.md

@@ -18,7 +18,7 @@ The number of resource groups that you can use for managing your VMs is limited
 ## Prerequisites
 
 * Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or sign up for a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
-* [Automation account](automation-offering-get-started.md) to manage machines.
+* [Automation account](./index.yml) to manage machines.
 * A [virtual machine](../virtual-machines/windows/quick-create-portal.md).
 
 ## Sign in to Azure
@@ -55,4 +55,4 @@ Sign in to Azure at https://portal.azure.com.
 ## Next steps
 
 * For details of working with the feature, see [Manage Change Tracking and Inventory](change-tracking-file-contents.md).
-* To troubleshoot general problems with the feature, see [Troubleshoot Change Tracking and Inventory issues](troubleshoot/change-tracking.md).
+* To troubleshoot general problems with the feature, see [Troubleshoot Change Tracking and Inventory issues](troubleshoot/change-tracking.md).

Diff for: articles/automation/automation-enable-changes-from-runbook.md

@@ -16,7 +16,7 @@ This article describes how you can use a runbook to enable the [Change Tracking
 ## Prerequisites
 
 * Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or sign up for a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
-* [Automation account](automation-offering-get-started.md) to manage machines.
+* [Automation account](./index.yml) to manage machines.
 * A [virtual machine](../virtual-machines/windows/quick-create-portal.md).
 
 ## Enable Change Tracking and Inventory 

Diff for: articles/automation/automation-enable-changes-from-vm.md

@@ -17,7 +17,7 @@ This article describes how you can use an Azure VM to enable the [Change Trackin
 ## Prerequisites
 
 * Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or sign up for a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
-* [Automation account](automation-offering-get-started.md) to manage machines.
+* [Automation account](./index.yml) to manage machines.
 * A [virtual machine](../virtual-machines/windows/quick-create-portal.md).
 
 ## Sign in to Azure

Diff for: articles/automation/automation-graphical-authoring-intro.md

@@ -367,7 +367,7 @@ The following example uses output from an activity called `Get Twitter Connectio
 
 ## Authenticate to Azure resources
 
-Runbooks in Azure Automation that manage Azure resources require authentication to Azure. The [Run As account](automation-create-runas-account.md), also referred to as a service principal, is the default mechanism that an Automation runbook uses to access Azure Resource Manager resources in your subscription. You can add this functionality to a graphical runbook by adding the `AzureRunAsConnection` connection asset, which uses the PowerShell [Get-AutomationConnection](/system-center/sma/manage-global-assets) cmdlet, to the canvas. You can also add the [Connect-AzAccount](/powershell/module/az.accounts/connect-azaccount) cmdlet. This scenario is illustrated in the following example.
+Runbooks in Azure Automation that manage Azure resources require authentication to Azure. The [Run As account](./manage-runas-account.md), also referred to as a service principal, is the default mechanism that an Automation runbook uses to access Azure Resource Manager resources in your subscription. You can add this functionality to a graphical runbook by adding the `AzureRunAsConnection` connection asset, which uses the PowerShell [Get-AutomationConnection](/system-center/sma/manage-global-assets) cmdlet, to the canvas. You can also add the [Connect-AzAccount](/powershell/module/az.accounts/connect-azaccount) cmdlet. This scenario is illustrated in the following example.
 
 ![Run As Authentication Activities](media/automation-graphical-authoring-intro/authenticate-run-as-account.png)
 
@@ -384,7 +384,7 @@ The next activity, `Connect-AzAccount`, adds the authenticated Run As account fo
 
 For the parameter fields **APPLICATIONID**, **CERTIFICATETHUMBPRINT**, and **TENANTID**, specify the name of the property for the field path, since the activity outputs an object with multiple properties. Otherwise, when the runbook executes, it fails while attempting to authenticate. This is what you need at a minimum to authenticate your runbook with the Run As account.
 
-Some subscribers create an Automation account using an [Azure AD user account](automation-create-aduser-account.md) to manage Azure classic deployment or for Azure Resource Manager resources. To maintain backward compatibility for these subscribers, the authentication mechanism to use in your runbook is the `Add-AzureAccount` cmdlet with a [credential asset](automation-credentials.md). The asset represents an Active Directory user with access to the Azure account.
+Some subscribers create an Automation account using an [Azure AD user account](./shared-resources/credentials.md) to manage Azure classic deployment or for Azure Resource Manager resources. To maintain backward compatibility for these subscribers, the authentication mechanism to use in your runbook is the `Add-AzureAccount` cmdlet with a [credential asset](./shared-resources/credentials.md). The asset represents an Active Directory user with access to the Azure account.
 
 You can enable this functionality for your graphical runbook by adding a credential asset to the canvas, followed by an `Add-AzureAccount` activity that uses the credential asset for its input. See the following example.