Skip to content

Commit d87d3a4

Browse files
authored
Merge pull request #108744 from tfitzmac/0323arm5
add arm term
2 parents 10f681a + a23a548 commit d87d3a4

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

articles/azure-resource-manager/templates/add-template-to-azure-pipelines.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description: Describes how to set up continuous integration in Azure Pipelines b
44
ms.topic: conceptual
55
ms.date: 10/17/2019
66
---
7-
# Integrate Resource Manager templates with Azure Pipelines
7+
# Integrate ARM templates with Azure Pipelines
88

9-
Visual Studio provides the Azure Resource Group project for creating templates and deploying them to your Azure subscription. You can integrate this project with Azure Pipelines for continuous integration and continuous deployment (CI/CD).
9+
Visual Studio provides the Azure Resource Group project for creating Azure Resource Manager (ARM) templates and deploying them to your Azure subscription. You can integrate this project with Azure Pipelines for continuous integration and continuous deployment (CI/CD).
1010

1111
There are two ways to deploy templates with Azure Pipelines:
1212

@@ -255,4 +255,4 @@ You can select the currently running pipeline to see details about the tasks. Wh
255255

256256
## Next steps
257257

258-
For step-by-step process on using Azure Pipelines with Resource Manager templates, see [Tutorial: Continuous integration of Azure Resource Manager templates with Azure Pipelines](template-tutorial-use-azure-pipelines.md).
258+
For step-by-step process on using Azure Pipelines with ARM templates, see [Tutorial: Continuous integration of ARM templates with Azure Pipelines](template-tutorial-use-azure-pipelines.md).

articles/azure-resource-manager/templates/deploy-rest.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 Resource Manager REST API to deploy
44
ms.topic: conceptual
55
ms.date: 06/04/2019
66
---
7-
# Deploy resources with Resource Manager templates and Resource Manager REST API
7+
# Deploy resources with ARM templates and Resource Manager REST API
88

9-
This article explains how to use the Resource Manager REST API with Resource Manager templates to deploy your resources to Azure.
9+
This article explains how to use the Resource Manager REST API with Azure Resource Manager (ARM) templates to deploy your resources to Azure.
1010

1111
You can either include your template in the request body or link to a file. When using a file, it can be a local file or an external file that is available through a URI. When your template is in a storage account, you can restrict access to the template and provide a shared access signature (SAS) token during deployment.
1212

@@ -116,7 +116,7 @@ The examples in this article use resource group deployments.
116116

117117
```json
118118
{
119-
"properties": {
119+
"properties": {
120120
"mode": "Incremental",
121121
"template": {
122122
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
@@ -186,5 +186,5 @@ The examples in this article use resource group deployments.
186186
- To roll back to a successful deployment when you get an error, see [Rollback on error to successful deployment](rollback-on-error.md).
187187
- 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).
188188
- To learn about handling asynchronous REST operations, see [Track asynchronous Azure operations](../management/async-operations.md).
189-
- To learn more about templates, see [Understand the structure and syntax of Azure Resource Manager templates](template-syntax.md).
189+
- To learn more about templates, see [Understand the structure and syntax of ARM templates](template-syntax.md).
190190

articles/azure-resource-manager/templates/secure-template-with-sas-token.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description: Deploy resources to Azure with an Azure Resource Manager template t
44
ms.topic: conceptual
55
ms.date: 08/14/2019
66
---
7-
# Deploy private Resource Manager template with SAS token
7+
# Deploy private ARM template with SAS token
88

9-
When your template is located in a storage account, you can restrict access to the template to avoid exposing it publicly. You access a secured template by creating a shared access signature (SAS) token for the template, and providing that token during deployment. This article explains how to use Azure PowerShell or Azure CLI to deploy a template with a SAS token.
9+
When your Azure Resource Manager (ARM) template is located in a storage account, you can restrict access to the template to avoid exposing it publicly. You access a secured template by creating a shared access signature (SAS) token for the template, and providing that token during deployment. This article explains how to use Azure PowerShell or Azure CLI to deploy a template with a SAS token.
1010

1111
## Create storage account with secured container
1212

@@ -134,5 +134,5 @@ For an example of using a SAS token with linked templates, see [Using linked tem
134134

135135

136136
## Next steps
137-
* For an introduction to deploying templates, see [Deploy resources with Resource Manager templates and Azure PowerShell](deploy-powershell.md).
137+
* For an introduction to deploying templates, see [Deploy resources with ARM templates and Azure PowerShell](deploy-powershell.md).
138138
* To define parameters in template, see [Authoring templates](template-syntax.md#parameters).

articles/azure-resource-manager/templates/template-deploy-what-if.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ ms.topic: conceptual
66
ms.date: 03/05/2020
77
ms.author: jgao
88
---
9-
# Resource Manager template deployment what-if operation (Preview)
9+
# ARM template deployment what-if operation (Preview)
1010

11-
Before deploying a template, you might want to preview the changes that will happen. Azure Resource Manager provides the what-if operation to let you see how resources will change if you deploy the template. The what-if operation doesn't make any changes to existing resources. Instead, it predicts the changes if the specified template is deployed.
11+
Before deploying an Azure Resource Manager (ARM) template, you might want to preview the changes that will happen. Azure Resource Manager provides the what-if operation to let you see how resources will change if you deploy the template. The what-if operation doesn't make any changes to existing resources. Instead, it predicts the changes if the specified template is deployed.
1212

1313
> [!NOTE]
1414
> The what-if operation is currently in preview. To use it, you must [sign up for the preview](https://aka.ms/armtemplatepreviews). As a preview release, the results may sometimes show that a resource will change when actually no change will happen. We're working to reduce these issues, but we need your help. Please report these issues at [https://aka.ms/whatifissues](https://aka.ms/whatifissues).
@@ -281,5 +281,5 @@ You see the expected changes and can confirm that you want the deployment to run
281281
## Next steps
282282

283283
- If you notice incorrect results from the preview release of what-if, please report the issues at [https://aka.ms/whatifissues](https://aka.ms/whatifissues).
284-
- To deploy templates with Azure PowerShell, see [Deploy resources with Resource Manager templates and Azure PowerShell](deploy-powershell.md).
285-
- To deploy templates with REST, see [Deploy resources with Resource Manager templates and Resource Manager REST API](deploy-rest.md).
284+
- To deploy templates with Azure PowerShell, see [Deploy resources with ARM templates and Azure PowerShell](deploy-powershell.md).
285+
- To deploy templates with REST, see [Deploy resources with ARM templates and Resource Manager REST API](deploy-rest.md).

0 commit comments

Comments
 (0)