Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into tsqlxml

Author: markingmyname

docs/connect/ado-net/sql/sql-server-features-adonet.md

@@ -1,7 +1,7 @@
 ---
 title: "SQL Server features and ADO.NET"
 description: "Describes SQL Server features that are useful for ADO.NET application developers."
-ms.date: "08/15/2019"
+ms.date: "07/09/2020"
 ms.assetid: 2839529b-a79b-4450-be5d-07a98dbc7a0f
 ms.prod: sql
 ms.prod_service: connectivity
@@ -50,6 +50,9 @@ Describes SqlClient support for LocalDB databases.
 [SqlClient support for Always Encrypted](sqlclient-support-always-encrypted.md)  
 Describes SqlClient support for the Always Encrypted feature.
 
+[SqlClient support for Data Discovery and Classification](data-classification.md)  
+Describes how to access Data Discovery and Classification information through SqlClient.
+
 ## Next steps
 - [SQL Server data operations in ADO.NET](sql-server-data-operations.md)
 - [SQL Server and ADO.NET](index.md)

docs/connect/jdbc/code-samples/retrieving-result-set-data-sample.md

@@ -1,5 +1,6 @@
 ---
-title: "Retrieving result set data sample | Microsoft Docs"
+title: "Retrieving result set data sample"
+description: "Learn how to retrieve a set of data from a SQL database and display that information in a Java application."
 ms.custom: ""
 ms.date: "08/12/2019"
 ms.prod: sql

docs/connect/jdbc/diagnosing-problems-with-the-jdbc-driver.md

@@ -1,5 +1,6 @@
 ---
-title: "Diagnosing problems with the JDBC driver | Microsoft Docs"
+title: "Diagnosing problems with the JDBC driver"
+description: "Learn how to diagnose and troubleshoot problems like error handling, checking the driver version and tracing."
 ms.custom: ""
 ms.date: "08/12/2019"
 ms.prod: sql

docs/connect/jdbc/getting-the-driver-version.md

@@ -1,5 +1,6 @@
 ---
-title: "Getting the driver version | Microsoft Docs"
+title: "Getting the driver version"
+description: "Learn how and where to find the version of the Microsoft JDBC Driver for SQL Server."
 ms.custom: ""
 ms.date: "08/12/2019"
 ms.prod: sql

docs/connect/jdbc/retrieving-result-set-data-sample.md

@@ -1,5 +1,6 @@
 ---
-title: "Retrieving result set data sample | Microsoft Docs"
+title: "Retrieving result set data sample"
+description: "Learn how to retrieve a set of data from a SQL database and display that information in a Java application."
 ms.custom: ""
 ms.date: "08/12/2019"
 ms.prod: sql

docs/connect/php/how-to-send-and-retrieve-utf-8-data-using-built-in-utf-8-support.md

@@ -1,5 +1,6 @@
 ---
-title: "How to: Send and Retrieve UTF-8 Data Using Built-In UTF-8 Support | Microsoft Docs"
+title: "How to: Send and Retrieve UTF-8 Data Using Built-In UTF-8 Support"
+description: "Learn how to send and retrieve UTF-8 encoded data using UTF-8 support built in to the drivers for PHP."
 ms.custom: ""
 ms.date: "03/23/2018"
 ms.prod: sql

docs/connect/php/sqlsrv-driver-api-reference.md

@@ -1,5 +1,6 @@
 ---
-title: "SQLSRV Driver API Reference | Microsoft Docs"
+title: "SQLSRV Driver API Reference"
+description: "The API reference for the SQLSRV driver for PHP describes available functions, their parameters, and return values."
 ms.custom: ""
 ms.date: "03/26/2018"
 ms.prod: sql

docs/relational-databases/security/encryption/transparent-data-encryption.md

@@ -77,7 +77,7 @@ The following illustration shows the architecture of TDE encryption. Only the da
 
 ![The Transparent Database Encryption architecture](../../../relational-databases/security/encryption/media/tde-architecture.png)
 
