Merge pull request #23660 from rwestMSFT/rw-0810-includes-always-on

[Bulk] INCLUDE file maintenance: remove two duplicate HADR files

Author: 19BMG00

docs/connect/jdbc/jdbc-driver-support-for-high-availability-disaster-recovery.md

@@ -17,7 +17,7 @@ ms.author: v-davidengel
 
 [!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
 
-  This article discusses [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)] support for high-availability, disaster recovery: [!INCLUDE[ssHADR](../../includes/sshadr_md.md)]. For more information about [!INCLUDE[ssHADR](../../includes/sshadr_md.md)], see [!INCLUDE[ssSQL11](../../includes/sssql11-md.md)] Books Online.
+  This article discusses [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)] support for high-availability, disaster recovery: [!INCLUDE[ssHADR](../../includes/sshadr-md.md)]. For more information about [!INCLUDE[ssHADR](../../includes/sshadr-md.md)], see [!INCLUDE[ssSQL11](../../includes/sssql11-md.md)] Books Online.
 
  Beginning in version 4.0 of the [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)], you can specify the availability group listener of a (high-availability, disaster-recovery) availability group (AG) in the connection property. If a [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)] application is connected to an Always On database that fails over, the original connection is broken, and the application must open a new connection to continue work after the failover. The following [connection properties](setting-the-connection-properties.md) were added in [!INCLUDE[jdbc_40](../../includes/jdbc_40_md.md)]:
 

docs/connect/jdbc/setting-the-connection-properties.md

