Merge pull request #11390 from MicrosoftDocs/FromPublicRepo

huypub · web-flow · commit a85bbcf42929 · 2019-08-05T10:00:47.000-07:00
Confirm merge from FromPublicRepo to master to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)
diff --git a/docs/analysis-services/multidimensional-tutorial/install-sample-data-and-projects.md b/docs/analysis-services/multidimensional-tutorial/install-sample-data-and-projects.md
@@ -48,7 +48,7 @@ An Analysis Services multidimensional model uses transactional data that you imp
   
 To install the database, do the following:  
   
-1.  Download an [AdventureWorkDW](https://github.com/Microsoft/sql-server-samples/releases/tag/adventureworks) database backup from GitHub.  
+1.  Download an [AdventureWorksDW](https://github.com/Microsoft/sql-server-samples/releases/tag/adventureworks) database backup from GitHub.  
   
 2.  Copy the backup file to the data directory of the local SQL Server Database Engine instance.
   
@@ -109,4 +109,4 @@ You are now ready to use the tutorial. For more information about how to get sta
 [Configure the Windows Firewall to Allow Analysis Services Access](../instances/configure-the-windows-firewall-to-allow-analysis-services-access.md)  
 [Configure the Windows Firewall to Allow SQL Server Access](../../sql-server/install/configure-the-windows-firewall-to-allow-sql-server-access.md)  
   
-  
+  
diff --git a/docs/big-data-cluster/cluster-troubleshooting-commands.md b/docs/big-data-cluster/cluster-troubleshooting-commands.md
@@ -87,7 +87,7 @@ If any errors have occurred, you can sometimes see the error in the recent event
 You can retrieve the logs for containers running in a pod. The following command retrieves the logs for all containers running in the pod named `master-0` and outputs them to a file name `master-0-pod-logs.txt`:
 
 ```bash
-kubectl logs master-0 --all-containers=true -n mssql-cluser > master-0-pod-logs.txt
+kubectl logs master-0 --all-containers=true -n mssql-cluster > master-0-pod-logs.txt
 ```
 
 ## <a id="services"></a> Get status of services
diff --git a/docs/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix.md b/docs/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix.md
@@ -47,7 +47,7 @@ ms.author: genemi
   
 ## SQL Version Compatibility  
   
-|Driver Version|SQL Server 2008|SQL Server 2008R2|SQL Server 2012|Azure SQL Database|PDW 2008R2 AU3<sup>4</sup>|SQL Server 2014|SQL Server 2016|SQL Server 2017|Azure SQL Managed Instance (Extended Private Preview)|  
+|Driver Version|SQL Server 2008|SQL Server 2008R2|SQL Server 2012|Azure SQL Database|PDW 2008R2 AU3<sup>4</sup>|SQL Server 2014|SQL Server 2016|SQL Server 2017|Azure SQL Managed Instance|  
 |-|-|-|-|-|-|-|-|-|-|
 |7.2|N|Y|Y|Y|Y|Y|Y|Y|Y|  
 |7.0|N|Y|Y|Y|Y|Y|Y|Y|Y|  
diff --git a/docs/relational-databases/system-information-schema-views/check-constraints-transact-sql.md b/docs/relational-databases/system-information-schema-views/check-constraints-transact-sql.md
@@ -30,7 +30,7 @@ monikerRange: ">=aps-pdw-2016||=azuresqldb-current||=azure-sqldw-latest||>=sql-s
 |Column name|Data type|Description|  
 |-----------------|---------------|-----------------|  
 |**CONSTRAINT_CATALOG**|**nvarchar(**128**)**|Constraint qualifier.|  
-|**CONSTRAINT_SCHEMA**|**nvarchar(**128**)**|Name of the schema to which the constraint belongs.<br /><br /> **&#42;&#42; Important &#42;&#42;** Do not use INFORMATION_SCHEMA views to determine the schema of an object. The only reliable way to find the schema of a object is to query the sys.objects catalog view.|  
+|**CONSTRAINT_SCHEMA**|**nvarchar(**128**)**|Name of the schema to which the constraint belongs.<br /><br /> &#42;&#42; Important &#42;&#42; Do not use INFORMATION_SCHEMA views to determine the schema of an object. The only reliable way to find the schema of a object is to query the sys.objects catalog view.|  
 |**CONSTRAINT_NAME**|**sysname**|Constraint name.|  
 |**CHECK_CLAUSE**|**nvarchar(**4000**)**|Actual text of the [!INCLUDE[tsql](../../includes/tsql-md.md)] definition statement.|  
   
diff --git a/docs/samples/wide-world-importers-what-is.md b/docs/samples/wide-world-importers-what-is.md
@@ -29,7 +29,7 @@ The typical flow for how items are stocked and distributed is as follows:
 - Suppliers send the items, WWI receives them and stocks them in their warehouse.
 - Customers order items from WWI
 - WWI fills the customer order with stock items in the warehouse, and when they do not have sufficient stock, they order the additional stock from the suppliers.
-- Some customers do not want to wait for items that are not in stock. If they order say five different stock items, and four are available, they want to receive the four items and backorder the remaining item. The item would them be sent later in a separate shipment.
+- Some customers do not want to wait for items that are not in stock. If they order say five different stock items, and four are available, they want to receive the four items and backorder the remaining item. The item would then be sent later in a separate shipment.
 - WWI invoices customers for the stock items, typically by converting the order to an invoice.
 - Customers might order items that are not in stock. These items are backordered.
 - WWI delivers stock items to customers either via their own delivery vans, or via other couriers or freight methods.
