Merge branch 'master' into sqllinuxtoolsupdate

Author: rothja

ReadMe.md

@@ -1,15 +1,20 @@
 Multiple OPS docsets publish from the sql-docs-pr repository and more coming.
 See the contributor-guide  folder for information on how to get permissions and setup your authoring environment.
 
-**\docs\analytics-platforms-system**
+**\docs-msdn\analytics-platforms-system**
 - Content for the  Microsoft Analytics Platform System (APS)
 - Publishing live to MSDN
 - [OPS Docset](https://ops.microsoft.com/#/sites/MSDN.Modern/docsets/analytics-platform-system)
 
-**\docs\linux**
-- Content for SQL Server on
-- to be published on docs.microsoft.com
-- [OPS Docset](https://ops.microsoft.com/#/sites/Docs/docsets/linux)
-
-**\docs\tools**
-- future locaiton of content for SQL Server related tools such as SSDT and SSMS
+**\docs\**
+- Content for SQL Server on Linux, SQL Tools, and SQL Drivers.  Future home of SQL Server 2016 content
+- published live to docs.microsoft.com
+- [Linux](https://docs.microsoft.com/en-us/sql/linux/)
+- [SQL Server Management Studio (SSM)](https://docs.microsoft.com/en-us/sql/ssms)
+- [SQL Server Data tools (SSDT](https://docs.microsoft.com/en-us/sql/ssdt)
+- [ADO .Net](https://docs.microsoft.com/en-us/sql/ado)
+- [ODBC](https://docs.microsoft.com/en-us/sql/odbc)
+- [SQL Drivers - JDBC, PHP, Ruby ...](https://docs.microsoft.com/en-us/sql/connect)
+- [SQL Server Samples](https://docs.microsoft.com/en-us/sql/sample)
+- [SQL Server Migration Assistant (SSMA)](https://docs.microsoft.com/en-us/sql/ssma)
+- [SQL Server release notes](https://docs.microsoft.com/en-us/sql/release-notes)

docs/connect/jdbc/using-advanced-data-types.md

@@ -1,31 +1,31 @@
----
-title: "Using Advanced Data Types | Microsoft Docs"
-ms.custom: ""
-ms.date: "01/19/2017"
-ms.prod: "sql-non-specified"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "drivers"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
-ms.assetid: b39461d3-48d6-4048-8300-1a886c00756d
-caps.latest.revision: 58
-author: "MightyPen"
-ms.author: "genemi"
-manager: "jhubbard"
----
-# Using Advanced Data Types
-[!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
-
+---
+title: "Using Advanced Data Types | Microsoft Docs"
+ms.custom: ""
+ms.date: "01/19/2017"
+ms.prod: "sql-non-specified"
+ms.reviewer: ""
+ms.suite: ""
+ms.technology: 
+  - "drivers"
+ms.tgt_pltfrm: ""
+ms.topic: "article"
+ms.assetid: b39461d3-48d6-4048-8300-1a886c00756d
+caps.latest.revision: 58
+author: "MightyPen"
+ms.author: "genemi"
+manager: "jhubbard"
+---
+# Using Advanced Data Types
+[!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
+
   The [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)] uses the JDBC advanced data types to convert the [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] data types to a format that can be understood by the Java programming language.  
 
 ## Remarks  
  The following table lists the default mappings between the advanced [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)], JDBC, and Java programming language data types.  
 
 |SQL Server Types|JDBC Types (java.sql.Types)|Java Language Types|  
 |----------------------|-----------------------------------|-------------------------|  
-|varbinary(max)<br /><br /> image|LONGVARBINARY|byte[] (default), Blob, InputStream, String|  
+|varbinary(max)<br /><br /> image|LONGVARBINARY|byte[] \(default), Blob, InputStream, String|  
 |text<br /><br /> varchar(max)|LONGVARCHAR|String (default), Clob, InputStream|  
 |ntext<br /><br /> nvarchar(max)|LONGVARCHAR<br /><br /> LONGNVARCHAR (Java SE 6.0)|String (default), Clob, NClob (Java SE 6.0)|  
 |xml|LONGVARCHAR<br /><br /> SQLXML (Java SE 6.0)|String (default), InputStream, Clob, byte[],Blob, SQLXML (Java SE 6.0)|  

docs/connect/odbc/TOC.md

@@ -1,8 +1,6 @@
-# [Getting Started with ODBC Driver for SQL Server](getting-started-with-odbc-driver-for-sql-server.md)
 # [Microsoft ODBC Driver for SQL Server](microsoft-odbc-driver-for-sql-server.md)
 # [Download ODBC Driver for SQL Server](download-odbc-driver-for-sql-server.md)
-# [Step 1: Configure development environment for C++ development](step-1-configure-development-environment-for-c-development.md)
-# [Step 2: Create a SQL database for C++ development](step-2-create-a-sql-database-for-c-development.md)
 
-# [Windows](./linux/TOC.md)
-# [Linux](./windows/TOC.md)
+# [Windows](./windows/TOC.md)
+# [Linux](./linux/TOC.md)
+# [Mac](./mac/TOC.md)

docs/connect/odbc/download-odbc-driver-for-sql-server.md

@@ -5,7 +5,7 @@ ms.date: "01/19/2017"
 ms.prod: "sql-non-specified"
 ms.reviewer: ""
 ms.suite: ""
-ms.technology: 
+ms.technology:
   - "drivers"
 ms.tgt_pltfrm: ""
 ms.topic: "article"
@@ -17,20 +17,20 @@ manager: "jhubbard"
 ---
 # Download ODBC Driver for SQL Server
 ## All Platforms  
-### Microsoft ODBC Driver 13.0 for SQL Server  
+### Microsoft ODBC Driver 13.1 for SQL Server  
 * [Download the Microsoft ODBC Driver 13 for SQL Server - All Platforms](https://www.microsoft.com/download/details.aspx?id=50420)
 
 ## Windows  
 
 ### Microsoft ODBC Driver 13.1 for SQL Server  
 * [Download the Microsoft ODBC Driver 13.1 for SQL Server on Windows](https://www.microsoft.com/download/details.aspx?id=53339)  
-  
+
 ### Microsoft ODBC Driver 11 for SQL Server  
 * [Download the Microsoft ODBC Driver  11 for SQL Server on Windows](https://www.microsoft.com/download/details.aspx?id=36434)  
 * [Download command line utilities for Microsoft ODBC Driver 11 for SQL Server](https://www.microsoft.com/download/details.aspx?id=36433)  
-  
+
 ## Linux  
-  
+
 ### Microsoft ODBC Driver 11 for SQL Server  
 *   **Red Hat Enterprise Linux 5 and 6 (64-bit)** - Download: [Microsoft ODBC Driver 11 for SQL Server - Red Hat Linux](http://go.microsoft.com/fwlink/?LinkId=267321)  
-*   **SUSE Linux Enterprise 11 Service Pack 2 (64-bit)** - Download: [Microsoft ODBC Driver 11 Preview for SQL Server - SUSE Linux](http://go.microsoft.com/fwlink/?LinkId=264916)
+*   **SUSE Linux Enterprise 11 Service Pack 2 (64-bit)** - Download: [Microsoft ODBC Driver 11 Preview for SQL Server - SUSE Linux](http://go.microsoft.com/fwlink/?LinkId=264916)

docs/connect/odbc/index.md

@@ -1,3 +1,3 @@
 ---
-redirect_url: /sql/connect/odbc/getting-started-with-odbc-driver-for-sql-server
----
+redirect_url: /sql/connect/odbc/microsoft-odbc-driver-for-sql-server
+---

docs/connect/odbc/linux/TOC.md

@@ -1,17 +1,17 @@
-# [ODBC Driver on Linux Support for High Availability, Disaster Recovery](odbc-driver-on-linux-support-for-high-availability-disaster-recovery.md)
-# [Connection String Keywords and Data Source Names (DSNs)](connection-string-keywords-and-data-source-names-dsns.md)
-# [Installing the Microsoft ODBC Driver for SQL Server on Linux](installing-the-microsoft-odbc-driver-for-sql-server-on-linux.md)
-# [System Requirements](system-requirements.md)
-# [Using Transparent Network IP Resolution](using-transparent-network-ip-resolution.md)
-# [Custom Keystore Providers](custom-keystore-providers.md)
 # [Microsoft ODBC Driver for SQL Server on Linux](microsoft-odbc-driver-for-sql-server-on-linux.md)
-# [Using Integrated Authentication](using-integrated-authentication.md)
 # [Release Notes for the Microsoft ODBC Driver for SQL Server on Linux](release-notes-for-the-microsoft-odbc-driver-for-sql-server-on-linux.md)
-# [Installing the Driver Manager](installing-the-driver-manager.md)
 # [Known Issues in this Version of the Driver](known-issues-in-this-version-of-the-driver.md)
-# [Frequently Asked Questions (FAQ) for ODBC Linux](frequently-asked-questions-faq-for-odbc-linux.md)
+# [System Requirements](system-requirements.md)
+# [Installing the Microsoft ODBC Driver for SQL Server on Linux](installing-the-microsoft-odbc-driver-for-sql-server-on-linux.md)
+# [Installing the Driver Manager](installing-the-driver-manager.md)
+# [Connection String Keywords and Data Source Names (DSNs)](connection-string-keywords-and-data-source-names-dsns.md)
+# [Using Integrated Authentication](using-integrated-authentication.md)
+# [ODBC Driver on Linux Support for High Availability, Disaster Recovery](odbc-driver-on-linux-support-for-high-availability-disaster-recovery.md)
+# [Using Transparent Network IP Resolution](using-transparent-network-ip-resolution.md)
+# [Using Always Encrypted with the Linux ODBC Driver](using-always-encrypted-with-the-linux-odbc-driver.md)
+# [Custom Keystore Providers](custom-keystore-providers.md)
 # [Connecting with sqlcmd](connecting-with-sqlcmd.md)
 # [Connecting with bcp](connecting-with-bcp.md)
 # [Data Access Tracing with the ODBC Driver on Linux](data-access-tracing-with-the-odbc-driver-on-linux.md)
 # [Programming Guidelines](programming-guidelines.md)
-# [Using Always Encrypted with the Linux ODBC Driver](using-always-encrypted-with-the-linux-odbc-driver.md)
+# [Frequently Asked Questions (FAQ) for ODBC Linux](frequently-asked-questions-faq-for-odbc-linux.md)

docs/connect/odbc/linux/connecting-with-bcp.md

@@ -59,9 +59,9 @@ Uses a character data type.
 Specifies the database to connect to.  
 
 -D  
-Causes the value passed to the sqlcmd -S option to be interpreted as a data source name (DSN). For more information, see "DSN Support in sqlcmd and bcp" in [Connecting with sqlcmd](../../../connect/odbc/linux/connecting-with-sqlcmd.md).  
+Causes the value passed to the bcp -S option to be interpreted as a data source name (DSN). For more information, see "DSN Support in sqlcmd and bcp" in [Connecting with sqlcmd](../../../connect/odbc/linux/connecting-with-sqlcmd.md).  
 
--e *eror_file*  
+-e *error_file*  
 Specifies the full path of an error file used to store any rows that the bcp utility cannot transfer from the file to the database.  
 
 -E  
@@ -83,7 +83,7 @@ Specifies a login timeout. The –l option specifies the number of seconds befor
 Specifies the number of the last row to export from a table or import from a data file.  
 
 -m *max_errors*  
-Specifies the maximum number of syntax errors that can occur before the bcp operation is canceled.  
+Specifies the maximum number of syntax errors that can occur before the bcp operation is cancelled.  
 
 -n  
 Uses the native (database) data types of the data to perform the bulk-copy operation.  

docs/connect/odbc/linux/connecting-with-sqlcmd.md

@@ -209,14 +209,14 @@ Create a sqlcmd scripting variable that can be used in a sqlcmd script.
 
 You can use the following alternative method:  
 
--   Put the parameters inside one file. Which you can then append to another file. This will help you use a parameter file to replace the values. Create a file called a.sql (the parameter file) with the following content:  
+-   Put the parameters inside one file, which you can then append to another file. This will help you use a parameter file to replace the values. Create a file called a.sql (the parameter file) with the following content:  
 
     ```  
     :setvar ColumnName object_id  
     :setvar TableName sys.objects  
     ```  
   
--   Create a file called b.sql,with the parameters for replacement:  
+-   Create a file called b.sql, with the parameters for replacement:  
   
     ```  
     select $(ColumnName) from $(TableName)  
@@ -230,7 +230,7 @@ You can use the following alternative method:
   
 -   Run sqlcmd and use c.sql as input file:  
   
-    slqcmd -S\<…> -P\<..> –U\<..> -I c.sql  
+    slqcmd -S<…> -P<..> –U<..> -I c.sql  
   
 -z *password*  
 Change password.  
@@ -267,7 +267,7 @@ The following entries are supported in a DSN on Linux:
   
 In a DSN, only the DRIVER entry is required, but to connect to a server, **sqlcmd** or **bcp** need the value in the SERVER entry.  
   
-If the same option is specified in both the DSN and the **sqlcmd** or **bcp** command line, the **sqlcmd** or **bcp** option override the value used in the DSN. For example, if the DSN has a DATABASE entry and the **sqlcmd** command line includes -d, the value passed to **-d** is used. If **Trusted_Connection=yes** is specified in the DSN, Kerberos authentication is used, and user name (**–U**) and password (**–P**) , if provided, is ignored.  
+If the same option is specified in both the DSN and the **sqlcmd** or **bcp** command line, the **sqlcmd** or **bcp** option overrides the value used in the DSN. For example, if the DSN has a DATABASE entry and the **sqlcmd** command line includes -d, the value passed to **-d** is used. If **Trusted_Connection=yes** is specified in the DSN, Kerberos authentication is used, and user name (**–U**) and password (**–P**) , if provided, is ignored.  
   
 Existing scripts that invoke **isql** can be modified to use **sqlcmd** by defining the following alias: **alias isql="sqlcmd –D"**.  
   

docs/connect/odbc/linux/connection-string-keywords-and-data-source-names-dsns.md

@@ -60,7 +60,7 @@ Server = [protocol:]server[,port]
 
 You can optionally specify the protocol and port to connect to the server. For example, **Server = tcp:***servername***,12345**.  
 
-To connect to a named instance on a static port, use **Server =** *servername***,***port_number*. Connecting to dynamic port is not supported.  
+To connect to a named instance on a static port, use **Server =** *servername***,***port_number*. Connecting to a dynamic port is not supported.  
 
 Optionally, you can add the DSN information to a template file and execute the following command: **odbcinst -i -s -f** *template_file*  
 
@@ -83,16 +83,19 @@ Regardless of the settings for **Encrypt** and **TrustServerCertificate**, the s
 By default, encrypted connections always verify the server’s certificate. However, if you connect to a server that has a self-signed certificate, also add the TrustServerCertificateOption:  
 
 ```  
-Driver='ODBC Driver 11 for SQL Server';Server=ServerNameHere;Encrypt=YES;TrustServerCertificate=YES  
+Driver='ODBC Driver 13 for SQL Server';Server=ServerNameHere;Encrypt=YES;TrustServerCertificate=YES  
 ```  
 
 SSL uses the OpenSSL library. The following table shows the minimum supported versions of OpenSSL and the default Certificate Trust Store locations for each platform:  
 
 |Platform|Minimum OpenSSL Version|Default Certificate Trust Store Location|  
 |------------|---------------------------|--------------------------------------------|  
-|Red Hat Enterprise Linux 5|0.9.8e|/etc/pki/tls/cert.pem|  
 |Red Hat Enterprise Linux 6|1.0.0-10|/etc/pki/tls/cert.pem|  
-|SuSE Linux Enterprise 11 Service Pack 2|0.9.8j|/etc/ssl/certs|  
+|Red Hat Enterprise Linux 7|1.0.1e|/etc/pki/tls/cert.pem|
+|SuSE Linux Enterprise 12 |1.0.1i|/etc/ssl/certs|
+|Ubuntu 15.10 |1.0.2d|/etc/ssl/certs|
+|Ubuntu 16.04 |1.0.2g|/etc/ssl/certs|
+|Ubuntu 16.10 |1.0.2g|/etc/ssl/certs|
 
 You can use **SQLDriverConnect** to specify encryption in the connection string.