Merge branch 'master' into release-arcee-ga

Author: v-alje

docs/connect/oledb/ole-db-how-to/results/execute-stored-procedure-with-odbc-call-and-process-output.md

@@ -51,14 +51,14 @@ ms.author: v-daenge
 
  Execute the third ( [!INCLUDE[tsql](../../../../includes/tsql-md.md)]) code listing to delete the stored procedure used by the application.  
 
-```  
+```sql
 USE AdventureWorks  
 if exists (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[myProc]'))  
    DROP PROCEDURE myProc  
 GO  
 
 CREATE PROCEDURE myProc   
-    @inparam nvarchar(5),,  
+    @inparam nvarchar(5),
     @outparam int OUTPUT  
 
 AS  
@@ -73,7 +73,7 @@ ELSE
 GO  
 ```  
 
-```  
+```cpp
 // compile with: ole32.lib oleaut32.lib  
 void InitializeAndEstablishConnection();  
 
@@ -345,7 +345,7 @@ void InitializeAndEstablishConnection() {
 }  
 ```  
   
-```  
+```sql  
 USE AdventureWorks  
 DROP PROCEDURE myProc  
 GO  

docs/database-engine/availability-groups/windows/configure-backup-on-availability-replicas-sql-server.md

@@ -160,12 +160,12 @@ ms.author: chadam
  To take the automated backup preference into account for a given availability group, on each server instance that hosts an availability replica whose backup priority is greater than zero (>0), you need to script backup jobs for the databases in the availability group. To determine whether the current replica is the preferred backup replica, use the [sys.fn_hadr_backup_is_preferred_replica](../../../relational-databases/system-functions/sys-fn-hadr-backup-is-preferred-replica-transact-sql.md) function in your backup script. If the availability replica that is hosted by the current server instance is the preferred replica for backups, this function returns 1. If not, the function returns 0. By running a simple script on each availability replica that queries this function, you can determine which replica should run a given backup job. For example, a typical snippet of a backup-job script would look like:  
   
 ```sql  
-IF (NOT sys.fn_hadr_backup_is_preferred_replica(@DBNAME))  
+IF (sys.fn_hadr_backup_is_preferred_replica(@DBNAME) != 1)  
 BEGIN  
       Select 'This is not the preferred replica, exiting with success';  
       RETURN 0 -- This is a normal, expected condition, so the script returns success  
 END  
-BACKUP DATABASE @DBNAME TO DISK=<disk>  
+BACKUP DATABASE @DBNAME TO DISK = '<path to backup file>'  
    WITH COPY_ONLY;  
 ```  
 

docs/machine-learning/predictions/real-time-scoring.md

@@ -106,7 +106,7 @@ Because the binary format is the same as that used by the PREDICT function, you
 DECLARE @irismodel varbinary(max)
 SELECT @irismodel = [native_model_object] from [ml_models]
 WHERE model_name = 'iris.dtree' 
-AND model_version = 'v1''
+AND model_version = 'v1'
 
 EXEC sp_rxPredict
 @model = @irismodel,

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

@@ -81,7 +81,7 @@ When a database collation is changed, only new tables will inherit the new datab
 
    DROP TABLE dbo.MyTable; 
 
-   EXEC sp_rename 'dbo.MyTable2', 'dbo.MyTable’;
+   EXEC sp_rename 'dbo.MyTable2', 'dbo.MyTable';
    ```
 
 -  Copy data to a new database that uses the new collation, and replace the original database. Create a new database using the new collation, and transfer the data from the original database via tools like [!INCLUDE[ssISnoversion](../../includes/ssisnoversion-md.md)] or the Import/Export Wizard in [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)]. This is a simpler approach for complex schemas. It would also require a final data syncronization between the original and the new databases before the final cut-off, if data continues to be changed by applications.

docs/relational-databases/databases/contained-database-collations.md

@@ -15,7 +15,7 @@ author: WilliamDAssafMSFT
 ms.author: wiassaf
 ---
 # Contained Database Collations
- [!INCLUDE [SQL Server](../../includes/applies-to-version/sqlserver.md)]
+ [!INCLUDE [SQL Server Azure SQL Managed Instance](../../includes/applies-to-version/sql-asdbmi.md)]
   Various properties affect the sort order and equality semantics of textual data, including case sensitivity, accent sensitivity, and the base language being used. These qualities are expressed to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] through the choice of collation for the data. For a more in-depth discussion of collations themselves, see [Collation and Unicode Support](../../relational-databases/collations/collation-and-unicode-support.md).  
 
  Collations apply not only to data stored in user tables, but to all text handled by [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], including metadata, temporary objects, variable names, etc. The handling of these differs in contained and non-contained databases. This change will not affect many users, but helps provide instance independence and uniformity. But this may also cause some confusion, as well as problems for sessions that access both contained and non-contained databases.  

docs/relational-databases/databases/modified-features-contained-database.md

@@ -15,7 +15,7 @@ author: WilliamDAssafMSFT
 ms.author: wiassaf
 ---
 # Modified Features (Contained Database)
- [!INCLUDE [SQL Server](../../includes/applies-to-version/sqlserver.md)]
+ [!INCLUDE [SQL Server Azure SQL Managed Instance](../../includes/applies-to-version/sql-asdbmi.md)]
   The following features have been modified to be supported by a partially contained database. Features are usually modified so they do not cross the database boundary.  
 
  For more information, see [Contained Databases](../../relational-databases/databases/contained-databases.md).  

docs/relational-databases/databases/security-best-practices-with-contained-databases.md

@@ -15,7 +15,7 @@ ms.author: vanto
 ms.reviewer: jaszymas
 ---
 # Security Best Practices with Contained Databases
- [!INCLUDE [SQL Server](../../includes/applies-to-version/sqlserver.md)]
+ [!INCLUDE [SQL Server Azure SQL Managed Instance](../../includes/applies-to-version/sql-asdbmi.md)]
 
   Contained databases have some unique threats that should be understood and mitigated by [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)] administrators. Most of the threats are related to the **USER WITH PASSWORD** authentication process, which moves the authentication boundary from the [!INCLUDE[ssDE](../../includes/ssde-md.md)] level to the database level.  
 

docs/relational-databases/indexes/columnstore-indexes-data-warehouse.md

@@ -115,7 +115,7 @@ BEGIN TRAN
     -- The query plan chooses a seek operation on the nonclustered index  
     -- and takes the row lock  
     SELECT * FROM t_account WHERE AccountKey = 100;  
-END TRAN  
+COMMIT TRAN  
 ```  
 
 ### Snapshot isolation and read-committed snapshot isolations  

docs/relational-databases/indexes/get-started-with-columnstore-for-real-time-operational-analytics.md

@@ -14,7 +14,7 @@ ms.author: mikeray
 monikerRange: "=azuresqldb-current||>=sql-server-2016||>=sql-server-linux-2017||=azuresqldb-mi-current"
 ---
 # Get started with Columnstore for real-time operational analytics
-[!INCLUDE [SQL Server Azure SQL Database](../../includes/applies-to-version/sql-asdb.md)]
+[!INCLUDE [SQL Server Azure SQL Database Azure SQL Managed Instance](../../includes/applies-to-version/sql-asdb-asdbmi.md)]
 
   [!INCLUDE[sssql16-md](../../includes/sssql16-md.md)] introduces real-time operational analytics, the ability to run both analytics and OLTP workloads on the same database tables at the same time. Besides running analytics in real time, you can also eliminate the need for ETL and a data warehouse.  
 

docs/relational-databases/json/optimize-json-processing-with-in-memory-oltp.md

@@ -120,6 +120,7 @@ CREATE TABLE xtp.Product(
     INDEX [idx_Product_MadeIn] NONCLUSTERED (MadeIn)
 
 ) WITH (MEMORY_OPTIMIZED=ON)
+GO
 
 ALTER TABLE Product
     ADD INDEX [idx_Product_Cost] NONCLUSTERED HASH(Cost)
@@ -142,6 +143,7 @@ AS BEGIN
 		JOIN OPENJSON(@ProductIds)
 			ON ProductID = value
 END;
+GO
 
 CREATE PROCEDURE xtp.UpdateProductData(@ProductId int, @Property nvarchar(100), @Value nvarchar(100))
 WITH SCHEMABINDING, NATIVE_COMPILATION
@@ -152,6 +154,7 @@ AS BEGIN
 	SET Data = JSON_MODIFY(Data, @Property, @Value)
 	WHERE ProductID = @ProductId;
 END
+GO
 ```
 
 ## Learn more about JSON in SQL Server and Azure SQL Database