Merge pull request #15227 from MicrosoftDocs/master

6/02 AM Publish

Author: huypub

docs/azure-data-studio/tutorial-qds-sql-server.md

@@ -8,7 +8,7 @@ author: markingmyname
 ms.author: maghan
 ms.reviewer: alayu; sstein
 ms.custom: seodec18; seo-lt-2019
-ms.date: 08/02/2019
+ms.date: 06/01/2020
 ---
 
 # Tutorial: Add the *five slowest queries* sample widget to the database dashboard
@@ -111,9 +111,7 @@ To add the *slow queries widget* to your dashboard, edit the *dashboard.database
 
    ![Insight detail dialog](./media/tutorial-qds-sql-server/insight-details-dialog.png)
 
-3. Right-click the cell to the right of **query_sql_txt** in **Item Details** and click **Copy Cell**.
-
-4. Close the **Insights** pane.
+3. Close the **Insights** pane.
 
 ## View the query plan
 

docs/connect/jdbc/understanding-xa-transactions.md

@@ -54,7 +54,7 @@ The following additional guidelines apply to tightly coupled transactions:
 The following steps are required if you want to use XA data sources together with Microsoft Distributed Transaction Coordinator (MS DTC) for handling distributed transactions.  
 
 > [!NOTE]  
-> The JDBC distributed transaction components are included in the xa directory of the JDBC driver installation. These components include the xa_install.sql and sqljdbc_xa.dll files.  
+> The JDBC distributed transaction components are included in the xa directory of the JDBC driver installation. These components include the xa_install.sql and sqljdbc_xa.dll files. If you have different versions of the JDBC driver on different clients, it is recommended to use the newest sqljdbc_xa.dll on the server.  
 
 > [!NOTE]  
 > Starting with SQL Server 2019 public preview CTP 2.0, the JDBC XA distributed transaction components are included in the SQL Server engine, and can be enabled or disabled with a system stored procedure.

docs/database-engine/availability-groups/windows/change-the-availability-mode-of-an-availability-replica-sql-server.md

@@ -45,27 +45,21 @@ You must be connected to the server instance that hosts the primary replica.
 
 1.  Connect to the server instance that hosts the primary replica.  
 
-2.  Use the [ALTER AVAILABILITY GROUP](../../../t-sql/statements/alter-availability-group-transact-sql.md) statement, as follows:  
+2.  Use the [ALTER AVAILABILITY GROUP](../../../t-sql/statements/alter-availability-group-transact-sql.md) statement, as the following example:  
 
+     ```sql
      ALTER AVAILABILITY GROUP *group_name* MODIFY REPLICA ON '*server_name*'  
-  
-     WITH ( {  
-  
-     AVAILABILITY_MODE = { SYNCHRONOUS_COMMIT | ASYNCHRONOUS_COMMIT }  
-  
-     | FAILOVER_MODE = { AUTOMATIC | MANUAL }  
-  
-     } )  
-  
-     where *group_name* is the name of the availability group and *server_name* is the name of the server instance that hosts the replica to be modified.  
+     WITH ( AVAILABILITY_MODE = ASYNCHRONOUS_COMMIT , FAILOVER_MODE = MANUAL );  
+     ```
+     
+     Where *group_name* is the name of the availability group and *server_name* is the name of the server instance that hosts the replica to be modified.  
 
     > [!NOTE]  
-    >  FAILOVER_MODE = AUTOMATIC is supported only if you also specify AVAILABILITY_MODE = SYNCHRONOUS_COMMIT.  
+    > `FAILOVER_MODE = AUTOMATIC` is supported only if you also specify `AVAILABILITY_MODE = SYNCHRONOUS_COMMIT`.  
 
      The following example, entered on the primary replica of the `AccountsAG` availability group, changes the availability and failover modes to synchronous commit and automatic failover, respectively, for the replica hosted by the `INSTANCE09` server instance.  
 
-    ```  
-  
+    ```sql
     ALTER AVAILABILITY GROUP AccountsAG MODIFY REPLICA ON 'INSTANCE09'  
        WITH (AVAILABILITY_MODE = SYNCHRONOUS_COMMIT);  
     ALTER AVAILABILITY GROUP AccountsAG MODIFY REPLICA ON 'INSTANCE09'  
@@ -81,13 +75,13 @@ You must be connected to the server instance that hosts the primary replica.
 
      For example, the following command modifies the replica `MyReplica` in the availability group `MyAg` to use synchronous-commit availability mode and to support automatic failover.  
 
-    ```  
+    ```powershell  
     Set-SqlAvailabilityReplica -AvailabilityMode "SynchronousCommit" -FailoverMode "Automatic" `   
     -Path SQLSERVER:\Sql\PrimaryServer\InstanceName\AvailabilityGroups\MyAg\AvailabilityReplicas\MyReplica  
     ```  
 
     > [!NOTE]  
