Formatting and spelling fixes.

v-chojas · web-flow · commit 0aaa0b78c679 · 2017-07-14T10:25:12.000-07:00
diff --git a/docs/connect/odbc/custom-keystore-providers.md b/docs/connect/odbc/custom-keystore-providers.md
@@ -81,7 +81,7 @@ typedef struct CEKeystoreProvider {
 |Field Name|Description|
 |:--|:--|
 |`Name`|The name of the keystore provider. It must not be the same as any other keystore provider previously loaded by the driver or present in this library. Null-terminated, wide-character* string.|
-|`Init`|Initialisation function. If an initialisation function is not required, this field may be null.|
+|`Init`|Initialization function. If an initialization function is not required, this field may be null.|
 |`Read`|Provider read function. May be null if not required.|
 |`Write`|Provider write function. Required if Read is not null. May be null if not required.|
 |`DecryptCEK`|ECEK decryption function. This function is the reason for existence of a keystore provider, and must not be null.|
@@ -93,7 +93,7 @@ With the exception of Free, the functions in this interface all have a pair of p
 ```
 int Init(CEKEYSTORECONTEXT *ctx, errFunc onError);
 ```
-Placeholder name for a provider-defined initialization function. The driver calls this function once, after a provider has been loaded, but before the first time it needs it to perform ECEK decryption or Read()/Write() requests. Use this function to perform any initialisation it needs. 
+Placeholder name for a provider-defined initialization function. The driver calls this function once, after a provider has been loaded, but before the first time it needs it to perform ECEK decryption or Read()/Write() requests. Use this function to perform any initialization it needs. 
 
 |Argument|Description|
 |:--|:--|
@@ -141,7 +141,7 @@ Placeholder name for a provider-defined ECEK decryption function. The driver cal
 |`alg`|[Input] The value of the [ALGORITHM](../../t-sql/statements/create-column-encryption-key-transact-sql.md) metadata attribute for the given ECEK. Null-terminated wide-character* string. This is intended to identify the encryption algorithm used to encrypt the given ECEK.|
 |`ecek`|[Input] Pointer to the ECEK to be decrypted.|
 |`ecekLen`|[Input] Length of the ECEK.|
-|`cekOut`|[Output] The provider shall allocate memory for the decrypted ECEK and write its address to the pointer pointed to by cekOut. It must be possible to free this block of memory using the [LocalFree](https://msdn.microsoft.com/en-us/library/windows/desktop/aa366730(v=vs.85).aspx) (Windows) or free (Linux/Mac) function. If no memory was allocated due to an error or otherwise, the provider shall set *cekOut to a null pointer.|
+|`cekOut`|[Output] The provider shall allocate memory for the decrypted ECEK and write its address to the pointer pointed to by cekOut. It must be possible to free this block of memory using the [LocalFree](https://msdn.microsoft.com/library/windows/desktop/aa366730(v=vs.85).aspx) (Windows) or free (Linux/Mac) function. If no memory was allocated due to an error or otherwise, the provider shall set *cekOut to a null pointer.|
 |`cekLen`|[Output] The provider shall write to the address pointed to by cekLen the length of the decrypted ECEK that it has written to **cekOut.|
 |`Return Value`|Return nonzero to indicate success, or zero to indicate failure.|
 
@@ -158,7 +158,7 @@ Placeholder name for a provider-defined CEK encryption function. The driver does
 |`alg`|[Input] The value of the [ALGORITHM](../../t-sql/statements/create-column-encryption-key-transact-sql.md) metadata attribute for the given ECEK. Null-terminated wide-character* string. This is intended to identify the encryption algorithm used to encrypt the given ECEK.|
 |`cek`|[Input] Pointer to the CEK to be encrypted.|
 |`cekLen`|[Input] Length of the CEK.|
-|`ecekOut`|[Output] The provider shall allocate memory for the encrypted CEK and write its address to the pointer pointed to by ecekOut. It must be possible to free this block of memory using the [LocalFree](https://msdn.microsoft.com/en-us/library/windows/desktop/aa366730(v=vs.85).aspx) (Windows) or free (Linux/Mac) function. If no memory was allocated due to an error or otherwise, the provider shall set *ecekOut to a null pointer.|
+|`ecekOut`|[Output] The provider shall allocate memory for the encrypted CEK and write its address to the pointer pointed to by ecekOut. It must be possible to free this block of memory using the [LocalFree](https://msdn.microsoft.com/library/windows/desktop/aa366730(v=vs.85).aspx) (Windows) or free (Linux/Mac) function. If no memory was allocated due to an error or otherwise, the provider shall set *ecekOut to a null pointer.|
 |`ecekLen`|[Output] The provider shall write to the address pointed to by ecekLen the length of the encrypted CEK that it has written to **ecekOut.|
 |`Return Value`|Return nonzero to indicate success, or zero to indicate failure.|
 
@@ -167,7 +167,8 @@ void (*Free)();
 ```
 Placeholder name for a provider-defined termination function. The driver may call this function upon normal termination of the process.
 
-*NB: Wide-character strings are 2-byte characters (UTF-16) due to how SQL Server stores them.*
+> [!NOTE]
+> *Wide-character strings are 2-byte characters (UTF-16) due to how SQL Server stores them.*
 
 
 ### Error Handling
@@ -183,7 +184,7 @@ The **onError** parameter points to an error-reporting function, with the follow
 |Argument|Description|
 |:--|:--|
 |`ctx`|[Input] The context to report the error on.|
-|`msg`|[Input] The error message to report. Null-terminated wide-character string. To allow parameterized information to be present, this string may contain insert-formatting sequences of the form accepted by the [FormatMessage](https://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).aspx) function. Extended functionality may be specified by this parameter as described below.|
+|`msg`|[Input] The error message to report. Null-terminated wide-character string. To allow parameterized information to be present, this string may contain insert-formatting sequences of the form accepted by the [FormatMessage](https://msdn.microsoft.com/library/windows/desktop/ms679351(v=vs.85).aspx) function. Extended functionality may be specified by this parameter as described below.|
 |...|[Input] Additional variadic parameters to fit format specifiers in msg, as appropriate.|
 
 To report when an error has occurred, the provider calls onError, supplying the context parameter passed into the provider function by the driver and an error message with optional additional parameters to be formatted in it. The provider may call this function multiple times to post multiple error messages consecutively within one provider-function invocation. For example:
@@ -292,7 +293,7 @@ int __stdcall KeystoreDecrypt(CEKEYSTORECONTEXT *ctx, errFunc *onError, const wc
         return 0;
     }
     if (!g_encryptKey) {
-        onError(ctx, L"Keystore provider not initialised with key");
+        onError(ctx, L"Keystore provider not initialized with key");
         return 0;
     }
 #ifndef _WIN32
@@ -323,7 +324,7 @@ int KeystoreEncrypt(CEKEYSTORECONTEXT *ctx, errFunc *onError,
     unsigned int i;
     printf("KSP Encrypt() function called (cekLen=%u)\n", cekLen);
     if (!g_encryptKey) {
-        onError(ctx, L"Keystore provider not initialised with key");
+        onError(ctx, L"Keystore provider not initialized with key");
         return 0;
     }
     *ecekOut = malloc(cekLen);
@@ -473,7 +474,7 @@ int main(int argc, char **argv) {
     return 4;
 FoundProv:
     if (pKsp->Init && !pKsp->Init(&ctx, postKspError)) {
-        fprintf(stderr, "Could not initialise provider\n");
+        fprintf(stderr, "Could not initialize provider\n");
         return 5;
     }
 #ifdef _WIN32
diff --git a/docs/connect/odbc/using-always-encrypted-with-the-odbc-driver.md b/docs/connect/odbc/using-always-encrypted-with-the-odbc-driver.md
@@ -40,7 +40,7 @@ Always Encrypted may also be enabled in the DSN configuration, using the same ke
  SQLSetConnectAttr(hdbc, SQL_COPT_SS_COLUMN_ENCRYPTION, (SQLPOINTER)SQL_COLUMN_ENCRYPTION_ENABLE, 0);
 ```
 
-Once enabled for the connection, the behaviour of Always Encrypted may be adjusted for individual queries. See [Controlling the Performance Impact of Always Encrypted](#controlling-the-performance-impact-of-always-encrypted) below for more information.
+Once enabled for the connection, the behavior of Always Encrypted may be adjusted for individual queries. See [Controlling the Performance Impact of Always Encrypted](#controlling-the-performance-impact-of-always-encrypted) below for more information.
 
 Note that enabling Always Encrypted is not sufficient for encryption or decryption to succeed; you also need to make sure that:
 
@@ -280,7 +280,7 @@ This section describes the built-in performance optimizations in the ODBC Driver
 
 If Always Encrypted is enabled for a connection, the ODBC Driver 13.1 for SQL Server will, by default, call [sys.sp_describe_parameter_encryption](https://msdn.microsoft.com/library/mt631693.aspx) for each parameterized query, passing the query statement (without any parameter values) to SQL Server. This stored procedure analyzes the query statement to find out if any parameters need to be encrypted, and if so, returns the encryption-related information for each parameter to allow the driver to encrypt them. The above behavior ensures a high-level of transparency to the client application: The application (and the application developer) does not need to be aware of which queries access encrypted columns, as long as the values targeting encrypted columns are passed to the driver in parameters.
 
-### Per-Statement Always Encrypted Behaviour
+### Per-Statement Always Encrypted Behavior
 
 To control the performance impact of retrieving encryption metadata for parameterized queries, you can alter the Always Encrypted behavior for individual queries if it has been enabled on the connection. This way, you can ensure that `sys.sp_describe_parameter_encryption` is invoked only for queries that you know have parameters targeting encrypted columns. Note, however, that by doing so, you reduce transparency of encryption: if you encrypt additional columns in your database, you may need to change the code of your application to align it with the schema changes.
 
@@ -320,7 +320,8 @@ If SQL Server informs the driver that the parameter does not need to be encrypte
 
 To reduce the number of calls to a column master key store to decrypt column encryption keys, the driver caches the plaintext CEKs in memory. After receiving the ECEK from database metadata, the driver first tries to find the plaintext CEK corresponding to the encrypted key value in the cache. The driver calls the key store containing the CMK only if it cannot find the corresponding plaintext CEK in the cache.
 
-**Note:** In the ODBC Driver 13.1 for SQL Server, the entries in the cache are evicted after a two hour timeout. This means that for a given ECEK, the driver contacts the key store only once during the lifetime of the application or every two hours, whichever is less.
+> [!NOTE]
+> In the ODBC Driver 13.1 for SQL Server, the entries in the cache are evicted after a two hour timeout. This means that for a given ECEK, the driver contacts the key store only once during the lifetime of the application or every two hours, whichever is less.
 
 ## Working with Column Master Key Stores
 
@@ -416,13 +417,15 @@ The driver attempts to load the library identified by the ValuePtr parameter usi
 
 `SQLSetConnectAttr` returns the usual error or success values, and additional information is available for any errors which occurred via the standard ODBC diagnostic mechanism.
 
-NOTE: The application programmer must ensure that any custom providers are loaded before any query requiring them is sent over any connection. Failure to do so results in the error:
+> [!NOTE]
+> The application programmer must ensure that any custom providers are loaded before any query requiring them is sent over any connection. Failure to do so results in the error:
 
 | Error | Description |
 |:--|:--|
 |`CE200`|Keystore provider %1 not found. Ensure that the appropriate keystore provider library has been loaded.|
 
-NOTE: Keystore provider implementors should avoid the use of `MSSQL` in the name of their custom providers. This term is reserved exclusively for Microsoft use and may cause conflicts with future built-in providers. Using this term in the name of a custom provider may result in an ODBC warning.
+> [!NOTE]
+> Keystore provider implementors should avoid the use of `MSSQL` in the name of their custom providers. This term is reserved exclusively for Microsoft use and may cause conflicts with future built-in providers. Using this term in the name of a custom provider may result in an ODBC warning.
 
 #### Getting the List of Loaded Providers
 
@@ -445,7 +448,8 @@ To allow retrieving the entire list, every Get operation returns the current pro
 
 The `SQL_COPT_SS_CEKEYSTOREDATA` connection attribute enables a client application to communicate with loaded keystore providers for configuring additional parameters, keying material, etc. The communication between a client application and a provider follows a simple request-response protocol, based on Get and Set requests using this connection attribute. Communication is initiated only by the client application.
 
-NOTE: Due to the nature of the ODBC calls CEKeyStoreProvider’s respond to (SQLGet/SetConnectAttr), the ODBC interface only supports setting data at the resolution of the connection context.
+> [!NOTE]
+> Due to the nature of the ODBC calls CEKeyStoreProvider’s respond to (SQLGet/SetConnectAttr), the ODBC interface only supports setting data at the resolution of the connection context.
 
 The application communicates with keystore providers through the driver via the CEKeystoreData structure:
 
@@ -477,7 +481,8 @@ SQLRETURN SQLSetConnectAttr( SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQL
 
 Additional detailed error information may be obtained via [SQLGetDiacRec](https://msdn.microsoft.com/library/ms710921(v=vs.85).aspx).
 
-NOTE: The provider can use the connection handle to associate the written data to a specific connection, if it so desires. This is useful for implementing per-connection configuration. It may also ignore the connection context and treat the data identically regardless of the connection used to send the data. See [Context Association](../../connect/odbc/custom-keystore-providers.md#context-association) for more information.
+> [!NOTE]
+> The provider can use the connection handle to associate the written data to a specific connection, if it so desires. This is useful for implementing per-connection configuration. It may also ignore the connection context and treat the data identically regardless of the connection used to send the data. See [Context Association](../../connect/odbc/custom-keystore-providers.md#context-association) for more information.
 
 #### Reading data from a provider
 
