From 8bfdbf0aa6d50d7d7ecf15a1be6ffaf928696f08 Mon Sep 17 00:00:00 2001
From: R Tucker <github@ryantucker.us>
Date: Sun, 9 Apr 2017 12:34:29 -0400
Subject: [PATCH] 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)
---
 config/settings.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config/settings.yml b/config/settings.yml
index ffcc1eaa74..038a84c55b 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: ''