Skip to content

Commit 02d1c66

Browse files
authored
Merge pull request #108800 from TimShererWithAquent/us1679050ac
Change SSL to TLS per 1679050
2 parents b3de7c4 + e101c66 commit 02d1c66

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

articles/virtual-machines/linux/tutorial-lamp-stack.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ In this tutorial, you deployed a LAMP server in Azure. You learned how to:
120120
> * Verify installation and configuration
121121
> * Install WordPress on the LAMP server
122122
123-
Advance to the next tutorial to learn how to secure web servers with SSL certificates.
123+
Advance to the next tutorial to learn how to secure web servers with TLS/SSL certificates.
124124

125125
> [!div class="nextstepaction"]
126-
> [Secure web server with SSL](tutorial-secure-web-server.md)
126+
> [Secure web server with TLS](tutorial-secure-web-server.md)
127127
128128
[2]: ./media/tutorial-lamp-stack/phpsuccesspage.png
129129
[3]: ./media/tutorial-lamp-stack/apachesuccesspage.png

articles/virtual-machines/linux/tutorial-lemp-stack.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ In this tutorial, you deployed a LEMP server in Azure. You learned how to:
168168
> * Verify installation and configuration
169169
> * Install WordPress on the LEMP stack
170170
171-
Advance to the next tutorial to learn how to secure web servers with SSL certificates.
171+
Advance to the next tutorial to learn how to secure web servers with TLS/SSL certificates.
172172

173173
> [!div class="nextstepaction"]
174-
> [Secure web server with SSL](tutorial-secure-web-server.md)
174+
> [Secure web server with TLS](tutorial-secure-web-server.md)
175175
176176
[2]: ./media/tutorial-lemp-stack/phpsuccesspage.png
177177
[3]: ./media/tutorial-lemp-stack/nginx.png

articles/virtual-machines/linux/tutorial-mean-stack.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ In this tutorial, you created a web application that keeps track of book records
347347
> * Access the routes with AngularJS
348348
> * Run the application
349349
350-
Advance to the next tutorial to learn how to secure web servers with SSL certificates.
350+
Advance to the next tutorial to learn how to secure web servers with TLS certificates.
351351
352352
> [!div class="nextstepaction"]
353-
> [Secure web server with SSL](tutorial-secure-web-server.md)
353+
> [Secure web server with TLS](tutorial-secure-web-server.md)

articles/virtual-machines/linux/tutorial-secure-web-server.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Tutorial: Secure a Linux web server with SSL certificates in Azure"
2+
title: "Tutorial: Secure a Linux web server with TLS/SSL certificates in Azure"
33
description: In this tutorial, you learn how to use the Azure CLI to secure a Linux virtual machine that runs the NGINX web server with SSL certificates stored in Azure Key Vault.
44
services: virtual-machines-linux
55
documentationcenter: virtual-machines
@@ -17,17 +17,17 @@ ms.date: 04/30/2018
1717
ms.author: cynthn
1818
ms.custom: mvc
1919

20-
#Customer intent: As an IT administrator or developer, I want to learn how to secure a web server with SSL certificates so that I can protect my customer data on web applications that I build and run.
20+
#Customer intent: As an IT administrator or developer, I want to learn how to secure a web server with TLS/SSL certificates so that I can protect my customer data on web applications that I build and run.
2121
---
2222

23-
# Tutorial: Secure a web server on a Linux virtual machine in Azure with SSL certificates stored in Key Vault
24-
To secure web servers, a Secure Sockets Layer (SSL) certificate can be used to encrypt web traffic. These SSL certificates can be stored in Azure Key Vault, and allow secure deployments of certificates to Linux virtual machines (VMs) in Azure. In this tutorial you learn how to:
23+
# Tutorial: Secure a web server on a Linux virtual machine in Azure with TLS/SSL certificates stored in Key Vault
24+
To secure web servers, a Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL), certificate can be used to encrypt web traffic. These TLS/SSL certificates can be stored in Azure Key Vault, and allow secure deployments of certificates to Linux virtual machines (VMs) in Azure. In this tutorial you learn how to:
2525

2626
> [!div class="checklist"]
2727
> * Create an Azure Key Vault
2828
> * Generate or upload a certificate to the Key Vault
2929
> * Create a VM and install the NGINX web server
30-
> * Inject the certificate into the VM and configure NGINX with an SSL binding
30+
> * Inject the certificate into the VM and configure NGINX with a TLS binding
3131
3232
This tutorial uses the CLI within the [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview), which is constantly updated to the latest version. To open the Cloud Shell, select **Try it** from the top of any code block.
3333

@@ -145,13 +145,13 @@ Your secured NGINX site is then displayed as in the following example:
145145

