summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--model/config.go2
-rw-r--r--webapp/components/admin_console/legal_and_support_settings.jsx2
-rw-r--r--webapp/i18n/en.json2
3 files changed, 3 insertions, 3 deletions
diff --git a/model/config.go b/model/config.go
index 79e01dbdd..85b71cb2a 100644
--- a/model/config.go
+++ b/model/config.go
@@ -499,7 +499,7 @@ func (o *Config) SetDefaults() {
if o.SupportSettings.TermsOfServiceLink == nil {
o.SupportSettings.TermsOfServiceLink = new(string)
- *o.SupportSettings.TermsOfServiceLink = ""
+ *o.SupportSettings.TermsOfServiceLink = "https://about.mattermost.com/default-terms/"
}
if !IsSafeLink(o.SupportSettings.PrivacyPolicyLink) {
diff --git a/webapp/components/admin_console/legal_and_support_settings.jsx b/webapp/components/admin_console/legal_and_support_settings.jsx
index 4eab71c64..3108dd60b 100644
--- a/webapp/components/admin_console/legal_and_support_settings.jsx
+++ b/webapp/components/admin_console/legal_and_support_settings.jsx
@@ -64,7 +64,7 @@ export default class LegalAndSupportSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.support.termsDesc'
- defaultMessage='Link to Terms of Service available to users on desktop and on mobile. Leaving this blank will hide the option to display a notice.'
+ defaultMessage='Link to the terms under which users may use your online service. By default, this includes the "Mattermost Conditions of Use (End Users)" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.'
/>
}
value={this.state.termsOfServiceLink}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index f0c16bef7..a3f5d55f9 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -681,7 +681,7 @@
"admin.support.privacyTitle": "Privacy Policy link:",
"admin.support.problemDesc": "Link to help documentation from team site main menu. By default this points to the peer-to-peer troubleshooting forum where users can search for, find and request help with technical issues.",
"admin.support.problemTitle": "Report a Problem link:",
- "admin.support.termsDesc": "Link to Terms of Service available to users on desktop and on mobile. Leaving this blank will hide the option to display a notice.",
+ "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
"admin.support.termsTitle": "Terms of Service link:",
"admin.system_analytics.activeUsers": "Active Users With Posts",
"admin.system_analytics.title": "the System",