-    >  To view the syntax of a cmdlet, use the **Get-Help** cmdlet in the [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] PowerShell environment. For more information, see [Get Help SQL Server PowerShell](../../../relational-databases/scripting/get-help-sql-server-powershell.md).  
+    > To view the syntax of a cmdlet, use the **Get-Help** cmdlet in the [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] PowerShell environment. For more information, see [Get Help SQL Server PowerShell](../../../relational-databases/scripting/get-help-sql-server-powershell.md).  
 
  **To set up and use the SQL Server PowerShell provider**  
 

docs/relational-databases/collations/set-or-change-the-server-collation.md

@@ -1,7 +1,7 @@
 ---
 title: "Set or Change the Server Collation | Microsoft Docs"
 ms.custom: ""
-ms.date: "12/05/2019"
+ms.date: "05/10/2020"
 ms.prod: sql
 ms.technology: 
 ms.topic: conceptual
@@ -23,8 +23,11 @@ ms.reviewer: carlrab
 
 ## Setting the server collation in SQL Server
 
-  The server collation is specified during [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] installation. Default server-level collation is **SQL_Latin1_General_CP1_CI_AS**. Unicode-only collations cannot be specified as the server-level collation. For more information, see [Collation and Unicode Support](collation-and-unicode-support.md).
-  
+  The server collation is specified during [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] installation. The default server-level collation is based upon the locale of the operating system. For example, the default collation for systems using US English (en-US) is **SQL_Latin1_General_CP1_CI_AS**. Unicode-only collations cannot be specified as the server-level collation. For more information, including the list of OS locale to default collation mappings, see the "Server-level collations" section of [Collation and Unicode Support](collation-and-unicode-support.md#Server-level-collations).
+
+> [!NOTE]  
+> The server-level collation for [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Express LocalDB is **SQL_Latin1_General_CP1_CI_AS** and cannot be changed, either during or after installation.  
+
 ## Changing the server collation in SQL Server
 
  Changing the default collation for an instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] can be a complex operation and involves the following steps:  
@@ -50,7 +53,7 @@ ms.reviewer: carlrab
 - Import all your data.  
   
 > [!NOTE]  
-> Instead of changing the default collation of an instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], you can specify a default collation for each new database you create.  
+> Instead of changing the default collation of an instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], you can specify a default collation for each new database you create via the `COLLATE` clause of the `CREATE DATABASE` and `ALTER DATABASE` statements. For more information, see [Set or Change the Database Collation](set-or-change-the-database-collation.md).  
   
 ## Setting the server collation in Managed Instance
 Server-level collation in Azure SQL Managed Instance can be specified when the instance is created and cannot be changed later. You can set server-level collation via [Azure portal](https://docs.microsoft.com/azure/sql-database/sql-database-managed-instance-get-started#create-a-managed-instance) or [PowerShell and Resource Manager template](https://docs.microsoft.com/azure/sql-database/scripts/sql-managed-instance-create-powershell-azure-resource-manager-template) while you are creating the instance. Default server-level collation is **SQL_Latin1_General_CP1_CI_AS**. Unicode-only and new UTF-8 collations cannot be specified as server-level collation.

docs/relational-databases/media/active-log.gif

@@ -53,7 +53,7 @@ sp_server_diagnostics [@repeat_interval =] 'repeat_interval_in_seconds'
 
 |Column|Data type|Description|  
 |------------|---------------|-----------------|  
-|**creation_time**|**datetime**|Indicates the time stamp of row creation. Each row in a single rowset has the same time stamp.|  
+|**create_time**|**datetime**|Indicates the time stamp of row creation. Each row in a single rowset has the same time stamp.|  
 |**component_type**|**sysname**|Indicates whether the row contains information for the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] instance level component or for an Always On availability group:<br /><br /> instance<br /><br /> Always On:AvailabilityGroup|  
 |**component_name**|**sysname**|Indicates the name of component or the name of the availability group:<br /><br /> system<br /><br /> resource<br /><br /> query_processing<br /><br /> io_subsystem<br /><br /> events<br /><br /> *\<name of the availability group>*|  
 |**state**|**int**|Indicates the health status of the component:<br /><br /> 0<br /><br /> 1<br /><br /> 2<br /><br /> 3|  

docs/relational-databases/media/tranlog2.gif

@@ -1,5 +1,6 @@
 ---
 title: "Adding and Removing Access Database Files (AccessToSQL) | Microsoft Docs"
+description: Learn how to add or remove Access databases to or from the SSMA project to migrate Access data to SQL Server or Azure SQL Database.
 ms.prod: sql
 ms.custom: ""
 ms.date: "01/19/2017"