incorporate Angel's comments

Author: mumian

.openpublishing.redirection.json

@@ -3746,6 +3746,11 @@
       "redirect_url": "/azure/azure-portal/azure-portal-dashboards",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-resource-manager/templates/template-tutorial-use-azure-pipelines.md",
+      "redirect_url": "/azure/azure-resource-manager/templates/deployment-tutorial-pipeline.md",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/azure-resource-manager/azure-resource-manager-security-controls.md",
       "redirect_url": "/azure/azure-resource-manager/management/azure-resource-manager-security-controls",

articles/azure-resource-manager/templates/deployment-script-template.md

@@ -40,7 +40,7 @@ The benefits of deployment script:
 - **A user-assigned managed identity with the contributor's role to the target resource-group**. This identity is used to execute deployment scripts. To perform operations outside of the resource group, you need to grant additional permissions. For example, assign the identity to the subscription level if you want to create a new resource group.
 
   > [!NOTE]
-  > The deployment script engine needs to create a storage account and a container instance in the background.  A user-assigned managed identity with the contributor’s role at the subscription level is required if the subscription has not registered the Azure storage account (Microsoft.Storage) and Azure container instance (Microsoft.ContainerInstance) resource providers.
+  > The deployment script engine needs to create a storage account and a container instance in the background.  A user-assigned managed identity with the contributor's role at the subscription level is required if the subscription has not registered the Azure storage account (Microsoft.Storage) and Azure container instance (Microsoft.ContainerInstance) resource providers.
 
   To create an identity, see [Create a user-assigned managed identity by using the Azure portal](../../active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-portal.md), or [by using Azure CLI](../../active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-cli.md), or [by using Azure PowerShell](../../active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-powershell.md). You need the identity ID when you deploy the template. The format of the identity is:
 
@@ -211,7 +211,7 @@ reference('<ResourceName>').output.text
 
 Different from the PowerShell deployment script, CLI/bash support does not expose a common variable to store script outputs, instead, there is an environment variable called **AZ_SCRIPTS_OUTPUT_PATH** that stores the location where the script outputs file resides. If a deployment script is run from a Resource Manager template, this environment variable is set automatically for you by the Bash shell.
 
-Deployment script outputs must be saved in the AZ_SCRIPTS_OUTPUT_PATH location, and the outputs must be a valid JSON string object. The contents of the file must be saved as a key-value pair. For example, an array of strings is stored as { “MyResult”: [ “foo”, “bar”] }.  Storing just the array results, for example [ “foo”, “bar” ], is invalid.
+Deployment script outputs must be saved in the AZ_SCRIPTS_OUTPUT_PATH location, and the outputs must be a valid JSON string object. The contents of the file must be saved as a key-value pair. For example, an array of strings is stored as { "MyResult": [ "foo", "bar"] }.  Storing just the array results, for example [ "foo", "bar" ], is invalid.
 
 [!code-json[](~/resourcemanager-templates/deployment-script/deploymentscript-basic-cli.json?range=1-44)]
 

articles/azure-resource-manager/templates/deployment-tutorial-linked-template.md

@@ -8,7 +8,7 @@ ms.author: jgao
 
 # Tutorial: Deploy a linked template
 
-In the [previous tutorials](./deployment-tutorial-local-template.md), you learned how to deploy a template that is stored in your local computer. To deploy complex solutions, you can break a template into many templates, and deploy these templates through a main template. In this tutorial, you learn how to deploy a main template and a linked template. You also learn how to secure the linked template by using SAS token. It takes about **12 minutes** to complete.
+In the [previous tutorials](./deployment-tutorial-local-template.md), you learned how to deploy a template that is stored in your local computer. To deploy complex solutions, you can break a template into many templates, and deploy these templates through a main template. In this tutorial, you learn how to deploy a main template that contains the reference to a linked template. When the main template get deployed, it triggers the deployment of the linked template. You also learn how to store and secure the linked template by using SAS token. It takes about **12 minutes** to complete.
 
 ## Prerequisites
 

articles/azure-resource-manager/templates/deployment-tutorial-pipeline.md

@@ -32,7 +32,7 @@ If you don't have an Azure subscription, [create a free account](https://azure.m
 
 To complete this article, you need:
 
