changes

Author: v-thepet

articles/devtest-labs/TOC.yml

@@ -8,7 +8,7 @@
   items:
   - name: Create a lab - Portal
     href: devtest-lab-create-lab.md
-  - name: Create a lab - Resource Manager template
+  - name: Create a lab - ARM template
     displayName: Resource Manager
     href: create-lab-windows-vm-template.md
   - name: Create a lab - REST API
@@ -21,7 +21,7 @@
     href: tutorial-use-custom-lab.md
 - name: Samples
   items:
-  - name: Resource Manager templates
+  - name: Quickstart ARM templates
     href: https://github.com/Azure/azure-devtestlab/tree/master/samples/DevTestLabs/QuickStartTemplates
   - name: Azure PowerShell
     href: samples-powershell.md
@@ -77,7 +77,7 @@
     items:
     - name: Create a network isolated lab
       href: network-isolation.md
-    - name: Create or modify labs using Resource Manager template
+    - name: Create and manage labs by using ARM templates
       href: devtest-lab-use-arm-and-powershell-for-lab-resources.md
     - name: Specify resource group for lab virtual machines
       href: resource-group-control.md
@@ -137,7 +137,7 @@
         href: devtest-lab-vm-powershell.md
       - name: Azure CLI
         href: devtest-lab-vmcli.md
-      - name: Resource Manager template
+      - name: ARM template
         href: devtest-lab-use-resource-manager-template.md
       - name: Create a VM using an image from shared image gallery
         href: add-vm-use-shared-image.md
@@ -173,16 +173,12 @@
       href: enable-managed-identities-lab-vms.md
   - name: Use environments in a lab
     items:
-    - name: Create an environment
+    - name: Create and configure environments
       href: devtest-lab-create-environment-from-arm.md
     - name: Use Platform-as-a-Service (PaaS) services
       href: use-paas-services.md
-    - name: Public environments
-      items:
-      - name: Configure and use public environments
-        href: devtest-lab-configure-use-public-environments.md
-      - name: Create an environment with Service Fabric cluster
-        href: create-environment-service-fabric-cluster.md
+    - name: Create a Service Fabric cluster environment
+      href: create-environment-service-fabric-cluster.md
     - name: Connect an environment to your lab's virtual network
       href: connect-environment-lab-virtual-network.md
     - name: Configure test environments with nested templates
@@ -197,10 +193,8 @@
     items:
     - name: Custom images vs. formulas
       href: devtest-lab-comparing-vm-base-image-types.md
-    - name: Manage environment templates
-      items:
-      - name: Add a Git repository for artifacts and templates
-        href: devtest-lab-add-artifact-repo.md
+    - name: Add a Git repository for artifacts and templates
+      href: devtest-lab-add-artifact-repo.md
     - name: Manage custom images
       items:
       - name: Create custom image from a VM

articles/devtest-labs/devtest-lab-create-environment-from-arm.md

