From bfc3012e6a059dc89b69b41ab3fe1fc43f1406f5 Mon Sep 17 00:00:00 2001
From: it33 <it33@users.noreply.github.com>
Date: Sat, 9 Jan 2016 21:39:19 -0800
Subject: Documenting how Preview Mode turns off

---
 web/react/components/admin_console/email_settings.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index 91d73dccd..48727e616 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -254,7 +254,7 @@ export default class EmailSettings extends React.Component {
                                 />
                                     {'false'}
                             </label>
-                            <p className='help-text'>{'Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.'}</p>
+                            <p className='help-text'>{'Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.\nSetting this to true removes the Preview Mode banner after logging out and logging back in.'}</p>
                         </div>
                     </div>
 
-- 
cgit v1.2.3-1-g7c22


From 0b1212f4745857a73a04ec6315a2d92d731f50d4 Mon Sep 17 00:00:00 2001
From: it33 <it33@users.noreply.github.com>
Date: Sat, 9 Jan 2016 21:42:18 -0800
Subject: Update Configuration-Settings.md

---
 doc/install/Configuration-Settings.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md
index 962be0eb7..31d4551f6 100644
--- a/doc/install/Configuration-Settings.md
+++ b/doc/install/Configuration-Settings.md
@@ -123,11 +123,13 @@ Settings to configure email signup, notifications, security, and SMTP options.
 #### Notifications
 
 ```"SendEmailNotifications": false```  
-"true": Enables sending of email notifications. “false”: Disables email notifications for developers who may want to skip email setup for faster development.
+"true": Enables sending of email notifications. “false”: Disables email notifications for developers who may want to skip email setup for faster development. Setting this to true removes the **Preview Mode: Email notifications have not been configured** banner (requires logging out and logging back in after setting is changed)
+
 
 ```"RequireEmailVerification": false```  
 "true": Require email verification after account creation prior to allowing login; “false”: Users do not need to verify their email address prior to login. Developers may set this field to false so skip sending verification emails for faster development.
 
+
 ```"FeedbackName": ""```  
 Name displayed on email account used when sending notification emails from Mattermost system.
 
-- 
cgit v1.2.3-1-g7c22


From bf1f0d03191165b5735e1a4f5850971b507ec513 Mon Sep 17 00:00:00 2001
From: it33 <it33@users.noreply.github.com>
Date: Sat, 9 Jan 2016 21:43:42 -0800
Subject: Update email_settings.jsx

---
 web/react/components/admin_console/email_settings.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index 48727e616..6aec3c7b1 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -254,7 +254,7 @@ export default class EmailSettings extends React.Component {
                                 />
                                     {'false'}
                             </label>
-                            <p className='help-text'>{'Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.\nSetting this to true removes the Preview Mode banner after logging out and logging back in.'}</p>
+                            <p className='help-text'>{'Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.\nSetting this to true removes the Preview Mode banner (requires logging out and logging back in after setting is changed).'}</p>
                         </div>
                     </div>
 
-- 
cgit v1.2.3-1-g7c22