Merge pull request #78944 from sptramer/tool-includes/cli-install

ktoliver · web-flow · commit e7d5fdd70fba · 2019-06-06T15:16:18.000-07:00
Updated CLI install instructions in includes.
diff --git a/includes/azure-cli-prerequisites-include.md b/includes/azure-cli-prerequisites-include.md
@@ -1,15 +1,14 @@
 ---
-author: genlin
-ms.service: virtual-network
+author: sptramer
 ms.topic: include
-ms.date: 11/09/2018	
-ms.author: genli
+ms.date: 05/31/2019
+ms.author: sttramer
 ---
 ## Prerequisite: Install the Azure CLI
-To perform the steps in this article, you need to [install the Azure Command-Line Interface for Mac, Linux, and Windows (Azure CLI)](../articles/cli-install-nodejs.md) and you need to [sign in to Azure](/cli/azure/authenticate-azure-cli). 
+
+To perform the steps in this article, [install the Azure CLI](/cli/azure/install-azure-cli) and [sign in to Azure](/cli/azure/authenticate-azure-cli). 
 
 > [!NOTE]
-> If you don't have an Azure account, you need one. Go sign up for a [free trial here](../articles/active-directory/fundamentals/sign-up-organization.md). In addition, to follow along completely you need to have either [jq](https://stedolan.github.io/jq/) or some other JSON parsing tool or library installed.
-> 
-> 
+> If you don't have an Azure account, you need one. Sign up for a [free trial here](../articles/active-directory/fundamentals/sign-up-organization.md).
+> In addition, to follow along you need to have either [jq](https://stedolan.github.io/jq/) or some other JSON parsing tool or library installed.
 
diff --git a/includes/container-service-connect.md b/includes/container-service-connect.md
@@ -2,7 +2,7 @@
 author: dlepow
 ms.service: container-service
 ms.topic: include
-ms.date: 11/09/2018
+ms.date: 06/05/2019
 ms.author: danlep
 ---
 # Make a remote connection to a Kubernetes, DC/OS, or Docker Swarm cluster
@@ -33,7 +33,7 @@ Follow these steps to install and configure `kubectl` on your computer.
 
 ### Install kubectl
 One way to install this
-tool is to use the `az acs kubernetes install-cli` Azure CLI command. To run this command, make sure that you [installed](/cli/azure/install-az-cli2) the latest version of the Azure CLI and are signed in to an Azure account (`az login`).
+tool is to use the `az acs kubernetes install-cli` Azure CLI command. To run this command, [install the Azure CLI](/cli/azure/install-azure-cli) and sign in to an Azure account with `az login`.
 
 ```azurecli
 # Linux or macOS
@@ -80,7 +80,7 @@ kubectl proxy
 
 The Kubernetes UI is now available at: `http://localhost:8001/ui`.
 
-For more information, see the [Kubernetes quick start](http://kubernetes.io/docs/user-guide/quick-start/).
+For more information, see the [Kubernetes quickstart](http://kubernetes.io/docs/user-guide/quick-start/).
 
 ## Connect to a DC/OS or Swarm cluster
 
diff --git a/includes/container-service-scale.md b/includes/container-service-scale.md
@@ -24,7 +24,7 @@ You can change the number of agent nodes in a DC/OS, Docker Swarm, or Kubernetes
 
 ## Scale with the Azure CLI
 
-Make sure that you [installed](/cli/azure/install-az-cli2) the latest Azure CLI and signed in to an Azure account (`az login`).
+[Install the Azure CLI](/cli/azure/install-azure-cli) and sign in to an Azure account with `az login`.
 
 ### See the current agent count
 To see the number of agents currently in the cluster, run the `az acs show` command. This shows the cluster configuration. For example, the following command shows the configuration of the container service named `containerservice-myACSName` in the resource group `myResourceGroup`:
diff --git a/includes/contains-classic-cli-content.md b/includes/contains-classic-cli-content.md
@@ -4,7 +4,7 @@ description: include file
 author: sptramer
 ms.author: sttramer
 manager: carmonm
-ms.date: 06/12/2018
+ms.date: 06/05/2019
 ms.topic: include
 ms.custom: include file
 ---
@@ -13,7 +13,5 @@ ms.custom: include file
 > an older version of the Azure CLI that should be used only with the
 > Azure classic deployment model.
 >
-> The classic CLI can be installed side-by-side with the modern Azure CLI,
-> but we recommend using the Azure CLI for all new scripts and deployments.
 > To install the classic CLI, see [Install the Azure classic CLI](/cli/azure/install-classic-cli)
-> and to install the current CLI, see [Install Azure CLI](/cli/azure/install-azure-cli).
+> and to install the current Azure CLI for Azure Resource Manager deployments, see [Install Azure CLI](/cli/azure/install-azure-cli).
diff --git a/includes/event-grid-preview-feature-note.md b/includes/event-grid-preview-feature-note.md
@@ -23,11 +23,9 @@ In [CloudShell](/azure/cloud-shell/quickstart):
 
 For a local installation:
 
-1. Uninstall Azure CLI locally.
-1. Install the [latest version](/cli/azure/install-azure-cli) of Azure CLI.
-1. Launch command window.
+1. [Install the Azure CLI](/cli/azure/install-azure-cli). Make sure that you have the latest version, by checking with `az --version`.
 1. Uninstall previous versions of the extension `az extension remove -n eventgrid`
-1. Install the extension `az extension add -n eventgrid`
+1. Install the `eventgrid` extension with `az extension add -n eventgrid`
 
 ### Install module for PowerShell
 
diff --git a/includes/hdinsight-use-latest-cli.md b/includes/hdinsight-use-latest-cli.md
@@ -8,5 +8,5 @@ ms.author: jasonh
 > [!IMPORTANT]
 > Azure CLI support for managing HDInsight resources using Azure Service Manager (ASM) is **deprecated**, and was removed on January 1, 2017. The steps in this document use the new Azure CLI commands that work with Azure Resource Manager.
 > 
-> Follow the steps in [Install and configure Azure CLI](../articles/cli-install-nodejs.md) to install the latest version of the Azure CLI. If you have scripts that need to be modified to use the new commands that work with Azure Resource Manager, see [Migrating to Azure Resource Manager-based development tools for HDInsight clusters](../articles/hdinsight/hdinsight-hadoop-development-using-azure-resource-manager.md) for more information.
+> Follow the steps in [Install the Azure CLI](/azure/cli/install-azure-cli) to install the latest version of the Azure CLI. If you have scripts that need to be modified to use the new commands that work with Azure Resource Manager, see [Migrating to Azure Resource Manager-based development tools for HDInsight clusters](../articles/hdinsight/hdinsight-hadoop-development-using-azure-resource-manager.md) for more information.
 
diff --git a/includes/hdinsight-use-latest-powershell-cli-and-dotnet-sdk.md b/includes/hdinsight-use-latest-powershell-cli-and-dotnet-sdk.md
@@ -2,13 +2,13 @@
 author: jasonwhowell
 ms.service: hdinsight
 ms.topic: include
-ms.date: 10/25/2018
+ms.date: 06/05/2019
 ms.author: jasonh
 ---
 > [!IMPORTANT]
 > Support for managing HDInsight resources using Azure Service Manager (ASM) through Azure PowerShell, the Azure CLI, and the HDInsight .NET SDK is **deprecated**, and was removed on January 1, 2017. The steps in this document use the new Azure PowerShell cmdlets, Azure CLI commands, and .NET SDK that work with Azure Resource Manager.
 > 
-> Please follow the steps in the [Install and Configure Azure CLI](../articles/cli-install-nodejs.md) and [Install and Configure Azure PowerShell](/powershell/azureps-cmdlets-docs) to install the latest version of Azure PowerShell and the Azure CLI. To install the latest version of the HDInsight .NET SDK, use the information provided on the [Microsoft Azure HDInsight .NET SDK](https://www.nuget.org/packages/Microsoft.WindowsAzure.Management.HDInsight/) NuGet page. If you have existing scripts or applications that need to be modified to use the new cmdlets, new CLI commands, or .NET SDK, see [Migrating to Azure Resource Manager-based development tools for HDInsight clusters](../articles/hdinsight/hdinsight-hadoop-development-using-azure-resource-manager.md) for more information.
+> Please follow the steps in the [Install and Configure Azure CLI](/azure/cli/install-azure-cli) and [Install and Configure Azure PowerShell](/powershell/azureps-cmdlets-docs) to install the latest version of Azure PowerShell and the Azure CLI. To install the latest version of the HDInsight .NET SDK, use the information provided on the [Microsoft Azure HDInsight .NET SDK](https://www.nuget.org/packages/Microsoft.WindowsAzure.Management.HDInsight/) NuGet page. If you have existing scripts or applications that need to be modified to use the new cmdlets, new CLI commands, or .NET SDK, see [Migrating to Azure Resource Manager-based development tools for HDInsight clusters](../articles/hdinsight/hdinsight-hadoop-development-using-azure-resource-manager.md) for more information.
 > 
 > 
 
diff --git a/includes/howto-detach-disk-linux.md b/includes/howto-detach-disk-linux.md
@@ -13,7 +13,7 @@ When you no longer need a data disk that's attached to a virtual machine (VM), y
 ## Find the disk
 Before you can detach a disk from a VM you need to find out the LUN number, which is an identifier for the disk to be detached. To do that, follow these steps:
 
-1. Open Azure CLI and [connect to your Azure subscription](/cli/azure/authenticate-azure-cli). Make sure you are in Azure Service Management mode (`azure config mode asm`).
+1. Open the Azure CLI and [connect to your Azure subscription](/cli/azure/authenticate-azure-cli). Make sure you are in Azure Service Management mode (`azure config mode asm`).
 2. Find out which disks are attached to your VM. The following example lists disks for the VM named `myVM`:
 
     ```azurecli
diff --git a/includes/iot-hub-get-started-create-device-identity.md b/includes/iot-hub-get-started-create-device-identity.md
@@ -12,7 +12,7 @@
 
 ## Create a device identity
 
-In this section, you use the Azure CLI to create a device identity for this tutorial. The Azure CLI is preinstalled in the [Azure Cloud Shell](~/articles/cloud-shell/overview.md), or you can [install it locally](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Device IDs are case sensitive.
+In this section, you use the Azure CLI to create a device identity for this tutorial. The Azure CLI is preinstalled in the [Azure Cloud Shell](~/articles/cloud-shell/overview.md), or you can [install the Azure CLI locally](/cli/azure/install-azure-cli). Device IDs are case sensitive.
 
 1. Run the following command in the command-line environment where you are using the Azure CLI to install the IoT extension:
 
diff --git a/includes/iot-solution-accelerators-access-vm.md b/includes/iot-solution-accelerators-access-vm.md
@@ -12,7 +12,7 @@
 
 ## Access the virtual machine
 
-The following steps use the `az` command in the Azure Cloud Shell. If you prefer, you can [Install Azure CLI 2.0](https://docs.microsoft.com/cli/azure/install-azure-cli) on your development machine and run the commands locally.
+The following steps use the Azure CLI in Azure Cloud Shell. If you prefer, you can [Install the Azure CLI](/cli/azure/install-azure-cli) on your development machine and run the commands locally.
 
 The following steps show you how to configure the Azure virtual machine to allow **SSH** access. The steps shown assume the name you chose for the solution accelerator is **contoso-simulation** -- replace this value with the name of your deployment:
 
diff --git a/includes/media-services-cli-instructions.md b/includes/media-services-cli-instructions.md
@@ -14,11 +14,11 @@ ms.custom: include file
 
 It is recommended to use [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview?view=azure-cli-latest) to execute CLI commands. **Cloud Shell** is a free, interactive shell that you can use to run the steps in this article. Common Azure tools are preinstalled and configured in Cloud Shell for you to use with your account. It provides the flexibility of choosing the shell experience that best suits the way you work. Linux users can opt for a Bash experience, while Windows users can opt for PowerShell.
 
-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](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). 
+You can also install the CLI locally. See [Install the Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli) for instructions for your platform.
 
-### Login
+### Sign in
 
-To start using the CLI shell (in the cloud or locally), run `az login` to create a connection with Azure.
+Using a local install of the CLI requires signing in to Azure. This step is not required for Azure Cloud Shell. Sign in with the `az login` command.
 
 If the CLI can open your default browser, it will do so and load a sign-in page. Otherwise, you need to open a browser page and follow the instructions on the command line to enter an authorization code after navigating to https://aka.ms/devicelogin in your browser.
 
diff --git a/includes/redis-cache-access-keys_cli.md b/includes/redis-cache-access-keys_cli.md
@@ -16,8 +16,6 @@ ms.custom: "include file"
 To retrieve the host name and ports using the Azure CLI you can call [az redis show](https://docs.microsoft.com/cli/azure/redis#az_redis_show), and to retrieve the keys you can call [az redis list-keys](https://docs.microsoft.com/cli/azure/redis#az_redis_list_keys). The following script calls these two commands and echoes the hostname, ports, and keys to the console.
 
 ```azurecli
-#/bin/bash
-
 # Retrieve the hostname, ports, and keys for contosoCache located in contosoGroup
 
 # Retrieve the hostname and ports for an Azure Cache for Redis instance
@@ -35,4 +33,4 @@ echo "Primary Key:" ${keys[0]}
 echo "Secondary Key:" ${keys[1]}
 ```
 
-For more information about this script, see [Get the hostname, ports, and keys for Azure Cache for Redis](../articles/azure-cache-for-redis/scripts/cache-keys-ports.md). For more information on Azure CLI see [Install Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli) and [Get started with Azure CLI](https://docs.microsoft.com/cli/azure/get-started-with-azure-cli).
+For more information about this script, see [Get the hostname, ports, and keys for Azure Cache for Redis](../articles/azure-cache-for-redis/scripts/cache-keys-ports.md). For more information on Azure CLI see [Install Azure CLI](/cli/azure/install-azure-cli) and [Get started with Azure CLI](/cli/azure/get-started-with-azure-cli).
diff --git a/includes/requires-classic-cli.md b/includes/requires-classic-cli.md
@@ -4,7 +4,7 @@ description: include file
 author: sptramer
 ms.author: sttramer
 manager: carmonm
-ms.date: 06/12/2018
+ms.date: 05/31/2019
 ms.topic: include
 ms.custom: include file
 ---
@@ -14,7 +14,7 @@ ms.custom: include file
 > so the classic CLI is required. 
 > 
 > The classic CLI can be installed side by side with the modern Azure CLI,
-> but we recommend the Azure CLI for all new scripts and deployments where feature support
-> is available. To install the classic CLI, see [Install the Azure classic CLI](https://docs.microsoft.com/cli/azure/install-classic-cli?view=azure-cli-latest). 
-> To install the current CLI, see [Install the Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest).
+> but we recommend the Azure CLI for all new scripts and deployments.
+> To install the classic CLI, see [Install the Azure classic CLI](/cli/azure/install-classic-cli). 
+> To install the latest version of the CLI, see [Install the Azure CLI](/cli/azure/install-azure-cli).
 
diff --git a/includes/sample-cli-install.md b/includes/sample-cli-install.md
@@ -1,12 +1,11 @@
 ---
 author: sptramer
-ms.service: virtual-machines
 ms.topic: include
-ms.date: 11/25/2018
+ms.date: 05/31/2019
 ms.author: sttramer
 ---
+To run this sample, install the latest version of the [Azure CLI](/cli/azure/install-azure-cli). To start, run `az login` to create a connection with Azure.
 
+Samples for the Azure CLI are written for the `bash` shell. To run this sample in Windows PowerShell or Command Prompt, you may need to change
+elements of the script.
 
-To run this sample, make sure you have installed the latest version of the [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli). To start, run `az login` to create a connection with Azure.
-
-This sample works in a Bash shell. For options on running Azure CLI scripts on Windows client, see [Install the Azure CLI on Windows](/cli/azure/install-azure-cli-windows).
diff --git a/includes/virtual-machines-autoscale.md b/includes/virtual-machines-autoscale.md
@@ -5,7 +5,7 @@ ms.topic: include
 ms.date: 10/26/2018
 ms.author: cynthn
 ---
-﻿You can easily [automatically scale](../articles/azure-monitor/platform/autoscale-best-practices.md) your [virtual machines (VMs)](../articles/virtual-machines/windows/overview.md) when you use [virtual machine scale sets](../articles/virtual-machine-scale-sets/virtual-machine-scale-sets-overview.md) and the [autoscaling feature of Azure Monitor](../articles/azure-monitor/platform/autoscale-overview.md). Your VMs need to be members of a scale set to be automatically scaled. This article provides information that enables you to better understand how to scale your VMs both vertically and horizontally using automatic and manual methods.
+You can easily [automatically scale](../articles/azure-monitor/platform/autoscale-best-practices.md) your [virtual machines (VMs)](../articles/virtual-machines/windows/overview.md) when you use [virtual machine scale sets](../articles/virtual-machine-scale-sets/virtual-machine-scale-sets-overview.md) and the [autoscaling feature of Azure Monitor](../articles/azure-monitor/platform/autoscale-overview.md). Your VMs need to be members of a scale set to be automatically scaled. This article provides information that enables you to better understand how to scale your VMs both vertically and horizontally using automatic and manual methods.
 
 ## Horizontal or vertical scaling
 
diff --git a/includes/virtual-machines-common-shared-images-cli.md b/includes/virtual-machines-common-shared-images-cli.md
@@ -12,7 +12,7 @@
 
 ## Before you begin
 
-To complete the example in this article, you must have an existing managed image of a generalized VM. For more information, see [Tutorial: Create a custom image of an Azure VM with the Azure CLI 2.0](https://docs.microsoft.com/azure/virtual-machines/linux/tutorial-custom-images). If the managed image contains a data disk, the data disk size cannot be more than 1 TB.
+To complete the example in this article, you must have an existing managed image of a generalized VM. For more information, see [Tutorial: Create a custom image of an Azure VM with the Azure CLI](https://docs.microsoft.com/azure/virtual-machines/linux/tutorial-custom-images). If the managed image contains a data disk, the data disk size cannot be more than 1 TB.
 
 ## Launch Azure Cloud Shell
 

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ ms.author: jasonh`
`8`	`8`	`> [!IMPORTANT]`
`9`	`9`	`> Azure CLI support for managing HDInsight resources using Azure Service Manager (ASM) is deprecated, and was removed on January 1, 2017. The steps in this document use the new Azure CLI commands that work with Azure Resource Manager.`
`10`	`10`	`>`
`11`		`-> Follow the steps in [Install and configure Azure CLI](../articles/cli-install-nodejs.md) to install the latest version of the Azure CLI. If you have scripts that need to be modified to use the new commands that work with Azure Resource Manager, see [Migrating to Azure Resource Manager-based development tools for HDInsight clusters](../articles/hdinsight/hdinsight-hadoop-development-using-azure-resource-manager.md) for more information.`
	`11`	`+> Follow the steps in [Install the Azure CLI](/azure/cli/install-azure-cli) to install the latest version of the Azure CLI. If you have scripts that need to be modified to use the new commands that work with Azure Resource Manager, see [Migrating to Azure Resource Manager-based development tools for HDInsight clusters](../articles/hdinsight/hdinsight-hadoop-development-using-azure-resource-manager.md) for more information.`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@`
`2`	`2`	`author: jasonwhowell`
`3`	`3`	`ms.service: hdinsight`
`4`	`4`	`ms.topic: include`
`5`		`-ms.date: 10/25/2018`
	`5`	`+ms.date: 06/05/2019`
`6`	`6`	`ms.author: jasonh`
`7`	`7`	`---`
`8`	`8`	`> [!IMPORTANT]`
`9`	`9`	`> Support for managing HDInsight resources using Azure Service Manager (ASM) through Azure PowerShell, the Azure CLI, and the HDInsight .NET SDK is deprecated, and was removed on January 1, 2017. The steps in this document use the new Azure PowerShell cmdlets, Azure CLI commands, and .NET SDK that work with Azure Resource Manager.`
`10`	`10`	`>`
`11`		-> Please follow the steps in the [Install and Configure Azure CLI](../articles/cli-install-nodejs.md) and [Install and Configure Azure PowerShell](/powershell/azureps-cmdlets-docs) to install the latest version of Azure PowerShell and the Azure CLI. To install the latest version of the HDInsight .NET SDK, use the information provided on the [Microsoft Azure HDInsight .NET SDK](https://www.nuget.org/packages/Microsoft.WindowsAzure.Management.HDInsight/) NuGet page. If you have existing scripts or applications that need to be modified to use the new cmdlets, new CLI commands, or .NET SDK, see [Migrating to Azure Resource Manager-based development tools for HDInsight clusters](../articles/hdinsight/hdinsight-hadoop-development-using-azure-resource-manager.md) for more information.
	`11`	+> Please follow the steps in the [Install and Configure Azure CLI](/azure/cli/install-azure-cli) and [Install and Configure Azure PowerShell](/powershell/azureps-cmdlets-docs) to install the latest version of Azure PowerShell and the Azure CLI. To install the latest version of the HDInsight .NET SDK, use the information provided on the [Microsoft Azure HDInsight .NET SDK](https://www.nuget.org/packages/Microsoft.WindowsAzure.Management.HDInsight/) NuGet page. If you have existing scripts or applications that need to be modified to use the new cmdlets, new CLI commands, or .NET SDK, see [Migrating to Azure Resource Manager-based development tools for HDInsight clusters](../articles/hdinsight/hdinsight-hadoop-development-using-azure-resource-manager.md) for more information.
`12`	`12`	`>`
`13`	`13`	`>`
`14`	`14`