Skip to content

Commit 5b729ff

Browse files
authored
Merge pull request #108731 from tfitzmac/0323arm4
add arm term
2 parents e2472e4 + 1722e26 commit 5b729ff

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

articles/azure-resource-manager/templates/copy-outputs.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description: Use copy operation in an Azure Resource Manager template to iterate
44
ms.topic: conceptual
55
ms.date: 02/25/2020
66
---
7-
# Output iteration in Azure Resource Manager templates
7+
# Output iteration in ARM templates
88

9-
This article shows you how to create more than one value for an output in your Azure Resource Manager template. By adding the **copy** element to the outputs section of your template, you can dynamically return a number of items during deployment.
9+
This article shows you how to create more than one value for an output in your Azure Resource Manager (ARM) template. By adding the **copy** element to the outputs section of your template, you can dynamically return a number of items during deployment.
1010

1111
You can also use copy with [resources](copy-resources.md), [properties in a resource](copy-properties.md), and [variables](copy-variables.md).
1212

@@ -147,11 +147,11 @@ The preceding example returns an array with the following values:
147147

148148
## Next steps
149149

150-
* To go through a tutorial, see [Tutorial: create multiple resource instances using Resource Manager templates](template-tutorial-create-multiple-instances.md).
150+
* To go through a tutorial, see [Tutorial: create multiple resource instances using ARM templates](template-tutorial-create-multiple-instances.md).
151151
* For other uses of the copy element, see:
152-
* [Resource iteration in Azure Resource Manager templates](copy-resources.md)
153-
* [Property iteration in Azure Resource Manager templates](copy-properties.md)
154-
* [Variable iteration in Azure Resource Manager templates](copy-variables.md)
155-
* If you want to learn about the sections of a template, see [Authoring Azure Resource Manager Templates](template-syntax.md).
156-
* To learn how to deploy your template, see [Deploy an application with Azure Resource Manager Template](deploy-powershell.md).
152+
* [Resource iteration in ARM templates](copy-resources.md)
153+
* [Property iteration in ARM templates](copy-properties.md)
154+
* [Variable iteration in ARM templates](copy-variables.md)
155+
* If you want to learn about the sections of a template, see [Authoring ARM templates](template-syntax.md).
156+
* To learn how to deploy your template, see [Deploy an application with ARM template](deploy-powershell.md).
157157

articles/azure-resource-manager/templates/copy-variables.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description: Use copy operation in an Azure Resource Manager template to iterate
44
ms.topic: conceptual
55
ms.date: 02/13/2020
66
---
7-
# Variable iteration in Azure Resource Manager templates
7+
# Variable iteration in ARM templates
88

9-
This article shows you how to create more than one value for a variable in your Azure Resource Manager template. By adding the **copy** element to the variables section of your template, you can dynamically set the number of items for a variable during deployment. You also avoid having to repeat template syntax.
9+
This article shows you how to create more than one value for a variable in your Azure Resource Manager (ARM) template. By adding the **copy** element to the variables section of your template, you can dynamically set the number of items for a variable during deployment. You also avoid having to repeat template syntax.
1010

1111
You can also use copy with [resources](copy-resources.md), [properties in a resource](copy-properties.md), and [outputs](copy-outputs.md).
1212

@@ -306,11 +306,11 @@ The following examples show common scenarios for creating more than one value fo
306306

307307
## Next steps
308308

309-
* To go through a tutorial, see [Tutorial: create multiple resource instances using Resource Manager templates](template-tutorial-create-multiple-instances.md).
309+
* To go through a tutorial, see [Tutorial: create multiple resource instances using ARM templates](template-tutorial-create-multiple-instances.md).
310310
* For other uses of the copy element, see:
311-
* [Resource iteration in Azure Resource Manager templates](copy-resources.md)
312-
* [Property iteration in Azure Resource Manager templates](copy-properties.md)
313-
* [Output iteration in Azure Resource Manager templates](copy-outputs.md)
314-
* If you want to learn about the sections of a template, see [Authoring Azure Resource Manager Templates](template-syntax.md).
315-
* To learn how to deploy your template, see [Deploy an application with Azure Resource Manager Template](deploy-powershell.md).
311+
* [Resource iteration in ARM templates](copy-resources.md)
312+
* [Property iteration in ARM templates](copy-properties.md)
313+
* [Output iteration in ARM templates](copy-outputs.md)
314+
* If you want to learn about the sections of a template, see [Authoring ARM templates](template-syntax.md).
315+
* To learn how to deploy your template, see [Deploy an application with ARM template](deploy-powershell.md).
316316

articles/azure-resource-manager/templates/create-templates-use-intellij.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.topic: conceptual
77
#Customer intent: As a developer new to Azure deployment, I want to learn how to use the IntelliJ IDEA to create and edit Resource Manager templates, so I can use the templates to deploy Azure resources.
88
---
99

10-
# Create and deploy Azure Resource Manager templates by using the IntelliJ IDEA
10+
# Create and deploy ARM templates by using the IntelliJ IDEA
1111

