remove mentions of mediagoblin_local.ini

diff --git a/docs/source/siteadmin/configuration.rst b/docs/source/siteadmin/configuration.rst
index 6b8cd225bc8f924552bdeeffb3d12581b02fb5ac..1b8dc9bb3be4b2d16ebf59f65265958f2fe2ff51 100644 (file)
--- a/docs/source/siteadmin/configuration.rst
+++ b/docs/source/siteadmin/configuration.rst
@@ -54,30 +54,6 @@ mediagoblin/config_spec.ini
   option that we didn't tell you about. :)
 
 
-Making local copies
-===================
-
-Let's assume you're doing the virtualenv setup described elsewhere in this
-manual, and you need to make local tweaks to the config files. How do you do 
-that? Let's see.
-
-To make changes to mediagoblin.ini ::
-
-    cp mediagoblin.ini mediagoblin_local.ini
-
-To make changes to paste.ini ::
-
-    cp paste.ini paste_local.ini
-
-From here you should be able to make direct adjustments to the files,
-and most of the commands described elsewhere in this manual will "notice"
-your local config files and use those instead of the non-local version.
-
-.. note::
-
-   Note that all commands provide a way to pass in a specific config
-   file also, usually by a ``-cf`` flag.
-
 
 Common changes
 ==============

diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index ac74a7f4a09d82fe91d22cc7866ff25a77945808..caccda919ff626fe92801a94bd88f0c2293083cb 100644 (file)
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -323,7 +323,7 @@ make a copy of ``paste.ini`` for editing so the original
 config files aren't lost (you likely won't need to edit the paste configuration,
 but we'll make a local copy of it just in case)::
 
-    $ cp -av mediagoblin.ini mediagoblin_local.ini && cp -av paste.ini paste_local.ini
+    $ cp -av paste.ini paste_local.ini
 
 ``mediagoblin.ini`` does not need to be copied, because original config is
 stored in ``mediagoblin.example.ini``.
@@ -340,7 +340,7 @@ Configure MediaGoblin to use the PostgreSQL database
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you are using PostgreSQL, edit the ``[mediagoblin]`` section in your
-``mediagoblin_local.ini`` and put in::
+``mediagoblin.ini`` and put in::
 
     sql_engine = postgresql:///mediagoblin
 

diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst
index 146e1aaeb7c749e659f3360dd066540f9c454beb..8f9239be7b8655cdd35c3fb247d93e76bfdc73eb 100644 (file)
--- a/docs/source/siteadmin/media-types.rst
+++ b/docs/source/siteadmin/media-types.rst
@@ -30,17 +30,14 @@ Enabling Media Types
 .. note::
     Media types are now plugins
 
-Media types are enabled in your MediaGoblin configuration file, typically it is
-created by copying ``mediagoblin.ini`` to ``mediagoblin_local.ini`` and then
-applying your changes to ``mediagoblin_local.ini``. If you don't already have a
-``mediagoblin_local.ini``, create one in the way described.
+Media types are enabled in your MediaGoblin configuration file.
 
 Most media types have additional dependencies that you will have to install.
 You will find descriptions on how to satisfy the requirements of each media type
 on this page.
 
 To enable a media type, add the the media type under the ``[plugins]`` section
-in you ``mediagoblin_local.ini``. For example, if your system supported image
+in you ``mediagoblin.ini``. For example, if your system supported image
 and video media types, then it would look like this::
 
     [plugins]
@@ -99,7 +96,7 @@ good/bad/ugly).  On Debianoid systems
 
 
 Add ``[[mediagoblin.media_types.video]]`` under the ``[plugins]`` section in
-your ``mediagoblin_local.ini`` and restart MediaGoblin.
+your ``mediagoblin.ini`` and restart MediaGoblin.
 
 Run
 
