Suggested changes

Author: rwestMSFT

docs/linux/quickstart-install-connect-docker.md

@@ -177,9 +177,12 @@ Before starting the following steps, make sure that you've selected your preferr
    ```
    ::: zone-end
 
-   You should see output similar to the following screenshot:
+   You should see output similar to the following:
 
-   :::image type="content" source="./media/quickstart-install-connect-docker/docker-ps-command.png" alt-text="Screenshot shows the output of the Docker p s command, which has columns for STATUS, PORTS, and other values.":::
+   ```output
+   CONTAINER ID   IMAGE                                        COMMAND                    CREATED         STATUS         PORTS                                       NAMES
+   d4a1999ef83e   mcr.microsoft.com/mssql/server:2017-latest   "/opt/mssql/bin/perm..."   2 minutes ago   Up 2 minutes   0.0.0.0:1433->1433/tcp, :::1433->1433/tcp   sql1
+   ```
 
 1. If the `STATUS` column shows a status of `Up`, then [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] is running in the container and listening on the port specified in the `PORTS` column. If the `STATUS` column for your [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] container shows `Exited`, see the [Troubleshooting section of the configuration guide](./sql-server-linux-docker-container-troubleshooting.md). The server is ready for connections once the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] error logs display the message: `SQL Server is now ready for client connections. This is an informational message; no user action is required`. You can review the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] error log inside the container using the command:
 
@@ -306,9 +309,12 @@ Before starting the following steps, make sure that you've selected your preferr
    ```
    ::: zone-end
 
-   You should see output similar to the following screenshot:
+   You should see output similar to the following:
 
-   :::image type="content" source="./media/quickstart-install-connect-docker/docker-ps-command.png" alt-text="Screenshot shows the output of the Docker p s command, which has columns for STATUS, PORTS, and other values.":::
+   ```output
+   CONTAINER ID   IMAGE                                        COMMAND                    CREATED         STATUS         PORTS                                       NAMES
+   d4a1999ef83e   mcr.microsoft.com/mssql/server:2019-latest   "/opt/mssql/bin/perm..."   2 minutes ago   Up 2 minutes   0.0.0.0:1433->1433/tcp, :::1433->1433/tcp   sql1
+   ```
 
 1. If the `STATUS` column shows a status of `Up`, then [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] is running in the container and listening on the port specified in the `PORTS` column. If the `STATUS` column for your [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] container shows `Exited`, see the [Troubleshooting section of the configuration guide](./sql-server-linux-docker-container-troubleshooting.md). The server is ready for connections once the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] error logs display the message: `SQL Server is now ready for client connections. This is an informational message; no user action is required`. You can review the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] error log inside the container using the command:
 
@@ -435,9 +441,12 @@ Before starting the following steps, make sure that you've selected your preferr
    ```
    ::: zone-end
 
-   You should see output similar to the following screenshot:
+   You should see output similar to the following:
 
-   :::image type="content" source="./media/quickstart-install-connect-docker/docker-ps-command.png" alt-text="Screenshot shows the output of the Docker p s command, which has columns for STATUS, PORTS, and other values.":::
+   ```output
+   CONTAINER ID   IMAGE                                        COMMAND                    CREATED         STATUS         PORTS                                       NAMES
+   d4a1999ef83e   mcr.microsoft.com/mssql/server:2022-latest   "/opt/mssql/bin/perm..."   2 minutes ago   Up 2 minutes   0.0.0.0:1433->1433/tcp, :::1433->1433/tcp   sql1
+   ```
 
 1. If the `STATUS` column shows a status of `Up`, then [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] is running in the container and listening on the port specified in the `PORTS` column. If the `STATUS` column for your [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] container shows `Exited`, see the [Troubleshooting section of the configuration guide](./sql-server-linux-docker-container-troubleshooting.md). The server is ready for connections once the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] error logs display the message: `SQL Server is now ready for client connections. This is an informational message; no user action is required`. You can review the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] error log inside the container using the command:
 

docs/linux/quickstart-install-connect-red-hat.md

@@ -57,6 +57,9 @@ For other system requirements, see [System requirements for SQL Server on Linux]
 
 ## <a id="install"></a> Install SQL Server
 
+<!--SQL Server 2017 on Linux-->
+::: moniker range="= sql-server-linux-2017 || = sql-server-2017"
+
 The following commands for installing [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] point to the RHEL 8 repository. RHEL 8 doesn't come preinstalled with `python2`, which is required by [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)]. Before you begin the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] install steps, execute the command and verify that `python2` is selected as the interpreter:
 
 ```bash
@@ -72,9 +75,6 @@ For more information, see the following blog on installing `python2` and configu
 
 To configure [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] on RHEL, run the following commands in a terminal to install the `mssql-server` package:
 
