Merge pull request #18749 from MicrosoftDocs/master

3/05 PM Publish

Author: huypub

docs/big-data-cluster/change-azdata-password.md

@@ -4,7 +4,7 @@ description: Update the `AZDATA_PASSWORD` manually
 author: NelGson
 ms.author: negust
 ms.reviewer: mikeray
-ms.date: 03/03/2021
+ms.date: 03/05/2021
 ms.topic: conceptual
 ms.prod: sql
 ms.technology: big-data-cluster
@@ -175,8 +175,8 @@ sudo yum install httpd-tools
     ```bash
     kubectl describe pods mgmtproxy-xxxxx  -n <namespace>
     ```   
-
-    For troubleshooting and further log collection, use the Azure Data CLI `[azdata bdc debug copy-logs](../azdata/reference/reference-azdata-bdc-debug.md)` command.   
+    
+    For troubleshooting and further log collection, use the Azure Data CLI [azdata bdc debug copy-logs](../azdata/reference/reference-azdata-bdc-debug.md) command.   
 
 
 8. Now login to Grafana using new password. 
@@ -225,4 +225,4 @@ Follow these options for manually updating the password for [Kibana](cluster-log
 
 * [azdata bdc (Azure Data CLI)](../azdata/reference/reference-azdata-bdc.md)  
 * [Monitor applications with azdata and Grafana Dashboard](app-monitor.md)   
-* [Check out cluster logs with Kibana Dashboard](cluster-logging-kibana.md)   
+* [Check out cluster logs with Kibana Dashboard](cluster-logging-kibana.md)   

docs/connect/php/connection-options.md

@@ -2,7 +2,7 @@
 title: "Connection Options"
 description: "This topic lists the options that are permitted in the associative array of sqlsrv_connect in the SQLSRV driver or the keywords that are permitted in the data source name the PDO_SQLSRV driver."
 ms.custom: ""
-ms.date: "01/29/2021"
+ms.date: "03/05/2021"
 ms.prod: sql
 ms.prod_service: connectivity
 ms.reviewer: ""
@@ -13,6 +13,7 @@ author: David-Engel
 ms.author: v-daenge
 ---
 # Connection Options
+
 [!INCLUDE[Driver_PHP_Download](../../includes/driver_php_download.md)]
 
 This topic lists the options that are permitted in the associative array (when using [sqlsrv_connect](sqlsrv-connect.md) in the SQLSRV driver) or the keywords that are permitted in the data source name (dsn) (when using [PDO::__construct](pdo-construct.md) in the PDO_SQLSRV driver).  
@@ -21,28 +22,28 @@ This topic lists the options that are permitted in the associative array (when u
 
 |Key|Value|Description|Default|  
 |-------|---------|---------------|-----------|  
-|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, refer to [Connect Using Azure Active Directory Authentication](azure-active-directory.md)|Not set.|
+|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|
 |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, refer to [Connect Using Azure Active Directory Authentication](azure-active-directory.md)|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|  
-|ColumnEncryption|One of the following strings:<br /><br />**Enabled**<br /><br />**Disabled**<br /><br />A string identifying the attestation protocol and URL for attesting the enclave|Specifies whether the Always Encrypted feature is enabled or not. If an attestation protocol and URL are specified, Always Encrypted with Secure Enclaves is enabled, provided the other requirements are met as described [here](always-encrypted-secure-enclaves.md).|Disabled|  
+|ColumnEncryption|One of the following strings:<br /><br />**Enabled**<br /><br />**Disabled**<br /><br />A string identifying the attestation protocol and URL for attesting the enclave|Specifies whether the Always Encrypted feature is enabled or not. If an attestation protocol and URL are specified, Always Encrypted with secure enclaves is enabled, provided the other requirements are met as described [here](always-encrypted-secure-enclaves.md).|Disabled|  
 |ConnectionPooling|1 or **true** for connection pooling on.<br /><br />0 or **false** for connection pooling off.|Specifies whether the connection is assigned from a connection pool (1 or **true**) or not (0 or **false**).<sup>1</sup>|**true** (1)|  
 |ConnectRetryCount|Integer between 0 and 255 (inclusive)|The maximum number of attempts to reestablish a broken connection before giving up. By default, a single attempt is made to reestablish a connection when broken. A value of 0 means that no reconnection will be attempted.|1|  
-|ConnectRetryInterval|Integer between 1 and 60 (inclusive)|The time, in seconds, between attempts to reestablish a connection. The application will attempt to reconnect immediately upon detecting a broken connection, and will then wait `ConnectRetryInterval` seconds before trying again. This keyword is ignored if `ConnectRetryCount` is equal to 0.|1|  
+|ConnectRetryInterval|Integer between 1 and 60 (inclusive)|The time, in seconds, between attempts to reestablish a connection. The application will attempt to reconnect immediately upon detecting a broken connection, and will then wait `ConnectRetryInterval` seconds before trying again. This keyword is ignored if `ConnectRetryCount` is equal to 0.|10|  
 |Database|String|Specifies the name of the database in use for the connection being established<sup>2</sup>.|The default database for the login being used.|  
 |DecimalPlaces<br /><br />(not supported in the PDO_SQLSRV driver)|Integer between 0 and 4 (inclusive)|Specifies the decimal places when formatting fetched money values.<br /><br />This option works only when `FormatDecimals` is true. Any negative integer or value more than 4 will be ignored.|Default precision and scale|
-|Driver|String|Specifies the Microsoft ODBC driver used to communicate with SQL Server.<br /><br />Possible values are:<br />ODBC Driver 17 for SQL Server<br />ODBC Driver 13 for SQL Server<br />ODBC Driver 11 for SQL Server (Windows only).|When the Driver keyword is not specified, the Microsoft Drivers for PHP for SQL Server attempt to find supported Microsoft ODBC driver(s) in the system, starting with the latest version of ODBC and so on.| 
+|Driver|String|Specifies the Microsoft ODBC driver used to communicate with SQL Server.<br /><br />Possible values are:<br />ODBC Driver 17 for SQL Server<br />ODBC Driver 13 for SQL Server<br />ODBC Driver 11 for SQL Server (Windows only).|When the Driver keyword is not specified, the Microsoft Drivers for PHP for SQL Server attempt to find supported Microsoft ODBC driver(s) in the system, starting with the latest version of ODBC and so on.|
 |Encrypt|1 or **true** for encryption on.<br /><br />0 or **false** for encryption off.|Specifies whether the communication with SQL Server is encrypted (1 or **true**) or unencrypted (0 or **false**)<sup>3</sup>.|**false** (0)|  
 |Failover_Partner|String|Specifies the server and instance of the database's mirror (if enabled and configured) to use when the primary server is unavailable.<br /><br />There are restrictions to using `Failover_Partner` with `MultiSubnetFailover`. For more information, see [Support for High Availability, Disaster Recovery](php-driver-for-sql-server-support-for-high-availability-disaster-recovery.md).<br /><br />This option is not supported on Linux or macOS because database mirroring is not supported by the ODBC driver on Linux or macOS. Instead, use Always On availability groups and set the `MultiSubnetFailover` and `TransparentNetworkIPResolution` options.|Not set.|
 |FormatDecimals<br /><br />(not supported in the PDO_SQLSRV driver)|1 or **true** to format fetched decimal strings.<br /><br />0 or **false** for default decimal formatting behavior.|Specifies whether to add leading zeroes to decimal strings when appropriate and enables the `DecimalPlaces` option for formatting money types. If left false, the default behavior of returning exact precision and omitting leading zeroes for values less than 1 is used.<br /><br />For more information, see [Formatting Decimal Strings and Money Values](formatting-decimals-sqlsrv-driver.md).|**false** (0)|
 |KeyStoreAuthentication|**KeyVaultPassword**<br /><br />**KeyVaultClientSecret**|Authentication method for accessing Azure Key Vault. Controls what kind of credentials are used with `KeyStorePrincipalId` and `KeyStoreSecret`. For more information, see [Using Azure Key Vault](using-always-encrypted-php-drivers.md#using-azure-key-vault).|Not set.|
-|KeyStorePrincipalId|String|Identifier for the account seeking to access Azure Key Vault. <br /><br />If `KeyStoreAuthentication` is **KeyVaultPassword**, this must be an Azure Active Directory username. <br /><br />If `KeyStoreAuthentication` is **KeyVaultClientSecret**, this must be an application client ID.|Not set.|
-|KeyStoreSecret|String|Credential secret for the account seeking to access Azure Key Vault. <br /><br />If `KeyStoreAuthentication` is **KeyVaultPassword**, this must be an Azure Active Directory password. <br /><br />If `KeyStoreAuthentication` is **KeyVaultClientSecret**, this must be an application client secret.|Not set.|
+|KeyStorePrincipalId|String|Identifier for the account seeking to access Azure Key Vault. <br /><br />If `KeyStoreAuthentication` is **KeyVaultPassword**, this value must be an Azure Active Directory username. <br /><br />If `KeyStoreAuthentication` is **KeyVaultClientSecret**, this value must be an application client ID.|Not set.|
+|KeyStoreSecret|String|Credential secret for the account seeking to access Azure Key Vault. <br /><br />If `KeyStoreAuthentication` is **KeyVaultPassword**, this value must be an Azure Active Directory password. <br /><br />If `KeyStoreAuthentication` is **KeyVaultClientSecret**, this value must be an application client secret.|Not set.|
 |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 Resultsets &#40;MARS&#41;](how-to-disable-multiple-active-resultsets-mars.md).|true (1)|  
+|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|  
 |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)|  
@@ -69,4 +70,5 @@ This topic lists the options that are permitted in the associative array (when u
 Many of the supported keys are ODBC connection string attributes. For information about ODBC connection strings, see [Using Connection String Keywords with SQL Native Client](../../relational-databases/native-client/applications/using-connection-string-keywords-with-sql-server-native-client.md).
 
 ## See Also  
+
 [Connecting to the Server](connecting-to-the-server.md)  

docs/connect/php/connection-resiliency.md

@@ -1,7 +1,7 @@
 ---
 title: "Idle Connection Resiliency"
 description: "Learn what idle connection resiliency is and how it behaves within the Microsoft Drivers for PHP for SQL Server."
-ms.date: "07/13/2017"
+ms.date: "03/04/2021"
 ms.prod: sql
 ms.prod_service: connectivity
 ms.custom: ""
@@ -20,7 +20,7 @@ Connection resiliency is implemented with two connection keywords that can be ad
 |Keyword|Values|Default|Description|
 |-|-|-|-|
 |**ConnectRetryCount**| Integer between 0 and 255 (inclusive)|1|The maximum number of attempts to reestablish a broken connection before giving up. By default, a single attempt is made to reestablish a connection when broken. A value of 0 means that no reconnection will be attempted.|
-|**ConnectRetryInterval**| Integer between 1 and 60 (inclusive)|1| The time, in seconds, between attempts to reestablish a connection. The application will attempt to reconnect immediately upon detecting a broken connection, and will then wait **ConnectRetryInterval** seconds before trying again. This keyword is ignored if **ConnectRetryCount** is equal to 0.
+|**ConnectRetryInterval**| Integer between 1 and 60 (inclusive)|10| The time, in seconds, between attempts to reestablish a connection. The application will attempt to reconnect immediately upon detecting a broken connection, and will then wait **ConnectRetryInterval** seconds before trying again. This keyword is ignored if **ConnectRetryCount** is equal to 0.
 
 If the product of **ConnectRetryCount** multiplied by **ConnectRetryInterval** is larger than **LoginTimeout**, then the client will cease attempting to connect once **LoginTimeout** is reached; otherwise, it will continue to try to reconnect until **ConnectRetryCount** is reached.
 
@@ -125,4 +125,4 @@ Statement 2 successful.
 ```
 
 ## See Also
-[Connection Resiliency in the Windows ODBC Driver](../odbc/windows/connection-resiliency-in-the-windows-odbc-driver.md)
+[Connection Resiliency in the Windows ODBC Driver](../odbc/windows/connection-resiliency-in-the-windows-odbc-driver.md)

docs/dma/dma-assess-sql-data-estate-to-sqldb.md

@@ -18,10 +18,12 @@ ms.custom: "seo-lt-2019"
 ---
 # Assess the readiness of a SQL Server data estate migrating to Azure SQL Database using the Data Migration Assistant
 
-Migrating hundreds of SQL Server instances and thousands of databases to Azure SQL Database, our Platform as a Service (PaaS) offering, is a considerable task. To streamline the process as much as possible, you need to feel confident about your relative readiness for migration. Identifying low-hanging fruit, including the servers and databases that are fully ready or that require minimal effort to prepare for migration, eases and accelerates your efforts.
+Migrating hundreds of SQL Server instances and thousands of databases to Azure SQL Database or Azure SQL Managed Instance, our Platform as a Service (PaaS) offerings, is a considerable task. To streamline the process as much as possible, you need to feel confident about your relative readiness for migration. Identifying low-hanging fruit, including the servers and databases that are fully ready or that require minimal effort to prepare for migration, eases and accelerates your efforts.
 
 This article provides step-by-step instructions for leveraging the [Data Migration Assistant](./dma-overview.md) to summarize readiness results and surface them on the [Azure Migrate](https://portal.azure.com/?feature.customPortal=false#blade/Microsoft_Azure_Migrate/AmhResourceMenuBlade/overview) hub.
 
+[!INCLUDE [online-offline](../includes/azure-migrate-to-assess-sql-data-estate.md)]
+
 >
 > [!VIDEO https://channel9.msdn.com/Shows/Data-Exposed/Data-Migration-Assistant/player?WT.mc_id=dataexposed-c9-niner]
 

docs/dma/dma-assess-ssis.md

@@ -31,6 +31,8 @@ DMA needs to run with **administrator** access to assess SSIS packages in Packag
 
 The following step-by-step instructions help you perform your first assessment for migrating SQL Server Integration Service (SSIS) packages to Azure SQL Database or Azure SQL Managed Instance, by using Data Migration Assistant.
 
+[!INCLUDE [online-offline](../includes/azure-migrate-to-assess-sql-data-estate.md)]
+
 ## Create an assessment
 
 1. Select the **New** (+) icon, and then select the **Assessment** project type as **Integration Service**.

docs/dma/dma-assesssqlonprem.md

@@ -21,8 +21,9 @@ ms.custom: "seo-lt-2019"
 
 The following step-by-step instructions help you perform your first assessment for migrating to on-premises SQL Server, SQL Server running on an Azure VM, or Azure SQL Database by using Data Migration Assistant.
 
-   > [!NOTE]
-   > Data Migration Assistant v5.0 introduces support for analyzing database connectivity and embedded SQL queries in the application code. For more information, see the blog post [Using Data Migration Assistant to assess an application’s data access layer](https://techcommunity.microsoft.com/t5/Microsoft-Data-Migration/Using-Data-Migration-Assistant-to-assess-an-application-s-data/ba-p/990430).
+Data Migration Assistant v5.0 introduces support for analyzing database connectivity and embedded SQL queries in the application code. For more information, see the blog post [Using Data Migration Assistant to assess an application’s data access layer](https://techcommunity.microsoft.com/t5/Microsoft-Data-Migration/Using-Data-Migration-Assistant-to-assess-an-application-s-data/ba-p/990430).
+
+[!INCLUDE [online-offline](../includes/azure-migrate-to-assess-sql-data-estate.md)]
 
 ## Create an assessment