@@ -98,7 +98,7 @@ The following table lists all the currently available connection string properti
 | sendTemporalDataTypesAsStringForBulkCopy<br/><br/>boolean<br/>["true" &#124; "false"]<br/><br/>true | (Version 8.4+) This connection property, when set to "false", sends **DATE**, **DATETIME**, **DATIMETIME2**, **DATETIMEOFFSET**, **SMALLDATETIME**, and **TIME** datatypes as their respective types instead of sending them as String.<br/><br/>With this connection property set to "false", the driver will only accept the default string literal format of each temporal datatype, for example:<br/><br/>DATE: `YYYY-MM-DD`<br/>DATETIME: `YYYY-MM-DD hh:mm:ss[.nnn]`<br/>DATETIME2: `YYYY-MM-DD hh:mm:ss[.nnnnnnn]`<br/>DATETIMEOFFSET: `YYYY-MM-DD hh:mm:ss[.nnnnnnn] [{+/-}hh:mm]`<br/>SMALLDATETIME: `YYYY-MM-DD hh:mm:ss`<br/>TIME: `hh:mm:ss[.nnnnnnn]`<br/> |
 | sendTimeAsDatetime<br/><br/>boolean<br/>["true" &#124; "false"]<br/><br/>true | This property was added in SQL Server JDBC Driver 3.0.<br/><br/> Set to "true" to send java.sql.Time values to the server as [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] **datetime** values. <br/>Set to "false" to send java.sql.Time values to the server as [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] **time** values.<br/><br/> The default value for this property is currently "true" and might change in a future release.<br/><br/> For more information about how the [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)] configures java.sql.Time values before it sends them to the server, see [Configuring How java.sql.Time Values are Sent to the Server](configuring-how-java-sql-time-values-are-sent-to-the-server.md). |
 | serverCertificate,<br/>server<br/><br/>String<br/><br/>null | (Version 11.2.0+) The path to the server certificate file. Used for validation when using **encrypt** set to **strict**. The driver supports certificate files using the PEM file format. |
-| serverName,<br/>server<br/><br/>String<br/><br/>null | The computer running [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] or an Azure SQL database.<br/><br/> You can also specify the Virtual Network Name of an [!INCLUDE[ssHADR](../../includes/sshadr_md.md)] availability group. For more information about disaster recovery, see [JDBC driver support for High Availability, disaster recovery](jdbc-driver-support-for-high-availability-disaster-recovery.md). |
+| serverName,<br/>server<br/><br/>String<br/><br/>null | The computer running [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] or an Azure SQL database.<br/><br/> You can also specify the Virtual Network Name of an availability group. For more information about disaster recovery, see [JDBC driver support for High Availability, disaster recovery](jdbc-driver-support-for-high-availability-disaster-recovery.md). |
 | serverNameAsACE<br/><br/>boolean<br/>["true" &#124; "false"]<br/><br/>false | (Version 6.0+) Set to "true" to indicate that the driver should translate the Unicode server name to ASCII compatible encoding (Punycode) for the connection. If this setting is false, the driver uses the server name as provided to connect.<br/><br/> For more information about international features, see [International features of the JDBC driver](international-features-of-the-jdbc-driver.md). |
 | serverPreparedStatement...<br/>DiscardThreshold<br/><br/>Integer<br/><br/>10 | (Version 6.2+) This property can be used to control how many outstanding prepared statement discard actions (<code>sp_unprepare</code>) can be outstanding per connection before a call to clean up the outstanding handles on the server is executed. <br/><br/> If this property is set to &lt;= 1, unprepare actions are executed immediately on prepared statement close. If it's set to &gt;1, these calls are batched together to avoid overhead of calling sp_unprepare too often. |
 | serverSpn<br/><br/>String<br/><br/>null | (Version 4.2+) This optional property can be used to specify the Service Principal Name (SPN) for a Java Kerberos connection.  It's used with **authenticationScheme**.<br/><br/> To specify the SPN, it can be in the form of: "MSSQLSvc/fqdn:port@REALM" where fqdn is the fully qualified domain name, port is the port number, and REALM is the Kerberos realm of the SQL Server in upper-case letters.<br/><br/> Note: the @REALM is optional if the default realm of the client (as specified in the Kerberos configuration) is the same as the Kerberos realm for the SQL Server.<br/><br/> For more information about using **serverSpn** with Java Kerberos, see [Using Kerberos integrated authentication to connect to SQL Server](using-kerberos-integrated-authentication-to-connect-to-sql-server.md). |

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

@@ -96,7 +96,7 @@ Specify the number of seconds before a `sqlcmd` login times out when you try to
 Control which error messages are sent to stdout.
 
 **-M** *multisubnet_failover*  
-Always specify **-M** when connecting to the availability group listener of a [!INCLUDE[ssSQL11](../../../includes/sssql11-md.md)] availability group or a [!INCLUDE[ssSQL11](../../../includes/sssql11-md.md)] Failover Cluster Instance. **-M** provides for faster detection of failovers and connection to the (currently) active server. If **-M** isn't specified, **-M** is off. For more information about [!INCLUDE[ssHADR](../../../includes/sshadr_md.md)], see [ODBC Driver on Linux and macOS - High Availability and Disaster Recovery](odbc-driver-on-linux-support-for-high-availability-disaster-recovery.md).
+Always specify **-M** when connecting to the availability group listener of a [!INCLUDE[ssSQL11](../../../includes/sssql11-md.md)] availability group or a [!INCLUDE[ssSQL11](../../../includes/sssql11-md.md)] Failover Cluster Instance. **-M** provides for faster detection of failovers and connection to the (currently) active server. If **-M** isn't specified, **-M** is off. For more information about [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)], see [ODBC Driver on Linux and macOS - High Availability and Disaster Recovery](odbc-driver-on-linux-support-for-high-availability-disaster-recovery.md).
 
 > [!NOTE]
 > **-M** isn't supported in the CTP for SUSE Linux. You can, however, specify the **MultiSubnetFailover=Yes** keyword in a DSN file passed to `sqlcmd`. For more information, see "DSN Support in `sqlcmd` and `bcp`" at the end of this article.

docs/connect/odbc/linux-mac/release-notes-odbc-sql-server-linux-mac.md

@@ -262,7 +262,7 @@ Ubuntu is now supported, along with Red Hat and SUSE. Each platform has a platfo
 
 The ODBC driver on SUSE Linux (Preview) supports 64-bit SUSE Linux Enterprise 11 Service Pack 2. For more information, see [System Requirements](system-requirements.md).  
 
-The ODBC driver on Linux supports [!INCLUDE[ssHADR](../../../includes/sshadr_md.md)]. For more information, see [ODBC Driver on Linux Support for High Availability, Disaster Recovery](odbc-driver-on-linux-support-for-high-availability-disaster-recovery.md).  
+The ODBC driver on Linux supports [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)]. For more information, see [ODBC Driver on Linux Support for High Availability, Disaster Recovery](odbc-driver-on-linux-support-for-high-availability-disaster-recovery.md).  
 
 The ODBC driver on Linux supports connections to Azure SQL Database.
 

docs/connect/php/connection-options.md

@@ -24,7 +24,7 @@ This topic lists the options that are permitted in the associative array (when u
 |-------|---------|---------------|-----------|  
 |AccessToken|String|The byte string of the Azure AD Access Token extracted from an OAuth JSON response.<br /><br />The connection string must not contain a user ID, password, or the `Authentication` keyword. For more information, see [Connect Using Azure Active Directory Authentication](azure-active-directory.md)|Not set.|
 |APP|String|Specifies the application name used in tracing.|Not set.|  
-|ApplicationIntent|String|Declares the application workload type when connecting to a server. Possible values are **ReadOnly** and **ReadWrite**.<br /><br />For more information about [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] support for [!INCLUDE[ssHADR](../../includes/sshadr_md.md)], see [Support for High Availability, Disaster Recovery](php-driver-for-sql-server-support-for-high-availability-disaster-recovery.md).|ReadWrite|
+|ApplicationIntent|String|Declares the application workload type when connecting to a server. Possible values are **ReadOnly** and **ReadWrite**.<br /><br />For more information about [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] support for [!INCLUDE[ssHADR](../../includes/sshadr-md.md)], see [Support for High Availability, Disaster Recovery](php-driver-for-sql-server-support-for-high-availability-disaster-recovery.md).|ReadWrite|
 |AttachDBFileName|String|Specifies which database file the server should attach.|Not set.|
 |Authentication|One of the following strings:<br /><br />**SqlPassword**<br /><br />**ActiveDirectoryPassword**<br /><br />**ActiveDirectoryMsi**<br /><br />**ActiveDirectoryServicePrincipal**|Specifies the authentication mode.<br /><br />For more information, see [Connect Using Azure Active Directory Authentication](azure-active-directory.md)|Not set.|
 |CharacterSet<br /><br />(not supported in the PDO_SQLSRV driver)|String|Specifies the character set used to send data to the server.<br /><br />Possible values are SQLSRV_ENC_CHAR and UTF-8. For more information, see [How to: Send and Retrieve UTF-8 Data Using Built-In UTF-8 Support](how-to-send-and-retrieve-utf-8-data-using-built-in-utf-8-support.md).|SQLSRV_ENC_CHAR|  
@@ -44,12 +44,12 @@ This topic lists the options that are permitted in the associative array (when u
 |Language|String|Specifies the language of messages returned by the server. The available languages are listed in the `sys.syslanguages` table. <br /><br />This option does not affect the language used by the drivers themselves, as they are currently available only in English, and it does not affect the language of the underlying ODBC driver, whose language is determined by the localized version installed on the client system. Therefore, changing this setting may result in messages being returned in different languages, depending on whether they come from the PHP driver, the ODBC driver, or SQL Server.|The default is the language set in SQL Server.|
 |LoginTimeout|Integer (SQLSRV driver)<br /><br />String (PDO_SQLSRV driver)|Specifies the number of seconds to wait before failing the connection attempt.|No timeout.|  
 |MultipleActiveResultSets|1 or **true** to use multiple active result sets.<br /><br />0 or **false** to disable multiple active result sets.|Disables or explicitly enables support for multiple active result sets (MARS).<br /><br />For more information, see [How to: Disable Multiple Active Result Sets &#40;MARS&#41;](how-to-disable-multiple-active-resultsets-mars.md).|true (1)|  
-|MultiSubnetFailover|String|Always specify `multiSubnetFailover=yes` when connecting to the availability group listener of a [!INCLUDE[ssSQL11](../../includes/sssql11-md.md)] availability group or a [!INCLUDE[ssSQL11](../../includes/sssql11-md.md)] Failover Cluster Instance. `multiSubnetFailover=yes` configures [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] to provide faster detection of and connection to the (currently) active server. Possible values are Yes and No.<br /><br />For more information about [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] support for [!INCLUDE[ssHADR](../../includes/sshadr_md.md)], see [Support for High Availability, Disaster Recovery](php-driver-for-sql-server-support-for-high-availability-disaster-recovery.md).|No|  
+|MultiSubnetFailover|String|Always specify `multiSubnetFailover=yes` when connecting to the availability group listener of a [!INCLUDE[ssSQL11](../../includes/sssql11-md.md)] availability group or a [!INCLUDE[ssSQL11](../../includes/sssql11-md.md)] Failover Cluster Instance. `multiSubnetFailover=yes` configures [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] to provide faster detection of and connection to the (currently) active server. Possible values are Yes and No.<br /><br />For more information about [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] support for [!INCLUDE[ssHADR](../../includes/sshadr-md.md)], see [Support for High Availability, Disaster Recovery](php-driver-for-sql-server-support-for-high-availability-disaster-recovery.md).|No|  
 |PWD<br /><br />(not supported in the PDO_SQLSRV driver)|String|Specifies the password associated with the User ID to be used when connecting with SQL Server Authentication<sup>4</sup>.|Not set.|  
 |QuotedId|1 or **true** to use SQL-92 rules.<br /><br />0 or **false** to use legacy rules.|Specifies whether to use SQL-92 rules for quoted identifiers (1 or **true**) or to use legacy Transact-SQL rules (0 or **false**).|**true** (1)|  
 |ReturnDatesAsStrings<br /><br />(not supported in the PDO_SQLSRV driver)|1 or **true** to return date and time types as strings.<br /><br />0 or **false** to return date and time types as PHP **DateTime** types.|Retrieves date and time types (datetime, smalldatetime, date, time, datetime2, and datetimeoffset) as strings or as PHP types. For more information, see [How to: Retrieve Date and Time Types as Strings Using the SQLSRV Driver](how-to-retrieve-date-and-time-type-as-strings-using-the-sqlsrv-driver.md). <br /><br />When using the PDO_SQLSRV driver, dates are returned as strings unless otherwise specified. For more information, see [How to: Retrieve Date and Time Types as PHP DateTime Objects Using the PDO_SQLSRV Driver](how-to-retrieve-datetime-objects-using-pdo-sqlsrv-driver.md).|**false**|
 |Scrollable|String|"buffered" indicates that you want a client-side (buffered) cursor, which allows you to cache an entire result set in memory. For more information, see [Cursor Types &#40;SQLSRV Driver&#41;](cursor-types-sqlsrv-driver.md).|Forward-only cursor|  
-|Server<br /><br />(not supported in the SQLSRV driver)|String|The [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] instance to connect to.<br /><br />You can also specify a virtual network name, to connect to an Always On availability group. For more information about [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] support for [!INCLUDE[ssHADR](../../includes/sshadr_md.md)], see [Support for High Availability, Disaster Recovery](php-driver-for-sql-server-support-for-high-availability-disaster-recovery.md).|Server is a required keyword (although it does not have to be the first keyword in the connection string). If a server name is not passed to the keyword, an attempt is made to connect to the local instance.<br /><br />The value passed to Server can be the name of a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] instance, or the IP address of the instance. You can optionally specify a port number (for example, `sqlsrv:server=(local),1033`).<br /><br />Beginning in version 3.0 of the [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] you can also specify a LocalDB instance with `server=(localdb)\instancename`. For more information, see [Support for LocalDB](php-driver-for-sql-server-support-for-localdb.md).|  
+|Server<br /><br />(not supported in the SQLSRV driver)|String|The [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] instance to connect to.<br /><br />You can also specify a virtual network name, to connect to an Always On availability group. For more information about [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] support for [!INCLUDE[ssHADR](../../includes/sshadr-md.md)], see [Support for High Availability, Disaster Recovery](php-driver-for-sql-server-support-for-high-availability-disaster-recovery.md).|Server is a required keyword (although it does not have to be the first keyword in the connection string). If a server name is not passed to the keyword, an attempt is made to connect to the local instance.<br /><br />The value passed to Server can be the name of a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] instance, or the IP address of the instance. You can optionally specify a port number (for example, `sqlsrv:server=(local),1033`).<br /><br />Beginning in version 3.0 of the [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] you can also specify a LocalDB instance with `server=(localdb)\instancename`. For more information, see [Support for LocalDB](php-driver-for-sql-server-support-for-localdb.md).|  
 |TraceFile|String|Specifies the path for the file used for trace data.|Not set.|  
 |TraceOn|1 or **true** to enable tracing.<br /><br />0 or **false** to disable tracing.|Specifies whether ODBC tracing is enabled (1 or **true**) or disabled (0 or **false**) for the connection being established.|**false** (0)|  
 |TransactionIsolation|The SQLSRV driver uses the following values:<br /><br />SQLSRV_TXN_READ_UNCOMMITTED<br /><br />SQLSRV_TXN_READ_COMMITTED<br /><br />SQLSRV_TXN_REPEATABLE_READ<br /><br />SQLSRV_TXN_SNAPSHOT<br /><br />SQLSRV_TXN_SERIALIZABLE<br /><br />The PDO_SQLSRV driver uses the following values:<br /><br />PDO::SQLSRV_TXN_READ_UNCOMMITTED<br /><br />PDO::SQLSRV_TXN_READ_COMMITTED<br /><br />PDO::SQLSRV_TXN_REPEATABLE_READ<br /><br />PDO::SQLSRV_TXN_SNAPSHOT<br /><br />PDO::SQLSRV_TXN_SERIALIZABLE|Specifies the transaction isolation level.<br /><br />For more information about transaction isolation, see [SET TRANSACTION ISOLATION LEVEL](../../t-sql/statements/set-transaction-isolation-level-transact-sql.md) in the SQL Server documentation.|SQLSRV_TXN_READ_COMMITTED<br /><br />or<br /><br />PDO::SQLSRV_TXN_READ_COMMITTED|