-## Using Transparent Data Encryption
+## Enable TDE
 
 To use TDE, follow these steps.
 
@@ -166,7 +166,7 @@ If you use a database in database mirroring or log shipping, both databases are
 > [!TIP]
 > To monitor changes in the TDE status of a database, use SQL Server Audit or SQL Database auditing. For SQL Server, TDE is tracked under the audit action group DATABASE_CHANGE_GROUP, which you can find in [SQL Server Audit Action Groups and Actions](../../../relational-databases/security/auditing/sql-server-audit-action-groups-and-actions.md).
 
-### Restrictions
+## Restrictions
 
 The following operations are disallowed during initial database encryption, key change, or database decryption:
 
@@ -218,7 +218,29 @@ When database files are created, instant file initialization is unavailable when
 
 To encrypt a database encryption key with an asymmetric key, the asymmetric key must be on an extensible key-management provider.
 
-### Transparent Data Encryption and transaction logs
+## TDE scan
+
+To enable TDE on a database, [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] must do an encryption scan. The scan reads each page from the data files into the buffer pool and then writes the encrypted pages back out to disk.
+
+To give you more control over the encryption scan, [!INCLUDE[sql-server-2019](../../../includes/sssqlv15-md.md)] introduces TDE scan, which has a suspend and resume syntax. You can pause the scan while the workload on the system is heavy or during business-critical hours and then resume the scan later.
+
+Use the following syntax to pause the TDE encryption scan:
+
+```sql
+ALTER DATABASE <db_name> SET ENCRYPTION SUSPEND;
+```
+
+Similarly, use the following syntax to resume the TDE encryption scan:
+
+```sql
+ALTER DATABASE <db_name> SET ENCRYPTION RESUME;
+```
+
+The encryption_scan_state column has been added to the sys.dm_database_encryption_keys dynamic management view. It shows the current state of the encryption scan. There's also a new column called encryption_scan_modify_date, which contains the date and time of the last encryption-scan state change.
+
+If the [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] instance restarts while its encryption scan is suspended, a message is logged in the error log on startup. The message indicates that an existing scan has been paused.
+
+## TDE and transaction logs
 
 Letting a database use TDE removes the remaining part of the current virtual transaction log. The removal forces creation of the next transaction log. This behavior guarantees that no clear text is left in the logs after the database is set for encryption.
 
@@ -241,51 +263,51 @@ Before a database encryption key changes, the previous database encryption key e
 
 If you change a database encryption key twice, you must do a log backup before you can change the database encryption key again.
 
-### Transparent Data Encryption and the tempdb system database
+## TDE and the tempdb system database
 
 The **tempdb** system database is encrypted if any other database on the [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] instance is encrypted by using TDE. This encryption might have a performance effect for unencrypted databases on the same [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] instance. For more information about the **tempdb** system database, see [tempdb Database](../../../relational-databases/databases/tempdb-database.md).
 
-### Transparent Data Encryption and replication
+## TDE and replication
 
 Replication doesn't automatically replicate data from a TDE-enabled database in an encrypted form. Separately enable TDE if you want to protect distribution and subscriber databases.
 
 Snapshot replication can store data in unencrypted intermediate files like BCP files. The initial data distribution for transactional and merge replication can too. During such replication, you can enable encryption to protect the communication channel.
 
 For more information, see [Enable Encrypted Connections to the Database Engine (SQL Server Configuration Manager)](../../../database-engine/configure-windows/enable-encrypted-connections-to-the-database-engine.md).
 
-### Transparent Data Encryption and FILESTREAM data
+## TDE and Always On	
+You can [add an encrypted database to an Always On availability group](../../../database-engine/availability-groups/windows/encrypted-databases-with-always-on-availability-groups-sql-server.md). 	
 
-**FILESTREAM** data isn't encrypted even when you enable TDE.
+To encrypt databases that are part of an availability group, create the master key and certificates, or asymmetric key (EKM) on all secondary replicas before creating the [database encryption key](../../../t-sql/statements/create-database-encryption-key-transact-sql.md) on the primary replica. 	
 
