From b91d9150f50b246f609afacfbde6aa255035f5d2 Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Wed, 30 Dec 2015 12:10:20 -0700
Subject: Update team_general_tab.jsx

help text for invite code in team settings
---
 web/react/components/team_general_tab.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/team_general_tab.jsx b/web/react/components/team_general_tab.jsx
index dc615f2e8..cc06a940e 100644
--- a/web/react/components/team_general_tab.jsx
+++ b/web/react/components/team_general_tab.jsx
@@ -424,7 +424,7 @@ export default class GeneralTab extends React.Component {
                             </div>
                         </div>
                     </div>
-                    <div className='setting-list__hint'>{'Your Invite Code is used in the URL sent to people to join your team. Regenerating your Invite Code will invalidate the URLs in previous invitations, unless "Allow anyone to sign-up from login page" is enabled.'}</div>
+                    <div className='setting-list__hint'>{'The Invite Code is used as part of the URL in the team invitation link created by **Get Team Invite Link** in the main menu. Regenerating creates a new team invitation link and invalidates the previous link.'}</div>
                 </div>
             );
 
-- 
cgit v1.2.3-1-g7c22


From 35c33d43fe18e69d298e40949aacd14be1533439 Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Wed, 30 Dec 2015 12:12:48 -0700
Subject: Update team_settings.jsx

help text for restrict domains
---
 web/react/components/admin_console/team_settings.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/admin_console/team_settings.jsx b/web/react/components/admin_console/team_settings.jsx
index 7991b9a01..9d958ce91 100644
--- a/web/react/components/admin_console/team_settings.jsx
+++ b/web/react/components/admin_console/team_settings.jsx
@@ -206,7 +206,7 @@ export default class TeamSettings extends React.Component {
                                 defaultValue={this.props.config.TeamSettings.RestrictCreationToDomains}
                                 onChange={this.handleChange}
                             />
-                            <p className='help-text'>{'Teams can only be created from a specific domain (e.g. "mattermost.org") or list of comma-separated domains (e.g. "corp.mattermost.com, mattermost.org").'}</p>
+                            <p className='help-text'>{'Teams and user accounts can only be created from a specific domain (e.g. "mattermost.org") or list of comma-separated domains (e.g. "corp.mattermost.com, mattermost.org").'}</p>
                         </div>
                     </div>
 
-- 
cgit v1.2.3-1-g7c22