Merge pull request from rothja/installwork

rothja · web-flow · commit 0fd6f3297f89 · 2016-10-27T13:57:38.000-04:00
Changes to setup topics
diff --git a/docs/linux/sql-server-linux-release-notes.md b/docs/linux/sql-server-linux-release-notes.md
@@ -6,7 +6,7 @@ description:
 author: rothja 
 ms.author: jroth 
 manager: jhubbard
-ms.date: 10-25-2016
+ms.date: 10-27-2016
 ms.topic: article
 ms.prod: sql-non-specified
 ms.service: 
@@ -31,7 +31,16 @@ ms.assetid:
 
 The following release notes apply to SQL Server vNext CTP1 running on Linux.
 
+## Supported operating systems 
+
+- Ubuntu 16.04LTS (EXT4 file system)
+- Red Hat Enterprise Linux 7.2: Workstation, Server and Desktop. (XFS or EXT4 file systems).
+- Docker Engine 1.8+ on Windows, Mac or Linux.
+- Less than 64 cores. Using 64 or more cores will cause an error.
+- Less than 32 GB of memory. If more than 32 GB of memory is available, only 32 GB will be used.
+
 ## Package details
+The following sections provide the Debian and RPM package details.
 
 ### Debian
 
@@ -49,23 +58,16 @@ The following release notes apply to SQL Server vNext CTP1 running on Linux.
 - **Architecture**: x86_64
 - **Version**: 13.0.2990.31
 
-## Package file locations
+### Package file locations
+The following table provide direct links to the Debian and RPM packages for SQL Server vNext.
+
+> [!IMPORTANT]
+> These packages are not meant to be used in typical installation scenarios. For installation steps, see [Install SQL Server on Linux](sql-server-linux-setup.md). 
 
 | Distribution | Download |
 |-----|-----|