12-
Learn how to deploy a Resource Manager template to Azure using the IntelliJ IDEA, and the process of editing and update the template directly from the IDE. Resource Manager templates are JSON files that define the resources you need to deploy for your solution. To understand the concepts associated with deploying and managing your Azure solutions, see [template deployment overview](overview.md).
12+
Learn how to deploy an Azure Resource Manager (ARM) template to Azure using the IntelliJ IDEA, and the process of editing and update the template directly from the IDE. ARM templates are JSON files that define the resources you need to deploy for your solution. To understand the concepts associated with deploying and managing your Azure solutions, see [template deployment overview](overview.md).
1313

1414
![Resource Manager template portal diagram](./media/quickstart-create-templates-use-the-portal/azure-resource-manager-export-deploy-template-portal.png)
1515

@@ -27,7 +27,7 @@ To complete this article, you need:
2727

2828
## Deploy a Quickstart template
2929

30-
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. The template used in this article is called [Create a standard storage account](https://github.com/Azure/azure-quickstart-templates/tree/master/101-storage-account-create/). It defines an Azure Storage account resource.
30+
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. The template used in this article is called [Create a standard storage account](https://github.com/Azure/azure-quickstart-templates/tree/master/101-storage-account-create/). It defines an Azure Storage account resource.
3131

3232
1. Right-click and save the [`azuredeploy.json`](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/101-storage-account-create/azuredeploy.json) and [`azuredeploy.parameters.json`](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/101-storage-account-create/azuredeploy.parameters.json) to your local computer.
3333

articles/azure-resource-manager/templates/deploy-cli.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description: Use Azure Resource Manager and Azure CLI to deploy resources to Azu
44
ms.topic: conceptual
55
ms.date: 03/16/2020
66
---
7-
# Deploy resources with Resource Manager templates and Azure CLI
7+
# Deploy resources with ARM templates and Azure CLI
88

9-
This article explains how to use Azure CLI with Resource Manager templates to deploy your resources to Azure. If you aren't familiar with the concepts of deploying and managing your Azure solutions, see [template deployment overview](overview.md).
9+
This article explains how to use Azure CLI with Azure Resource Manager (ARM) templates to deploy your resources to Azure. If you aren't familiar with the concepts of deploying and managing your Azure solutions, see [template deployment overview](overview.md).
1010

1111
[!INCLUDE [sample-cli-install](../../../includes/sample-cli-install.md)]
1212

@@ -79,7 +79,7 @@ The deployment can take a few minutes to complete. When it finishes, you see a m
7979

8080
## Deploy remote template
8181

82-
Instead of storing Resource Manager templates on your local machine, you may prefer to store them in an external location. You can store templates in a source control repository (such as GitHub). Or, you can store them in an Azure storage account for shared access in your organization.
82+
Instead of storing ARM templates on your local machine, you may prefer to store them in an external location. You can store templates in a source control repository (such as GitHub). Or, you can store them in an Azure storage account for shared access in your organization.
8383

8484
To deploy an external template, use the **template-uri** parameter. Use the URI in the example to deploy the sample template from GitHub.
8585

@@ -235,7 +235,7 @@ If your template has a syntax error, the command returns an error indicating it
235235

236236
- To roll back to a successful deployment when you get an error, see [Rollback on error to successful deployment](rollback-on-error.md).
237237
- To specify how to handle resources that exist in the resource group but aren't defined in the template, see [Azure Resource Manager deployment modes](deployment-modes.md).
238-
- To understand how to define parameters in your template, see [Understand the structure and syntax of Azure Resource Manager templates](template-syntax.md).
238+
- To understand how to define parameters in your template, see [Understand the structure and syntax of ARM templates](template-syntax.md).
239239
- For tips on resolving common deployment errors, see [Troubleshoot common Azure deployment errors with Azure Resource Manager](common-deployment-errors.md).
240240
- For information about deploying a template that requires a SAS token, see [Deploy private template with SAS token](secure-template-with-sas-token.md).
241241
- To safely roll out your service to more than one region, see [Azure Deployment Manager](deployment-manager-overview.md).

articles/azure-resource-manager/templates/deploy-portal.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ ms.topic: conceptual
55
ms.date: 06/27/2019
66
---
77

8-
# Deploy resources with Resource Manager templates and Azure portal
8+
# Deploy resources with ARM templates and Azure portal
99

10-
Learn how to use the [Azure portal](https://portal.azure.com) with [Azure Resource Manager](overview.md) to deploy your Azure resources. To learn about managing your resources, see [Manage Azure resources by using the Azure portal](../management/manage-resources-portal.md).
10+
Learn how to use the [Azure portal](https://portal.azure.com) with [Azure Resource Manager (ARM) templates](overview.md) to deploy your Azure resources. To learn about managing your resources, see [Manage Azure resources by using the Azure portal](../management/manage-resources-portal.md).
1111

1212
Deploying Azure resources by using the Azure portal usually involves two steps:
1313

1414
- Create a resource group.
1515
- Deploy resources to the resource group.
1616

17-
In addition, you can also deploy an Azure Resource Manager template to create Azure resources.
17+
In addition, you can also deploy an ARM template to create Azure resources.
1818

1919
This article shows both methods.
2020

@@ -68,7 +68,7 @@ After you create a resource group, you can deploy resources to the group from th
6868

6969
## Deploy resources from custom template
7070

71-
If you want to execute a deployment but not use any of the templates in the Marketplace, you can create a customized template that defines the infrastructure for your solution. To learn about creating templates, see [Understand the structure and syntax of Azure Resource Manager templates](template-syntax.md).
71+
If you want to execute a deployment but not use any of the templates in the Marketplace, you can create a customized template that defines the infrastructure for your solution. To learn about creating templates, see [Understand the structure and syntax of ARM templates](template-syntax.md).
7272

7373
> [!NOTE]
7474
> The portal interface doesn't support referencing a [secret from a Key Vault](key-vault-parameter.md). Instead, use [PowerShell](deploy-powershell.md) or [Azure CLI](deploy-cli.md) to deploy your template locally or from an external URI.
@@ -121,5 +121,5 @@ If you want to execute a deployment but not use any of the templates in the Mark
121121

122122
- To view audit logs, see [Audit operations with Resource Manager](../management/view-activity-logs.md).
123123
- To troubleshoot deployment errors, see [View deployment operations](deployment-history.md).
124-
- To export a template from a deployment or resource group, see [Export Azure Resource Manager templates](export-template-portal.md).
124+
- To export a template from a deployment or resource group, see [Export ARM templates](export-template-portal.md).
125125
- To safely roll out your service across multiple regions, see [Azure Deployment Manager](deployment-manager-overview.md).

articles/azure-resource-manager/templates/deploy-powershell.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description: Use Azure Resource Manager and Azure PowerShell to deploy resources
44
ms.topic: conceptual
55
ms.date: 03/16/2020
66
---
7-
# Deploy resources with Resource Manager templates and Azure PowerShell
7+
# Deploy resources with ARM templates and Azure PowerShell
88

9-
Learn how to use Azure PowerShell with Resource Manager templates to deploy your resources to Azure. For more information about the concepts of deploying and managing your Azure solutions, see [template deployment overview](overview.md).
9+
Learn how to use Azure PowerShell with Azure Resource Manager (ARM) templates to deploy your resources to Azure. For more information about the concepts of deploying and managing your Azure solutions, see [template deployment overview](overview.md).
1010

1111
## Deployment scope
1212

@@ -72,7 +72,7 @@ The deployment can take a few minutes to complete.
7272

7373
## Deploy remote template
7474

75-
Instead of storing Resource Manager templates on your local machine, you may prefer to store them in an external location. You can store templates in a source control repository (such as GitHub). Or, you can store them in an Azure storage account for shared access in your organization.
75+
Instead of storing ARM templates on your local machine, you may prefer to store them in an external location. You can store templates in a source control repository (such as GitHub). Or, you can store them in an Azure storage account for shared access in your organization.
7676

7777
To deploy an external template, use the **TemplateUri** parameter. Use the URI in the example to deploy the sample template from GitHub.
7878

@@ -85,7 +85,7 @@ New-AzResourceGroupDeployment -ResourceGroupName $resourceGroupName `
8585
-TemplateUri https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/101-storage-account-create/azuredeploy.json
8686
```
8787

88-
The preceding example requires a publicly accessible URI for the template, which works for most scenarios because your template shouldn't include sensitive data. If you need to specify sensitive data (like an admin password), pass that value as a secure parameter. However, if you don't want your template to be publicly accessible, you can protect it by storing it in a private storage container. For information about deploying a template that requires a shared access signature (SAS) token, see [Deploy private template with SAS token](secure-template-with-sas-token.md). To go through a tutorial, see [Tutorial: Integrate Azure Key Vault in Resource Manager Template deployment](template-tutorial-use-key-vault.md).
88+
The preceding example requires a publicly accessible URI for the template, which works for most scenarios because your template shouldn't include sensitive data. If you need to specify sensitive data (like an admin password), pass that value as a secure parameter. However, if you don't want your template to be publicly accessible, you can protect it by storing it in a private storage container. For information about deploying a template that requires a shared access signature (SAS) token, see [Deploy private template with SAS token](secure-template-with-sas-token.md). To go through a tutorial, see [Tutorial: Integrate Azure Key Vault in ARM template deployment](template-tutorial-use-key-vault.md).
8989

9090
## Deploy from Azure Cloud Shell
9191

@@ -198,5 +198,5 @@ Test-AzResourceGroupDeployment : After parsing a value an unexpected character w
198198

199199
- To roll back to a successful deployment when you get an error, see [Rollback on error to successful deployment](rollback-on-error.md).
200200
- To specify how to handle resources that exist in the resource group but aren't defined in the template, see [Azure Resource Manager deployment modes](deployment-modes.md).
201-
- To understand how to define parameters in your template, see [Understand the structure and syntax of Azure Resource Manager templates](template-syntax.md).
201+
- To understand how to define parameters in your template, see [Understand the structure and syntax of ARM templates](template-syntax.md).
202202
- For information about deploying a template that requires a SAS token, see [Deploy private template with SAS token](secure-template-with-sas-token.md).

0 commit comments

Comments
 (0)