about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorR Tucker <github@ryantucker.us>2017-04-09 12:34:29 -0400
committerEugen <eugen@zeonfederated.com>2017-04-09 18:34:29 +0200
commit8bfdbf0aa6d50d7d7ecf15a1be6ffaf928696f08 (patch)
tree5006d744617480fff359aa21ebc7e7b3ac4fc9b2 /config
parentd4fe6cd2bfee50cfcde5de5c3f58240552e9c71d (diff)
Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289)
* Put a useful message for new admins on /about/more

I totally failed to realize this file was just defaults.  I think
this message would be a good default for people like me.

* Revert default site description, expand comment

This will keep setup-related stuff from leaking into public views,
while still hopefully keeping over-eager admins from editing this
file unnecessarily before RTFMing.  (e.g., me)
Diffstat (limited to 'config')
-rw-r--r--config/settings.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/settings.yml b/config/settings.yml
index ffcc1eaa7..038a84c55 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,4 +1,11 @@
 # config/app.yml for rails-settings-cached
+#
+# This file contains default values, and does not need to be edited
+# when configuring an instance.  These settings may be changed by an
+# Administrator using the Web UI.
+#
+# For more information, see docs/Running-Mastodon/Administration-guide.md
+#
 defaults: &defaults
   site_title: 'Mastodon'
   site_description: ''