Merge pull request #15943 from MicrosoftDocs/FromPublicRepo

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

Author: huypub

docs/odbc/reference/syntax/sqlcancelhandle-function.md

@@ -17,9 +17,7 @@ ms.author: v-daenge
 ---
 # SQLCancelHandle Function
 **Conformance**  
- Version Introduced: ODBC 3.8  
-  
- Standards Compliance: None  
+ Version Introduced: ODBC 3.8 Standards Compliance: None  
 
  It is expected that most ODBC 3.8 (and later) drivers will implement this function. If a driver does not, a call to **SQLCancelHandle** with a connection handle in the *Handle* parameter will return SQL_ERROR with a SQLSTATE of IM001 and message 'Driver does not support this function'' A call to **SQLCancelHandle** with a statement handle as the *Handle* parameter will be mapped to a call to **SQLCancel** by the Driver Manager and can be processed if the driver implements **SQLCancel**. An application can use **SQLGetFunctions** to determine if a driver supports **SQLCancelHandle**.  
 

docs/odbc/reference/syntax/sqlcompleteasync-function.md

@@ -17,9 +17,7 @@ ms.author: v-daenge
 ---
 # SQLCompleteAsync Function
 **Conformance**  
- Version Introduced: ODBC 3.8  
-  
- Standards Compliance: None  
+ Version Introduced: ODBC 3.8 Standards Compliance: None  
 
  **Summary**  
  **SQLCompleteAsync** can be used to determine when an asynchronous function is complete using either notification- or polling-based processing. For more information about asynchronous operations, see [Asynchronous Execution](../../../odbc/reference/develop-app/asynchronous-execution.md).  

docs/odbc/reference/syntax/sqlgetinfo-function.md

@@ -66,7 +66,7 @@ SQLRETURN SQLGetInfo(
   
  For all other types of data, the value of *BufferLength* is ignored and the driver assumes the size of \**InfoValuePtr* is SQLUSMALLINT or SQLUINTEGER, depending on the *InfoType*.  
   
-## Return Value  
+## Returns  
 
  SQL_SUCCESS, SQL_SUCCESS_WITH_INFO, SQL_ERROR, or SQL_INVALID_HANDLE.  
   

docs/odbc/reference/syntax/sqlsetpos-function.md

@@ -65,7 +65,7 @@ SQLRETURN SQLSetPos(
   
  For more information, see "Comments."  
   
- **Returns**  
+## Returns  
   
  SQL_SUCCESS, SQL_SUCCESS_WITH_INFO, SQL_NEED_DATA, SQL_STILL_EXECUTING, SQL_ERROR, or SQL_INVALID_HANDLE.  
   

docs/relational-databases/errors-events/mssqlserver-137-database-engine-error.md

@@ -29,12 +29,15 @@ ms.author: mathoma
 ## Explanation  
 This error occurs when a variable is used in a SQL script without first declaring the variable. The following example returns error 137 for both the SET and SELECT statements because **\@mycol** is not declared.  
 
+```sql
 SET @mycol = 'ContactName';  
 
-SELECT @mycol;  
+SELECT @mycol; 
+```
 
 One of the more complicated causes of this error includes the use of a variable that is declared outside the EXECUTE statement. For example, the variable **\@mycol** specified in the SELECT statement is local to the SELECT statement; thus it is outside the EXECUTE statement.  
 
+```sql
 USE AdventureWorks2012;  
 
 GO  
@@ -43,13 +46,15 @@ DECLARE @mycol nvarchar(20);
 
 SET @mycol = 'Name';  
 
-EXECUTE ('SELECT @mycol FROM Production.Product;');  
+EXECUTE ('SELECT @mycol FROM Production.Product;'); 
+```
 
 ## User Action  
 Verify that any variables used in a SQL script are declared before being used elsewhere in the script.  
 
 Rewrite the script so that it does not reference variables in the EXECUTE statement that are declared outside of it. For example:  
 
+```sql
 USE AdventureWorks2012;  
 
 GO  
@@ -58,7 +63,8 @@ DECLARE @mycol nvarchar(20) ;
 
 SET @mycol = 'Name';  
 
-EXECUTE ('SELECT ' + @mycol + ' FROM Production.Product';) ;  
+EXECUTE ('SELECT ' + @mycol + ' FROM Production.Product';) ;
+```
 
 ## See Also  
 [EXECUTE (Transact-SQL)](~/t-sql/language-elements/execute-transact-sql.md)  

docs/relational-databases/errors-events/mssqlserver-605-database-engine-error.md

@@ -48,6 +48,7 @@ If the 605 error is not transient, the problem is severe and must be corrected b
 
 1.  Identify the tables associated with the allocation units specified in the message by running the following query. Replace `allocation_unit_id` with the allocation units specified in the error message.  
 
+    ```sql  
     USE`database_name`;  
 
     GO  
@@ -67,6 +68,7 @@ If the 605 error is not transient, the problem is severe and must be corrected b
     ORDER BY au.allocation_unit_id;  
 
     GO  
+    ```
 
 2.  Execute DBCC CHECKTABLE without a REPAIR clause on the table associated with the second allocation unit ID specified in the error message.  
 

docs/relational-databases/security/encryption/sql-server-and-database-encryption-keys-database-engine.md

@@ -24,7 +24,7 @@ ms.author: jaszymas
 
 ### Service master key
 
- The Service Master Key is the root of the SQL Server encryption hierarchy. The SMK is automatically generated the first time the [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] instance is started and is used to encrypt a linked server password, credentials, and the database master key. The SMK is encrypted by using the local machine key using the Windows Data Protection API (DPAPI). The DPAPI uses a key that is derived from the Windows credentials of the [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] service account and the computer's credentials. The service master key can only be decrypted by the service account under which it was created or by a principal that has access to the machine's credentials.
+ The Service Master Key is the root of the SQL Server encryption hierarchy. The SMK is automatically generated the first time the [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] instance is started and is used to encrypt a linked server password, credentials, and the database master key in each database. The SMK is encrypted by using the local machine key using the Windows Data Protection API (DPAPI). The DPAPI uses a key that is derived from the Windows credentials of the [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] service account and the computer's credentials. The service master key can only be decrypted by the service account under which it was created or by a principal that has access to the machine's credentials.
 
 The Service Master Key can only be opened by the Windows service account under which it was created or by a principal with access to both the service account name and its password.