-* **A GitHub account**, where you use it to create a repository for your templates. If you don’t have one, you can [create one for free](https://github.com). For more information about using GitHub repositories, see [Build GitHub repositories](/azure/devops/pipelines/repos/github).
+* **A GitHub account**, where you use it to create a repository for your templates. If you don't have one, you can [create one for free](https://github.com). For more information about using GitHub repositories, see [Build GitHub repositories](/azure/devops/pipelines/repos/github).
 * **Install Git**. This tutorial instruction uses *Git Bash* or *Git Shell*. For instructions, see [Install Git]( https://www.atlassian.com/git/tutorials/install-git).
 * **An Azure DevOps organization**. If you don't have one, you can create one for free. See [Create an organization or project collection]( https://docs.microsoft.com/azure/devops/organizations/accounts/create-organization?view=azure-devops).
 * (optional) **Visual Studio Code with Resource Manager Tools extension**. See [Use Visual Studio Code to create Azure Resource Manager templates](use-vs-code-to-create-template.md).
@@ -43,7 +43,7 @@ GitHub is used to store your project source code including Resource Manager temp
 
 ### Create a GitHub repository
 
-If you don’t have a GitHub account, see [Prerequisites](#prerequisites).
+If you don't have a GitHub account, see [Prerequisites](#prerequisites).
 
 1. Sign in to [GitHub](https://github.com).
 1. Select your account image on the upper right corner, and then select **Your repositories**.
@@ -98,7 +98,7 @@ The azuredeploy.json has been added to the local repository. Next, you upload th
 
     ```bash
     git add .
-    git commit -m “Add web app templates.”
+    git commit -m "Add web app templates."
     git push origin master
     ```
 
@@ -112,7 +112,7 @@ So far, you have created a GitHub repository, and uploaded the templates to the
 
 ## Create a DevOps project
 
-A DevOps organization is needed before you can proceed to the next procedure.  If you don’t have one, see [Prerequisites](#prerequisites).
+A DevOps organization is needed before you can proceed to the next procedure.  If you don't have one, see [Prerequisites](#prerequisites).
 
 1. Sign in to [Azure DevOps](https://dev.azure.com).
 1. Select a DevOps organization from the left.
@@ -179,6 +179,8 @@ To create a pipeline with a step to deploy a template:
     * **Deployment mode**: Select **Incremental**.
     * **Deployment name**: Enter **DeployPipelineTemplate**. Select **Advanced** before you can see **Deployment name**.
 
+    ![Azure Resource Manager Azure DevOps Azure Pipelines step](./media/deployment-tutorial-pipeline/resource-manager-template-pipeline-configure.png)
+
 1. Select **Add**.
 
     For more information about the task, see [Azure Resource Group Deployment task](/azure/devops/pipelines/tasks/deploy/azure-resource-group-deployment), and [Azure Resource Manager template deployment task](https://github.com/microsoft/azure-pipelines-tasks/blob/master/Tasks/AzureResourceManagerTemplateDeploymentV3/README.md)
@@ -188,7 +190,7 @@ To create a pipeline with a step to deploy a template:
     ![Azure Resource Manager Azure DevOps Azure Pipelines yaml](./media/deployment-tutorial-pipeline/azure-resource-manager-devops-pipelines-yml.png)
 
 1. Select **Save and run**.
-1. Select **Save and run** again. A copy of the YAML file is saved into the connected repository. You can see the YAML file by browse to your repository.
+1. From the **Save and run** pane, select **Save and run** again. A copy of the YAML file is saved into the connected repository. You can see the YAML file by browse to your repository.
 1. Verify that the pipeline is executed successfully.
 
     ![Azure Resource Manager Azure DevOps Azure Pipelines yaml](./media/deployment-tutorial-pipeline/azure-resource-manager-devops-pipelines-status.png)
@@ -215,13 +217,13 @@ When you update the template and push the changes to the remote repository, the
     ```bash
     git pull origin master
     git add .
-    git commit -m “Update the storage account type.”
+    git commit -m "Update the storage account type."
     git push origin master
     ```
 
-    The first command syncs the local repository with the remote repository. Remember the pipeline YAML file was added to the remote repository.
+    The first command (pull) syncs the local repository with the remote repository. The pipeline YAML file was only added to the remote repository. Running the pull command downloads a copy of the YAML file to the local branch.
 
-    With the master branch of the remote repository updated, the pipeline is fired again.
+    The fourth command (push) uploads the revised linkedStorageAccount.json file to the remote repository. With the master branch of the remote repository updated, the pipeline is fired again.
 
 To verify the changes, you can check the Replication property of the storage account.  See [Verify the deployment](#verify-the-deployment).
 

articles/azure-resource-manager/templates/media/deployment-tutorial-pipeline/resource-manager-template-pipeline-configure.png

@@ -9,7 +9,7 @@ ms.author: jgao
 
 # Tutorial: Secure artifacts in Azure Resource Manager template deployments
 
-Learn how to secure the artifacts used in your Azure Resource Manager templates by using an Azure Storage account with shared access signatures (SAS). Deployment artifacts are any files, in addition to the main template file, that are needed to complete a deployment. For example, in [Tutorial: Import SQL BACPAC files with Azure Resource Manager templates](./template-tutorial-deploy-sql-extensions-bacpac.md), the main template creates an Azure SQL Database instance. It also calls a BACPAC file to create tables and insert data. The BACPAC file is an artifact and is stored in an Azure Storage account. A storage account key was used to access the artifact. 
+Learn how to secure the artifacts used in your Azure Resource Manager templates by using an Azure Storage account with shared access signatures (SAS). Deployment artifacts are any files, in addition to the main template file, that are needed to complete a deployment. For example, in [Tutorial: Import SQL BACPAC files with Azure Resource Manager templates](./template-tutorial-deploy-sql-extensions-bacpac.md), the main template creates an Azure SQL Database instance. It also calls a BACPAC file to create tables and insert data. The BACPAC file is an artifact and is stored in an Azure Storage account. A storage account key was used to access the artifact.
 
 In this tutorial, you use SAS to grant limited access to the BACPAC file in your own Azure Storage account. For more information about SAS, see [Using shared access signatures (SAS)](../../storage/common/storage-dotnet-shared-access-signature-part-1.md).
 
@@ -133,7 +133,7 @@ In this session, you modify the template you created in [Tutorial: Import SQL BA
 
 ## Edit the template
 
-1. Replace the storageAccountKey parameter definition with the following parameter definition: 
+1. Replace the storageAccountKey parameter definition with the following parameter definition:
 
     ```json
         "_artifactsLocationSasToken": {
@@ -206,7 +206,7 @@ When the Azure resources are no longer needed, clean up the resources you deploy
 
 ## Next steps
 
-In this tutorial, you deployed a SQL server and a SQL database and imported a BACPAC file by using an SAS token. To learn how to create an Azure pipeline to continuously develop and deploy Resource Manager templates, see:
+In this tutorial, you deployed a SQL server and a SQL database and imported a BACPAC file by using an SAS token. To learn how to deploy Azure resources across multiple regions, and how to use safe deployment practices, see
 
 > [!div class="nextstepaction"]
-> [Continuous integration with Azure Pipeline](./template-tutorial-use-azure-pipelines.md)
+> [Use safe deployment practices](./deployment-manager-tutorial.md)

articles/azure-resource-manager/templates/template-tutorial-secure-artifacts.md

@@ -131,7 +131,7 @@ You can verify the deployment by exploring the resource groups from the Azure po
 
 Congratulations, you've finished this introduction to deploying templates to Azure. Let us know if you have any comments and suggestions in the feedback section. Thanks!
 
-You're ready to jump into more advanced concepts about templates. The next tutorial goes into more detail about using template reference documentation to help with defining resources to deploy.
+The next tutorial series goes into more detail about deploying templates.
 
 > [!div class="nextstepaction"]
-> [Utilize template reference](template-tutorial-create-encrypted-storage-accounts.md)
+> [Deploy a local template](./deployment-tutorial-local-template.md)

articles/azure-resource-manager/templates/template-tutorial-use-parameter-file.md

@@ -41,6 +41,7 @@
     - name: 2 - Deploy a linked template
       href: deployment-tutorial-linked-template.md
     - name: 3 - Create a pipeline
+      displayName: Devop
       href: deployment-tutorial-pipeline.md
   - name: Advanced
     items:
@@ -69,9 +70,6 @@
       href: template-tutorial-deploy-sql-extensions-bacpac.md
     - name: Secure artifacts
       href: template-tutorial-secure-artifacts.md
-    - name: Continuous integration with Azure Pipelines
-      displayName: DevOps
-      href: template-tutorial-use-azure-pipelines.md
     - name: Use safe deployment practices
       displayName: adm
       href: deployment-manager-tutorial.md