Skip to content

Commit b479b0a

Browse files
MashaMSFTMashaMSFT
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into 20200325_fixes
2 parents 6e73f96 + ea83165 commit b479b0a

1,407 files changed

Lines changed: 2967 additions & 2962 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.openpublishing.redirection.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,6 +1380,16 @@
13801380
"redirect_url": "/sql/machine-learning/what-s-new-in-sql-server-machine-learning-services",
13811381
"redirect_document_id": true
13821382
},
1383+
{
1384+
"source_path": "docs/machine-learning/tutorials/sql-server-python-tutorials.md",
1385+
"redirect_url": "/sql/machine-learning/tutorials/python-tutorials",
1386+
"redirect_document_id": true
1387+
},
1388+
{
1389+
"source_path": "docs/machine-learning/tutorials/sql-server-r-tutorials.md",
1390+
"redirect_url": "/sql/machine-learning/tutorials/r-tutorials",
1391+
"redirect_document_id": true
1392+
},
13831393
{
13841394
"source_path": "docs/linux/sql-server-linux-develop-use-ssms.md",
13851395
"redirect_url": "/sql/linux/sql-server-linux-manage-ssms",

‎docs/connect/jdbc/fips-mode.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The Microsoft JDBC Driver for SQL Server supports running in JVMs configured to
1919
#### Prerequisites
2020

2121
- FIPS configured JVM
22-
- Appropriate SSL Certificate
22+
- Appropriate TLS/SSL Certificate
2323
- Appropriate policy files
2424
- Appropriate Configuration parameters
2525

@@ -32,11 +32,11 @@ To see the approved modules for FIPS Configuration, refer to [Validated Modules
3232
Vendors may have some additional steps to configure a JVM with FIPS.
3333

3434
## Appropriate SSL certificate
35-
In order to connect to SQL Server in FIPS mode, a valid SSL Certificate is required. Install or import it into the Java Key Store on the client machine (JVM) where FIPS is enabled.
35+
In order to connect to SQL Server in FIPS mode, a valid TLS/SSL Certificate is required. Install or import it into the Java Key Store on the client machine (JVM) where FIPS is enabled.
3636

3737
### Importing SSL certificate in Java keyStore
3838
For FIPS, most likely you need to import the certificate (.cert) in either PKCS or a provider-specific format.
39-
Use the following snippet to import the SSL certificate and store it in a working directory with the appropriate KeyStore format. _TRUST\_STORE\_PASSWORD_ is your password for Java KeyStore.
39+
Use the following snippet to import the TLS/SSL certificate and store it in a working directory with the appropriate KeyStore format. _TRUST\_STORE\_PASSWORD_ is your password for Java KeyStore.
4040

4141
```java
4242
public void saveGenericKeyStore(
@@ -66,7 +66,7 @@ private Certificate getCertificate(String pathName)
6666
}
6767
```
6868

69-
The following example is importing an Azure SSL Certificate in PKCS12 format with the BouncyCastle Provider. The certificate is imported in the working directory named _MyTrustStore\_PKCS12_ by using the following snippet:
69+
The following example is importing an Azure TLS/SSL Certificate in PKCS12 format with the BouncyCastle Provider. The certificate is imported in the working directory named _MyTrustStore\_PKCS12_ by using the following snippet:
7070

7171
`saveGenericKeyStore(BCFIPS, PKCS12, "SQLAzure SSL Certificate Name", "SQLAzure.cer");`
7272

‎docs/database-engine/configure-windows/configure-the-network-packet-size-server-configuration-option.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ms.author: mikeray
4949
- The maximum network packet size for encrypted connections is 16,383 bytes.
5050

5151
> [!NOTE]
52-
> If MARS is enabled, the SMUX provider will add a 16-byte header to the packet before SSL encryption, reducing the maximum network packet size to 16368 bytes.
52+
> If MARS is enabled, the SMUX provider will add a 16-byte header to the packet before TLS encryption, reducing the maximum network packet size to 16368 bytes.
5353
5454
### <a name="Recommendations"></a> Recommendations
5555

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

Lines changed: 8 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: This quickstart shows how to install SQL Server 2017 or SQL Server
55
author: VanMSFT
66
ms.custom: seo-lt-2019
77
ms.author: vanto
8-
ms.date: 01/08/2020
8+
ms.date: 04/10/2020
99
ms.topic: conceptual
1010
ms.prod: sql
1111
ms.technology: linux
@@ -33,20 +33,8 @@ In this quickstart, you install SQL Server 2019 on Red Hat Enterprise Linux (RHE
3333
3434
## Prerequisites
3535

36-
<!--SQL Server 2019 on Linux-->
37-
::: moniker range=">= sql-server-linux-ver15 || >= sql-server-ver15 || =sqlallproducts-allversions"
38-
3936
You must have a RHEL 7.3, 7.4, 7.5, 7.6, or 8 machine with **at least 2 GB** of memory.
4037

41-
::: moniker-end
42-
43-
<!--SQL Server 2017 on Linux-->
44-
::: moniker range="= sql-server-linux-2017 || = sql-server-2017"
45-
46-
You must have a RHEL 7.3, 7.4, 7.5, or 7.6 machine with **at least 2 GB** of memory.
47-
48-
::: moniker-end
49-
5038
To install Red Hat Enterprise Linux on your own machine, go to [https://access.redhat.com/products/red-hat-enterprise-linux/evaluation](https://access.redhat.com/products/red-hat-enterprise-linux/evaluation). You can also create RHEL virtual machines in Azure. See [Create and Manage Linux VMs with the Azure CLI](https://docs.microsoft.com/azure/virtual-machines/linux/tutorial-manage-vm), and use `--image RHEL` in the call to `az vm create`.
5139

5240
If you have previously installed a CTP or RC release of SQL Server, you must first remove the old repository before following these steps. For more information, see [Configure Linux repositories for SQL Server 2017 and 2019](sql-server-linux-change-repo.md).
@@ -58,12 +46,17 @@ For other system requirements, see [System requirements for SQL Server on Linux]
5846

5947
## <a id="install"></a>Install SQL Server
6048

49+
> [!NOTE]
50+
> RHEL 8 is supported for SQL Server 2017 starting with CU20. The following commands for SQL Server 2017 points to the RHEL 8 repository. RHEL 8 does not come preinstalled with python2, which is required by SQL Server. 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.
51+
>
52+
> If you are using RHEL 7, change the path below to `/rhel/7` instead of `/rhel/8`.
53+
6154
To configure SQL Server on RHEL, run the following commands in a terminal to install the **mssql-server** package:
6255

6356
1. Download the Microsoft SQL Server 2017 Red Hat repository configuration file:
6457

6558
```bash
66-
sudo curl -o /etc/yum.repos.d/mssql-server.repo https://packages.microsoft.com/config/rhel/7/mssql-server-2017.repo
59+
sudo curl -o /etc/yum.repos.d/mssql-server.repo https://packages.microsoft.com/config/rhel/8/mssql-server-2017.repo
6760
```
6861

6962
> [!TIP]
@@ -157,44 +150,6 @@ At this point, SQL Server 2019 is running on your RHEL machine and is ready to u
157150

158151
::: moniker-end
159152

160-
<!--SQL Server 2017 on Linux-->
161-
::: moniker range="= sql-server-linux-2017 || = sql-server-2017"
162-
163-
## <a id="tools"></a>Install the SQL Server command-line tools
164-
165-
To create a database, you need to connect with a tool that can run Transact-SQL statements on the SQL Server. The following steps install the SQL Server command-line tools: [sqlcmd](../tools/sqlcmd-utility.md) and [bcp](../tools/bcp-utility.md).
166-
167-
1. Download the Microsoft Red Hat repository configuration file.
168-
169-
```bash
170-
sudo curl -o /etc/yum.repos.d/msprod.repo https://packages.microsoft.com/config/rhel/7/prod.repo
171-
```
172-
173-
1. If you had a previous version of **mssql-tools** installed, remove any older unixODBC packages.
174-
175-
```bash
176-
sudo yum remove unixODBC-utf16 unixODBC-utf16-devel
177-
```
178-
179-
1. Run the following commands to install **mssql-tools** with the unixODBC developer package.
180-
181-
```bash
182-
sudo yum install -y mssql-tools unixODBC-devel
183-
```
184-
185-
1. For convenience, add `/opt/mssql-tools/bin/` to your **PATH** environment variable. This enables you to run the tools without specifying the full path. Run the following commands to modify the **PATH** for both login sessions and interactive/non-login sessions:
186-
187-
```bash
188-
echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bash_profile
189-
echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc
190-
source ~/.bashrc
191-
```
192-
193-
::: moniker-end
194-
195-
<!--SQL Server 2019 on Linux-->
196-
::: moniker range=">= sql-server-linux-ver15 || >= sql-server-ver15 || =sqlallproducts-allversions"
197-
198153
## <a id="tools"></a>Install the SQL Server command-line tools
199154

200155
To create a database, you need to connect with a tool that can run Transact-SQL statements on the SQL Server. The following steps install the SQL Server command-line tools: [sqlcmd](../tools/sqlcmd-utility.md) and [bcp](../tools/bcp-utility.md).
@@ -211,7 +166,7 @@ To create a database, you need to connect with a tool that can run Transact-SQL
211166
sudo yum remove unixODBC-utf16 unixODBC-utf16-devel
212167
```
213168

214-
1. Run the following commands to install **mssql-tools** with the unixODBC developer package.
169+
1. Run the following commands to install **mssql-tools** with the unixODBC developer package. For more information, see [Install the Microsoft ODBC driver for SQL Server (Linux)](../connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server.md).
215170

216171
```bash
217172
sudo yum install -y mssql-tools unixODBC-devel
@@ -225,6 +180,4 @@ To create a database, you need to connect with a tool that can run Transact-SQL
225180
source ~/.bashrc
226181
```
227182

228-
::: moniker-end
229-
230183
[!INCLUDE [Connect, create, and query data](../includes/sql-linux-quickstart-connect-query.md)]

‎docs/linux/quickstart-install-connect-suse.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "SUSE: Install SQL Server on Linux"
33
description: This quickstart shows how to install SQL Server 2017 or SQL Server 2019 on SUSE Linux Enterprise Server and then create and query a database with sqlcmd.
44
author: VanMSFT
55
ms.author: vanto
6-
ms.date: 11/04/2019
6+
ms.date: 04/10/2020
77
ms.topic: conceptual
88
ms.prod: sql
99
ms.technology: linux
@@ -178,7 +178,7 @@ To create a database, you need to connect with a tool that can run Transact-SQL
178178
sudo zypper --gpg-auto-import-keys refresh
179179
```
180180

181-
1. Install **mssql-tools** with the unixODBC developer package.
181+
1. Install **mssql-tools** with the unixODBC developer package. For more information, see [Install the Microsoft ODBC driver for SQL Server (Linux)](../connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server.md).
182182

183183
```bash
184184
sudo zypper install -y mssql-tools unixODBC-devel

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

Lines changed: 17 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Ubuntu: Install SQL Server on Linux"
33
description: This quickstart shows how to install SQL Server 2017 or SQL Server 2019 on Ubuntu and then create and query a database with sqlcmd.
44
author: VanMSFT
55
ms.author: vanto
6-
ms.date: 03/12/2020
6+
ms.date: 04/10/2020
77
ms.topic: conceptual
88
ms.prod: sql
99
ms.custom: seo-lt-2019
@@ -17,7 +17,7 @@ ms.assetid: 31c8c92e-12fe-4728-9b95-4bc028250d85
1717
<!--SQL Server 2017 on Linux-->
1818
::: moniker range="= sql-server-linux-2017 || = sql-server-2017"
1919

20-
In this quickstart, you install SQL Server 2017 on Ubuntu 16.04. You then connect with **sqlcmd** to create your first database and run queries.
20+
In this quickstart, you install SQL Server 2017 on Ubuntu 18.04. You then connect with **sqlcmd** to create your first database and run queries.
2121

2222
::: moniker-end
2323

@@ -36,24 +36,26 @@ In this quickstart, you install SQL Server 2019 on Ubuntu 18.04. You then connec
3636
<!--SQL Server 2017 on Linux-->
3737
::: moniker range="= sql-server-linux-2017 || = sql-server-2017"
3838

39-
You must have a Ubuntu 16.04 machine with **at least 2 GB** of memory.
39+
You must have an Ubuntu 16.04 or 18.04 machine with **at least 2 GB** of memory.
4040

41-
To install Ubuntu 16.04 on your own machine, go to <http://releases.ubuntu.com/xenial/>. You can also create Ubuntu virtual machines in Azure. See [Create and Manage Linux VMs with the Azure CLI](https://docs.microsoft.com/azure/virtual-machines/linux/tutorial-manage-vm).
41+
To install Ubuntu 18.04 on your own machine, go to <http://releases.ubuntu.com/bionic/>. You can also create Ubuntu virtual machines in Azure. See [Create and Manage Linux VMs with the Azure CLI](https://docs.microsoft.com/azure/virtual-machines/linux/tutorial-manage-vm).
4242

4343
> [!NOTE]
4444
> At this time, the [Windows Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about) for Windows 10 is not supported as an installation target.
4545
4646
For other system requirements, see [System requirements for SQL Server on Linux](sql-server-linux-setup.md#system).
4747

4848
> [!NOTE]
49-
> Ubuntu 18.04 is not yet officially supported, but running SQL Server is possible with [modifications](https://blogs.msdn.microsoft.com/sql_server_team/installing-sql-server-2017-for-linux-on-ubuntu-18-04-lts/).
49+
> Ubuntu 18.04 is supported starting with SQL Server 2017 CU20. If you want to use the instructions on this article with Ubuntu 18.04, make sure you use the correct [repository path](sql-server-linux-change-repo.md), `18.04` instead of `16.04`.
50+
>
51+
> If you are running SQL Server on a lower version, the configuration is possible with [modifications](https://blogs.msdn.microsoft.com/sql_server_team/installing-sql-server-2017-for-linux-on-ubuntu-18-04-lts/).
5052
5153
::: moniker-end
5254

5355
<!--SQL Server 2019 on Linux-->
5456
::: moniker range=">= sql-server-linux-ver15 || >= sql-server-ver15 || =sqlallproducts-allversions"
5557

56-
You must have a Ubuntu 18.04 machine with **at least 2 GB** of memory.
58+
You must have an Ubuntu 16.04 or 18.04 machine with **at least 2 GB** of memory.
5759

5860
To install Ubuntu 18.04 on your own machine, go to <http://releases.ubuntu.com/bionic/>. You can also create Ubuntu virtual machines in Azure. See [Create and Manage Linux VMs with the Azure CLI](https://docs.microsoft.com/azure/virtual-machines/linux/tutorial-manage-vm).
5961

@@ -69,6 +71,9 @@ For other system requirements, see [System requirements for SQL Server on Linux]
6971

7072
## <a id="install"></a>Install SQL Server
7173

74+
> [!NOTE]
75+
> The following commands for SQL Server 2017 points to the Ubuntu 18.04 repository. If you are using Ubuntu 16.04, change the path below to `/ubuntu/16.04/` instead of `/ubuntu/18.04/`.
76+
7277
To configure SQL Server on Ubuntu, run the following commands in a terminal to install the **mssql-server** package.
7378

7479
1. Import the public repository GPG keys:
@@ -80,14 +85,14 @@ To configure SQL Server on Ubuntu, run the following commands in a terminal to i
8085
2. Register the Microsoft SQL Server Ubuntu repository:
8186

8287
```bash
83-
sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/16.04/mssql-server-2017.list)"
88+
sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/18.04/mssql-server-2017.list)"
8489
```
8590

8691
> [!TIP]
8792
> If you want to install SQL Server 2019 , you must instead register the SQL Server 2019 repository. Use the following command for SQL Server 2019 installations:
8893
>
8994
> ```bash
90-
> sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/16.04/mssql-server-2019.list)"
95+
> sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/18.04/mssql-server-2019.list)"
9196
> ```
9297
9398
3. Run the following commands to install SQL Server:
@@ -126,6 +131,9 @@ At this point, SQL Server is running on your Ubuntu machine and is ready to use!
126131

127132
## <a id="install"></a>Install SQL Server
128133

134+
> [!NOTE]
135+
> The following commands for SQL Server 2019 points to the Ubuntu 18.04 repository. If you are using Ubuntu 16.04, change the path below to `/ubuntu/16.04/` instead of `/ubuntu/18.04/`.
136+
129137
To configure SQL Server on Ubuntu, run the following commands in a terminal to install the **mssql-server** package.
130138

131139
1. Import the public repository GPG keys:
@@ -170,59 +178,6 @@ At this point, SQL Server 2019 is running on your Ubuntu machine and is ready to
170178

171179
## <a id="tools"></a>Install the SQL Server command-line tools
172180

173-
<!--SQL Server 2017 on Linux-->
174-
::: moniker range="= sql-server-linux-2017 || = sql-server-2017"
175-
176-
To create a database, you need to connect with a tool that can run Transact-SQL statements on the SQL Server. The following steps install the SQL Server command-line tools: [sqlcmd](../tools/sqlcmd-utility.md) and [bcp](../tools/bcp-utility.md).
177-
178-
Use the following steps to install the **mssql-tools** on Ubuntu.
179-
180-
1. Import the public repository GPG keys.
181-
182-
```bash
183-
curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
184-
```
185-
186-
1. Register the Microsoft Ubuntu repository.
187-
188-
```bash
189-
curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
190-
```
191-
192-
1. Update the sources list and run the installation command with the unixODBC developer package.
193-
194-
```bash
195-
sudo apt-get update
196-
sudo apt-get install mssql-tools unixodbc-dev
197-
```
198-
199-
> [!Note]
200-
> To update to the latest version of **mssql-tools** run the following commands:
201-
> ```bash
202-
> sudo apt-get update
203-
> sudo apt-get install mssql-tools
204-
> ```
205-
206-
1. **Optional**: Add `/opt/mssql-tools/bin/` to your **PATH** environment variable in a bash shell.
207-
208-
To make **sqlcmd/bcp** accessible from the bash shell for login sessions, modify your **PATH** in the **~/.bash_profile** file with the following command:
209-
210-
```bash
211-
echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bash_profile
212-
```
213-
214-
To make **sqlcmd/bcp** accessible from the bash shell for interactive/non-login sessions, modify the **PATH** in the **~/.bashrc** file with the following command:
215-
216-
```bash
217-
echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc
218-
source ~/.bashrc
219-
```
220-
221-
::: moniker-end
222-
223-
<!--SQL Server 2019 on Linux-->
224-
::: moniker range=">= sql-server-linux-ver15 || >= sql-server-ver15 || =sqlallproducts-allversions"
225-
226181
To create a database, you need to connect with a tool that can run Transact-SQL statements on the SQL Server. The following steps install the SQL Server command-line tools: [sqlcmd](../tools/sqlcmd-utility.md) and [bcp](../tools/bcp-utility.md).
227182

228183
Use the following steps to install the **mssql-tools** on Ubuntu.
@@ -239,7 +194,7 @@ Use the following steps to install the **mssql-tools** on Ubuntu.
239194
curl https://packages.microsoft.com/config/ubuntu/18.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
240195
```
241196

242-
1. Update the sources list and run the installation command with the unixODBC developer package.
197+
1. Update the sources list and run the installation command with the unixODBC developer package. For more information, see [Install the Microsoft ODBC driver for SQL Server (Linux)](../connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server.md).
243198

244199
```bash
245200
sudo apt-get update
@@ -268,6 +223,4 @@ Use the following steps to install the **mssql-tools** on Ubuntu.
268223
source ~/.bashrc
269224
```
270225
271-
::: moniker-end
272-
273226
[!INCLUDE [Connect, create, and query data](../includes/sql-linux-quickstart-connect-query.md)]

0 commit comments

Comments
 (0)