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

Fix misleading SSL/TLS SMTP email configuration

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 = [