@@ -13,7 +13,9 @@ Azure multi-tier web apps or SharePoint farms use multiple virtual machines (VMs
 
 Multi-VM ARM environment templates use the [Microsoft.Compute/virtualmachines](/azure/templates/microsoft.compute/virtualmachines) resource type. Lab users can use the templates to easily and consistently deploy multiple VMs with preinstalled resources as a single environment. The VMs created with this resource type appear under their environments in the lab's **My environments** list.
 
-You can configure DevTest Labs to load ARM environment templates directly from public or private Git source control repositories. Lab users can then create environments by selecting the templates in the Azure portal, just as they can select individual [VM base images](devtest-lab-comparing-vm-base-image-types.md) to create VMs.
+![Screenshot that shows V Ms in an environment.](./media/devtest-lab-create-environment-from-arm/environment.png)
+
+You can configure DevTest Labs to load ARM environment templates directly from public or private Git source control repositories. Lab users can then create environments by selecting the templates in the Azure portal, just as they select individual [VM base images](devtest-lab-comparing-vm-base-image-types.md) to create VMs.
 
 VMs in the same environment share the same lifecycle, and lab users can manage the VMs together. You can track the cost of lab environments and PaaS resources, just as you track costs for individual lab VMs.
 
@@ -33,7 +35,7 @@ Azure DevTest Labs has a [public ARM template repository](https://github.com/Azu
 
 You can use the public environment templates as-is, or customize them to suit your needs. To suggest revisions or additions to the public templates, submit pull requests against the open-source [GitHub public template repository](https://github.com/Azure/azure-devtestlab/tree/master/Environments) 
 
-You can also [store environment templates in your own Git repositories](devtest-lab-use-resource-manager-template.md#store-arm-templates-in-git-repositories), and [connect those repositories to your lab](devtest-lab-use-resource-manager-template.md#add-template-repositories-to-labs) to make your templates available to all lab users. For instructions, see [Create Azure virtual machines by using ARM templates](devtest-lab-use-resource-manager-template.md).
+You can also [store environment templates in your own Git repositories](devtest-lab-use-resource-manager-template.md#store-arm-templates-in-git-repositories), and [connect those repositories to your lab](devtest-lab-use-resource-manager-template.md#add-template-repositories-to-labs) to make your templates available to all lab users.
 
 ## Enable and configure public environments
 
@@ -105,7 +107,7 @@ By default, lab users have **Reader** role in environments, so they can't change
 
 If you need to create multiple environments for development or testing scenarios, you can automate environment deployment with Azure PowerShell or Azure CLI.
 
-Lab users can automate VM creation by using the Azure CLI commands [az lab vm create](/cli/azure/lab/vm#az_lab_vm_create) and [az deployment group create](/cli/azure/deployment/group#az_deployment_group_create). For more information, see [Deploy resources with Resource Manager templates and Azure CLI](../azure-resource-manager/templates/deploy-cli.md).
+You can use the Azure CLI command [az deployment group create](/cli/azure/deployment/group#az_deployment_group_create) to create environments. For more information, see [Deploy resources with Resource Manager templates and Azure CLI](../azure-resource-manager/templates/deploy-cli.md).
 
 Lab owners and administrators can use Azure PowerShell to create VMs and environments from ARM templates.
 

articles/devtest-labs/devtest-lab-use-arm-and-powershell-for-lab-resources.md

@@ -27,29 +27,29 @@ In DevTest Labs, you can:
 
 - [Use ARM templates with Azure PowerShell or Azure CLI automation](#arm-template-automation) to create, deploy, and manage labs, environments, and VMs.
 
-## Multi-VM vs. single-VM ARM templates
+## Single-VM and environment templates
 
 DevTest Labs often uses ARM templates to create VMs. There are two methods for creating VMs in DevTest Labs. Each method is used for different scenarios and requires different permissions. The ARM template's `resource` property declares the method to use.
 
-### Microsoft.Compute/virtualmachines
+### Microsoft.Compute/virtualmachines environment templates
 
-ARM templates use the [Microsoft.Compute/virtualmachines](/azure/templates/microsoft.compute/virtualmachines) resource type to provision multiple lab VMs and PaaS resources in a single environment, such as a SharePoint farm. Lab users can use these templates to create multi-VM environments. VMs created with this resource type appear under the environments in the lab's **My environments** list.
+ARM templates that use the [Microsoft.Compute/virtualmachines](/azure/templates/microsoft.compute/virtualmachines) resource type provision multiple lab VMs and PaaS resources in a single environment, such as a SharePoint farm. Lab users can use these templates to create multiple-VM environments. VMs created with this resource type appear under the environments in the lab's **My environments** list.
 
 :::image type="content" source="./media/devtest-lab-use-arm-and-powershell-for-lab-resources/devtestlab-lab-vm-single-environment.png" alt-text="Screenshot that shows V Ms in an environment in the My environments list.":::
 
 For more information and instructions for configuring and using environment templates, see [Use ARM templates to create DevTest Labs environments](devtest-lab-create-environment-from-arm.md).
 
-### Microsoft.DevTestLab/labs/virtualmachines
+### Microsoft.DevTestLab/labs/virtualmachines single-VM templates
 
-To provision individual VM configurations, ARM templates use the [Microsoft.DevTestLab/labs/virtualmachines](/azure/templates/microsoft.devtestlab/2018-09-15/labs/virtualmachines) resource type. Each VM created with this resource type appears as a separate item in the lab's **My virtual machines** list. To create and deploy these VMs, you can [use a quickstart template](#arm-quickstart-templates) from the Azure portal. You can also use ARM templates with Azure PowerShell or Azure CLI to [automate VM deployment](#arm-template-automation).
+ARM templates that use the [Microsoft.DevTestLab/labs/virtualmachines](/azure/templates/microsoft.devtestlab/2018-09-15/labs/virtualmachines) resource type provision individual VM configurations. Each VM created with this resource type appears as a separate item in the lab's **My virtual machines** list. To create and deploy VMs with these templates, you can [use a quickstart template](#arm-quickstart-templates) from the Azure portal. You can also [automate VM deployment](#arm-template-automation) with Azure PowerShell or Azure CLI.
 
 :::image type="content" source="./media/devtest-lab-use-arm-and-powershell-for-lab-resources/devtestlab-lab-vm-single-item.png" alt-text="Screenshot that shows the list of single V Ms in the DevTest Labs virtual machines list.":::
 
 ## ARM quickstart templates
 
 To use an ARM template to quickly create a DevTest Labs lab with a Windows Server VM, follow the instructions at [Quickstart: Use an ARM template to create a lab in DevTest Labs](create-lab-windows-vm-template.md).
 
-Or, to access DevTest Labs quickstart template from the Azure portal:
+Or to access DevTest Labs quickstart template from the Azure portal:
 
 1. In the Azure portal, search for and select **Deploy a custom template**.
 1. On the **Custom deployment** screen, make sure **Quickstart template** is selected, and select the dropdown arrow next to **Quickstart template (disclaimer)**.
@@ -62,26 +62,26 @@ Or, to access DevTest Labs quickstart template from the Azure portal:
 
 Lab administrators can deploy ARM templates with Azure CLI or Azure PowerShell to automate VM creation and management.
 
-[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
-
-Use the Azure CLI commands [az lab vm create](/cli/azure/lab/vm#az_lab_vm_create) and [az deployment group create](/cli/azure/deployment/group#az_deployment_group_create) to automate VM creation with ARM templates. For more information and instructions, see [Deploy resources with Resource Manager templates and Azure CLI](../azure-resource-manager/templates/deploy-cli.md).
+In Azure CLI, use the commands [az lab vm create](/cli/azure/lab/vm#az_lab_vm_create) and [az deployment group create](/cli/azure/deployment/group#az_deployment_group_create) to automate VM creation with ARM templates. For more information and instructions, see [Deploy resources with Resource Manager templates and Azure CLI](../azure-resource-manager/templates/deploy-cli.md).
 
-Use the Azure PowerShell commands [New-AzResource](/powershell/module/az.resources/new-azresource) and [New-AzResourceGroupDeployment](/powershell/module/az.resources/new-azresourcegroupdeployment) to provision VMs with ARM templates.
+In Azure PowerShell, use [New-AzResource](/powershell/module/az.resources/new-azresource) and [New-AzResourceGroupDeployment](/powershell/module/az.resources/new-azresourcegroupdeployment) to provision VMs with ARM templates.
 
-Provisioning VMs with PowerShell requires administrator permissions. Lab administrators can deploy ARM templates to create claimable lab VMs or image factory golden images. Lab users can then use the custom images to create VM instances. For more information and instructions, see [Create a DevTest Labs VM with Azure PowerShell](devtest-lab-vm-powershell.md).
+[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
 
-Administrators can also automate ARM environment template deployment to fully manage development and test environments. For information and instructions, see [Automate environment creation with PowerShell](devtest-lab-create-environment-from-arm.md#automate-environment-creation).
+Lab administrators can deploy ARM templates to create claimable lab VMs or image factory golden images. Provisioning VMs with PowerShell requires administrator permissions. Lab users can then use the custom images to create VM instances. For more information and instructions, see [Create a DevTest Labs VM with Azure PowerShell](devtest-lab-vm-powershell.md).
 
-You can automate several other common tasks by using ARM templates with PowerShell:
+You can automate several other common DevTest Labs tasks by using ARM templates with PowerShell:
 
 - [Create a custom image from a VHD file using PowerShell](devtest-lab-create-custom-image-from-vhd-using-powershell.md)
 - [Upload a VHD file to a lab's storage account using PowerShell](devtest-lab-upload-vhd-using-powershell.md)
 - [Add an external user to a lab using PowerShell](devtest-lab-add-devtest-user.md#add-an-external-user-to-a-lab-using-powershell)
 - [Create a lab custom role using PowerShell](devtest-lab-grant-user-permissions-to-specific-lab-policies.md#creating-a-lab-custom-role-using-powershell)
 
+Lab administrators can also automate ARM environment template deployment, to fully manage development and test environments. For information and instructions, see [Automate environment creation](devtest-lab-create-environment-from-arm.md#automate-environment-creation).
+
 ## Next steps
 
-- [Best practices for creating Azure Resource Manager templates](../azure-resource-manager/templates/best-practices.md) has guidelines and suggestions for creating reliable, easy to use ARM templates.
+- [Best practices for creating Azure Resource Manager templates](../azure-resource-manager/templates/best-practices.md) has guidelines and suggestions for creating reliable, easy-to-use ARM templates.
 - [Deploy resources with Resource Manager templates and Azure PowerShell](../azure-resource-manager/templates/deploy-powershell.md) has general information about using Azure PowerShell with ARM templates.
 - The public [DevTest Labs GitHub repository](https://github.com/Azure/azure-devtestlab) has preconfigured [quickstart ARM templates](https://github.com/Azure/azure-devtestlab/tree/master/samples/DevTestLabs/QuickStartTemplates), [PowerShell scripts](https://github.com/Azure/azure-devtestlab/tree/master/samples/DevTestLabs/Scripts), [artifacts](https://github.com/Azure/azure-devtestlab/tree/master/Artifacts), and [environments](https://github.com/Azure/azure-devtestlab/tree/master/Environments) that you can use as-is or customize for your needs.
-- Explore the ARM templates in the [Azure Quickstart template gallery](https://github.com/Azure/azure-quickstart-templates).
+- You can explore more ARM templates in the [Azure Quickstart template gallery](https://github.com/Azure/azure-quickstart-templates).

articles/devtest-labs/devtest-lab-use-resource-manager-template.md

@@ -5,15 +5,15 @@ ms.topic: how-to
 ms.date: 01/03/2022
 ---
 
-# Create Azure virtual machines by using ARM templates
+# Use ARM templates to create DevTest Labs virtual machines
 
 You can use Azure Resource Manager (ARM) templates to create preconfigured Azure virtual machines (VMs) in Azure DevTest Labs. 
 
 [!INCLUDE [About Azure Resource Manager](../../includes/resource-manager-quickstart-introduction.md)]
 
 Single-VM ARM templates use the [Microsoft.DevTestLab/labs/virtualmachines](/azure/templates/microsoft.devtestlab/2018-09-15/labs/virtualmachines) resource type. Each VM created with this resource type appears as a separate item in the lab's **My virtual machines** list.
 
-You can create your own single-VM ARM templates, access the public [DevTest Labs GitHub repository](https://github.com/Azure/azure-devtestlab) for preconfigured templates, or modify existing ARM templates to meet your needs.
+You can create your own single-VM ARM templates, access the public [DevTest Labs GitHub repository](https://github.com/Azure/azure-devtestlab) for preconfigured templates, or modify existing ARM templates to meet your needs. Lab users can use your ARM templates to create and deploy Azure VMs.
 
 This article describes how to:
 
@@ -96,7 +96,7 @@ Add your template repositories to your lab so all lab users can access the templ
 
    ![Screenshot that shows adding a new template repository to a lab.](./media/devtest-lab-create-environment-from-arm/repo-values.png)
 
-The repository now appears in the **Repositories** list for the lab. Users can now use the repository templates to [create multi-VM DevTest Labs environments](devtest-lab-create-environment-from-arm.md). Lab administrators can use the templates to [automate lab deployment and management tasks](devtest-lab-use-arm-and-powershell-for-lab-resources#arm-template-automation).
+The repository now appears in the **Repositories** list for the lab. Users can now use the repository templates to [create multi-VM DevTest Labs environments](devtest-lab-create-environment-from-arm.md). Lab administrators can use the templates to [automate lab deployment and management tasks](devtest-lab-use-arm-and-powershell-for-lab-resources.md#arm-template-automation).
 
 ### Next steps