Skip to content

Commit 4a05265

Browse files
authored
Merge pull request #108823 from tfitzmac/0324arm1
add arm term
2 parents 556f796 + 65fc680 commit 4a05265

6 files changed

+32
-32
lines changed

articles/azure-resource-manager/templates/template-tutorial-create-encrypted-storage-accounts.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ ms.author: jgao
88
ms.custom: seodec18
99
---
1010

11-
# Tutorial: Utilize the Azure Resource Manager template reference
11+
# Tutorial: Utilize the ARM template reference
1212

13-
Learn how to find the template schema information, and use the information to create Azure Resource Manager templates.
13+
Learn how to find the template schema information, and use the information to create Azure Resource Manager (ARM) templates.
1414

1515
In this tutorial, you use a base template from Azure Quickstart templates. Using template reference documentation, you customize the template to create an encrypted Storage account.
1616

@@ -31,11 +31,11 @@ If you don't have an Azure subscription, [create a free account](https://azure.m
3131

3232
To complete this article, you need:
3333

34-
* 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).
34+
* Visual Studio Code with Resource Manager Tools extension. See [Use Visual Studio Code to create ARM templates](use-vs-code-to-create-template.md).
3535

3636
## Open a Quickstart template
3737

38-
[Azure QuickStart Templates](https://azure.microsoft.com/resources/templates/) is a repository for Resource Manager templates. Instead of creating a template from scratch, you can find a sample template and customize it. The template used in this quickstart is called [Create a standard storage account](https://azure.microsoft.com/resources/templates/101-storage-account-create/). The template defines an Azure Storage account resource.
38+
[Azure QuickStart Templates](https://azure.microsoft.com/resources/templates/) is a repository for ARM templates. Instead of creating a template from scratch, you can find a sample template and customize it. The template used in this quickstart is called [Create a standard storage account](https://azure.microsoft.com/resources/templates/101-storage-account-create/). The template defines an Azure Storage account resource.
3939

4040
1. From Visual Studio Code, select **File**>**Open File**.
4141
2. In **File name**, paste the following URL:

articles/azure-resource-manager/templates/template-tutorial-create-multiple-instances.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.topic: tutorial
77
ms.author: jgao
88
---
99

10-
# Tutorial: Create multiple resource instances with Resource Manager templates
10+
# Tutorial: Create multiple resource instances with ARM templates
1111

12-
Learn how to iterate in your Azure Resource Manager template to create multiple instances of an Azure resource. In this tutorial, you modify a template to create three storage account instances.
12+
Learn how to iterate in your Azure Resource Manager (ARM) template to create multiple instances of an Azure resource. In this tutorial, you modify a template to create three storage account instances.
1313

1414
![Azure Resource Manager creates multiple instances diagram](./media/template-tutorial-create-multiple-instances/resource-manager-template-create-multiple-instances-diagram.png)
1515

@@ -26,11 +26,11 @@ If you don't have an Azure subscription, [create a free account](https://azure.m
2626

2727
To complete this article, you need:
2828

29-
* 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).
29+
* Visual Studio Code with Resource Manager Tools extension. See [Use Visual Studio Code to create ARM templates](use-vs-code-to-create-template.md).
3030

3131
## Open a Quickstart template
3232

33-
[Azure QuickStart Templates](https://azure.microsoft.com/resources/templates/) is a repository for Resource Manager templates. Instead of creating a template from scratch, you can find a sample template and customize it. The template used in this quickstart is called [Create a standard storage account](https://azure.microsoft.com/resources/templates/101-storage-account-create/). The template defines an Azure Storage account resource.
33+
[Azure QuickStart Templates](https://azure.microsoft.com/resources/templates/) is a repository for ARM templates. Instead of creating a template from scratch, you can find a sample template and customize it. The template used in this quickstart is called [Create a standard storage account](https://azure.microsoft.com/resources/templates/101-storage-account-create/). The template defines an Azure Storage account resource.
3434

3535
1. From Visual Studio Code, select **File**>**Open File**.
3636
2. In **File name**, paste the following URL:
@@ -103,7 +103,7 @@ The completed template looks like:
103103
}
104104
```
105105
106-
For more information about creating multiple instances, see [Deploy multiple instances of a resource or property in Azure Resource Manager Templates](./copy-resources.md)
106+
For more information about creating multiple instances, see [Deploy multiple instances of a resource or property in ARM templates](./copy-resources.md)
107107
108108
## Deploy the template
109109

articles/azure-resource-manager/templates/template-tutorial-create-templates-with-dependent-resources.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ ms.topic: tutorial
77
ms.author: jgao
88
---
99

10-
# Tutorial: Create Azure Resource Manager templates with dependent resources
10+
# Tutorial: Create ARM templates with dependent resources
1111

12-
Learn how to create an Azure Resource Manager template to deploy multiple resources and configure the deployment order. After you create the template, you deploy the template using the Cloud shell from the Azure portal.
12+
Learn how to create an Azure Resource Manager (ARM) template to deploy multiple resources and configure the deployment order. After you create the template, you deploy the template using the Cloud shell from the Azure portal.
1313

14-
In this tutorial, you create a storage account, a virtual machine, a virtual network, and some other dependent resources. Some of the resources cannot be deployed until another resource exists. For example, you can't create the virtual machine until its storage account and network interface exist. You define this relationship by making one resource as dependent on the other resources. Resource Manager evaluates the dependencies between resources, and deploys them in their dependent order. When resources aren't dependent on each other, Resource Manager deploys them in parallel. For more information, see [Define the order for deploying resources in Azure Resource Manager Templates](./define-resource-dependency.md).
14+
In this tutorial, you create a storage account, a virtual machine, a virtual network, and some other dependent resources. Some of the resources cannot be deployed until another resource exists. For example, you can't create the virtual machine until its storage account and network interface exist. You define this relationship by making one resource as dependent on the other resources. Resource Manager evaluates the dependencies between resources, and deploys them in their dependent order. When resources aren't dependent on each other, Resource Manager deploys them in parallel. For more information, see [Define the order for deploying resources in ARM templates](./define-resource-dependency.md).
1515

1616
![Resource Manager template dependent resources deployment order diagram](./media/template-tutorial-create-templates-with-dependent-resources/resource-manager-template-dependent-resources-diagram.png)
1717

@@ -28,17 +28,17 @@ If you don't have an Azure subscription, [create a free account](https://azure.m
2828

2929
To complete this article, you need:
3030

31-
* 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).
31+
* Visual Studio Code with Resource Manager Tools extension. See [Use Visual Studio Code to create ARM templates](use-vs-code-to-create-template.md).
3232
* To increase security, use a generated password for the virtual machine administrator account. Here is a sample for generating a password:
3333

3434
```console
3535
openssl rand -base64 32
3636
```
37-
Azure Key Vault is designed to safeguard cryptographic keys and other secrets. For more information, see [Tutorial: Integrate Azure Key Vault in Resource Manager Template deployment](./template-tutorial-use-key-vault.md). We also recommend you to update your password every three months.
37+
Azure Key Vault is designed to safeguard cryptographic keys and other secrets. For more information, see [Tutorial: Integrate Azure Key Vault in ARM template deployment](./template-tutorial-use-key-vault.md). We also recommend you to update your password every three months.
3838

3939
## Open a Quickstart template
4040

41-
Azure QuickStart Templates is a repository for Resource Manager templates. Instead of creating a template from scratch, you can find a sample template and customize it. The template used in this tutorial is called [Deploy a simple Windows VM](https://azure.microsoft.com/resources/templates/101-vm-simple-windows/).
41+
Azure QuickStart Templates is a repository for ARM templates. Instead of creating a template from scratch, you can find a sample template and customize it. The template used in this tutorial is called [Deploy a simple Windows VM](https://azure.microsoft.com/resources/templates/101-vm-simple-windows/).
4242

4343
1. From Visual Studio Code, select **File**>**Open File**.
4444
2. In **File name**, paste the following URL:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.author: jgao
1818

1919
# Tutorial: Use deployment scripts to create a self-signed certificate (Preview)
2020

21-
Learn how to use deployment scripts in Azure Resource Manage templates. Deployment scripts can be used to perform custom steps that can't be done by Resource Manager templates. For example, creating a self-signed certificate. In this tutorial, you create a template to deploy an Azure key vault, and then use a `Microsoft.Resources/deploymentScripts` resource in the same template to create a certificate and then add the certificate to the key vault. To learn more about deployment script, see [Use deployment scripts in Azure Resource Manager templates](./deployment-script-template.md).
21+
Learn how to use deployment scripts in Azure Resource Manage (ARM) templates. Deployment scripts can be used to perform custom steps that can't be done by ARM templates. For example, creating a self-signed certificate. In this tutorial, you create a template to deploy an Azure key vault, and then use a `Microsoft.Resources/deploymentScripts` resource in the same template to create a certificate and then add the certificate to the key vault. To learn more about deployment script, see [Use deployment scripts in ARM templates](./deployment-script-template.md).
2222

2323
> [!IMPORTANT]
2424
> Two deployment script resources, a storage account and a container instance, are created in the same resource group for script execution and troubleshooting. These resources are usually deleted by the script service when the script execution gets in a terminal state. You are billed for the resources until the resources are deleted. To learn more, see [Clean up deployment script resources](./deployment-script-template.md#clean-up-deployment-script-resources).
@@ -36,7 +36,7 @@ This tutorial covers the following tasks:
3636

3737
To complete this article, you need:
3838

39-
* **[Visual Studio Code](https://code.visualstudio.com/) with the Resource Manager Tools extension**. See [Use Visual Studio Code to create Azure Resource Manager templates](./use-vs-code-to-create-template.md).
39+
* **[Visual Studio Code](https://code.visualstudio.com/) with the Resource Manager Tools extension**. See [Use Visual Studio Code to create ARM templates](./use-vs-code-to-create-template.md).
4040

4141
* **A user-assigned managed identity with the contributor's role at the subscription level**. This identity is used to execute deployment scripts. To create one, see [User-assigned managed identity](../../active-directory/managed-identities-azure-resources/qs-configure-portal-windows-vm.md#user-assigned-managed-identity). You need the identity ID when you deploy the template. The format of the identity is:
4242

@@ -55,7 +55,7 @@ To complete this article, you need:
5555

5656
## Open a Quickstart template
5757

58-
Instead of creating a template from scratch, you open a template from [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/). Azure Quickstart Templates is a repository for Resource Manager templates.
58+
Instead of creating a template from scratch, you open a template from [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/). Azure Quickstart Templates is a repository for ARM templates.
5959

6060
The template used in this quickstart is called [Create an Azure Key Vault and a secret](https://azure.microsoft.com/resources/templates/101-key-vault-create/). The template creates a key vault, and then adds a secret to the key vault.
6161

@@ -341,7 +341,7 @@ When the Azure resources are no longer needed, clean up the resources you deploy
341341
342342
## Next steps
343343
344-
In this tutorial, you learned how to use deployment script in Azure Resource Manager templates. To learn how to deploy Azure resources based on conditions, see:
344+
In this tutorial, you learned how to use deployment script in ARM templates. To learn how to deploy Azure resources based on conditions, see:
345345
346346
> [!div class="nextstepaction"]
347347
> [Use conditions](./template-tutorial-use-conditions.md)

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.topic: tutorial
77
ms.author: jgao
88
---
99

10-
# Tutorial: Use condition in Azure Resource Manager templates
10+
# Tutorial: Use condition in ARM templates
1111

12-
Learn how to deploy Azure resources based on conditions.
12+
Learn how to deploy Azure resources based on conditions in an Azure Resource Manager (ARM) template.
1313

1414
In the [Set resource deployment order](./template-tutorial-create-templates-with-dependent-resources.md) tutorial, you create a virtual machine, a virtual network, and some other dependent resources including a storage account. Instead of creating a new storage account every time, you let people choose between creating a new storage account and using an existing storage account. To accomplish this goal, you define an additional parameter. If the value of the parameter is "new", a new storage account is created. Otherwise, an existing storage account with the name provided is used.
1515

@@ -26,28 +26,28 @@ This tutorial covers the following tasks:
2626
This tutorial only covers a basic scenario of using conditions. For more information, see:
2727

2828
* [Template file structure: Condition](conditional-resource-deployment.md).
29-
* [Conditionally deploy a resource in an Azure Resource Manager template](/azure/architecture/building-blocks/extending-templates/conditional-deploy).
29+
* [Conditionally deploy a resource in an ARM template](/azure/architecture/building-blocks/extending-templates/conditional-deploy).
3030
* [Template function: If](./template-functions-logical.md#if).
31-
* [Comparison functions for Azure Resource Manager templates](./template-functions-comparison.md)
31+
* [Comparison functions for ARM templates](./template-functions-comparison.md)
3232

3333
If you don't have an Azure subscription, [create a free account](https://azure.microsoft.com/free/) before you begin.
3434

3535
## Prerequisites
3636

3737
To complete this article, you need:
3838

39-
* 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).
39+
* Visual Studio Code with Resource Manager Tools extension. See [Use Visual Studio Code to create ARM templates](use-vs-code-to-create-template.md).
4040
* To increase security, use a generated password for the virtual machine administrator account. Here is a sample for generating a password:
4141

4242
```console
4343
openssl rand -base64 32
4444
```
4545

46-
Azure Key Vault is designed to safeguard cryptographic keys and other secrets. For more information, see [Tutorial: Integrate Azure Key Vault in Resource Manager Template deployment](./template-tutorial-use-key-vault.md). We also recommend you to update your password every three months.
46+
Azure Key Vault is designed to safeguard cryptographic keys and other secrets. For more information, see [Tutorial: Integrate Azure Key Vault in ARM template deployment](./template-tutorial-use-key-vault.md). We also recommend you to update your password every three months.
4747

4848
## Open a Quickstart template
4949

50-
Azure QuickStart Templates is a repository for Resource Manager templates. Instead of creating a template from scratch, you can find a sample template and customize it. The template used in this tutorial is called [Deploy a simple Windows VM](https://azure.microsoft.com/resources/templates/101-vm-simple-windows/).
50+
Azure QuickStart Templates is a repository for ARM templates. Instead of creating a template from scratch, you can find a sample template and customize it. The template used in this tutorial is called [Deploy a simple Windows VM](https://azure.microsoft.com/resources/templates/101-vm-simple-windows/).
5151

5252
1. From Visual Studio Code, select **File**>**Open File**.
5353
2. In **File name**, paste the following URL:

0 commit comments

Comments
 (0)