-<!--SQL Server 2017 on Linux-->
-::: moniker range="= sql-server-linux-2017 || = sql-server-2017"
-
 1. Download the [!INCLUDE [sssql17-md](../includes/sssql17-md.md)] Red Hat repository configuration file:
 
    ```bash
@@ -117,6 +117,21 @@ At this point, [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] is run
 <!--SQL Server 2019 on Linux-->
 ::: moniker range="= sql-server-linux-ver15 || = sql-server-ver15"
 
+The following commands for installing [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] point to the RHEL 8 repository. RHEL 8 doesn't come preinstalled with `python2`, which is required by [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)]. Before you begin the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] install steps, execute the command and verify that `python2` is selected as the interpreter:
+
+```bash
+sudo alternatives --config python
+# If not configured, install python2 and openssl10 using the following commands: 
+sudo yum install python2
+sudo yum install compat-openssl10
+# Configure python2 as the default interpreter using this command: 
+sudo alternatives --config python
+```
+
+For more information, see the following blog on installing `python2` and configuring it as the default interpreter: https://www.redhat.com/en/blog/installing-microsoft-sql-server-red-hat-enterprise-linux-8-beta.
+
+To configure [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] on RHEL, run the following commands in a terminal to install the `mssql-server` package:
+
 1. Download the [!INCLUDE [sssql19-md](../includes/sssql19-md.md)] Red Hat repository configuration file:
 
    ```bash
@@ -159,10 +174,14 @@ At this point, [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] is run
 <!--SQL Server 2022 on Linux-->
 ::: moniker range=">= sql-server-linux-ver16 || >= sql-server-ver16"
 
+The following commands for installing [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] point to the RHEL 8 repository.
+
+To configure [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] on RHEL, run the following commands in a terminal to install the `mssql-server` package:
+
 1. Download the [!INCLUDE [sssql22-md](../includes/sssql22-md.md)] Red Hat repository configuration file:
 
    ```bash
-   sudo curl -o /etc/yum.repos.d/mssql-server.repo https://packages.microsoft.com/config/rhel/8/mssql-server-2022.repo
+   sudo curl -o /etc/yum.repos.d/mssql-server.repo https://packages.microsoft.com/config/rhel/8/mssql-server-preview.repo
    ```
 
    > [!TIP]  

docs/linux/quickstart-install-connect-ubuntu.md

@@ -181,7 +181,7 @@ To configure [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] on Ubunt
 1. Register the [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] Ubuntu repository:
 
    ```bash
-   sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/20.04/mssql-server-2022.list)"
+   sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/20.04/mssql-server-preview.list)"
    ```
 
    > [!TIP]  

docs/linux/sample-unattended-install-ubuntu.md

@@ -64,9 +64,9 @@ fi
 
 echo Adding Microsoft repositories...
 sudo curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
-repoargs="$(curl https://packages.microsoft.com/config/ubuntu/16.04/mssql-server-2017.list)"
+repoargs="$(curl https://packages.microsoft.com/config/ubuntu/20.04/mssql-server-2019.list)"
 sudo add-apt-repository "${repoargs}"
-repoargs="$(curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list)"
+repoargs="$(curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list)"
 sudo add-apt-repository "${repoargs}"
 
 echo Running apt-get update -y...

docs/linux/sql-server-linux-overview.md

@@ -3,7 +3,8 @@ title: Overview of SQL Server on Linux
 description: This article describes how SQL Server runs on Linux and provides information on how to learn more.
 author: VanMSFT 
 ms.author: vanto
-ms.date: 03/31/2022
+ms.reviewer: randolphwest
+ms.date: 06/08/2022
 ms.topic: conceptual
 ms.prod: sql
 ms.technology: linux
@@ -14,14 +15,21 @@ ms.assetid: 9dcc6a90-0add-42c2-815b-862e4e2a21ac
 [!INCLUDE [SQL Server - Linux](../includes/applies-to-version/sql-linux.md)]
 
 ::: moniker range="= sql-server-2017 || = sql-server-linux-2017"
-Starting with SQL Server 2017, SQL Server runs on Linux. It's the same SQL Server database engine, with many similar features and services regardless of your operating system.
+Starting with [!INCLUDE [sssql17-md](../includes/sssql17-md.md)], SQL Server runs on Linux. It's the same SQL Server database engine, with many similar features and services regardless of your operating system.
 
-> [!TIP]
+> [!TIP]  
 > [SQL Server 2019](sql-server-linux-overview.md?view=sql-server-ver15&preserve-view=true) is available! To find out what's new for Linux in the latest release, see [What's new in SQL Server 2019 for Linux](sql-server-linux-whats-new-2019.md?view=sql-server-ver15&preserve-view=true).
 ::: moniker-end
 
