resolve merge conflict

Author: MikeRayMSFT

docs/database-engine/availability-groups/windows/tune-compression-for-availability-group.md

@@ -18,6 +18,7 @@ By default, SQL Server compresses data streams where appropriate for availabilit
 | Synchronous-commit replica | Not compressed
 | Asynchronous- commit replicas | Compressed
 | During automatic seeding | Not compressed
+| TDE enabled in database  | Not compressed
 
 ## Trace flags for availability group compression 
 

docs/database-engine/install-windows/latest-updates-for-microsoft-sql-server.md

@@ -30,7 +30,7 @@ Each of the following links provides information for all of the applicable produ
 
 |Product Versions   | Latest Service Pack |  Latest GDR | Latest cumulative update | CU Release Date | General Guidance  |
 |--|--|--|--|--|--|
-|SQL Server 2019|N/A|[KB 4517790](https://support.microsoft.com/help/4517790)|CU 5 [(KB 4552255)](https://support.microsoft.com/help/4552255)|6/11/2020|[SQL Server 2019 Installation](https://docs.microsoft.com/sql/database-engine/install-windows/installation-for-sql-server)|
+|SQL Server 2019|N/A|[KB 4517790](https://support.microsoft.com/help/4517790)|CU 5 [(KB 4552255)](https://support.microsoft.com/help/4552255)|6/22/2020|[SQL Server 2019 Installation](https://docs.microsoft.com/sql/database-engine/install-windows/installation-for-sql-server)|
 |SQL Server 2017|N/A|[KB 4505224](https://support.microsoft.com/help/4505224)|CU 20 [(KB 4541283)](https://support.microsoft.com/help/4541283)|4/7/2020|[SQL Server 2017 Installation](https://docs.microsoft.com/sql/database-engine/install-windows/installation-for-sql-server)|
 |SQL Server 2016|SP2 [(KB 4052908)](https://support.microsoft.com/help/4052908)|[KB 4532097](https://support.microsoft.com/help/4532097)|CU 13 [(KB 4549825)](https://support.microsoft.com/kb/4549825)|5/28/2020|[SQL Server 2016 Installation](https://technet.microsoft.com/library/bb500469.aspx)|
 |SQL Server 2016|SP1 [(KB 3182545)](https://support.microsoft.com/help/3182545/sql-server-2016-service-pack-1-release-information)|[KB 4505219](https://support.microsoft.com/help/4505219)|CU 15 + GDR [(KB 4505221)](https://support.microsoft.com/help/4505221)|7/9/2019|[SQL Server 2016 Installation](https://technet.microsoft.com/library/bb500469.aspx)|

docs/relational-databases/performance/best-practice-with-the-query-store.md

@@ -28,9 +28,9 @@ For a quick description on how to use Query Store in troubleshooting scenarios,
 
 ## <a name="Insight"></a> Use Query Performance Insight in Azure SQL Database
 
-If you run Query Store in Azure [!INCLUDE[ssSDS](../../includes/sssds-md.md)], you can use [Query Performance Insight](https://docs.microsoft.com/azure/sql-database/sql-database-query-performance) to analyze resource consumption over time. While you can use [!INCLUDE[ssManStudio](../../includes/ssmanstudio-md.md)] and [Azure Data Studio](https://docs.microsoft.com/sql/azure-data-studio/what-is) to get detailed resource consumption for all your queries, such as CPU, memory, and I/O, Query Performance Insight gives you a quick and efficient way to determine their impact on overall DTU consumption for your database. For more information, see [Azure SQL Database Query Performance Insight](https://azure.microsoft.com/documentation/articles/sql-database-query-performance/).
+If you run Query Store in [!INCLUDE[ssSDSfull](../../includes/sssdsfull-md.md)], you can use [Query Performance Insight](https://docs.microsoft.com/azure/sql-database/sql-database-query-performance) to analyze resource consumption over time. While you can use [!INCLUDE[ssManStudio](../../includes/ssmanstudio-md.md)] and [Azure Data Studio](../../azure-data-studio/what-is.md) to get detailed resource consumption for all your queries, such as CPU, memory, and I/O, Query Performance Insight gives you a quick and efficient way to determine their impact on overall DTU consumption for your database. For more information, see [Azure SQL Database Query Performance Insight](https://azure.microsoft.com/documentation/articles/sql-database-query-performance/).
 
-This section describes optimal configuration defaults that are designed to ensure reliable operation of the Query Store and dependent features. Default configuration is optimized for continuous data collection, that is minimal time spent in OFF/READ_ONLY states. For more information about all available Query Store options, see [ALTER DATABASE SET options (Transact-SQL)](../../t-sql/statements/alter-database-transact-sql-set-options.md).
+This section describes optimal configuration defaults that are designed to ensure reliable operation of the Query Store and dependent features. Default configuration is optimized for continuous data collection, that is minimal time spent in OFF/READ_ONLY states. For more information about all available Query Store options, see [ALTER DATABASE SET options (Transact-SQL)](../../t-sql/statements/alter-database-transact-sql-set-options.md#query-store).
 
 | Configuration | Description | Default | Comment |
 | --- | --- | --- | --- |
@@ -43,14 +43,14 @@ This section describes optimal configuration defaults that are designed to ensur
 | | | | |
 
 > [!IMPORTANT]
-> These defaults are automatically applied in the final stage of Query Store activation in all Azure SQL databases (see preceding important note). After this light up, Azure SQL Database won't be changing configuration values set by customers, unless they negatively impact primary workload or reliable operations of the Query Store.
+> These defaults are automatically applied in the final stage of Query Store activation in all [!INCLUDE[ssSDSfull](../../includes/sssdsfull-md.md)]. After it's enabled, [!INCLUDE[ssSDSfull](../../includes/sssdsfull-md.md)] won't change configuration values that are set by customers, unless they negatively impact primary workload or reliable operations of the Query Store.
 
 > [!NOTE]  
-> Query Store cannot be disabled in Azure SQL Database single database and elastic pool. Executing ALTER DATABASE [database] SET QUERY_STORE = OFF will return the warning “'QUERY_STORE=OFF' is not supported in this version of SQL Server.” 
+> Query Store cannot be disabled in [!INCLUDE[ssSDSfull](../../includes/sssdsfull-md.md)] single database and Elastic Pool. Executing `ALTER DATABASE [database] SET QUERY_STORE = OFF` will return the warning `'QUERY_STORE=OFF' is not supported in this version of SQL Server.`. 
 
-If you want to stay with your custom settings, use [ALTER DATABASE with Query Store options](https://msdn.microsoft.com/library/bb522682.aspx) to revert configuration to the previous state. Check out [Best Practices with the Query Store](https://msdn.microsoft.com/library/mt604821.aspx) in order to learn how top chose optimal configuration parameters.
+If you want to stay with your custom settings, use [ALTER DATABASE with Query Store options](../../t-sql/statements/alter-database-transact-sql-set-options.md#query-store) to revert configuration to the previous state. Check out [Best Practices with the Query Store](../../relational-databases/performance/best-practice-with-the-query-store.md) in order to learn how to choose optimal configuration parameters.
 
-## Use Query Store with elastic pool databases
+## Use Query Store with Elastic Pool databases
 
 You can use Query Store in all databases without concerns, in even densely packed pools. All issues related to excessive resource usage that might have occurred when Query Store was enabled for the large number of databases in the elastic pools have been resolved.
 

docs/relational-databases/system-dynamic-management-views/sys-dm-db-column-store-row-group-physical-stats-transact-sql.md

@@ -41,8 +41,8 @@ This extends the catalog view [sys.column_store_row_groups (Transact-SQL&#41
 |**total_rows**|**bigint**|Number of rows physically stored in the row group. For compressed row groups. Includes the rows that are marked deleted.|  
 |**deleted_rows**|**bigint**|Number of rows physically stored in a compressed row group that are marked for deletion.<br /><br /> 0 for row groups that are in the delta store.|  
 |**size_in_bytes**|**bigint**|Combined size, in bytes, of all the pages in this row group. This size does not include the size required to store metadata or shared dictionaries.|  
-|**trim_reason**|**tinyint**|Reason that triggered the COMPRESSED row group to have less than the maximum number of rows.<br /><br /> 0 - UNKNOWN_UPGRADED_FROM_PREVIOUS_VERSION<br /><br /> 1 - NO_TRIM<br /><br /> 2 - BULKLOAD<br /><br /> 3 - REORG<br /><br /> 4 - DICTIONARY_SIZE<br /><br /> 5 - MEMORY_LIMITATION<br /><br /> 6 - RESIDUAL_ROW_GROUP<br /><br /> 7  -  STATS_MISMATCH<br /><br /> 8 - SPILLOVER|  
-|**trim_reason_desc**|**nvarchar(60)**|Description of *trim_reason*.<br /><br /> 0 - UNKNOWN_UPGRADED_FROM_PREVIOUS_VERSION: Occurred when upgrading from the previous version of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)].<br /><br /> 1 - NO_TRIM: The row group was not trimmed. The row group was compressed with the maximum of 1,048,476 rows.  The number of rows could be less if a subset of rows was deleted after delta rowgroup was closed<br /><br /> 2 - BULKLOAD: The bulk-load batch size limited the number of rows.<br /><br /> 3 - REORG:  Forced compression as part of REORG command.<br /><br /> 4 - DICTIONARY_SIZE: Dictionary size grew too large to compress all of the rows together.<br /><br /> 5 - MEMORY_LIMITATION: Not enough available memory to compress all the rows together.<br /><br /> 6 - RESIDUAL_ROW_GROUP:  Closed as part of last row group with rows < 1 million during index build operation<br /><br /> 7 - STATS_MISMATCH: Only for columnstore on in-memory table. If stats incorrectly indicated >= 1 million qualified rows in the tail but we found fewer, the compressed rowgroup will have < 1 million rows<br /><br /> 8 - SPILLOVER: Only for columnstore on in-memory table. If tail has > 1 million qualified rows, the last batch remaining rows are compressed if the count is between 100k and 1 million|  
+|**trim_reason**|**tinyint**|Reason that triggered the COMPRESSED row group to have less than the maximum number of rows.<br /><br /> 0 - UNKNOWN_UPGRADED_FROM_PREVIOUS_VERSION<br /><br /> 1 - NO_TRIM<br /><br /> 2 - BULKLOAD<br /><br /> 3 - REORG<br /><br /> 4 - DICTIONARY_SIZE<br /><br /> 5 - MEMORY_LIMITATION<br /><br /> 6 - RESIDUAL_ROW_GROUP<br /><br /> 7  -  STATS_MISMATCH<br /><br /> 8 - SPILLOVER<br /><br /> 9 - AUTO_MERGE|  
+|**trim_reason_desc**|**nvarchar(60)**|Description of *trim_reason*.<br /><br /> 0 - UNKNOWN_UPGRADED_FROM_PREVIOUS_VERSION: Occurred when upgrading from the previous version of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)].<br /><br /> 1 - NO_TRIM: The row group was not trimmed. The row group was compressed with the maximum of 1,048,476 rows.  The number of rows could be less if a subset of rows was deleted after delta rowgroup was closed<br /><br /> 2 - BULKLOAD: The bulk-load batch size limited the number of rows.<br /><br /> 3 - REORG:  Forced compression as part of REORG command.<br /><br /> 4 - DICTIONARY_SIZE: Dictionary size grew too large to compress all of the rows together.<br /><br /> 5 - MEMORY_LIMITATION: Not enough available memory to compress all the rows together.<br /><br /> 6 - RESIDUAL_ROW_GROUP:  Closed as part of last row group with rows < 1 million during index build operation<br /><br /> 7 - STATS_MISMATCH: Only for columnstore on in-memory table. If stats incorrectly indicated >= 1 million qualified rows in the tail but we found fewer, the compressed rowgroup will have < 1 million rows<br /><br /> 8 - SPILLOVER: Only for columnstore on in-memory table. If tail has > 1 million qualified rows, the last batch remaining rows are compressed if the count is between 100k and 1 million<br /><br /> 9 - AUTO_MERGE: A Tuple Mover merge operation running in the background consolidated one or more rowgroups into this rowgroup.|  
 |**transition_to_compressed_state**|tinyint|Shows how this rowgroup got moved from the deltastore to a compressed state in the columnstore.<br /><br /> 1- NOT_APPLICABLE<br /><br /> 2 - INDEX_BUILD<br /><br /> 3 - TUPLE_MOVER<br /><br /> 4 - REORG_NORMAL<br /><br /> 5 - REORG_FORCED<br /><br /> 6 - BULKLOAD<br /><br /> 7 - MERGE|  
 |**transition_to_compressed_state_desc**|nvarchar(60)| 1 - NOT_APPLICABLE - the operation does not apply to the deltastore. Or, the rowgroup was compressed prior to upgrading to [!INCLUDE[ssSQL15](../../includes/sssql15-md.md)] in which case the history is not preserved.<br /><br /> 2 - INDEX_BUILD - An index create or index rebuild compressed the rowgroup.<br /><br /> 3 - TUPLE_MOVER - The tuple mover running in the background compressed the rowgroup. Tuple mover happens after the rowgroup changes state from OPEN to CLOSED.<br /><br /> 4 - REORG_NORMAL - The reorganization operation, ALTER INDEX ... REORG, moved the CLOSED rowgroup from the deltastore to the columnstore. This occurred before the tuple-mover had time to move the rowgroup.<br /><br /> 5 - REORG_FORCED - This rowgroup was open in the deltastore and was forced into the columnstore before it had a full number of rows.<br /><br /> 6 - BULKLOAD - A bulk-load operation compressed the rowgroup directly without using the deltastore.<br /><br /> 7 - MERGE - A merge operation consolidated one or more rowgroups into this rowgroup and then performed the columnstore compression.|  
 |**has_vertipaq_optimization**|bit|VertiPaq optimization improves columnstore compression by rearranging the order of the rows in the rowgroup to achieve higher compression. This optimization occurs automatically in most cases. There are two cases where VertiPaq optimization is not used:<br/>  a. when a delta rowgroup moves into the columnstore and there are one or more nonclustered indexes on the columnstore index - in this case VertiPaq optimization is skipped to minimizes changes to the mapping index;<br/> b. for columnstore indexes on memory-optimized tables. <br /><br /> 0 = No<br /><br /> 1 = Yes|  

docs/t-sql/statements/alter-function-transact-sql.md

@@ -300,7 +300,7 @@ RETURNS return_data_type
  Indicates that the [!INCLUDE[ssDE](../../includes/ssde-md.md)] encrypts the catalog view columns that contains the text of the ALTER FUNCTION statement. Using ENCRYPTION prevents the function from being published as part of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] replication. ENCRYPTION cannot be specified for CLR functions.  
 
  SCHEMABINDING  
- Specifies that the function is bound to the database objects that it references. This condition will prevent changes to the function if other schema bound objects are referencing it.  
+ Specifies that the function is bound to the database objects that it references. When SCHEMABINDING is specified, the base objects cannot be modified in a way that would affect the function definition. The function definition itself must first be modified or dropped to remove dependencies on the object that is to be modified..  
 
  The binding of the function to the objects it references is removed only when one of the following actions occurs: