Merge pull request #108259 from msebolt/powershell-update-pr6

another revision

Author: GitHubber17

articles/sql-database/scripts/sql-database-add-elastic-pool-to-failover-group-cli.md

@@ -20,10 +20,10 @@ If you choose to install and use the CLI locally, this article requires that you
 
 ## Sample script
 
-[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
-
 ### Sign in to Azure
 
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+
 ```azurecli-interactive
 $subscription = "<subscriptionId>" # add subscription here
 
@@ -39,17 +39,17 @@ az account set -s $subscription # ...or use 'az login'
 Use the following command to remove the resource group and all resources associated with it.
 
 ```azurecli-interactive
-az group delete --name $resourceGroup
+az group delete --name $resource
 ```
 
-## Script explanation
+## Sample reference
 
-This script uses the following commands.
+This script uses the following commands. Each command in the table links to command specific documentation.
 
-| Command | Notes |
+| | |
 |---|---|
-| [az sql elastic-pool](/cli/azure/sql/elastic-pool) | Creates an elastic database pool for a an Azure SQL Database. |
-| [az sql failover-group ](/cli/azure/sql/failover-group) | Creates a new failover group. |
+| [az sql elastic-pool](/cli/azure/sql/elastic-pool) | Elastic pool commands. |
+| [az sql failover-group ](/cli/azure/sql/failover-group) | Failover group commands. |
 
 ## Next steps
 

articles/sql-database/scripts/sql-database-add-managed-instance-to-failover-group-cli.md

@@ -14,57 +14,45 @@ ms.date: 07/16/2019
 ---
 # Use CLI to add an Azure SQL Database managed instance to a failover group
 
-This PowerShell script example creates two managed instances, adds them to a failover group, and then tests failover from the primary managed instance to the secondary managed instance.
+This Azure CLI example creates two managed instances, adds them to a failover group, and then tests failover from the primary managed instance to the secondary managed instance.
 
-[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+If you choose to install and use the CLI locally, this article requires that you are running the Azure CLI version 2.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install the Azure CLI](/cli/azure/install-azure-cli).
 
-[!INCLUDE [cloud-shell-try-it.md](../../../includes/cloud-shell-try-it.md)]
+## Sample script
 
-If you choose to install and use the CLI locally, this article requires that you are running the Azure CLI version 2.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install the Azure CLI](/cli/azure/install-azure-cli).
+### Sign in to Azure
+
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
 
-## Sample scripts
+### Run the script
 
 [!code-azurecli-interactive[main](../../../cli_scripts/sql-database/failover-groups/add-managed-instance-to-failover-group-az-cli.sh "Add managed instance to a failover group")]
 
-## Clean up deployment
+### Clean up deployment
 
 Use the following command to remove the resource group and all resources associated with it. You will need to remove the resource group twice. Removing the resource group the first time will remove the managed instance and virtual clusters but will then fail with the error message `az group delete : Long running operation failed with status 'Conflict'.`. Run the az group delete command a second time to remove any residual resources as well as the resource group.
 
 ```azurecli-interactive
-az group delete --name $resourceGroupName
+az group delete --name $resource
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command specific documentation.
 
-| Command | Notes |
+| | |
 |---|---|
-| [az group create](/cli/azure/group#az-group-create) | Creates a resource group in which all resources are stored. |
-| [az network vnet create](/cli/azure/network/vnet#az-network-vnet-create) | Creates a virtual network.  |
-| [az network vnet subnet create](/cli/azure/network/vnet/subnet#az-network-vnet-subnet-create) | Adds a subnet configuration to a virtual network. |
-| [az network vnet show](/cli/azure/network/vnet#az-network-vnet-show) | Gets a virtual network in a resource group. |
-| [az network vnet subnet show](/cli/azure/network/vnet/subnet#az-network-vnet-subnet-show) | Gets a subnet in a virtual network. |
-| [az network nsg create](/cli/azure/network/nsg#az-network-nsg-create) | Creates a network security group. |
-| [az network route-table create](/cli/azure/network/route-table#az-network-route-table-create) | Creates a route table. |
-| [az network vnet subnet update](/cli/azure/network/vnet/subnet#az-network-vnet-subnet-update) | Updates a subnet configuration for a virtual network. |
-| [az network vnet update](/cli/azure/network/vnet#az-network-vnet-update) | Updates a virtual network. |
-| [az network nsg show](/cli/azure/network/nsg#az-network-nsg-show) | Gets a network security group. |
-| [az network nsg rule create](/cli/azure/network/nsg/rule#az-network-nsg-rule-create)| Adds a network security rule configuration to a network security group. |
-| [az network nsg rule update](/cli/azure/network/nsg#az-network-nsg-update) | Updates a network security group. |
-| [az network route-table route create](/cli/azure/network/route-table/route#az-network-route-table-route-create) | Adds a route to a route table. |
-| [az network route-table update](/cli/azure/network/route-table#az-network-route-table-update) | Updates a route table. |
-| [az sql mi create](/cli/azure/sql/mi#az-sql-mi-create) | Creates an Azure SQL Database managed instance. |
-| [az sql mi show](/cli/azure/sql/mi#az-sql-mi-show)| Returns information about Azure SQL Managed Database Instance. |
-| [az network public-ip create](/cli/azure/network/public-ip#az-network-public-ip-create) | Creates a public IP address. |
-| [az network vnet-gateway create](/cli/azure/network/vnet-gateway#az-network-vnet-gateway-create) | Creates a Virtual Network Gateway |
-| [az sql instance-failover-group create](/cli/azure/sql/instance-failover-group#az-sql-instance-failover-group-create) | Creates a new Azure SQL Database managed instance failover group. |
-| [az sql instance-failover-group show](/cli/azure/sql/instance-failover-group#az-sql-instance-failover-group-show) | Gets or lists managed instance failover groups.|
-| [az sql instance-failover-group set-primary](/cli/azure/sql/instance-failover-group#az-sql-instance-failover-group-set-primary) | Executes a failover of a managed instance failover group. |
-| [az group delete](/cli/azure/vm/extension#az-vm-extension-set) | Deletes a resource group including all nested resources. |
+| [az network vnet](/cli/azure/network/vnet) | Virtual network commands.  |
+| [az network vnet subnet](/cli/azure/network/vnet/subnet) | Virtual network subnet commands. |
+| [az network nsg](/cli/azure/network/nsg) | Network security group commands. |
+| [az network route-table](/cli/azure/network/route-table) | Route table commands. |
+| [az sql mi](/cli/azure/sql/mi) | Managed instance commands. |
+| [az network public-ip](/cli/azure/network/public-ip) | Network public IP address commands. |
+| [az network vnet-gateway](/cli/azure/network/vnet-gateway) | Virtual Network Gateway commands. |
+| [az sql instance-failover-group](/cli/azure/sql/instance-failover-group) | Managed instance failover group commands. |
 
 ## Next steps
 
-For more information on the Azure CLI, see [Azure CLI documentation](https://docs.microsoft.com/cli/azure).
+For more information on the Azure CLI, see [Azure CLI documentation](/cli/azure).
 
 Additional SQL Database CLI script samples can be found in the [Azure SQL Database documentation](../sql-database-cli-samples.md).

articles/sql-database/scripts/sql-database-add-single-db-to-failover-group-cli.md

@@ -12,18 +12,18 @@ ms.author: mathoma
 ms.reviewer: carlrab
 ms.date: 07/16/2019
 ---
-# Use CLI to add an Azure SQL Database single database into a failover group
+# Use CLI to add an Azure SQL Database into a failover group
 
 This Azure CLI script example creates a single database, creates a failover group, adds the database to it, and tests failover.
 
 If you choose to install and use the CLI locally, this topic requires that you are running the Azure CLI version 2.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install the Azure CLI]( /cli/azure/install-azure-cli).
 
 ## Sample script
 
-[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
-
 ### Sign in to Azure
 
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+
 ```azurecli-interactive
 $subscription = "<subscriptionId>" # add subscription here
 
@@ -42,14 +42,14 @@ Use the following command to remove the resource group and all resources associa
 az group delete --name $resource
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command specific documentation.
 
-| Command | Notes |
+| | |
 |---|---|
-| [az sql db](/cli/azure/sql/db) | Creates a database. |
-| [az sql failover-group](/cli/azure/sql/failover-group) | Creates a failover group. |
+| [az sql db](/cli/azure/sql/db) | Database commands. |
+| [az sql failover-group](/cli/azure/sql/failover-group) | Failover group commands. |
 
 ## Next steps
 

articles/sql-database/scripts/sql-database-auditing-and-threat-detection-cli.md

@@ -20,10 +20,10 @@ If you choose to install and use the CLI locally, this topic requires that you a
 
 ## Sample script
 
-[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
-
 ### Sign in to Azure
 
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+
 ```azurecli-interactive
 $subscription = "<subscriptionId>" # add subscription here
 
@@ -39,14 +39,14 @@ az account set -s $subscription # ...or use 'az login'
 Use the following command to remove the resource group and all resources associated with it.
 
 ```azurecli-interactive
-az group delete --name $resourceGroup
+az group delete --name $resource
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command specific documentation.
 
-| Command | Notes |
+| | |
 |---|---|
 | [az sql db audit-policy](/cli/azure/sql/db/audit-policy) | Sets the auditing policy for a database. |
 | [az sql db threat-policy](/cli/azure/sql/db/threat-policy) | Sets an Advanced Threat Protection policy on a database. |

articles/sql-database/scripts/sql-database-backup-database-cli.md

@@ -19,10 +19,10 @@ If you choose to install and use the CLI locally, this article requires that you
 
 ## Sample script
 
-[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
-
 ### Sign in to Azure
 
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+
 ```azurecli-interactive
 $subscription = "<subscriptionId>" # add subscription here
 
@@ -38,21 +38,17 @@ az account set -s $subscription # ...or use 'az login'
 Use the following command to remove  the resource group and all resources associated with it.
 
 ```azurecli-interactive
-az group delete --name $resourceGroup
+az group delete --name $resource
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command specific documentation.
 
 | Command | Notes |
 |---|---|
-| [az group create](/cli/azure/group#az-group-create) | Creates a resource group in which all resources are stored. |
-| [az sql server create](/cli/azure/sql/server#az-sql-server-create) | Creates a SQL Database server that hosts single databases and elastic pools. |
-| [az sql db show](/cli/azure/sql/db#az-sql-db-show) | Gets a SQL standalone or pooled database. |
-| [az sql db restore](/cli/azure/sql/db#az-sql-db-restore) | Restores a SQL standalone or pooled database. |
-| [az sql db delete](/cli/azure/sql/db#az-sql-db-delete) | Removes an Azure SQL standalone or pooled database. |
-| [az group delete](/cli/azure/vm/extension#az-vm-extension-set) | Deletes a resource group including all nested resources. |
+| [az sql server](/cli/azure/sql/server) | Server commands. |
+| [az sql db](/cli/azure/sql/db) | Database commands. |
 
 ## Next steps
 

articles/sql-database/scripts/sql-database-copy-database-to-new-server-cli.md

@@ -20,10 +20,10 @@ If you choose to install and use the CLI locally, this article requires that you
 
 ## Sample script
 
-[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
-
 ### Sign in to Azure
 
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+
 ```azurecli-interactive
 $subscription = "<subscriptionId>" # add subscription here
 
@@ -39,15 +39,15 @@ az account set -s $subscription # ...or use 'az login'
 Use the following command to remove the resource group and all resources associated with it.
 
 ```azurecli-interactive
-az group delete --name $sourceresourcegroupname
-az group delete --name $targetresourcegroupname
+az group delete --name $resource
+az group delete --name $targetResource
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command specific documentation.
 
-| Command | Notes |
+| | |
 |---|---|
 | [az sql db copy](/cli/azure/sql/db#az-sql-db-copy) | Creates a copy of a database that uses the snapshot at the current time. |
 

articles/sql-database/scripts/sql-database-create-and-configure-database-cli.md

@@ -16,38 +16,38 @@ ms.date: 06/25/2019
 
 This Azure CLI script example creates an Azure SQL database and configure a server-level firewall rule. Once the script has been successfully run, the SQL Database can be accessed from all Azure services and the configured IP address.
 
-[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
-
-[!INCLUDE [cloud-shell-try-it.md](../../../includes/cloud-shell-try-it.md)]
-
 If you choose to install and use the CLI locally, this topic requires that you are running the Azure CLI version 2.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install the Azure CLI]( /cli/azure/install-azure-cli).
 
 ## Sample script
 
+### Sign in to Azure
+
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+
+### Run the script
+
 [!code-azurecli-interactive[main](../../../cli_scripts/sql-database/create-and-configure-database/create-and-configure-database.sh "Create SQL Database")]
 
-## Clean up deployment
+### Clean up deployment
 
 Use the following command to remove  the resource group and all resources associated with it.
 
 ```azurecli-interactive
-az group delete --name $resourceGroupName
+az group delete --name $resource
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command specific documentation.
 
-| Command | Notes |
+| | |
 |---|---|
-| [az group create](/cli/azure/group#az-group-create) | Creates a resource group in which all resources are stored. |
-| [az sql server create](/cli/azure/sql/server#az-sql-server-create) | Creates a SQL Database server that hosts a single database or elastic pool. |
-| [az sql server firewall create](/cli/azure/sql/server/firewall-rule#az-sql-server-firewall-rule-create) | Creates a firewall rule to allow access to all single databases an elastic pools on the SQL Database server from the entered IP address range. |
-| [az sql db create](/cli/azure/sql/db#az-sql-db-create) | Creates a single database or elastic pool. |
-| [az group delete](/cli/azure/resource#az-resource-delete) | Deletes a resource group including all nested resources. |
+| [az sql server](/cli/azure/sql/server#az-sql-server-create) | Server commands |
+| [az sql server firewall](/cli/azure/sql/server/firewall-rule#az-sql-server-firewall-rule-create) | Server firewall commands. |
+| [az sql db](/cli/azure/sql/db#az-sql-db-create) | Database commands. |
 
 ## Next steps
 
-For more information on the Azure CLI, see [Azure CLI documentation](https://docs.microsoft.com/cli/azure).
+For more information on the Azure CLI, see [Azure CLI documentation](/cli/azure).
 
 Additional SQL Database CLI script samples can be found in the [Azure SQL Database documentation](../sql-database-cli-samples.md).

articles/sql-database/scripts/sql-database-create-configure-managed-instance-cli.md

@@ -19,45 +19,39 @@ This Azure CLI script example creates an Azure SQL Database managed instance in
 > [!IMPORTANT]
 > For limitations, see [supported regions](../sql-database-managed-instance-resource-limits.md#supported-regions) and [supported subscription types](../sql-database-managed-instance-resource-limits.md#supported-subscription-types).
 
-[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
-
-[!INCLUDE [cloud-shell-try-it.md](../../../includes/cloud-shell-try-it.md)]
-
 If you choose to install and use the CLI locally, this article requires that you are running the Azure CLI version 2.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install the Azure CLI](/cli/azure/install-azure-cli).
 
 ## Sample script
 
+### Sign in to Azure
+
+[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+
+### Run the script
+
 [!code-azurecli-interactive[main](../../../cli_scripts/sql-database/managed-instance/create-managed-instance.sh "Create managed instance")]
 
-## Clean up deployment
+### Clean up deployment
 
 Use the following command to remove the resource group and all resources associated with it.
 
 ```azurecli-interactive
-az group delete --name $resourceGroupName
+az group delete --name $resource
 ```
 
-## Script explanation
+## Sample reference
 
 This script uses the following commands. Each command in the table links to command specific documentation.
 
-| Command | Notes |
+| | |
 |---|---|
-| [az group create](/cli/azure/group#az-group-create) | Creates a resource group in which all resources are stored. |
-| [az network vnet create](/cli/azure/network/vnet#az-network-vnet-create) | Creates a virtual network. |
-| [az network vnet subnet create](/cli/azure/network/vnet/subnet#az-network-vnet-subnet-create) | Adds a subnet configuration to a virtual network. |
-| [az network vnet show](/cli/azure/network/vnet#az-network-vnet-show) | Gets a virtual network in a resource group. |
-| [az network vnet update](/cli/azure/network/vnet#az-network-vnet-update) | Sets the goal state for a virtual network. |
-| [az network vnet subnet show](/cli/azure/network/vnet/subnet#az-network-vnet-subnet-show) | Gets a subnet in a virtual network |
-| [az network vnet subnet update](/cli/azure/network/vnet/subnet#az-network-vnet-subnet-update) | Configures the goal state for a subnet configuration in a virtual network. |
-| [az network route-table create](/cli/azure/network/route-table#az-network-route-table-create) | Creates a route table. |
-| [az network route-table show](/cli/azure/network/route-table#az-network-route-table-show) | Gets route tables. |
-| [az network route-table update](/cli/azure/network/route-table#az-network-route-table-update) | Sets the goal state for a route table. |
-| [az sql mi create](/cli/azure/sql/mi#az-sql-mi-create) | Creates an Azure SQL Database managed instance. |
-| [az group delete](/cli/azure/vm/extension#az-vm-extension-set) | Deletes a resource group including all nested resources. |
+| [az network vnet](/cli/azure/network/vnet) | Virtual network commands. |
+| [az network vnet subnet](/cli/azure/network/vnet/subnet) | Virtual network subnet commands. |
+| [az network route-table](/cli/azure/network/route-table) | Network route table commands. |
+| [az sql mi](/cli/azure/sql/mi) | Managed instance commands. |
 
 ## Next steps
 
-For more information on the Azure CLI, see [Azure CLI documentation](https://docs.microsoft.com/cli/azure).
+For more information on the Azure CLI, see [Azure CLI documentation](/cli/azure).
 
 Additional SQL Database CLI script samples can be found in the [Azure SQL Database documentation](../sql-database-cli-samples.md).