From d0d7767366326ba34da78bb077ef23b1e7ada765 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 24 Oct 2016 11:34:30 +0200
Subject: [PATCH] Fix misleading SSL/TLS SMTP email configuration

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 settings/templates/admin/additional-mail.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/templates/admin/additional-mail.php b/settings/templates/admin/additional-mail.php
index 88eec421ec5..23723a423c0 100644
--- a/settings/templates/admin/additional-mail.php
+++ b/settings/templates/admin/additional-mail.php
@@ -33,8 +33,8 @@ $mail_smtpauthtype = [
 
 $mail_smtpsecure = [
 	''		=> $l->t('None'),
-	'ssl'	=> $l->t('SSL'),
-	'tls'	=> $l->t('TLS'),
+	'ssl'	=> $l->t('SSL/TLS'),
+	'tls'	=> $l->t('STARTTLS'),
 ];
 
 $mail_smtpmode = [
-- 
GitLab