Merge pull request #14497 from TimShererWithAquent/us1679050ep

Change SSL to TLS per 1679050

Author: PRMerger15

docs/master-data-services/create-database-mail-profile-and-account-dialog-box.md

@@ -39,7 +39,7 @@ ms.author: lle
 |**Reply email address**|Optional setting. Type the email address to use for replies to email messages sent from this account. An example reply email address is admin@contoso.com.|  
 |**SMTP server**|Type the name or IP address of the SMTP server the account uses to send email. An example SMTP server format is **smtp.***<company_name>***.com**. For help with this, consult your mail administrator.|  
 |**Port number**|Type the port number of the SMTP server for this account. The default SMTP port is 25.|  
-|**This server requires a secure connection (SSL)**|Encrypts communication using Secure Sockets Layer (SSL).|  
+|**This server requires a secure connection (SSL)**|Encrypts communication using Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL).|  
 
 ## SMTP Authentication  
  Database Mail can be sent by using the credentials of the [!INCLUDE[ssDEnoversion](../includes/ssdenoversion-md.md)], by using other credentials that you supply, or anonymously. As a best practice, if your email server requires authentication, create a specific user account to use for Database Mail. This user account should have minimal permissions, and should not be used for any other purpose.  

docs/master-data-services/create-website-dialog-box-master-data-services-configuration-manager.md

@@ -24,7 +24,7 @@ ms.author: lle
 |Control Name|Description|  
 |------------------|-----------------|  
 |**Website name**|Type a name for the website or use the default name. This name is a friendly name that is used only to identify the site in IIS. It is not used to access the site from a web browser.<br /><br /> The name must be unique among all the sites in IIS on the local computer.|  
-|**Protocol**|Displays **http**. Use hypertext transfer protocol (HTTP) when you do not require client and server communication to take place over an encrypted channel.<br /><br /> **Note**: You cannot create an HTTPS site in [!INCLUDE[ssMDScfgmgr](../includes/ssmdscfgmgr-md.md)]. HTTPS is the HTTP protocol using Secure Sockets Layer (SSL), and it is useful when exchanging confidential or personal data, or when you want users to confirm the identity of the server before transmitting personal information. If you require information to be transferred between the server and a client over an encrypted channel, you must use an IIS tool, such as IIS Manager, to configure the site with an HTTPS binding and to associate the website binding with a server certificate; this is required before you can successfully open the website in a web browser. For more information about server certificates, see [Configuring Server Certificates in IIS 7](https://go.microsoft.com/fwlink/?LinkId=163220) on [!INCLUDE[msCoName](../includes/msconame-md.md)] TechNet.|  
+|**Protocol**|Displays **http**. Use hypertext transfer protocol (HTTP) when you do not require client and server communication to take place over an encrypted channel.<br /><br /> **Note**: You cannot create an HTTPS site in [!INCLUDE[ssMDScfgmgr](../includes/ssmdscfgmgr-md.md)]. HTTPS is the HTTP protocol using Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL), and it is useful when exchanging confidential or personal data, or when you want users to confirm the identity of the server before transmitting personal information. If you require information to be transferred between the server and a client over an encrypted channel, you must use an IIS tool, such as IIS Manager, to configure the site with an HTTPS binding and to associate the website binding with a server certificate; this is required before you can successfully open the website in a web browser. For more information about server certificates, see [Configuring Server Certificates in IIS 7](https://go.microsoft.com/fwlink/?LinkId=163220) on [!INCLUDE[msCoName](../includes/msconame-md.md)] TechNet.|  
 |**IP address**|Select an IP address that users can use to access the site. By default, **All Unassigned** is selected. Unless you have a reason to use a specific IPv4 or IPv6 address, use the default value.<br /><br /> With **All Unassigned**, this site responds to requests for all IP addresses on the port and optional host name that you specify. If another site on the server has a binding on the same port but with a specific IP address, that site receives HTTP requests to that port and specific IP address, and the site with the **All Unassigned** IP address receives all other HTTP requests to that port and the other IP addresses.|  
 |**Port**|Type the port for requests made to this website. If you select the HTTP protocol, the default port is 80. If you specify a port different from the default ports, clients must specify the port number in order to connect to the website.<br /><br /> **Note**: The **Default Website** in IIS is configured to use the HTTP protocol on port 80 with all unassigned IP addresses. If you attempt to create the website in [!INCLUDE[ssMDScfgmgr](../includes/ssmdscfgmgr-md.md)] with the default binding information, you receive an error that a duplicate binding exists. You must either change the binding information for the site in [!INCLUDE[ssMDScfgmgr](../includes/ssmdscfgmgr-md.md)], or change the binding information for the Default Website by using an IIS tool, such as IIS Manager. Alternately, you can specify a host header to enable IIS to uniquely identify the website. Make sure that you configure your firewall to accept traffic over the port you specify.|  
 |**Host header**|Optional value. Type a host header name. Use this when you want to assign a host name, also known as a domain name, to a computer that uses a single IP address or port. When you specify a host name, clients must use that name instead of the IP address to access the website. When you configure a host name, you cannot open the site in a web browser until your DNS server has an entry for that host name.<br /><br /> For example, if you want users to access your site at `https://www.contoso.com/`, you must specify www.contoso.com as the host name and the DNS server must have an entry for it.<br /><br /> If your website is available on an intranet, you do not have to specify a host name if users type the server name in a browser, for example, `https://server_name`. However, if the DNS server in your environment is configured to store other names for this web server, you can create a separate binding for each host name so that users can use the other names stored by the DNS server. If you must configure more than one host name for your site, use an IIS tool, such as IIS Manager to add additional site bindings.|  

docs/master-data-services/develop/create-master-data-manager-web-service-proxy-classes.md

@@ -26,7 +26,7 @@ ms.author: lle
 2.  Find the **mdsWsHttpBehavior** section under **\<serviceBehaviors>**. For the **\<serviceMetadata>** element, set **httpGetEnabled** to **true**.  
 
     > [!NOTE]  
-    >  If you want to enable Web services over Secure Sockets Layer (SSL), set **httpsGetEnabled** to **true** in the **mdsWsHttpBehavior** section of the web.config file. You also need to change **mdsWsHTTPBinding** so that it is configured for SSL, as well, and comment out the non-SSL section.  
+    >  If you want to enable Web services over Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL), set **httpsGetEnabled** to **true** in the **mdsWsHttpBehavior** section of the web.config file. You also need to change **mdsWsHTTPBinding** so that it is configured for TLS, as well, and comment out the non-TLS section.  
   
 3.  Save changes to the file.  
 

