Removing references to MongoDB in docs/

diff --git a/docs/source/codebase.rst b/docs/source/codebase.rst
index 6de71f07de4d8f1fcc6e525e4ef162a54a88a02d..3ef91290bad39aaacb11087ff91a1e898073b137 100644 (file)
--- a/docs/source/codebase.rst
+++ b/docs/source/codebase.rst
@@ -81,10 +81,6 @@ Software Stack
   * `Celery <http://celeryproject.org/>`_: for task queuing (resizing
     images, encoding video, ...)
 
-  * `MongoKit <http://namlook.github.com/mongokit/>`_: the lightweight
-    ORM for MongoDB we're using which will make it easier to define
-    structures and all that (will be swapped out soon...)
-
   * `Babel <http://babel.edgewall.org>`_: Used to extract and compile
     translations.
 
@@ -148,7 +144,7 @@ Here are some interesting files and what they do:
 
 :routing.py: maps url paths to views
 :views.py:   views handle http requests
-:models.py:  holds the mongodb schemas---these are the data structures
+:models.py:  holds the sqlalchemy schemas---these are the data structures
              we're working with
 
 You'll notice that there are several sub-directories: tests,

diff --git a/docs/source/deploying.rst b/docs/source/deploying.rst
index ed74b44133d411304eeb37ffebde45d433bd610a..bd874150d1e902ba8ce0b3b26c5055d4235a0590 100644 (file)
--- a/docs/source/deploying.rst
+++ b/docs/source/deploying.rst
@@ -111,46 +111,6 @@ where the first ``mediagoblin`` is the database owner and the second
     More on this in :ref:`Drop Privileges for MediaGoblin <drop-privileges-for-mediagoblin>`.
 
 
-Configure MongoDB
-~~~~~~~~~~~~~~~~~
-
-.. warning::
-
-    If this is a fresh setup and you have already set up PostgreSQL, you
-    will not need this step.
-
-First, install MongoDB. On a DEB-based system run::
-
-    sudo apt-get install mongodb
-
-on a RPM-based system, run::
-
-    yum install mongodb-server
-
-After installing MongoDB some preliminary database configuration may
-be necessary.
-
-Ensure that MongoDB `journaling
-<http://www.mongodb.org/display/DOCS/Journaling>`_ is enabled. Journaling
-is enabled by default in version 2.0 and later 64-bit MongoDB instances.
-Check your deployment, and consider enabling journaling if you're running
-32-bit systems or earlier version.
-
-.. warning::
-
-   Running MongoDB without journaling risks general data corruption
-   and raises the possibility of losing data within a 60-second
-   window when the server restarts.
-
-   MediaGoblin recommends enabling MongoDB's journaling feature by
-   adding a ``--journal`` flag to the command line or a "``journal:
-   true``" option to the configuration file.
-
-MongoDB can take a lot of space by default. If you're planning on
-running a smaller instance, consider the `scaling down guide
-<http://wiki.mediagoblin.org/Scaling_Down>`_ for some appropriate
-tradeoffs to conserve space.
-
 .. _drop-privileges-for-mediagoblin:
 
 Drop Privileges for MediaGoblin