resolve merge conflict

Author: MikeRayMSFT

.openpublishing.redirection.json

@@ -2676,10 +2676,15 @@
             "redirect_document_id": false
         },
         {
-            "source_path": "docs/tools/dta/ lesson-3-1-starting-the-dta-command-prompt-utility-and-tuning-a-workload.md",
+            "source_path": "docs/tools/dta/lesson-3-1-starting-the-dta-command-prompt-utility-and-tuning-a-workload.md",
             "redirect_url": "/sql/tools/dta/lesson-3-using-the-dta-command-prompt-utility",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/connect/jdbc/redistributing-the-microsoft-jdbc-driver.md",
+            "redirect_url": "/sql/connect/jdbc/deploying-the-jdbc-driver",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/connect/php/release-notes-for-the-php-sql-driver.md",
             "redirect_url": "/sql/connect/php/release-notes-php-sql-driver",

docs/connect/jdbc/deploying-the-jdbc-driver.md

@@ -1,7 +1,7 @@
 ---
 title: "Deploying the JDBC driver | Microsoft Docs"
 ms.custom: ""
-ms.date: "08/12/2019"
+ms.date: 10/28/2019
 ms.prod: sql
 ms.prod_service: connectivity
 ms.reviewer: ""
@@ -45,7 +45,13 @@ ms.author: genemi
  To unpack the tar file, move it to the directory where you want the driver installed and type the following command:  
 
  `tar -xf sqljdbc_<version>_<language>.tar`  
-  
+
+## Legalities of driver redistribution
+
+The JDBC Driver versions 6.0, 6.2, 6.4, and 7.0 are redistributable. Review the _Distributable Code_ clause in the license agreements.
+
+The JDBC Driver versions 4.x are old and obsolete. Support for 4.x expired before 2018.
+
 ## See also  
  [Overview of the JDBC driver](../../connect/jdbc/overview-of-the-jdbc-driver.md)  
 

docs/connect/jdbc/frequently-asked-questions-faq-for-jdbc-driver.md

@@ -1,7 +1,7 @@
 ---
 title: "Frequently asked questions (FAQ) for JDBC driver | Microsoft Docs"
 ms.custom: ""
-ms.date: "08/12/2019"
+ms.date: "10/28/2019"
 ms.prod: sql
 ms.prod_service: connectivity
 ms.reviewer: ""
@@ -11,7 +11,6 @@ ms.assetid: cbc0e397-ecf2-4494-87b2-a492609bceae
 author: MightyPen
 ms.author: genemi
 ---
-
 # Frequently asked questions (FAQ) for JDBC driver
 
 [!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
@@ -29,28 +28,31 @@ See the [Microsoft JDBC Driver for SQL Server support matrix](../../connect/jdbc
 **What is the difference between the JDBC driver packages available on the Microsoft Download Center and the JDBC driver available on GitHub?**  
 The JDBC driver files available on the GitHub repository for the Microsoft JDBC driver are the core of the JDBC driver and are under the open-source license listed in the repository. The driver packages on the Microsoft Download Center include additional libraries for Windows-integrated authentication and enabling XA transactions with the JDBC driver. Those additional libraries are under the license included with the downloadable package.
 
-**What should I know when upgrading my driver?**
- The Microsoft JDBC Driver 7.4 supports the JDBC 4.2, and 4.3 (partially) specifications and includes three JAR class libraries in the installation package as follows:
+**What should I know when upgrading my driver?**  
+The Microsoft JDBC Driver 7.4 supports the JDBC 4.2, and 4.3 (partially) specifications and includes three JAR class libraries in the installation package as follows:
 
 | JAR                        | JDBC Specification            | JDK Version |
 | -------------------------- | ----------------------------- | ----------- |
 | mssql-jdbc-7.4.1.jre12.jar | JDBC 4.3 (partially), and 4.2 | JDK 12.0    |
 | mssql-jdbc-7.4.1.jre11.jar | JDBC 4.3 (partially), and 4.2 | JDK 11.0    |
 | mssql-jdbc-7.4.1.jre8.jar  | JDBC 4.2                      | JDK 8.0     |
+|                       |                          |        |
 
- The Microsoft JDBC Driver 7.2 supports the JDBC 4.2, and 4.3 (partially) specifications and includes two JAR class libraries in the installation package as follows:
+The Microsoft JDBC Driver 7.2 supports the JDBC 4.2, and 4.3 (partially) specifications and includes two JAR class libraries in the installation package as follows:
 
 | JAR                        | JDBC Specification            | JDK Version |
 | -------------------------- | ----------------------------- | ----------- |
 | mssql-jdbc-7.2.2.jre11.jar | JDBC 4.3 (partially), and 4.2 | JDK 11.0    |
 | mssql-jdbc-7.2.2.jre8.jar  | JDBC 4.2                      | JDK 8.0     |
+|                       |                          |        |
 
- The Microsoft JDBC Driver 7.0 supports the JDBC 4.2, and 4.3 (partially) specifications and includes two JAR class libraries in the installation package as follows:
+The Microsoft JDBC Driver 7.0 supports the JDBC 4.2, and 4.3 (partially) specifications and includes two JAR class libraries in the installation package as follows:
 
 | JAR                        | JDBC Specification            | JDK Version |
 | -------------------------- | ----------------------------- | ----------- |
 | mssql-jdbc-7.0.0.jre10.jar | JDBC 4.3 (partially), and 4.2 | JDK 10.0    |
 | mssql-jdbc-7.0.0.jre8.jar  | JDBC 4.2                      | JDK 8.0     |
+|                       |                          |        |
 
 The Microsoft JDBC Driver 6.4 supports the JDBC 4.1, 4.2, and 4.3 (partially) specifications and includes three JAR class libraries in the installation package as follows:
 
@@ -59,48 +61,51 @@ The Microsoft JDBC Driver 6.4 supports the JDBC 4.1, 4.2, and 4.3 (partially) sp
 | mssql-jdbc-6.4.0.jre9.jar | JDBC 4.3 (partially), 4.2, and 4.1 | JDK 9.0     |
 | mssql-jdbc-6.4.0.jre8.jar | JDBC 4.2, and 4.1                  | JDK 8.0     |
 | mssql-jdbc-6.4.0.jre7.jar | JDBC 4.1                           | JDK 7.0     |
+|                      |                               |        |
 
 The Microsoft JDBC Driver 6.2 supports the JDBC 4.0, 4.1, and 4.2 specifications and includes two JAR class libraries in the installation package as follows:
 
 | JAR                       | JDBC Specification     | JDK Version |
 | ------------------------- | ---------------------- | ----------- |
 | mssql-jdbc-6.2.2.jre8.jar | JDBC 4.2, 4.1, and 4.0 | JDK 8.0     |
 | mssql-jdbc-6.2.2.jre7.jar | JDBC 4.1 and 4.0       | JDK 7.0     |
+|                      |                   |        |
 
 The Microsoft JDBC Drivers 6.0 and 4.2 for SQL Server supports JDBC 4.0, 4.1, and 4.2 specifications and include two JAR class libraries in the installation package as follows:
 
 | JAR           | JDBC Specification     | JDK Version |
 | ------------- | ---------------------- | ----------- |
 | sqljdbc42.jar | JDBC 4.2, 4.1, and 4.0 | JDK 8.0     |
 | sqljdbc41.jar | JDBC 4.1 and 4.0       | JDK 7.0     |
+|          |                   |        |
 
 The Microsoft JDBC Driver 4.1 for SQL Server supports the JDBC 4.0 specification and includes one JAR class library in the installation package as follows:
 
 | JAR           | JDBC Specification | JDK Version     |
 | ------------- | ------------------ | --------------- |
 | sqljdbc41.jar | JDBC 4.0           | JDK 7.0 and 6.0 |
+|          |               |        |
 
 **Do I need to make any code changes in my application to use the latest driver with my existing SQL Server version?**  
 In general, the driver is designed to be backward compatible so that you do not need to change your existing applications when upgrading the driver. In the event that a new driver version introduces a breaking change, the [Release Notes for the JDBC Driver](../../connect/jdbc/release-notes-for-the-jdbc-driver.md) section provides clear details on the change and the impact to existing applications. In addition, you can review the release notes included with the driver for a list of bugs fixed in that release and known issues.
 
 **How much does the driver cost?**  
 The Microsoft JDBC Driver for SQL Server is available at no additional charge.
 
-**Can I redistribute the driver?**
-The JDBC Drivers 4.1, 4.2, 6.0, 6.2, 6.4, and 7.0 are redistributable. Review the "Distributable Code" clause in the license agreements.
+**Can I redistribute the driver?**  
+The JDBC Drivers 6.0, 6.2, 6.4, and 7.0 are redistributable. Review the "Distributable Code" clause in the license agreements.
 
-**Can I use the driver to access Microsoft SQL Server from a Linux computer?**
+**Can I use the driver to access Microsoft SQL Server from a Linux computer?**  
 Yes! You can use the driver to access SQL Server from Linux, Unix, and other non-Windows platforms. For more information, see [Microsoft JDBC Driver for SQL Server Support Matrix](../../connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix.md).
 
-**Does the driver support Secure Sockets Layer (SSL) encryption?**
+**Does the driver support Secure Sockets Layer (SSL) encryption?**  
 Starting with version 1.2, the driver supports Secure Sockets Layer (SSL) encryption. For more information, see [Using SSL Encryption](../../connect/jdbc/using-ssl-encryption.md).
 
 **Which authentication types are supported by the Microsoft JDBC Driver for SQL Server?**  
 The table below lists available authentication options. A pure Java Kerberos authentication is available starting with the 4.0 release of the driver.
 
-|             |                                       |
-| ----------- | ------------------------------------- |
 | Platform    | Authentication                        |
+| ----------- | ------------------------------------- |
 | Non-Windows | Pure Java Kerberos                    |
 | Non-Windows | SQL Server                            |
 | Non-Windows | Azure Active Directory Authentication |
@@ -109,6 +114,7 @@ The table below lists available authentication options. A pure Java Kerberos aut
 | Windows     | Kerberos with NTLM backup             |
 | Windows     | NTLM                                  |
 | Windows     | Azure Active Directory Authentication |
+|        |                                  |
 
 **Does the driver support Internet Protocol version 6 (IPv6) addresses?**  
 Yes. The driver supports the use of IPv6 addresses. Use the connection properties collection and the serverName connection string property. For more information, see [Building the Connection URL](../../connect/jdbc/building-the-connection-url.md).
@@ -122,7 +128,7 @@ The driver provides support for Java Platform, Enterprise Edition 5 (Java EE 5)
 **Is support available for the driver?**  
 Several support options are available. You may post your question or issue to our [GitHub repository](https://github.com/microsoft/mssql-jdbc) which is monitored by Microsoft. [Forums](https://go.microsoft.com/fwlink/?LinkID=246673) are monitored by Microsoft, MVPs, and the community. You may also contact Microsoft Customer Support. The development team may ask you to reproduce the issue outside any third-party application servers. If the issue cannot be reproduced outside the hosting Java container environment, you will need to involve the related third-party so that the team can continue to assist you. The team may also ask you to reproduce your issue on an operating system such as Windows so the problem can be best supported.
 
-**Is the driver certified for use with any third-party application servers?**
+**Is the driver certified for use with any third-party application servers?**  
 The driver has been tested against various application servers including IBM WebSphere and SAP Netweaver.
 
 **How do I enable tracing?**  

docs/connect/jdbc/overview-of-the-jdbc-driver.md

@@ -1,7 +1,7 @@
 ---
 title: "Overview of the JDBC driver | Microsoft Docs"
 ms.custom: ""
-ms.date: "08/12/2019"
+ms.date: 10/28/2019
 ms.prod: sql
 ms.prod_service: connectivity
 ms.reviewer: ""
@@ -12,27 +12,34 @@ author: MightyPen
 ms.author: genemi
 ---
 # Overview of the JDBC driver
+
 [!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
 
-  The Microsoft JDBC Driver for SQL Server is a Type 4 Java Database Connectivity (JDBC) 4.2 compliant driver that provides robust data access to SQL Server 2017, SQL Server 2016, SQL Server 2014, SQL Server 2012, SQL Server 2008 R2, SQL Server 2008, and Azure SQL Database.  
-  
- The topics in this section provide a general overview of the JDBC driver, including the system requirements needed to use it, how it can be used, and where you can go for more information.  
-  
+The Microsoft JDBC Driver for SQL Server is a Type 4 Java Database Connectivity (JDBC) 4.2 compliant driver that provides robust data access to SQL Server 2017, SQL Server 2016, SQL Server 2014, SQL Server 2012, SQL Server 2008 R2, SQL Server 2008, and Azure SQL Database.  
+
+## Redistribution
+
+The JDBC Driver versions 6.0, 6.2, 6.4, and 7.0 are redistributable. Review the _Distributable Code_ clause in the license agreements.
+
+The JDBC Driver versions 4.x are old and obsolete. Support for 4.x expired before 2018.
+
 ## In this section  
-  
+
+The topics in this section provide a general overview of the JDBC driver, including the system requirements needed to use it, how it can be used, and where you can go for more information.  
+
 |Topic|Description|  
 |-----------|-----------------|  
 |[Download Microsoft JDBC Driver for SQL Server](../../connect/jdbc/download-microsoft-jdbc-driver-for-sql-server.md)|Download links for Microsoft JDBC driver for SQL Server|  
 |[Release notes for the JDBC driver](../../connect/jdbc/release-notes-for-the-jdbc-driver.md)|Describes the features that have been added to the current release of the Microsoft JDBC driver.|  
 |[System requirements for the JDBC driver](../../connect/jdbc/system-requirements-for-the-jdbc-driver.md)|Describes the system requirements needed to use the Microsoft JDBC driver.|  
 |[Using the JDBC driver](../../connect/jdbc/using-the-jdbc-driver.md)|Describes how to configure your environment to use the Microsoft JDBC driver and how to make a simple connection to a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] database.|  
 |[Understanding Java EE support](../../connect/jdbc/understanding-java-ee-support.md)|Describes how to use the Microsoft JDBC driver within a Java Platform, Enterprise Edition (Java EE) environment.|  
-|[Deploying the JDBC driver](../../connect/jdbc/deploying-the-jdbc-driver.md)|Describes how to deploy the Microsoft JDBC driver on Windows and Unix operating systems.|  
-|[Redistributing the Microsoft JDBC Driver](../../connect/jdbc/redistributing-the-microsoft-jdbc-driver.md)|Describes how to register to redistribute the Microsoft JDBC driver.|  
+|[Deploying the JDBC driver](../../connect/jdbc/deploying-the-jdbc-driver.md)|Describes how to redistribute and deploy the Microsoft JDBC driver on Windows and Unix operating systems.|  
 |[Finding additional JDBC driver information](../../connect/jdbc/finding-additional-jdbc-driver-information.md)|Describes where to find additional resources about the Microsoft JDBC driver, including links to external resources.|  
 |[Microsoft JDBC Driver for SQL Server support matrix](../../connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix.md)|Support matrix and support lifecycle policy for the Microsoft JDBC driver for SQL Server.|  
 |[Frequently asked questions (FAQ) for JDBC driver](../../connect/jdbc/frequently-asked-questions-faq-for-jdbc-driver.md)|Frequently asked questions about the Microsoft JDBC driver.|  
 |[Feature dependencies of Microsoft JDBC Driver for SQL Server](../../connect/jdbc/feature-dependencies-of-microsoft-jdbc-driver-for-sql-server.md)|Feature dependencies of Microsoft JDBC Driver for SQL Server.|
+|   |   |
 
 ## See also  
  [JDBC driver GitHub repository](https://github.com/microsoft/mssql-jdbc)  

docs/connect/jdbc/redistributing-the-microsoft-jdbc-driver.md

@@ -40,6 +40,7 @@ You can run applications with the driver on the following Windows operating syst
 - Windows Server 2008 R2
 - Windows Server 2012
 - Windows Server 2012 R2
+- Windows Server 2016
 - Windows Vista SP2   _(ODBC Driver 11 only.)_
 - Windows 7
 - Windows 8

docs/connect/odbc/windows/system-requirements-installation-and-driver-files.md

@@ -2513,8 +2513,6 @@
       href: ../connect/jdbc/understanding-java-ee-support.md
     - name: Deploying the JDBC Driver
       href: ../connect/jdbc/deploying-the-jdbc-driver.md
-    - name: Redistributing the Microsoft JDBC Driver
-      href: ../connect/jdbc/redistributing-the-microsoft-jdbc-driver.md
     - name: Finding Additional JDBC Driver Information
       href: ../connect/jdbc/finding-additional-jdbc-driver-information.md
     - name: Microsoft JDBC Driver for SQL Server Support Matrix

docs/connect/toc.yml

@@ -15,7 +15,7 @@ ms.author: mathoma
 ---
 # Distributed availability groups
 [!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
-Distributed availability groups are a new feature introduced in SQL Server 2016, as a variation of the existing Always On availability groups feature. This article clarifies some aspects of distributed availability groups and complements the existing [SQL Server documentation](https://docs.microsoft.com/sql/sql-server/index.yml).
+Distributed availability groups are a new feature introduced in SQL Server 2016, as a variation of the existing Always On availability groups feature. This article clarifies some aspects of distributed availability groups and complements the existing [SQL Server documentation](https://docs.microsoft.com/sql/sql-server/).
 
 > [!NOTE]
 > "DAG" is not the official abbreviation for *distributed availability group*, because the abbreviation is already used for the Exchange Database Availability Group feature. This Exchange feature has no relation to SQL Server availability groups or distributed availability groups.