-| Red Hat Enterprise Linux 7.2 | [https://private-repo.microsoft.com/rhel7/mssql-private-preview/mssql-server-13.0.2990.31-12.x86_64.rpm](https://private-repo.microsoft.com/rhel7/mssql-private-preview/mssql-server-13.0.2990.31-12.x86_64.rpm) |
 | Ubuntu 16.04 | [https://private-repo.microsoft.com/ubuntu/mssql-private-preview/pool/main/m/mssql-server/mssql-server_13.0.2990-31-8_amd64.deb](https://private-repo.microsoft.com/ubuntu/mssql-private-preview/pool/main/m/mssql-server/mssql-server_13.0.2990-31-8_amd64.deb) |
-
-## Supported operating systems 
-
-- Ubuntu 16.04LTS (EXT4 file system)
-- Red Hat Enterprise Linux 7.2: Workstation, Server and Desktop. (XFS or EXT4 file systems).
-- Docker Engine 1.8+ on Windows, Mac or Linux.
-- Less than 64 cores. Using 64 or more cores will cause an error.
-- Less than 32 GB of memory. If more than 32 GB of memory is available, only 32 GB will be used.
-
-> [!NOTE] 
-> Any file systems that are not specified in the previous list are not supported.
+| Red Hat Enterprise Linux 7.2 | [https://private-repo.microsoft.com/rhel7/mssql-private-preview/mssql-server-13.0.2990.31-12.x86_64.rpm](https://private-repo.microsoft.com/rhel7/mssql-private-preview/mssql-server-13.0.2990.31-12.x86_64.rpm) |
 
 ## Known issues
 
diff --git a/docs/linux/sql-server-linux-setup-docker.md b/docs/linux/sql-server-linux-setup-docker.md
@@ -6,7 +6,7 @@ description:
 author: rothja 
 ms.author: jroth 
 manager: jhubbard
-ms.date: 10-21-2016
+ms.date: 10-27-2016
 ms.topic: article
 ms.prod: sql-non-specified
 ms.service: 
@@ -39,16 +39,16 @@ This topic explains how to pull and run the mssql-server Docker image. This imag
 
 ### Docker for Mac
 1. Click on the Docker logo on the top status bar.
-2. Select “Preferences”.
+2. Select **Preferences**.
 3. Move the memory indicator to 4GB or more.
-4. Click the “restart” button at the button of the screen.
+4. Click the **restart** button at the button of the screen.
 
 ### For Windows users:
 1. Right-click on the Docker icon from the task bar.
-2. Click “Settings” under that menu.
-3. Click on the “Advanced” Tab.
+2. Click **Settings** under that menu.
+3. Click on the **Advanced** Tab.
 4. Move the memory indicator to 4GB or more.
-5. Click the “Apply” button.
+5. Click the **Apply** button.
 
 ## Pull and run the Docker image
 1. Login to the preview Docker registry by using the credentials provided to you in the welcome email.
@@ -63,11 +63,13 @@ This topic explains how to pull and run the mssql-server Docker image. This imag
 
         $ sudo docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=\<your_password_here\>" -p 1433:1433 -d private-repo.microsoft.com/mssql-private-preview/mssql-server:latest
 
-4. To persist the data generated from your Docker container, you must map volume to the host machine. To do that, use the run command with the “-v \<host_folder\>:/var/opt/mssql” flag. This will allow the data to be restored between container executions.
+4. To persist the data generated from your Docker container, you must map volume to the host machine. To do that, use the run command with the **-v \<host_folder\>:/var/opt/mssql** flag. This will allow the data to be restored between container executions.
 
         $ sudo docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=\<your_password_here\>" -p 1433:1433 -v \<host folder\>:/var/opt/mssql -d private-repo.microsoft.com/mssql-private-preview/mssql- server:latest
 
-> [!NOTE]
-> The **ACCEPT_EULA** and **SA_PASSWORD** environment variables are required to run the image.
+    > [!NOTE]
+    > The **ACCEPT_EULA** and **SA_PASSWORD** environment variables are required to run the image.
 
-## Next Steps
+## Next steps
+
+After installing SQL Server on Linux, next see [how to connect to the server and run basic Transact-SQL queries](sql-server-linux-connect-and-query.md).
diff --git a/docs/linux/sql-server-linux-setup-red-hat.md b/docs/linux/sql-server-linux-setup-red-hat.md
@@ -6,7 +6,7 @@ description:
 author: rothja 
 ms.author: jroth 
 manager: jhubbard
-ms.date: 10-18-2016
+ms.date: 10-27-2016
 ms.topic: article
 ms.prod: sql-non-specified
 ms.service: 
@@ -36,6 +36,9 @@ First, install the mssql-server Package on RHEL.
 
         $ sudo su
 
+> [!IMPORTANT]
+> The following steps will change when we get ready to release. They will look something like this. There will be steps for importing the public keys and registering the repository before the apt-get update / apt-get install commands. 
+
 2. Download the configuration script and make it executable.
 
         # curl -O https://private-repo.microsoft.com/tools/configure-mssql-repo-2.sh
@@ -77,9 +80,41 @@ After installation on Red Hat Enterprise Linux you will need to do the following
         $ sudo firewall-cmd --zone=public --add-port=1433/tcp --permanent
         $ sudo firewall-cmd --reload
 
-## TODO
-Section for upgrade
-Section for installing tools
+## Install the tools
+The following steps installs the command-line tools, Microsoft ODBC drivers, and their dependencies. For the details on what gets installed, see [Command-line tools and ODBC drivers](sql-server-linux-setup.md#tools).
+
+> [!IMPORTANT]
+> The following steps will change when we get ready to release.
+
+1. Start a terminal session as root:
+
+        $ sudo su
+
+2. Download an installation script for the SQL Server tools and ODBC drivers installation:
+
+        # wget https://gallery.technet.microsoft.com/ODBC-Driver-13-for-SQL- 8d067754/file/162203/1/install.sh
+
+3. Run the installation script:
+
+        # sh install.sh
+
+4. Once completed, exit the root mode.
+
+        # exit
+
+If you are install these packages from the same Linux machine as your SQL Server installation, you can run a test by connecting to your local SQL Server instance (localhost) with your **SA** username and password:
+
+    $ sqlcmd -S localhost -U SA -P <password>
+
+Type **exit** to return to the command-line.
+
+To uninstall the tools, download the uninstall script and follow the same steps as described above:
+
+    $ sudo su
+    # wget https://gallery.technet.microsoft.com/ODBC-Driver-13-Tools-e419eed1/file/153767/2/uninstall.sh
+    # sh uninstall.sh 
+    # exit 
 
 ## Next steps
-TBD 
+After installation, connect to the SQL Server instance to create and manage databases. To get started, see [Connect and query SQL Server on Linux](sql-server-linux-connect-and-query.md).
+
diff --git a/docs/linux/sql-server-linux-setup-ubuntu.md b/docs/linux/sql-server-linux-setup-ubuntu.md
@@ -6,7 +6,7 @@ description:
 author: rothja 
 ms.author: jroth 
 manager: jhubbard
-ms.date: 10-18-2016
+ms.date: 10-27-2016
 ms.topic: article
 ms.prod: sql-non-specified
 ms.service: 
@@ -36,6 +36,9 @@ First, install the mssql-server Package on Ubuntu.
 
         $ sudo su
 
+> [!IMPORTANT]
+> The following steps will change when we get ready to release. They will look something like this. There will be steps for importing the public keys and registering the repository before the apt-get update / apt-get install commands. 
+
 2. Download the configuration script and make it executable.
 
         # curl -O https://private-repo.microsoft.com/tools/configure-mssql-repo-2.sh
@@ -68,11 +71,40 @@ First, install the mssql-server Package on Ubuntu.
 ## Verify the installation
 Use the following command to print the installed package name and version:
 
-      $ dpkg-query -W | grep mssql
+    $ dpkg-query -W | grep mssql
+
+## Install the tools
+The following steps installs the command-line tools, Microsoft ODBC drivers, and their dependencies. For the details on what gets installed, see [Command-line tools and ODBC drivers](sql-server-linux-setup.md#tools).
+
+> [!NOTE]
+> If you install these packages from the same Linux machine as your SQL Server installation, you do NOT need to perform steps 1-2 which were done as part of the SQL Server installation.
+
+> [!IMPORTANT]
+> The following steps will change when we get ready to release.
+
+2. Download the configuration script and make it executable.
+
+        # curl -O https://private-repo.microsoft.com/tools/configure-mssql-repo-2.sh
+        # sudo chmod a+x configure-mssql-repo-2.sh
+
+3. Pass the unique URL provided for you in your invitation email as a parameter to the script. This URL is labeled as **“Package script configuration URL parameter”**:
+
+        # sudo ./configure-mssql-repo-2.sh <URL provided in email>
+
+4. Add the private preview tools repository, and install the SQL Command Line Utilities with its dependencies by running the commands below.
+
+        echo "deb https://private-repo.microsoft.com/ubuntu/mssql-tools-private-preview mssql main" | sudo tee /etc/apt/sources.list.d/mssql-tools.list 
+
+5. Update the sources list and run the installation command:
+
+        $ sudo apt-get update 
+        $ sudo apt-get install mssql-tools
+
+If you are install these packages from the same Linux machine as your SQL Server installation, you can run a test by connecting to your local SQL Server instance (localhost) with your **SA** username and password:
+
+    $ sqlcmd -S localhost -U SA -P <password>
 
-## TODO
-Section for upgrade
-Section for installing tools
+Type **exit** to return to the command-line.
 
 ## Next steps
-TBD   
+After installation, connect to the SQL Server instance to create and manage databases. To get started, see [Connect and query SQL Server on Linux](sql-server-linux-connect-and-query.md).
diff --git a/docs/linux/sql-server-linux-setup.md b/docs/linux/sql-server-linux-setup.md
@@ -6,7 +6,7 @@ description:
 author: rothja 
 ms.author: jroth 
 manager: jhubbard
-ms.date: 10-20-2016
+ms.date: 10-27-2016
 ms.topic: article
 ms.prod: sql-non-specified
 ms.service: 
@@ -29,6 +29,12 @@ ms.assetid:
 
 SQL Server vNext CTP1 is supported on several distribution of Linux. It is also available as a Docker image which can run on Docker for Linux, Windows, and Mac. The topics in this section provide tutorials and general guidance for installing SQL Server vNext CTP1 on Linux. 
 
+If you want to go straight to a setup tutorial, select your Linux distribution:
+> [!div class="op_single_selector"]
+- [Ubuntu](sql-server-linux-setup-ubuntu.md)
+- [Red Hat Enterprise Linux](sql-server-linux-setup-red-hat.md)
+- [Docker](sql-server-linux-setup-docker.md)
+
 ## Supported distributions
 SQL Server vNext CTP1 is supported on the following distributions:
 
@@ -37,13 +43,19 @@ SQL Server vNext CTP1 is supported on the following distributions:
 | Red Hat Enterprise Linux | 7 |
 | Ubuntu | 16.04 |
 
-It also has support for the Docker Engine running on any supported Linux distribution or Docker for Mac/Windows.
+It also has support for the Docker Engine 1.8+ running on any supported Linux distribution. In addition, you can use the latest version of Docker for Mac/Windows.
+
+## <a id="tools"> </a> Command-line tools and ODBC drivers
+You can optionally install the SQL Server command-line tools. It also installs the Microsoft ODBC drivers and dependencies. 
 
-| Docker | Supported version |
+The following tools are installed:
+
+| Tool | Description |
 |-----|-----|
-| Docker Engine (Linux) | 1.8+ |
-| Docker for Mac | Latest |
-| Docker for Windows | Latest |
+| [sqlcmd](https://msdn.microsoft.com/library/ms162773.aspx) | Run Transact-SQL queries or scripts on any SQL Server instance. |
+| [bcp](https://msdn.microsoft.com/library/ms162802.aspx) | Bulk copies data between an instance of Microsoft SQL Server and a data file in a user-specified format. |
+
+For the specific steps for installing the tools, see the installation guides in the next section.
 
 ## Installation guides
 
@@ -54,6 +66,6 @@ The following guides provide step-by-step installation guides for the supported
 - [Install SQL Server on Linux (Docker)](sql-server-linux-setup-docker.md)
 
 ## Next Steps
-After installing SQL Server on Linux, next see [how to connect to the server and run basic Transact-SQL queries](sql-server-linux-connect-and-query.md).
+After installation, connect to the SQL Server instance to create and manage databases. To get started, see [Connect and query SQL Server on Linux](sql-server-linux-connect-and-query.md).
 
 
