Bringing even with master.

v-alje · v-alje · commit 0ea391091a3d · 2019-04-12T17:29:17.000-07:00
diff --git a/docs/relational-databases/performance/best-practice-with-the-query-store.md b/docs/relational-databases/performance/best-practice-with-the-query-store.md
@@ -13,7 +13,7 @@ ms.assetid: 5b13b5ac-1e4c-45e7-bda7-ebebe2784551
 author: julieMSFT
 ms.author: jrasnick
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||= azure-sqldw-latest||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # Best Practice with the Query Store
 [!INCLUDE[appliesto-ss-asdb-asdw-xxx-md](../../includes/appliesto-ss-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/performance/how-query-store-collects-data.md b/docs/relational-databases/performance/how-query-store-collects-data.md
@@ -13,7 +13,7 @@ ms.assetid: 8d5eec36-0013-480a-9c11-183e162e4c8e
 author: julieMSFT
 ms.author: jrasnick
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||= azure-sqldw-latest||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # How Query Store Collects Data
 [!INCLUDE[appliesto-ss-asdb-asdw-xxx-md](../../includes/appliesto-ss-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/performance/query-store-usage-scenarios.md b/docs/relational-databases/performance/query-store-usage-scenarios.md
@@ -13,7 +13,7 @@ ms.assetid: f5309285-ce93-472c-944b-9014dc8f001d
 author: julieMSFT
 ms.author: jrasnick
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||= azure-sqldw-latest||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # Query Store Usage Scenarios
 [!INCLUDE[appliesto-ss-asdb-asdw-xxx-md](../../includes/appliesto-ss-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/system-catalog-views/query-store-catalog-views-transact-sql.md b/docs/relational-databases/system-catalog-views/query-store-catalog-views-transact-sql.md
@@ -16,7 +16,7 @@ ms.assetid: 43d5466a-89e2-4e59-b87e-a2a78e59a1de
 author: stevestein
 ms.author: sstein
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # Query Store Catalog Views (Transact-SQL)
 [!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/system-catalog-views/sys-database-query-store-options-transact-sql.md b/docs/relational-databases/system-catalog-views/sys-database-query-store-options-transact-sql.md
@@ -21,7 +21,7 @@ ms.assetid: 16b47d55-8019-41ff-ad34-1e0112178067
 author: stevestein
 ms.author: sstein
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # sys.database_query_store_options (Transact-SQL)
 [!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/system-catalog-views/sys-query-context-settings-transact-sql.md b/docs/relational-databases/system-catalog-views/sys-query-context-settings-transact-sql.md
@@ -20,7 +20,7 @@ ms.assetid: 3c1887df-6bd8-491e-82fc-d25ad9589faf
 author: stevestein
 ms.author: sstein
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # sys.query_context_settings (Transact-SQL)
 [!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/system-catalog-views/sys-query-store-plan-transact-sql.md b/docs/relational-databases/system-catalog-views/sys-query-store-plan-transact-sql.md
@@ -21,7 +21,7 @@ ms.assetid: b4d05439-6360-45db-b1cd-794f4a64935e
 author: stevestein
 ms.author: sstein
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # sys.query_store_plan (Transact-SQL)
 [!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/system-catalog-views/sys-query-store-query-text-transact-sql.md b/docs/relational-databases/system-catalog-views/sys-query-store-query-text-transact-sql.md
@@ -21,7 +21,7 @@ ms.assetid: f7032fa0-7c16-4492-bb82-685806c63a8c
 author: stevestein
 ms.author: sstein
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # sys.query_store_query_text (Transact-SQL)
 [!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/system-catalog-views/sys-query-store-query-transact-sql.md b/docs/relational-databases/system-catalog-views/sys-query-store-query-transact-sql.md
@@ -21,7 +21,7 @@ ms.assetid: bdee149e-7556-4fc3-8242-925dd4b7b6ac
 author: stevestein
 ms.author: sstein
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # sys.query_store_query (Transact-SQL)
 [!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/system-catalog-views/sys-query-store-runtime-stats-interval-transact-sql.md b/docs/relational-databases/system-catalog-views/sys-query-store-runtime-stats-interval-transact-sql.md
@@ -21,7 +21,7 @@ ms.assetid: 2be83785-0569-41a3-88c8-59bfa0932e6e
 author: stevestein
 ms.author: sstein
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # sys.query_store_runtime_stats_interval (Transact-SQL)
 [!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/system-catalog-views/sys-query-store-runtime-stats-transact-sql.md b/docs/relational-databases/system-catalog-views/sys-query-store-runtime-stats-transact-sql.md
@@ -21,7 +21,7 @@ ms.assetid: ccf7a57c-314b-450c-bd34-70749a02784a
 author: stevestein
 ms.author: sstein
 manager: craigg
-monikerRange: "=azuresqldb-current||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
+monikerRange: "=azuresqldb-current||>=sql-server-2016||= azure-sqldw-latest||=sqlallproducts-allversions||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # sys.query_store_runtime_stats (Transact-SQL)
 [!INCLUDE[tsql-appliesto-ss2016-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2016-asdb-asdw-xxx-md.md)]
diff --git a/docs/relational-databases/system-stored-procedures/filestream-and-filetable-sp-filestream-force-garbage-collection.md b/docs/relational-databases/system-stored-procedures/filestream-and-filetable-sp-filestream-force-garbage-collection.md
@@ -31,20 +31,20 @@ manager: craigg
 ## Syntax  
   
 ```  
-sp_filestream_force_garbage_collection  
-    [ @dbname = ]  'database_name',  
-    [ @filename = ] 'logical_file_name' ]  
+sp_filestream_force_garbage_collection
+    [ @dbname = ]  'database_name'
+    [ , [ @filename = ] 'logical_file_name' ]
 ```  
   
 ## Arguments  
- **@dbname** = *database_name*
+ `[ @dbname = ]  'database_name'`  
  Signifies the name of the database to run the garbage collector on.  
   
 > [!NOTE]  
->  *dbname* is **sysname**. If not specified, current database is assumed.  
+> `@dbname` is **sysname**. If not specified, current database is assumed.  
   
- **@filename** = *logical_file_name*  
- Specifies the logical name of the FILESTREAM container to run the garbage collector on. **@filename** is optional. If no logical filename is specified, the garbage collector cleans all FILESTREAM containers in the specified database.  
+ `[ @filename = ] 'logical_file_name'`  
+ Specifies the logical name of the FILESTREAM container to run the garbage collector on. `@filename` is optional. If no logical filename is specified, the garbage collector cleans all FILESTREAM containers in the specified database.  
   
 ## Return Code Values  
   
diff --git a/docs/relational-databases/system-stored-procedures/sp-addlinkedsrvlogin-transact-sql.md b/docs/relational-databases/system-stored-procedures/sp-addlinkedsrvlogin-transact-sql.md
@@ -29,30 +29,29 @@ manager: craigg
 ## Syntax  
   
 ```  
-  
 sp_addlinkedsrvlogin [ @rmtsrvname = ] 'rmtsrvname'   
-     [ , [ @useself = ] 'TRUE' | 'FALSE' | NULL ]   
+     [ , [ @useself = ] { 'TRUE' | 'FALSE' | NULL } ]   
      [ , [ @locallogin = ] 'locallogin' ]   
      [ , [ @rmtuser = ] 'rmtuser' ]   
      [ , [ @rmtpassword = ] 'rmtpassword' ]   
 ```  
   
 ## Arguments  
- [ @rmtsrvname **=** ] **'***rmtsrvname***'**  
+ `[ @rmtsrvname = ] 'rmtsrvname'`  
  Is the name of a linked server that the login mapping applies to. *rmtsrvname* is **sysname**, with no default.  
   
- [ @useself **=** ] **'**TRUE**'** | 'FALSE' | 'NULL'  
+ `[ @useself = ] { 'TRUE' | 'FALSE' | NULL }'`  
  Determines whether to connect to *rmtsrvname* by impersonating local logins or explicitly submitting a login and password. The data type is **varchar(**8**)**, with a default of TRUE.  
   
  A value of TRUE specifies that logins use their own credentials to connect to *rmtsrvname*, with the *rmtuser* and *rmtpassword* arguments being ignored. FALSE specifies that the *rmtuser* and *rmtpassword* arguments are used to connect to *rmtsrvname* for the specified *locallogin*. If *rmtuser* and *rmtpassword* are also set to NULL, no login or password is used to connect to the linked server.  
   
- [ @locallogin **=** ] **'***locallogin***'**  
+ `[ @locallogin = ] 'locallogin'`  
  Is a login on the local server. *locallogin* is **sysname**, with a default of NULL. NULL specifies that this entry applies to all local logins that connect to *rmtsrvname*. If not NULL, *locallogin* can be a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] login or a Windows login. The Windows login must have been granted access to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] either directly, or through its membership in a Windows group granted access.  
   
- [ @rmtuser **=** ] **'***rmtuser***'**  
+ `[ @rmtuser = ] 'rmtuser'`  
  Is the remote login used to connect to *rmtsrvname* when @useself is FALSE. When the remote server is an instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] that does not use Windows Authentication, *rmtuser* is a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] login. *rmtuser* is **sysname**, with a default of NULL.  
   
- [ @rmtpassword **=** ] **'***rmtpassword***'**  
+ `[ @rmtpassword = ] 'rmtpassword'`  
  Is the password associated with *rmtuser*. *rmtpassword* is **sysname**, with a default of NULL.  
   
 ## Return Code Values  
diff --git a/docs/relational-databases/system-stored-procedures/sp-audit-write-transact-sql.md b/docs/relational-databases/system-stored-procedures/sp-audit-write-transact-sql.md
@@ -29,22 +29,21 @@ manager: craigg
 ## Syntax  
   
 ```  
-  
-sp_audit_write [ @user_defined_event_id =  ] user_defined_event_id ,   
-        [ @succeeded =  succeeded   
-    [ , [ @user_defined_information =  ] 'user_defined_information' ]   
-    [ ; ]  
+sp_audit_write [ @user_defined_event_id = ] user_defined_event_id
+    [ , [ @succeeded = ] succeeded ]
+    [ , [ @user_defined_information = ] 'user_defined_information' ]
+    [ ; ]
 ```  
   
 ## Arguments  
- **@user_defined_event_id**  
+ `[ @user_defined_event_id = ] user_defined_event_id`  
  A parameter defined by the user and recorded in the **user_defined_event_id** column of the audit log. *@user_defined_event_id* is type **smallint**.  
   
- **@succeeded**  
- A parameter passed by user to indicate whether the event was successful or not. This appears in the succeeded column of the audit log. *@succeeded* is **bit**.  
+ `[ @succeeded = ] succeeded`  
+ A parameter passed by user to indicate whether the event was successful or not. This appears in the succeeded column of the audit log. `@succeeded` is **bit**.  
   
- **@user_defined_information**  
- Is the text defined by the user and recorded in the new user_defined_event_id column of the audit log. *@user_defined_information* is **nvarchar(4000)**.  
+ `[ @user_defined_information = ] 'user_defined_information'`  
+ Is the text defined by the user and recorded in the new user_defined_event_id column of the audit log. `@user_defined_information` is **nvarchar(4000)**.  
   
 ## Return Code Values  
  0 (success) or 1 (failure)  
diff --git a/docs/relational-databases/system-stored-procedures/sp-delete-database-firewall-rule-azure-sql-database.md b/docs/relational-databases/system-stored-procedures/sp-delete-database-firewall-rule-azure-sql-database.md
@@ -28,14 +28,13 @@ monikerRange: "= azuresqldb-current || = sqlallproducts-allversions"
  
 ## Syntax  
   
-```  
-  
+```    
 sp_delete_database_firewall_rule [@name =] [N]'name'
 [ ; ]  
 ```  
   
 ## Arguments  
- [**@name =**] **'**_name_**'**  
+ `[@name =] [N]'name'`  
  The name of the database-level firewall setting that will be removed. *name* is **nvarchar(128)** with no default value. The Unicode identifier `N` is optional for [!INCLUDE[ssSDS_md](../../includes/sssds-md.md)]. 
   
 ## Permissions  
diff --git a/docs/relational-databases/wmi-provider-configuration/working-with-the-wmi-provider-for-configuration-management.md b/docs/relational-databases/wmi-provider-configuration/working-with-the-wmi-provider-for-configuration-management.md
@@ -1,7 +1,7 @@
 ---
 title: "Working with the WMI Provider for Configuration Management | Microsoft Docs"
 ms.custom: ""
-ms.date: "03/14/2017"
+ms.date: "04/12/2019"
 ms.prod: sql
 ms.prod_service: "database-engine"
 ms.reviewer: ""
@@ -22,23 +22,48 @@ ms.author: "carlrab"
 manager: craigg
 ---
 # Working with the WMI Provider for Configuration Management
+
 [!INCLUDE[tsql-appliesto-ss2008-xxxx-xxxx-xxx-md](../../includes/tsql-appliesto-ss2008-xxxx-xxxx-xxx-md.md)]
-  Consider the following before programming with the WMI Provider for Computer Management:  
-  
+
+This article provides guidance about how to program with the WMI Provider for Computer Management.
+
 ## Binding  
  The WMI Provider for Configuration Management is a COM object model and it supports early and late binding. With late binding you can use script languages, such as VBScript, to manipulate the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] services, network settings, and aliases programmatically.  
   
- For further information about programming WMI Provider implementations using scripting languages, see the [!INCLUDE[msCoName](../../includes/msconame-md.md)] MSDN [Web site](https://go.microsoft.com/fwlink/?linkid=15426).  
-  
-## Specifying a Connection String  
- Applications direct the WMI Provider for Configuration Management to an instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] by connecting to a WMI namespace defined by the provider. The Windows WMI service maps this namespace to the provider DLL and loads it into memory. All instances of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] are represented with a single WMI namespace. The namespace defaults to  
-  
-```  
-\\.\root\Microsoft\SqlServer\ComputerManagement12\instance_name  
-```  
-  
- where `instance_name` defaults to `MSSQLSERVER` in a default installation of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)].  
-  
+## Specifying a Connection String
+
+Applications direct the WMI Provider for Configuration Management to an instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] by connecting to a WMI namespace defined by the provider. The Windows WMI service maps this namespace to the provider DLL, and loads the DLL into memory. All instances of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] are represented with a single WMI namespace.
+
+The namespace defaults to the following format. In the format, `VV` is the major version number of SQL Server. The number is discoverable by running `SELECT @@VERSION;`.
+
+```console
+\\.\root\Microsoft\SqlServer\ComputerManagementVV
+```
+
+When you connect by using PowerShell, the leading `\\.\` must be removed. For example, the following PowerShell code lists all WMI classes for a SQL Server 2016, which is major version 13.
+
+```powershell
+Get-WmiObject -Namespace 'root\Microsoft\SqlServer\ComputerManagement13' -List
+```
+
+<!--
+Updated this on 2019-04-12, per:
+   ~ https://github.com/MicrosoftDocs/sql-docs/issues/1817
+   ~ https://github.com/rrg92/sql-docs/commit/3d518bfc0d55f819c762abc3e5c5c9eed85abe94?diff=unified
+
+Thus from here I (GeneMi = MightyPen) removed the following text about 'instance_name':
+
+'root\Microsoft\SqlServer\ComputerManagement13\instance_name'
+
+where `instance_name` defaults to `MSSQLSERVER` in a default installation of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)].
+-->
+
+You can use following PowerShell code to query all available WMI ComputerManagement namespaces.
+
+```powershell
+gwmi -ns 'root\Microsoft\SqlServer' __NAMESPACE | ? {$_.name -match 'ComputerManagement' } | select name
+```
+
  **Note:** If you are connecting through Windows Firewall you will need to make sure your computers are configured appropriately. See the "Connecting Through Windows Firewall" article in the Windows Management Instrumentation documentation on [!INCLUDE[msCoName](../../includes/msconame-md.md)] MSDN [Web site](https://go.microsoft.com/fwlink/?linkid=15426).  
   
 ## Permissions and Server Authentication  
diff --git a/docs/t-sql/statements/drop-workload-classifier-transact-sql.md b/docs/t-sql/statements/drop-workload-classifier-transact-sql.md
@@ -65,4 +65,4 @@ DROP WORKLOAD CLASSIFIER wgcELTRole;
 ## See Also
 
 [CREATE WORKLOAD CLASSIFIER &#40;Transact-SQL&#41;](../../t-sql/statements/create-workload-classifier-transact-sql.md)</br>
-[SQL Data Warehouse Workload Classification](/azure/sql-data-warehouse/classification)
+[SQL Data Warehouse Workload Classification](/azure/sql-data-warehouse/sql-data-warehouse-workload-classification)
