diff options
| author | Jason Blais <jason@spinpunch.com> | 2016-08-17 11:16:53 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-08-17 11:16:53 -0400 |
| commit | dba2deabb06aa5092bc634687294fa5c8cecd8bd (patch) | |
| tree | d48f19b30a87b1e7320c9b8565eb3484d5ce2a6f /webapp | |
| parent | 4ef5c1bfb335e41e06e6fb0f0d9d99838ea064e6 (diff) | |
| download | chat-dba2deabb06aa5092bc634687294fa5c8cecd8bd.tar.gz chat-dba2deabb06aa5092bc634687294fa5c8cecd8bd.tar.bz2 chat-dba2deabb06aa5092bc634687294fa5c8cecd8bd.zip | |
Fix typo in admin.service.siteURLDescription (#3818)
* Fix typo in admin.service.siteURLDescription
* Update configuration_settings.jsx
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/configuration_settings.jsx | 2 | ||||
| -rw-r--r-- | 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 1207f1f79..b41aa4397 100644 --- a/webapp/components/admin_console/configuration_settings.jsx +++ b/webapp/components/admin_console/configuration_settings.jsx @@ -69,7 +69,7 @@ export default class ConfigurationSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.service.siteURLDescription' - defaultMessage='The URL, including post number and protocol, that users will use to access Mattermost. Leave blank to automatically configure based on incoming traffic.' + defaultMessage='The URL, including port number and protocol, that users will use to access Mattermost. Leave blank to automatically configure based on incoming traffic.' /> } value={this.state.siteURL} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index ae8a2d260..47b2288e3 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -653,7 +653,7 @@ "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.", "admin.service.sessionDaysEx": "Ex \"30\"", "admin.service.siteURL": "Site URL:", - "admin.service.siteURLDescription": "The URL, including post number and protocol, that users will use to access Mattermost. Leave blank to automatically configure based on incoming traffic.", + "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. Leave blank to automatically configure based on incoming traffic.", "admin.service.siteURLExample": "Ex \"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.", |