From 85ad561e1cd41252a41c542da6f2e5802d8870c6 Mon Sep 17 00:00:00 2001
From: dpg <doubleplusgood23@gmail.com>
Date: Thu, 25 Jan 2018 21:52:37 -0500
Subject: [PATCH] Slight changes. The mediagoblin_local.ini instruction seems
 to only exist on the currently hosted docs?

---
 mediagoblin.example.ini               | 2 +-
 mediagoblin/plugins/piwigo/README.rst | 2 +-
 paste.ini                             | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mediagoblin.example.ini b/mediagoblin.example.ini
index 7b528359..7eb72bde 100644
--- a/mediagoblin.example.ini
+++ b/mediagoblin.example.ini
@@ -1,5 +1,5 @@
 # If you want to make changes to this file, first copy it to
-# mediagoblin_local.ini, then make the changes there.
+# mediagoblin.ini, then make the changes there.
 #
 # If you don't see what you need here, have a look at mediagoblin/config_spec.ini
 # It defines types and defaults so it's a good place to look for documentation
diff --git a/mediagoblin/plugins/piwigo/README.rst b/mediagoblin/plugins/piwigo/README.rst
index 0c71ffbc..2d816662 100644
--- a/mediagoblin/plugins/piwigo/README.rst
+++ b/mediagoblin/plugins/piwigo/README.rst
@@ -12,7 +12,7 @@
    It might even go away without any notice.
 
 Okay, so if you still want to test this plugin,
-add the following to your mediagoblin_local.ini:
+add the following to your mediagoblin.ini:
 
 .. code-block:: ini
 
diff --git a/paste.ini b/paste.ini
index ce3f01e8..f387d4fc 100644
--- a/paste.ini
+++ b/paste.ini
@@ -11,6 +11,7 @@ pipeline = mediagoblin
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
+# use of mediagoblin.ini now prefered
 config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
 # static paths
 /mgoblin_media = %(here)s/user_dev/media/public
-- 
2.14.1