-::: moniker range=">= sql-server-ver15 || >= sql-server-linux-ver15"
-SQL Server 2019 runs on Linux. It's the same SQL Server database engine, with many similar features and services regardless of your operating system. To find out more about this release, see [What's new in SQL Server 2019 for Linux](sql-server-linux-whats-new-2019.md).
+::: moniker range="= sql-server-ver15 || = sql-server-linux-ver15"
+[!INCLUDE [sssql19-md](../includes/sssql19-md.md)] runs on Linux. It's the same SQL Server database engine, with many similar features and services regardless of your operating system. To find out more about this release, see [What's new in SQL Server 2019 for Linux](sql-server-linux-whats-new-2019.md).
+
+> [!TIP]  
+> [SQL Server 2022 Preview](sql-server-linux-overview.md?view=sql-server-ver16&preserve-view=true) is available! To find out what's new for Linux in the latest release, see [What's new in [!INCLUDE[sql-server-2022](../includes/sssql22-md.md)]](../sql-server/what-s-new-in-sql-server-2022.md).
+::: moniker-end
+
+::: moniker range=">= sql-server-ver16 || >= sql-server-linux-ver16"
+[!INCLUDE [sssql22-md](../includes/sssql22-md.md)] runs on Linux. It's the same SQL Server database engine, with many similar features and services regardless of your operating system. To find out more about this release, see [What's new in [!INCLUDE[sql-server-2022](../includes/sssql22-md.md)]](../sql-server/what-s-new-in-sql-server-2022.md).
 ::: moniker-end
 
 ## Install
@@ -31,9 +39,16 @@ To get started, install SQL Server on Linux using one of the following quickstar
 - [Install on Red Hat Enterprise Linux](quickstart-install-connect-red-hat.md)
 - [Install on SUSE Linux Enterprise Server](quickstart-install-connect-suse.md)
 - [Install on Ubuntu](quickstart-install-connect-ubuntu.md)
-- [Run on Docker](quickstart-install-connect-docker.md)
+- [Install containers for SQL Server on Linux](quickstart-install-connect-docker.md)
 - [Provision a SQL VM in Azure](/azure/azure-sql/virtual-machines/linux/sql-vm-create-portal-quickstart?toc=/sql/toc/toc.json)
 
+### Container images
+
+You can find SQL Server container images on Linux at the following locations, based on the operating system image that was used to create the image.
+
+- For RHEL-based SQL Server container images, see [SQL Server Red Hat Containers](https://catalog.redhat.com/software/containers/mssql/rhel/server/61f2f612f385723914ed60bc).
+- For Ubuntu based SQL Server images, see [SQL Server on Docker Hub](https://hub.docker.com/_/microsoft-mssql-server).
+
 ## Connect
 
 After installation, connect to the SQL Server instance on your Linux machine. You can connect locally or remotely and with a variety of tools and drivers. The quickstarts demonstrate how to use the [sqlcmd](sql-server-linux-setup-tools.md) command-line tool. Other tools include the following:
@@ -46,17 +61,19 @@ After installation, connect to the SQL Server instance on your Linux machine. Yo
 
 ## Explore
 
-SQL Server 2017 and [!INCLUDE[SQL Server 2019](../includes/sssql19-md.md)] have the same underlying database engine on all supported platforms, including Linux. Therefore, many existing features and capabilities operate the same way on Linux. This area of the documentation exposes some of these features from a Linux perspective. It also calls out areas that have unique requirements on Linux.
+Starting with [!INCLUDE [sssql17-md](../includes/sssql17-md.md)], [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] has the same underlying database engine on all supported platforms, including Linux and containers. Therefore, many existing features and capabilities operate the same way. This area of the documentation exposes some of these features from a Linux perspective. It also calls out areas that have unique requirements on Linux.
 
-If you are already familiar with SQL Server on Linux, review the release notes for general guidelines and known issues for this release:
+If you are already familiar with [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] on Linux, review the release notes for general guidelines and known issues for this release:
 
 - [SQL Server 2017 release notes](sql-server-linux-release-notes.md)
 - [SQL Server 2019 release notes](sql-server-linux-release-notes-2019.md)
+- [SQL Server 2022 Preview release notes](sql-server-linux-release-notes-2022.md)
 
 Then look at what's new:
 
 - [What's new for SQL Server 2017](sql-server-linux-whats-new.md)
 - [What's new for SQL Server 2019 on Linux](../sql-server/what-s-new-in-sql-server-2019.md#sql-server-on-linux)
+- [What's new in [!INCLUDE[sql-server-2022](../includes/sssql22-md.md)]](../sql-server/what-s-new-in-sql-server-2022.md)
 
 > [!TIP]
 > For answers to frequently asked questions, see the [SQL Server on Linux FAQ](sql-server-linux-faq.yml).

docs/toc.yml

@@ -10533,7 +10533,7 @@ items:
       href: linux/quickstart-install-connect-suse.md
     - name: Install & Connect - Ubuntu
       href: linux/quickstart-install-connect-ubuntu.md
-    - name: Run & Connect - Docker
+    - name: Run & Connect - Container
       href: linux/quickstart-install-connect-docker.md
     - name: Deploy SQL Server container - Kubernetes
       href: linux/quickstart-sql-server-containers-kubernetes.md