146146
## Next steps
147147

148-
In this tutorial, you secured an NGINX web server with an SSL certificate stored in Azure Key Vault. You learned how to:
148+
In this tutorial, you secured an NGINX web server with a TLS/SSL certificate stored in Azure Key Vault. You learned how to:
149149

150150
> [!div class="checklist"]
151151
> * Create an Azure Key Vault
152152
> * Generate or upload a certificate to the Key Vault
153153
> * Create a VM and install the NGINX web server
154-
> * Inject the certificate into the VM and configure NGINX with an SSL binding
154+
> * Inject the certificate into the VM and configure NGINX with a TLS binding
155155

156156
Follow this link to see pre-built virtual machine script samples.
157157

articles/virtual-machines/windows/tutorial-iis-sql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ In this tutorial, you installed a SQL\IIS\.NET stack using Azure PowerSh
135135
> * Create a VM running SQL Server
136136
> * Install the SQL Server extension
137137
138-
Advance to the next tutorial to learn how to secure IIS web server with SSL certificates.
138+
Advance to the next tutorial to learn how to secure IIS web server with TLS/SSL certificates.
139139

140140
> [!div class="nextstepaction"]
141-
> [Secure IIS web server with SSL certificates](tutorial-secure-web-server.md)
141+
> [Secure IIS web server with TLS/SSL certificates](tutorial-secure-web-server.md)
142142

articles/virtual-machines/windows/tutorial-secure-web-server.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: "Tutorial: Secure a Windows web server with SSL certificates in Azure"
3-
description: In this tutorial, you learn how to use Azure PowerShell to secure a Windows virtual machine that runs the IIS web server with SSL certificates stored in Azure Key Vault.
2+
title: "Tutorial: Secure a Windows web server with TLS/SSL certificates in Azure"
3+
description: In this tutorial, you learn how to use Azure PowerShell to secure a Windows virtual machine that runs the IIS web server with TLS/SSL certificates stored in Azure Key Vault.
44
services: virtual-machines-windows
55
documentationcenter: virtual-machines
66
author: cynthn
@@ -17,21 +17,21 @@ ms.date: 02/09/2018
1717
ms.author: cynthn
1818
ms.custom: mvc
1919

20-
#Customer intent: As an IT administrator or developer, I want to learn how to secure a web server with SSL certificates so that I can protect my customer data on web applications that I build and run.
20+
#Customer intent: As an IT administrator or developer, I want to learn how to secure a web server with TLS/SSL certificates so that I can protect my customer data on web applications that I build and run.
2121
---
2222

23-
# Tutorial: Secure a web server on a Windows virtual machine in Azure with SSL certificates stored in Key Vault
23+
# Tutorial: Secure a web server on a Windows virtual machine in Azure with TLS/SSL certificates stored in Key Vault
2424

2525
> [!NOTE]
2626
> Currently this doc only works for Generalized images. If attempting this tutorial using a Specialized disk you will receive an error.
2727
28-
To secure web servers, a Secure Sockets Layer (SSL) certificate can be used to encrypt web traffic. These SSL certificates can be stored in Azure Key Vault, and allow secure deployments of certificates to Windows virtual machines (VMs) in Azure. In this tutorial you learn how to:
28+
To secure web servers, a Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL), certificate can be used to encrypt web traffic. These TLS/SSL certificates can be stored in Azure Key Vault, and allow secure deployments of certificates to Windows virtual machines (VMs) in Azure. In this tutorial you learn how to:
2929

3030
> [!div class="checklist"]
3131
> * Create an Azure Key Vault
3232
> * Generate or upload a certificate to the Key Vault
3333
> * Create a VM and install the IIS web server
34-
> * Inject the certificate into the VM and configure IIS with an SSL binding
34+
> * Inject the certificate into the VM and configure IIS with a TLS binding
3535
3636

3737
## Launch Azure Cloud Shell
@@ -170,13 +170,13 @@ Your secured IIS website is then displayed as in the following example:
170170

171171

172172
## Next steps
173-
In this tutorial, you secured an IIS web server with an SSL certificate stored in Azure Key Vault. You learned how to:
173+
In this tutorial, you secured an IIS web server with a TLS/SSL certificate stored in Azure Key Vault. You learned how to:
174174

175175
> [!div class="checklist"]
176176
> * Create an Azure Key Vault
177177
> * Generate or upload a certificate to the Key Vault
178178
> * Create a VM and install the IIS web server
179-
> * Inject the certificate into the VM and configure IIS with an SSL binding
179+
> * Inject the certificate into the VM and configure IIS with a TLS binding
180180
181181
Follow this link to see pre-built virtual machine script samples.
182182

0 commit comments

Comments
 (0)