resolve conflicts

Author: mumian

articles/azure-resource-manager/bicep/conditional-resource-deployment.md

@@ -144,7 +144,7 @@ If you use a [reference](template-functions-resource.md#reference) or [list](tem
 
 Use the [if](template-functions-logical.md#if) function to make sure the function is only evaluated for conditions when the resource is deployed. See the [if function](template-functions-logical.md#if) for a sample template that uses `if` and `reference` with a conditionally deployed resource.
 
-You set a [resource as dependent](define-resource-dependency.md) on a conditional resource exactly as you would any other resource. When a conditional resource isn't deployed, Azure Resource Manager automatically removes it from the required dependencies.
+You set a [resource as dependent](./resource-dependency.md) on a conditional resource exactly as you would any other resource. When a conditional resource isn't deployed, Azure Resource Manager automatically removes it from the required dependencies.
 
 ## Complete mode
 

articles/azure-resource-manager/bicep/copy-resources.md

@@ -370,7 +370,7 @@ The following examples show common scenarios for creating more than one instance
 
 ## Next steps
 
-- To set dependencies on resources that are created in a copy loop, see [Define the order for deploying resources in ARM templates](define-resource-dependency.md).
+- To set dependencies on resources that are created in a copy loop, see [Define the order for deploying resources in ARM templates](./resource-dependency.md).
 - To go through a tutorial, see [Tutorial: Create multiple resource instances with ARM templates](../templates/template-tutorial-create-multiple-instances.md).
 - For a Microsoft Learn module that covers resource copy, see [Manage complex cloud deployments by using advanced ARM template features](/learn/modules/manage-deployments-advanced-arm-template-features/).
 - For other uses of the copy loop, see:

articles/azure-resource-manager/bicep/data-types.md

@@ -1,20 +1,20 @@
 ---
-title: Data types in templates (Bicep)
-description: Describes the data types that are available in Azure Resource Manager templates. (Bicep)
+title: Data types in Bicep
+description: Describes the data types that are available in Bicep
 ms.topic: conceptual
 author: mumian
 ms.author: jgao
 
-ms.date: 03/04/2021
+ms.date: 05/05/2021
 ---
 
-# Data types in ARM templates (Bicep)
+# Data types in Bicep
 
-This article describes the data types supported in Azure Resource Manager templates (ARM templates). It covers both JSON and Bicep data types.
+This article describes the data types supported in [Bicep](./overview.md).
 
 ## Supported types
 
-Within an ARM template, you can use these data types:
+Within a Bicep, you can use these data types:
 
 * array
 * bool
@@ -26,28 +26,7 @@ Within an ARM template, you can use these data types:
 
 ## Arrays
 
-Arrays start with a left bracket (`[`) and end with a right bracket (`]`).
-
-In JSON, an array can be declared in a single line or multiple lines. Each element is separated by a comma.
-
-In Bicep, an array must be declared in multiple lines. Don't use commas between values.
-
-# [JSON](#tab/json)
-
-```json
-"parameters": {
-  "exampleArray": {
-    "type": "array",
-    "defaultValue": [
-      1,
-      2,
-      3
-    ]
-  }
-},
-```
-
-# [Bicep](#tab/bicep)
+Arrays start with a left bracket (`[`) and end with a right bracket (`]`). In Bicep, an array must be declared in multiple lines. Don't use commas between values.
 
 ```bicep
 param exampleArray array = [
@@ -57,25 +36,8 @@ param exampleArray array = [
 ]
 ```
 
----
-
 The elements of an array can be the same type or different types.
 
-# [JSON](#tab/json)
-
-```json
-"variables": {
-  "mixedArray": [
-    "[resourceGroup().name]",
-    1,
-    true,
-    "example string"
-  ]
-}
-```
-
-# [Bicep](#tab/bicep)
-
 ```bicep
 var mixedArray = [
   resourceGroup().name
@@ -85,80 +47,28 @@ var mixedArray = [
 ]
 ```
 
----
-
 ## Booleans
 
 When specifying boolean values, use `true` or `false`. Don't surround the value with quotation marks.
 
-# [JSON](#tab/json)
-
-```json
-"parameters": {
-  "exampleBool": {
-    "type": "bool",
-    "defaultValue": true
-  }
-},
-```
-
-# [Bicep](#tab/bicep)
-
 ```bicep
 param exampleBool bool = true
 ```
 
----
-
 ## Integers
 
 When specifying integer values, don't use quotation marks.
 
-# [JSON](#tab/json)
-
-```json
-"parameters": {
-  "exampleInt": {
-    "type": "int",
-    "defaultValue": 1
-  }
-}
-```
-
-# [Bicep](#tab/bicep)
-
 ```bicep
 param exampleInt int = 1
 ```
 
----
-
-For integers passed as inline parameters, the range of values may be limited by the SDK or command-line tool you use for deployment. For example, when using PowerShell to deploy a template, integer types can range from -2147483648 to 2147483647. To avoid this limitation, specify large integer values in a [parameter file](parameter-files.md). Resource types apply their own limits for integer properties.
+For integers passed as inline parameters, the range of values may be limited by the SDK or command-line tool you use for deployment. For example, when using PowerShell to deploy a Bicep, integer types can range from -2147483648 to 2147483647. To avoid this limitation, specify large integer values in a [parameter file](parameter-files.md). Resource types apply their own limits for integer properties.
 
 ## Objects
 
 Objects start with a left brace (`{`) and end with a right brace (`}`). Each property in an object consists of key and value. The key and value are separated by a colon (`:`).
 
-# [JSON](#tab/json)
-
-In JSON, the key is enclosed in double quotes. Each property is separated by a comma.
-
-```json
-"parameters": {
-  "exampleObject": {
-    "type": "object",
-    "defaultValue": {
-      "name": "test name",
-      "id": "123-abc",
-      "isCurrent": true,
-      "tier": 1
-    }
-  }
-}
-```
-
-# [Bicep](#tab/bicep)
-
 In Bicep, the key isn't enclosed by quotes. Don't use commas to between properties.
 
 ```bicep
@@ -186,53 +96,22 @@ Given the previous declaration, the expression x.y.z evaluates to the literal st
 
 Property accessors can be used with any object. This includes parameters and variables of object types and object literals. Using a property accessor on an expression of non-object type is an error.
 
----
-
 ## Strings
 
-In JSON, strings are marked with double quotes. In Bicep, strings are marked with singled quotes.
-
-# [JSON](#tab/json)
-
-```json
-"parameters": {
-  "exampleString": {
-    "type": "string",
-    "defaultValue": "test value"
-  }
-},
-```
-
-# [Bicep](#tab/bicep)
+In Bicep, strings are marked with singled quotes.
 
 ```bicep
 param exampleString string = 'test value'
 ```
----
 
 ## Secure strings and objects
 
-Secure string uses the same format as string, and secure object uses the same format as object. When you set a parameter to a secure string or secure object, the value of the parameter isn't saved to the deployment history and isn't logged. However, if you set that secure value to a property that isn't expecting a secure value, the value isn't protected. For example, if you set a secure string to a tag, that value is stored as plain text. Use secure strings for passwords and secrets.
+Secure string uses the same format as string, and secure object uses the same format as object. With Bicep, you add the `@secure()` modifier to a string or object.
 
-With Bicep, you add the `@secure()` modifier to a string or object.
+When you set a parameter to a secure string or secure object, the value of the parameter isn't saved to the deployment history and isn't logged. However, if you set that secure value to a property that isn't expecting a secure value, the value isn't protected. For example, if you set a secure string to a tag, that value is stored as plain text. Use secure strings for passwords and secrets.
 
 The following example shows two secure parameters:
 
-# [JSON](#tab/json)
-
-```json
-"parameters": {
-  "password": {
-    "type": "secureString"
-  },
-  "configValues": {
-    "type": "secureObject"
-  }
-}
-```
-
-# [Bicep](#tab/bicep)
-
 ```bicep
 @secure()
 param password string
@@ -241,8 +120,7 @@ param password string
 param configValues object
 ```
 
----
 
 ## Next steps
 
-To learn about the template syntax, see [Understand the structure and syntax of ARM templates](../templates/template-syntax.md).
+To learn about the structure and syntax of Bicep, see [Bicep file structure](./file.md).

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

@@ -178,7 +178,7 @@ For more information, see [Azure Resource Manager template specs (Preview)](temp
 
 ## Preview changes
 
-Before deploying your template, you can preview the changes the template will make to your environment. Use the [what-if operation](template-deploy-what-if.md) to verify that the template makes the changes that you expect. What-if also validates the template for errors.
+Before deploying your template, you can preview the changes the template will make to your environment. Use the [what-if operation](./deploy-what-if.md) to verify that the template makes the changes that you expect. What-if also validates the template for errors.
 
 ## Parameters
 

articles/azure-resource-manager/bicep/deploy-cloud-shell.md

@@ -115,4 +115,4 @@ To deploy a local template, you must first upload your template to the storage a
 ## Next steps
 
 - For more information about deployment commands, see [Deploy resources with ARM templates and Azure CLI](deploy-cli.md) and [Deploy resources with ARM templates and Azure PowerShell](deploy-powershell.md).
-- To preview changes before deploying a template, see [ARM template deployment what-if operation](template-deploy-what-if.md).
+- To preview changes before deploying a template, see [ARM template deployment what-if operation](./deploy-what-if.md).

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

@@ -180,7 +180,7 @@ For more information, see [Azure Resource Manager template specs (Preview)](temp
 
 ## Preview changes
 
-Before deploying your template, you can preview the changes the template will make to your environment. Use the [what-if operation](template-deploy-what-if.md) to verify that the template makes the changes that you expect. What-if also validates the template for errors.
+Before deploying your template, you can preview the changes the template will make to your environment. Use the [what-if operation](./deploy-what-if.md) to verify that the template makes the changes that you expect. What-if also validates the template for errors.
 
 ## Pass parameter values
 

articles/azure-resource-manager/bicep/deploy-rest.md

@@ -70,7 +70,7 @@ The examples in this article use resource group deployments.
    }
    ```
 
-1. Before deploying your template, you can preview the changes the template will make to your environment. Use the [what-if operation](template-deploy-what-if.md) to verify that the template makes the changes that you expect. What-if also validates the template for errors.
+1. Before deploying your template, you can preview the changes the template will make to your environment. Use the [what-if operation](./deploy-what-if.md) to verify that the template makes the changes that you expect. What-if also validates the template for errors.
 
 1. To deploy a template, provide your subscription ID, the name of the resource group, the name of the deployment in the request URI.
 

articles/azure-resource-manager/bicep/template-deploy-what-if.md renamed to articles/azure-resource-manager/bicep/deploy-what-if.md

@@ -32,7 +32,7 @@ To use what-if in Azure CLI, you must have Azure CLI 2.14.0 or later. If needed,
 
 When you use what-if in PowerShell or Azure CLI, the output includes color-coded results that help you see the different types of changes.
 
-![Resource Manager template deployment what-if operation fullresourcepayload and change types](./media/template-deploy-what-if/resource-manager-deployment-whatif-change-types.png)
+![Resource Manager template deployment what-if operation fullresourcepayload and change types](./media/deploy-what-if/resource-manager-deployment-whatif-change-types.png)
 
 The text output is:
 
@@ -122,7 +122,7 @@ The what-if operation lists six different types of changes:
 
 - **Create**: The resource doesn't currently exist but is defined in the template. The resource will be created.
 
-- **Delete**: This change type only applies when using [complete mode](deployment-modes.md) for deployment. The resource exists, but isn't defined in the template. With complete mode, the resource will be deleted. Only resources that [support complete mode deletion](complete-mode-deletion.md) are included in this change type.
+- **Delete**: This change type only applies when using [complete mode](deployment-modes.md) for deployment. The resource exists, but isn't defined in the template. With complete mode, the resource will be deleted. Only resources that [support complete mode deletion](deployment-complete-mode-deletion.md) are included in this change type.
 
 - **Ignore**: The resource exists, but isn't defined in the template. The resource won't be deployed or modified.
 
@@ -246,7 +246,7 @@ az deployment group what-if \
 
 The what-if output appears similar to:
 
-![Resource Manager template deployment what-if operation output](./media/template-deploy-what-if/resource-manager-deployment-whatif-change-types.png)
+![Resource Manager template deployment what-if operation output](./media/deploy-what-if/resource-manager-deployment-whatif-change-types.png)
 
 The text output is:
 
@@ -342,7 +342,7 @@ az deployment group create \
 
 Because no resources are defined in the template and the deployment mode is set to complete, the virtual network will be deleted.
 
-![Resource Manager template deployment what-if operation output deployment mode complete](./media/template-deploy-what-if/resource-manager-deployment-whatif-output-mode-complete.png)
+![Resource Manager template deployment what-if operation output deployment mode complete](./media/deploy-what-if/resource-manager-deployment-whatif-output-mode-complete.png)
 
 The text output is:
 

articles/azure-resource-manager/bicep/complete-mode-deletion.md renamed to articles/azure-resource-manager/bicep/deployment-complete-mode-deletion.md

@@ -21,7 +21,7 @@ If you deploy to [more than one resource group in a template](./deploy-to-resour
 The resources are listed by resource provider namespace. To match a resource provider namespace with its Azure service name, see [Resource providers for Azure services](../management/azure-services-resource-providers.md).
 
 > [!NOTE]
-> Always use the [what-if operation](template-deploy-what-if.md) before deploying a template in complete mode. What-if shows you which resources will be created, deleted, or modified. Use what-if to avoid unintentionally deleting resources.
+> Always use the [what-if operation](./deploy-what-if.md) before deploying a template in complete mode. What-if shows you which resources will be created, deleted, or modified. Use what-if to avoid unintentionally deleting resources.
 
 Jump to a resource provider namespace:
 > [!div class="op_single_selector"]

articles/azure-resource-manager/bicep/deployment-history-deletions.md

@@ -28,7 +28,7 @@ Deployments are deleted from your history when you exceed 775 deployments. Azure
 >
 > If your resource group is already at the 800 limit, your next deployment fails with an error. The automatic deletion process starts immediately. You can try your deployment again after a short wait.
 
-In addition to deployments, you also trigger deletions when you run the [what-if operation](template-deploy-what-if.md) or validate a deployment.
+In addition to deployments, you also trigger deletions when you run the [what-if operation](./deploy-what-if.md) or validate a deployment.
 
 When you give a deployment the same name as one in the history, you reset its place in the history. The deployment moves to the most recent place in the history. You also reset a deployment's place when you [roll back to that deployment](../templates/rollback-on-error.md) after an error.