From 7f3e4cf8b36abb77ae7ce12e9539b4253f39240c Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Sat, 8 Dec 2018 21:01:00 +0100
Subject: [PATCH] help: Make clearer that SSL is dead and TLS is its successor

UI was changed in https://bugzilla.gnome.org/show_bug.cgi?id=761506
---
 help/C/mail-receiving-options-exchange-mapi.page | 2 +-
 help/C/mail-receiving-options-imap-plus.page     | 2 +-
 help/C/mail-receiving-options-pop.page           | 2 +-
 help/C/mail-receiving-options-usenet-news.page   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/help/C/mail-receiving-options-exchange-mapi.page b/help/C/mail-receiving-options-exchange-mapi.page
index bc74e2fcf5..f43dd852af 100644
--- a/help/C/mail-receiving-options-exchange-mapi.page
+++ b/help/C/mail-receiving-options-exchange-mapi.page
@@ -29,7 +29,7 @@
 <item><p>Enter the Domain name for that server.</p>
 <note style="tip"><p>If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
 <item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have <app>Evolution</app> check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
-<item><p>Select if you want to use a secure connection (SSL or TLS).</p></item>
+<item><p>Select if you want to use a secure connection (TLS or its deprecated predecessor SSL).</p></item>
 <item><p>Click <gui style="button">Authenticate</gui> and enter your password.</p></item>
 </list>
 
diff --git a/help/C/mail-receiving-options-imap-plus.page b/help/C/mail-receiving-options-imap-plus.page
index 7526ddff38..b79bd02e49 100644
--- a/help/C/mail-receiving-options-imap-plus.page
+++ b/help/C/mail-receiving-options-imap-plus.page
@@ -29,7 +29,7 @@
 
 <list>
 <item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
-<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
+<item><p>Select if you want to use a secure connection (TLS or its deprecated predecessor SSL).</p><p>You should enable this option if your server supports it.</p>
 <note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
 <item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have <app>Evolution</app> check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
 <item><p>Select if you want <app>Evolution</app> to remember your password.</p></item>
diff --git a/help/C/mail-receiving-options-pop.page b/help/C/mail-receiving-options-pop.page
index 2580a22cc1..421e48af96 100644
--- a/help/C/mail-receiving-options-pop.page
+++ b/help/C/mail-receiving-options-pop.page
@@ -33,7 +33,7 @@
 
 <list>
 <item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
-<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
+<item><p>Select if you want to use a secure connection (TLS or its deprecated predecessor SSL).</p><p>You should enable this option if your server supports it.</p>
 <note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
 <item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have <app>Evolution</app> check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
 <item><p>Select if you want <app>Evolution</app> to remember your password.</p></item>
diff --git a/help/C/mail-receiving-options-usenet-news.page b/help/C/mail-receiving-options-usenet-news.page
index ce97b5ac49..2b43ddf1e9 100644
--- a/help/C/mail-receiving-options-usenet-news.page
+++ b/help/C/mail-receiving-options-usenet-news.page
@@ -29,7 +29,7 @@
 
 <list>
 <item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
-<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
+<item><p>Select if you want to use a secure connection (TLS or its deprecated predecessor SSL).</p><p>You should enable this option if your server supports it.</p>
 <note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
 <item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have <app>Evolution</app> check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
 <item><p>Select if you want <app>Evolution</app> to remember your password.</p></item>