Merge pull request #108972 from TimShererWithAquent/us1679050af

Change SSL to TLS per 1679050

Author: American-Dipper

articles/cosmos-db/local-emulator-export-ssl-certificates.md

@@ -1,6 +1,6 @@
 ---
 title: Export the Azure Cosmos DB Emulator certificates
-description: When developing in languages and runtimes that do not use the Windows Certificate Store you will need to export and manage the SSL certificates. This post gives step by step instructions.
+description: When developing in languages and runtimes that do not use the Windows Certificate Store you will need to export and manage the TLS/SSL certificates. This post gives step by step instructions.
 ms.service: cosmos-db
 ms.topic: conceptual
 ms.date: 05/23/2019
@@ -13,13 +13,13 @@ ms.author: dech
 
 [**Download the Emulator**](https://aka.ms/cosmosdb-emulator)
 
-The Azure Cosmos DB Emulator provides a local environment that emulates the Azure Cosmos DB service for development purposes including its use of SSL connections. This post demonstrates how to export the SSL certificates for use in languages and runtimes that do not integrate with the Windows Certificate Store such as Java which uses its own [certificate store](https://docs.oracle.com/cd/E19830-01/819-4712/ablqw/index.html) and Python which uses [socket wrappers](https://docs.python.org/2/library/ssl.html) and Node.js which uses [tlsSocket](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). You can read more about the emulator in [Use the Azure Cosmos DB Emulator for development and testing](./local-emulator.md).
+The Azure Cosmos DB Emulator provides a local environment that emulates the Azure Cosmos DB service for development purposes including its use of TLS connections. This post demonstrates how to export the TLS/SSL certificates for use in languages and runtimes that do not integrate with the Windows Certificate Store such as Java which uses its own [certificate store](https://docs.oracle.com/cd/E19830-01/819-4712/ablqw/index.html) and Python which uses [socket wrappers](https://docs.python.org/2/library/ssl.html) and Node.js which uses [tlsSocket](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). You can read more about the emulator in [Use the Azure Cosmos DB Emulator for development and testing](./local-emulator.md).
 
 This tutorial covers the following tasks:
 
 > [!div class="checklist"]
 > * Rotating certificates
-> * Exporting SSL certificate
+> * Exporting TLS/SSL certificate
 > * Learning how to use the certificate in Java, Python, and Node.js
 
 ## Certification rotation
@@ -30,7 +30,7 @@ Both certificates can be regenerated by clicking **Reset Data** as shown below f
 
 ![Azure Cosmos DB local emulator reset data](./media/local-emulator-export-ssl-certificates/database-local-emulator-reset-data.png)
 
-## How to export the Azure Cosmos DB SSL certificate
+## How to export the Azure Cosmos DB TLS/SSL certificate
 
 1. Start the Windows Certificate manager by running certlm.msc and navigate to the Personal->Certificates folder and open the certificate with the friendly name **DocumentDbEmulatorCertificate**.
 
@@ -70,23 +70,23 @@ When running Java applications or MongoDB applications that use the Java client
 
 Follow the instructions in the [Adding a Certificate to the Java CA Certificates Store](https://docs.microsoft.com/azure/java-add-certificate-ca-store) to import the X.509 certificate into the default Java certificate store. Keep in mind you will be working in the %JAVA_HOME% directory when running keytool.
 
-Once the "CosmosDBEmulatorCertificate" SSL certificate is installed your application should be able to connect and use the local Azure Cosmos DB Emulator. If you continue to have trouble you may want to follow the [Debugging SSL/TLS Connections](https://docs.oracle.com/javase/7/docs/technotes/guides/security/jsse/ReadDebug.html) article. It is very likely the certificate is not installed into the %JAVA_HOME%/jre/lib/security/cacerts store. For example if you have multiple installed versions of Java your application may be using a different cacerts store than the one you updated.
+Once the "CosmosDBEmulatorCertificate" TLS/SSL certificate is installed your application should be able to connect and use the local Azure Cosmos DB Emulator. If you continue to have trouble you may want to follow the [Debugging SSL/TLS Connections](https://docs.oracle.com/javase/7/docs/technotes/guides/security/jsse/ReadDebug.html) article. It is very likely the certificate is not installed into the %JAVA_HOME%/jre/lib/security/cacerts store. For example if you have multiple installed versions of Java your application may be using a different cacerts store than the one you updated.
 
 ## How to use the certificate in Python
 
-By default the [Python SDK(version 2.0.0 or higher)](sql-api-sdk-python.md) for the SQL API will not try and use the SSL certificate when connecting to the local emulator. If however you want to use SSL validation you can follow the examples in the [Python socket wrappers](https://docs.python.org/2/library/ssl.html) documentation.
+By default the [Python SDK(version 2.0.0 or higher)](sql-api-sdk-python.md) for the SQL API will not try and use the TLS/SSL certificate when connecting to the local emulator. If however you want to use TLS validation you can follow the examples in the [Python socket wrappers](https://docs.python.org/2/library/ssl.html) documentation.
 
 ## How to use the certificate in Node.js
 
-By default the [Node.js SDK(version 1.10.1 or higher)](sql-api-sdk-node.md) for the SQL API will not try and use the SSL certificate when connecting to the local emulator. If however you want to use SSL validation you can follow the examples in the [Node.js documentation](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback).
+By default the [Node.js SDK(version 1.10.1 or higher)](sql-api-sdk-node.md) for the SQL API will not try and use the TLS/SSL certificate when connecting to the local emulator. If however you want to use TLS validation you can follow the examples in the [Node.js documentation](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback).
 
 ## Next steps
 
 In this tutorial, you've done the following:
 
 > [!div class="checklist"]
 > * Rotated certificates
-> * Exported the SSL certificate
+> * Exported the TLS/SSL certificate
 > * Learned how to use the certificate in Java, Python and Node.js
 
 You can now proceed to the concepts section for more information about Azure Cosmos DB. 

articles/cosmos-db/sql-api-nodejs-get-started.md

@@ -120,7 +120,7 @@ Now that your app exists, you need to make sure it can talk to Azure Cosmos DB.
    ```
 
 > [!Note]
-> If connecting to the **Cosmos DB Emulator**, disable SSL verification for your node process:
+> If connecting to the **Cosmos DB Emulator**, disable TLS verification for your node process:
 >   ```
 >   process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 >   const client = new CosmosClient({ endpoint, key });

articles/cosmos-db/sql-api-sdk-node.md

@@ -314,7 +314,7 @@ Not always the most visible changes, but they help our team ship better code, fa
 ### <a name="1.11.0"/>1.11.0</a>
 * Added the support for aggregation queries (COUNT, MIN, MAX, SUM, and AVG).
 * Added the option for controlling degree of parallelism for cross partition queries.
-* Added the option for disabling SSL verification when running against Azure Cosmos DB Emulator.
+* Added the option for disabling TLS verification when running against Azure Cosmos DB Emulator.
 * Lowered minimum throughput on partitioned collections from 10,100 RU/s to 2500 RU/s.
 * Fixed the continuation token bug for single partition collection. GitHub issue #107.
 * Fixed the executeStoredProcedure bug in handling 0 as single param. GitHub issue #155.
@@ -324,7 +324,7 @@ Not always the most visible changes, but they help our team ship better code, fa
 * Minor code cleanup.
 
 ### <a name="1.10.1"/>1.10.1</a>
-* Disabling SSL verification when using the SDK to target the emulator(hostname=localhost).
+* Disabling TLS verification when using the SDK to target the emulator(hostname=localhost).
 * Added support for enabling script logging during stored procedure execution.
 
 ### <a name="1.10.0"/>1.10.0</a>

articles/cosmos-db/storage-explorer.md

@@ -210,14 +210,14 @@ There are a few reasons you may be seeing this error, the two most common ones a
 
 + You're behind a *transparent proxy*, which means someone (such as your IT department) is intercepting HTTPS traffic, decrypting it, and then encrypting it using a self-signed certificate.
 
-+ You're running software, such as anti-virus software, which is injecting a self-signed SSL certificates into the HTTPS messages you receive.
++ You're running software, such as anti-virus software, which is injecting a self-signed TLS/SSL certificates into the HTTPS messages you receive.
 
 When Storage Explorer encounters one of these "self-signed certificates", it can no longer know if the HTTPS message it's receiving has been tampered with. If you have a copy of the self-signed certificate though, then you can tell Storage Explorer to trust it. If you're unsure of who is injecting the certificate, then you can try to find it yourself by doing the following steps:
 
-1. Install Open SSL
+1. Install OpenSSL
      - [Windows](https://slproweb.com/products/Win32OpenSSL.html) (any of the light versions is ok)
      - Mac and Linux: Should be included with your operating system
-2. Run Open SSL
+2. Run OpenSSL
     - Windows: Go to the install directory, then **/bin/**, then double-click on **openssl.exe**.
     - Mac and Linux: execute **openssl** from a terminal
 3. Execute `s_client -showcerts -connect microsoft.com:443`

articles/cosmos-db/tutorial-setup-ci-cd.md

@@ -172,4 +172,4 @@ If you are setting up the CI/CD pipeline by using a YAML task, you can define th
 
 To learn more about using the emulator for local development and testing, see [Use the Azure Cosmos DB Emulator for local development and testing](https://docs.microsoft.com/azure/cosmos-db/local-emulator).
 
-To export emulator SSL certificates, see [Export the Azure Cosmos DB Emulator certificates for use with Java, Python, and Node.js](https://docs.microsoft.com/azure/cosmos-db/local-emulator-export-ssl-certificates)
+To export emulator TLS/SSL certificates, see [Export the Azure Cosmos DB Emulator certificates for use with Java, Python, and Node.js](https://docs.microsoft.com/azure/cosmos-db/local-emulator-export-ssl-certificates)