Merge pull request #4742 from MicrosoftDocs/FromPublicRepo

Confirm merge from FromPublicRepo to master to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)

Author: v-alje

docs/database-engine/install-windows/installing-updates-from-the-command-prompt.md

@@ -38,7 +38,7 @@ The name of the update package can vary and may include a language, edition, and
 - Setup can integrate the latest product updates with the main product installation so that the main product and its applicable updates are installed at the same time. You can prepare an installation of database engine instance to include product update: 
 
     ```
-    setup.exe /q /IAcceptSQLServerLicenseTerms /ACTION=/proxy/https/github.com/MicrosoftDocs/sql-docs/commit/PrepareImage /UpdateEnabled=True /UpdateEnabled=True /UpdateSource=\<path where the update is downloaded> /INSTANCEID=\<Instance ID> /FEATURES=SQLEngine. 
+    setup.exe /q /IAcceptSQLServerLicenseTerms /ACTION=/proxy/https/github.com/MicrosoftDocs/sql-docs/commit/PrepareImage /UpdateEnabled=True /UpdateSource=\<path where the update is downloaded> /INSTANCEID=\<Instance ID> /FEATURES=SQLEngine. 
     ```
 
 - Update [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] shared components only, like [!INCLUDE[ssISnoversion](../../includes/ssisnoversion-md.md)] and Management Tools: 

docs/linux/tutorial-sql-server-containers-kubernetes.md

@@ -32,7 +32,7 @@ This tutorial demonstrates how to configure a highly available SQL Server instan
 
 ## HA solution that uses Kubernetes running in Azure Container Service
 
-Kubernetes 1.6 and later has support for [storage classes](http://kubernetes.io/docs/concepts/storage/storage-classes/), [persistent volume claims](http://kubernetes.io/docs/concepts/storage/storage-classes/#persistentvolumeclaims), and the [Azure disk volume driver](http://github.com/Azure/azurefile-dockervolumedriver). You can create and manage your SQL Server instances natively in Kubernetes. The example in this article shows how to create a [deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) to achieve a high availability configuration similar to a shared disk failover cluster instance. In this configuration, Kubernetes plays the role of the cluster orchestrator. When a SQL Server instance in a container fails, the orchestrator bootstraps another instance of the container that attaches to the same persistent storage.
+Kubernetes 1.6 and later has support for [storage classes](http://kubernetes.io/docs/concepts/storage/storage-classes/), [persistent volume claims](http://kubernetes.io/docs/concepts/storage/storage-classes/#persistentvolumeclaims), and the [Azure disk volume type](https://github.com/kubernetes/examples/tree/master/staging/volumes/azure_disk). You can create and manage your SQL Server instances natively in Kubernetes. The example in this article shows how to create a [deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) to achieve a high availability configuration similar to a shared disk failover cluster instance. In this configuration, Kubernetes plays the role of the cluster orchestrator. When a SQL Server instance in a container fails, the orchestrator bootstraps another instance of the container that attaches to the same persistent storage.
 
 ![Diagram of Kubernetes SQL Server cluster](media/tutorial-sql-server-containers-kubernetes/kubernetes-sql.png)
 

docs/relational-databases/system-catalog-views/sys-database-query-store-options-transact-sql.md

@@ -53,8 +53,8 @@ ms.workload: "Inactive"
 |**query_capture_mode_desc**|**nvarchar(60)**|Textual description of the actual capture mode of Query Store:<br /><br /> ALL (default for [!INCLUDE[ssSQL15](../../includes/sssql15-md.md)])<br /><br /> AUTO (default for [!INCLUDE[sqldbesa](../../includes/sqldbesa-md.md)])<br /><br /> NONE|  
 |**size_based_cleanup_mode**|**smallint**|Controls whether cleanup will be automatically activated when total amount of data gets close to maximum size:<br /><br /> 1 = OFF – size based cleanup won’t be automatically activated.<br /><br /> 2 = AUTO - size based cleanup will be automatically activated when size on disk reaches 90% of **max_storage_size_mb**. This is the default configuration value.<br /><br />Size based cleanup removes the least expensive and oldest queries first. It stops at approximately 80% of max_storage_size_mb.|  
 |**size_based_cleanup_mode_desc**|**smallint**|Textual description of the actual size-based cleanup mode of Query Store:<br /><br /> OFF <br /><br /> AUTO (default)|  
-|**wait_stats_capture_mode**|**smallint**|Controls whether Query Store performs capture of wait statistics: <br /><br /> 0 = OFF <br /><br /> 1 = ON|
-|**wait_stats_mode_capture_desc**|**nvarchar(60)**|Textual description of the actual wait statistics capture mode: <br /><br /> OFF <br /><br /> ON (default)| 
+|**wait_stats_capture_mode**|**smallint**|Controls whether Query Store performs capture of wait statistics: <br /><br /> 0 = OFF <br /><br /> 1 = ON<br /> **Applies to**: [!INCLUDE[ssSQL17](../../includes/sssql17-md.md)] through [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)].|
+|**wait_stats_mode_capture_desc**|**nvarchar(60)**|Textual description of the actual wait statistics capture mode: <br /><br /> OFF <br /><br /> ON (default)<br /> **Applies to**: [!INCLUDE[ssSQL17](../../includes/sssql17-md.md)] through [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)].| 
 
 ## Permissions  
  Requires the **VIEW DATABASE STATE** permission.  

docs/relational-databases/system-dynamic-management-views/sys-dm-os-wait-stats-transact-sql.md

@@ -126,7 +126,7 @@ This command resets all counters to 0.
 |BROKER_FORWARDER |TBD <br /> **Applies to**: [!INCLUDE[ssSQL12](../../includes/sssql11-md.md)] through [!INCLUDE[ssCurrent](../../includes/sscurrent-md.md)].| 
 |BROKER_INIT |Occurs when initializing Service Broker in each active database. This should occur infrequently.| 
 |BROKER_MASTERSTART |Occurs when a task is waiting for the primary event handler of the Service Broker to start. This should occur very briefly.| 
-|BROKER_RECEIVE_WAITFOR |Occurs when the RECEIVE WAITFOR is waiting. This is typical if no messages are ready to be received.| 
+|BROKER_RECEIVE_WAITFOR |Occurs when the RECEIVE WAITFOR is waiting. This may mean that either no messages are ready to be received in the queue or a lock contention is preventing it from receiving messages from the queue.| 
 |BROKER_REGISTERALLENDPOINTS |Occurs during the initialization of a Service Broker connection endpoint. This should occur very briefly.| 
 |BROKER_SERVICE |Occurs when the Service Broker destination list that is associated with a target service is updated or re-prioritized.| 
 |BROKER_SHUTDOWN |Occurs when there is a planned shutdown of Service Broker. This should occur very briefly, if at all.|