Merge pull request #1872 from nextcloud/ds-26447-misleading-ssl-config

Fix misleading SSL/TLS SMTP email configuration
2016-10-24 13:30:54 +02:00 · 2016-10-24 13:30:54 +02:00 · 24786d5c51
parent f054adb429 d0d7767366
commit 24786d5c51
1 changed files with 2 additions and 2 deletions
--- 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 = [