docs/master-data-services/install-windows/create-a-master-data-manager-web-application-master-data-services.md

@@ -72,7 +72,7 @@ ms.author: lle
 
 -   Associate the web application with a [!INCLUDE[ssMDSshort](../../includes/ssmdsshort-md.md)] database. For more information, see [Associate a Master Data Services Database and Web Application](../../master-data-services/install-windows/associate-a-master-data-services-database-and-web-application.md).  
 
--   Optionally, configure the website that hosts the [!INCLUDE[ssMDSmdm](../../includes/ssmdsmdm-md.md)] web application to use an HTTPS binding if you want to encrypt content by using Secure Sockets Layer (SSL). You must use an Internet Information Services (IIS) tool, such as IIS Manager, to configure the server certificate for the web server, and to configure an HTTPS binding and the SSL settings for the site. For more information, see [Secure a Master Data Manager Web Application](../../master-data-services/install-windows/secure-a-master-data-manager-web-application.md).  
+-   Optionally, configure the website that hosts the [!INCLUDE[ssMDSmdm](../../includes/ssmdsmdm-md.md)] web application to use an HTTPS binding if you want to encrypt content by using Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL). You must use an Internet Information Services (IIS) tool, such as IIS Manager, to configure the server certificate for the web server, and to configure an HTTPS binding and the TLS settings for the site. For more information, see [Secure a Master Data Manager Web Application](../../master-data-services/install-windows/secure-a-master-data-manager-web-application.md).  
 
 ## See Also  
  [Install Master Data Services](../../master-data-services/install-windows/install-master-data-services.md)  

docs/master-data-services/install-windows/secure-a-master-data-manager-web-application.md

@@ -38,7 +38,7 @@ ms.author: lle
 
 5.  From the list, select **https**.  
 
-6.  Select the SSL certificate.  
+6.  Select the TLS/SSL certificate.  
 
 7.  Click **OK**.