Merge remote-tracking branch 'refs/remotes/merge-requests/47'

docs/source/siteadmin/relnotes.rst

@@ -100,7 +100,19 @@ MongoDB-based MediaGoblin instance to the newer SQL-based system.
 
 **Do this to upgrade**
 
-1. Make sure to run ``bin/gmg dbupdate`` after upgrading.
+    # directory of your mediagoblin install
+    cd /srv/mediagoblin.example.org
+
+    # copy source for this release
+    git fetch
+    git checkout tags/v0.3.2
+
+    # perform any needed database updates
+    bin/gmg dbupdate
+    
+    # restart your servers however you do that, e.g.,
+    sudo service mediagoblin-paster restart
+    sudo service mediagoblin-celeryd restart
 
 
 **New features**

mediagoblin.ini

@@ -20,6 +20,8 @@ email_debug_mode = true
 allow_registration = true
 
 ## Uncomment this to turn on video or enable other media types
+## You may have to install dependencies, and will have to run ./bin/dbupdate
+## See http://docs.mediagoblin.org/siteadmin/media-types.html for details.
 # media_types = mediagoblin.media_types.image, mediagoblin.media_types.video
 
 ## Uncomment this to put some user-overriding templates here