From 621880569565fe0d6c015dc1a5f514bc92dac395 Mon Sep 17 00:00:00 2001
From: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
Date: Tue, 3 Jan 2017 23:15:34 +0100
Subject: Add port 587 (used for STARTTLS) as an example SMTP port (#4893)

---
 webapp/components/admin_console/email_settings.jsx | 2 +-
 webapp/i18n/en.json                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx
index bd9a530ba..9dc02857b 100644
--- a/webapp/components/admin_console/email_settings.jsx
+++ b/webapp/components/admin_console/email_settings.jsx
@@ -255,7 +255,7 @@ export default class EmailSettings extends AdminSettings {
                             defaultMessage='SMTP Server Port:'
                         />
                     }
-                    placeholder={Utils.localizeMessage('admin.email.smtpPortExample', 'Ex: "25", "465"')}
+                    placeholder={Utils.localizeMessage('admin.email.smtpPortExample', 'Ex: "25", "465", "587"')}
                     helpText={
                         <FormattedMessage
                             id='admin.email.smtpPortDescription'
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 55727c115..def5b117d 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -281,7 +281,7 @@
   "admin.email.smtpPasswordExample": "Ex: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP Server Password:",
   "admin.email.smtpPortDescription": "Port of SMTP email server.",
-  "admin.email.smtpPortExample": "Ex: \"25\", \"465\"",
+  "admin.email.smtpPortExample": "Ex: \"25\", \"465\", \"587\"",
   "admin.email.smtpPortTitle": "SMTP Server Port:",
   "admin.email.smtpServerDescription": "Location of SMTP email server.",
   "admin.email.smtpServerExample": "Ex: \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
-- 
cgit v1.2.3-1-g7c22