@@ -139,7 +136,7 @@ Then install ``scikits.audiolab`` for the spectrograms::
     ./bin/pip install scikits.audiolab
 
 Add ``[[mediagoblin.media_types.audio]]`` under the ``[plugins]`` section in your
-``mediagoblin_local.ini`` and restart MediaGoblin.
+``mediagoblin.ini`` and restart MediaGoblin.
 
 Run
 
@@ -160,7 +157,7 @@ To enable raw image you need to install pyexiv2.  On Debianoid systems
     sudo apt-get install python-pyexiv2
 
 Add ``[[mediagoblin.media_types.raw_image]]`` under the ``[plugins]``
-section in your ``mediagoblin_local.ini`` and restart MediaGoblin.
+section in your ``mediagoblin.ini`` and restart MediaGoblin.
 
 Run
 
@@ -184,8 +181,7 @@ library, which is necessary for creating thumbnails of ASCII art
     ./bin/easy_install chardet
 
 
-Next, modify (and possibly copy over from ``mediagoblin.ini``) your
-``mediagoblin_local.ini``.  In the ``[plugins]`` section, add
+Next, modify your ``mediagoblin.ini``.  In the ``[plugins]`` section, add
 ``[[mediagoblin.media_types.ascii]]``.
 
 Run
@@ -207,7 +203,7 @@ It may work on some earlier versions, but that is not guaranteed (and
 is surely not to work prior to Blender 2.5X).
 
 Add ``[[mediagoblin.media_types.stl]]`` under the ``[plugins]`` section in your
-``mediagoblin_local.ini`` and restart MediaGoblin.
+``mediagoblin.ini`` and restart MediaGoblin.
 
 Run
 
@@ -256,7 +252,7 @@ This feature has been tested on Fedora with:
 It may work on some earlier versions, but that is not guaranteed.
 
 Add ``[[mediagoblin.media_types.pdf]]`` under the ``[plugins]`` section in your
-``mediagoblin_local.ini`` and restart MediaGoblin.
+``mediagoblin.ini`` and restart MediaGoblin.
 
 Run
 

diff --git a/docs/source/siteadmin/production-deployments.rst b/docs/source/siteadmin/production-deployments.rst
index ee9155732c4888335da629dc623573143c925b4e..3d11f02264fc5e1cc1d7448efcd46b2f29130f6d 100644 (file)
--- a/docs/source/siteadmin/production-deployments.rst
+++ b/docs/source/siteadmin/production-deployments.rst
@@ -76,7 +76,7 @@ modify it to suit your environment's setup:
     ExecStartPre=/bin/mkdir -p /run/mediagoblin
     ExecStartPre=/bin/chown -hR mediagoblin:mediagoblin /run/mediagoblin
     # Celery process will run as the `mediagoblin` user after start.
-    Environment=MEDIAGOBLIN_CONFIG=/srv/mediagoblin.example.org/mediagoblin/mediagoblin_local.ini \
+    Environment=MEDIAGOBLIN_CONFIG=/srv/mediagoblin.example.org/mediagoblin/mediagoblin.ini \
                 CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery
     ExecStart=/srv/mediagoblin.example.org/mediagoblin/bin/celery worker \
                   --logfile=/var/log/mediagoblin/celery.log \

diff --git a/docs/source/siteadmin/theming.rst b/docs/source/siteadmin/theming.rst
index 9c01a5b3afa462142d6b76f0a4b3c87570e91ce0..24f23235ae27a506473db373ab5874ad044f4887 100644 (file)
--- a/docs/source/siteadmin/theming.rst
+++ b/docs/source/siteadmin/theming.rst
@@ -43,7 +43,7 @@ want to install this theme!  Don't worry, it's fairly painless.
 3. ``tar -xzvf <tar-archive>``
 
 4. Open your configuration file (probably named
-   ``mediagoblin_local.ini``) and set the theme name::
+   ``mediagoblin.ini``) and set the theme name::
 
        [mediagoblin]
        # ...