Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into release-2019-cu

Author: v-alje

docs/azdata/install/deploy-install-azdata-installer.md

@@ -5,52 +5,25 @@ description: Learn how to install the azdata tool with the installer.
 author: MikeRayMSFT 
 ms.author: mikeray
 ms.reviewer: mihaelab
-ms.date: 11/04/2019
+ms.date: 09/30/2020
 ms.topic: conceptual
 ms.prod: sql
 ms.technology: big-data-cluster
 ---
 
-# Install `azdata` to manage [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ss-nover.md)] with Windows Installer
+# Install `azdata` with Windows Installer
 
-[!INCLUDE[SQL Server 2019](../../includes/applies-to-version/azdata.md)]
+[!INCLUDE [azdata](../../includes/applies-to-version/azdata.md)]
 
-This article describes how to install `azdata` on Windows. Before the Windows Installation was available, the installation of `azdata` required `pip`.
+This article describes how to install `azdata` on Windows with an installer. Use `azdata` to manage SQL Server Big Data Clusters or Azure Arc enabled data services.
 
->For Linux (Ubuntu), see [install `azdata` with installer](./deploy-install-azdata-linux-package.md).
-
-At this time, there are no package managers to install `azdata` on other operating systems or distributions. For these platforms, see [install `azdata` without package manager](./deploy-install-azdata.md).
-
-## Install `azdata` with the Microsoft Windows Installer
+## Steps to Install `azdata` with the Microsoft Windows Installer
 
 To install `azdata` on with the Microsoft Windows Installer,
 
 1. Remove `azdata` if it was installed using `pip`. If `azdata` was installed using Windows Installer, proceed to the next step.
 1. Install `azdata` using the Windows Installer.
 