-<a name="scan-suspend-resume"></a>
+If a certificate is used to protect the database encryption key (DEK), [back up the certificate](../../../t-sql/statements/backup-certificate-transact-sql.md) created on the primary replica, and then [create the certificate from a file](../../../t-sql/statements/create-certificate-transact-sql.md) on all secondary replicas before creating the database encryption key on the primary replica. 
 
-## Transparent Data Encryption scan
+## TDE and FILESTREAM data
 
-To enable TDE on a database, [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] must do an encryption scan. The scan reads each page from the data files into the buffer pool and then writes the encrypted pages back out to disk.
+**FILESTREAM** data isn't encrypted even when you enable TDE.
 
-To give you more control over the encryption scan, [!INCLUDE[sql-server-2019](../../../includes/sssqlv15-md.md)] introduces TDE scan, which has a suspend and resume syntax. You can pause the scan while the workload on the system is heavy or during business-critical hours and then resume the scan later.
+<a name="scan-suspend-resume"></a>
 
-Use the following syntax to pause the TDE encryption scan:
+## Remove TDE
 
-```sql
-ALTER DATABASE <db_name> SET ENCRYPTION SUSPEND;
-```
-
-Similarly, use the following syntax to resume the TDE encryption scan:
+Remove encryption from the database by using the `ALTER DATABASE` statement.
 
 ```sql
-ALTER DATABASE <db_name> SET ENCRYPTION RESUME;
+ALTER DATABASE <db_name> SET ENCRYPTION OFF;
 ```
 
-The encryption_scan_state column has been added to the sys.dm_database_encryption_keys dynamic management view. It shows the current state of the encryption scan. There's also a new column called encryption_scan_modify_date, which contains the date and time of the last encryption-scan state change.
+To view the state of the database, use the [sys.dm_database_encryption_keys](../../../relational-databases/system-dynamic-management-views/sys-dm-database-encryption-keys-transact-sql.md) dynamic management view.
 
-If the [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] instance restarts while its encryption scan is suspended, a message is logged in the error log on startup. The message indicates that an existing scan has been paused.
+Wait for decryption to finish before removing the database encryption key by using [DROP DATABASE ENCRYPTION KEY](../../../t-sql/statements/drop-database-encryption-key-transact-sql.md).
+
+> [!IMPORTANT]
+> Back up the master key and certificate that are used for TDE to a safe location. The master key and certificate are required to restore backups that were taken when the database was encrypted with TDE. After you remove the database encryption key, take a log backup followed by a fresh full backup of the decrypted database. 
 
-## Transparent Data Encryption and buffer pool extension
+## TDE and buffer pool extension
 
 When you encrypt a database using TDE, files related to buffer pool extension (BPE) aren't encrypted. For those files, use encryption tools like BitLocker or EFS at the file-system level.
 
-## Transparent Data Encryption and In-Memory OLTP
+## TDE and In-Memory OLTP
 
 You can enable TDE on a database that has In-Memory OLTP objects. In [!INCLUDE[ssSQL15](../../../includes/sssql15-md.md)] and [!INCLUDE[ssSDSfull](../../../includes/sssdsfull-md.md)], In-Memory OLTP log records and data are encrypted if you enable TDE. In [!INCLUDE[ssSQL14](../../../includes/sssql14-md.md)], In-Memory OLTP log records are encrypted if you enable TDE, but files in the MEMORY_OPTIMIZED_DATA filegroup are unencrypted.
 

docs/t-sql/statements/create-sequence-transact-sql.md

@@ -238,7 +238,7 @@ SELECT * FROM sys.sequences WHERE name = 'TestSequence' ;
 
  A partial list of the output demonstrates the default values.  
 
-| Output | Default values|  
+| Output | Default value|  
 |-|-|  
 |`start_value`|`-9223372036854775808`|  
 |`increment`|`1`|