diff options
| author | Jeff Schering <jeffschering@gmail.com> | 2017-06-06 13:37:40 -0700 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-06-06 16:37:39 -0400 |
| commit | 02f09b8af90f1df38762b5257291b31597575dbb (patch) | |
| tree | 32d69d0a7a6135a51294255cbf5ccc74a1d4fa9f /webapp | |
| parent | fb55d9cc7d8f157aabece5ca43bacede5616523c (diff) | |
| download | chat-02f09b8af90f1df38762b5257291b31597575dbb.tar.gz chat-02f09b8af90f1df38762b5257291b31597575dbb.tar.bz2 chat-02f09b8af90f1df38762b5257291b31597575dbb.zip | |
Updating Site URL help text in System Console (#6582)
* Updating Site URL help text in System Console
* Replacing single quotes with double quotes
* Corrected statement about non-standard ports
* Converted double quotes to single quotes
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/configuration_settings.jsx | 2 | ||||
| -rwxr-xr-x | webapp/i18n/en.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/configuration_settings.jsx b/webapp/components/admin_console/configuration_settings.jsx index 29901ad90..f352bf24f 100644 --- a/webapp/components/admin_console/configuration_settings.jsx +++ b/webapp/components/admin_console/configuration_settings.jsx @@ -105,7 +105,7 @@ export default class ConfigurationSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.service.siteURLDescription' - defaultMessage='The URL, including port number and protocol, that users will use to access Mattermost. This setting is required.' + defaultMessage='The URL that users will use to access Mattermost. Standard ports, such as 80 and 443, can be omitted, but non-standard ports are required. For example: http://mattermost.example.com:8065. This setting is required.' /> } value={this.state.siteURL} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 9a1f6d6c0..ca7101154 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -746,7 +746,7 @@ "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.", "admin.service.sessionDaysEx": "E.g.: \"30\"", "admin.service.siteURL": "Site URL:", - "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This setting is required.", + "admin.service.siteURLDescription": "The URL that users will use to access Mattermost. Standard ports, such as 80 and 443, can be omitted, but non-standard ports are required. For example: http://mattermost.example.com:8065. This setting is required.", "admin.service.siteURLExample": "E.g.: \"https://mattermost.example.com:1234\"", "admin.service.ssoSessionDays": "Session length SSO (days):", "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.", |