-### Uninstall if previous installation done with `pip`
-
-If you have any previous releases of `azdata` installed, it is important to uninstall it first before installing the latest version.
-
-   To remove the release candidate version of `azdata`, run the following command.
-
-   ```bash
-   pip3 uninstall -r https://azdatacli.blob.core.windows.net/python/azdata/2019-rc1/requirements.txt
-   ```
-
-Once removed, [install `azdata` on Windows](#install-azdata-windows).
-
->[!NOTE]
->If your previous installation was done using the MSI, you will not need to uninstall any current versions before using the MSI installer.
-
-### <a id="install-azdata-windows"></a>Install with Windows Installer
-
-Use the Windows Installer to install or update `azdata` on Windows.
-
-[Download the `azdata` Windows Installer](https://aka.ms/azdata-msi).
-
-When the installer asks if it can make changes to your computer, click `Yes`.
-
 ### Uninstall `azdata` with Windows Installer
 
 To uninstall `azdata` with Windows Installer, follow the instructions for the appropriate operating system.

docs/azdata/install/deploy-install-azdata-linux-package.md

@@ -1,109 +1,112 @@
 ---
-title: Install azdata with installer on Linux
-titleSuffix:
-description: Learn how to install the azdata tool with the installer (Linux). 
+title: Install azdata with apt
+description: Learn how to install the azdata tool with apt. 
 author: MikeRayMSFT 
 ms.author: mikeray
 ms.reviewer: mihaelab
-ms.date: 01/07/2020
+ms.date: 09/30/2020
 ms.topic: conceptual
 ms.prod: sql
 ms.technology: big-data-cluster
 ---
 
 # Install `azdata` with apt
 
-[!INCLUDE[SQL Server 2019](../../includes/applies-to-version/azdata.md)]
+[!INCLUDE[azdata](../../includes/applies-to-version/azdata.md)]
 
-This article describes how to install `azdata` on Linux. Before these package managers were available, the installation of `azdata` required `pip`.
+For Linux distributions with `apt` there is a package for the `azdata-cli`. The CLI package has been tested on Linux versions which use `apt`:
 
-[!INCLUDE [azdata-package-installation-remove-pip-install](../../includes/azdata-package-installation-remove-pip-install.md)]
-
-## <a id="linux"></a>Install `azdata` for Linux
+- Ubuntu 16.04, Ubuntu 18.04
 
-`azdata` installation package is available for Ubuntu with `apt`.
+[!INCLUDE [azdata-package-installation-remove-pip-install](../../includes/azdata-package-installation-remove-pip-install.md)]
 
-### <a id="azdata-apt"></a>Install `azdata` with apt (Ubuntu)
+## Install with apt
 
->[!NOTE]
->The `azdata` package does not use the system Python, rather installs its own Python interpreter.
+>[!IMPORTANT]
+> The RPM package of the `azdata-cli` depends on the python3 package. On your system, this may be a Python version which predates the requirement of *Python 3.6.x*. If this poses an issue for you, find a replacement python3 package or follow the manual install instructions that use [`pip`](../install/deploy-install-azdata-pip.md).
 
-1. Get packages needed for the install process:
+1. Install dependencies necessary to install `azdata-cli`.
 
-    ```bash
-    sudo apt-get update
-    sudo apt-get install gnupg ca-certificates curl wget software-properties-common apt-transport-https lsb-release -y
-    ```
+   ```bash
+   sudo apt-get update
+   sudo apt-get install gnupg ca-certificates curl wget software-properties-common apt-transport-https lsb-release -y
+   ```
 
-2. Download and install the signing key:
+2. Import the Microsoft repository key.
 
-    ```bash
-    curl -sL https://packages.microsoft.com/keys/microsoft.asc |
-    gpg --dearmor |
-    sudo tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null
-    ```
+   ```bash
+   curl -sL https://packages.microsoft.com/keys/microsoft.asc |
+   gpg --dearmor |
+   sudo tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null
+   ```
 
-3. Add the `azdata` repository information.
+3. Create local repository information.
 
    For Ubuntu 16.04 client run:
+
     ```bash
     sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/16.04/prod.list)"
     ```
 
    For Ubuntu 18.04 client run:
+
     ```bash
     sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/18.04/prod.list)"
     ```
 
-4. Update repository information and install `azdata`:
+   For Ubuntu 20.04 client run:
 
     ```bash
-    sudo apt-get update
-    sudo apt-get install -y azdata-cli
+    sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/20.04/prod.list)
     ```
 
-5. Verify installation:
+4. Install `azdata-cli`.
 
-    ```bash
-    azdata --version
-    ```
+   ```bash
+   sudo apt-get update
+   sudo apt-get install -y azdata-cli
+   ```
+
+## Verify install
 
-### Update
+```bash
+azdata
+azdata --version
+```
+
+## Update
 
-Upgrade `azdata` only:
+Update the `azdata-cli` with the `apt-get update` and `apt-get install` commands.
 
 ```bash
 sudo apt-get update && sudo apt-get install --only-upgrade -y azdata-cli
 ```
 
-### Uninstall
+## Uninstall
 
-1. Uninstall with apt-get remove:
-
-    ```bash
-    sudo apt-get remove -y azdata-cli
-    ```
+1. Remove the package from your system.
 
-2. Remove the `azdata` repository information:
+   ```bash
+   sudo apt-get remove -y azdata-cli
+   ```
 
-    >[!NOTE]
-    >This step is not needed if you plan on installing `azdata` in the future
+2. Remove the repository information if you do not plan to reinstall `azdata-cli`.
 
-    ```bash
-    sudo rm /etc/apt/sources.list.d/azdata-cli.list
-    ```
+   ```bash
+   sudo rm /etc/apt/sources.list.d/azdata-cli.list
+   ```
 
-3. Remove the signing key:
+3. Remove the repository key.
 
-    ```bash
-    sudo rm /etc/apt/trusted.gpg.d/dpgswdist.v1.asc.gpg
-    ```
+   ```bash
+   sudo rm /etc/apt/trusted.gpg.d/dpgswdist.v1.asc.gpg
+   ```
 
-4. Remove any unneeded dependencies that were installed with Azdata CLI:
+4. Remove dependencies no longer required.
 
-    ```bash
-    sudo apt autoremove
-    ```
+   ```bash
+   sudo apt autoremove
+   ```
 
 ## Next steps
 

docs/azdata/install/deploy-install-azdata-macos.md

@@ -5,18 +5,19 @@ description: Learn how to install the azdata tool on macOS.
 author: MikeRayMSFT 
 ms.author: mikeray
 ms.reviewer: mihaelab
-ms.date: 01/07/2020
+ms.date: 09/30/2020
 ms.topic: conceptual
 ms.prod: sql
 ms.technology: big-data-cluster
 ---
 
 # Install `azdata` on macOS
 
-For the macOS platform, you can install the `azdata-cli` with homebrew package manager. The CLI package has been tested on macOS versions: 
-* 10.13 High Sierra
-* 10.14 Mojave
-* 10.15 Catalina
+For the macOS platform, you can install the `azdata-cli` with Homebrew package manager. The CLI package has been tested on macOS versions:
+
+- 10.13 High Sierra
+- 10.14 Mojave
+- 10.15 Catalina
 
 ## Install with Homebrew
 
@@ -48,7 +49,7 @@ brew upgrade azdata-cli
 
 ## Uninstall
 
-Use homebrew to uninstall the `azdata-cli` package.
+Use Homebrew to uninstall the `azdata-cli` package.
 
 ```bash
 brew uninstall azdata-cli