Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin into 55

Conflicts: docs/source/siteadmin/relnotes.rst
2013-07-31 15:27:22 -07:00 · 2013-07-31 15:27:22 -07:00 · 2119ee3b90
commit 2119ee3b90
parent 9b60486894 5058cd5100
3 changed files with 3 additions and 4 deletions
--- a/docs/Makefile
+++ b/docs/Makefile
@ -2,7 +2,7 @@
 #

 # You can set these variables from the command line.
-SPHINXOPTS    =
+SPHINXOPTS    = -W
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build
--- a/docs/source/plugindocs/raven.rst
+++ b/docs/source/plugindocs/raven.rst
@ -1,2 +1 @@
-.. _raven-setup: Set up the raven plugin
 .. include:: ../../../mediagoblin/plugins/raven/README.rst
--- a/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@ -108,8 +108,8 @@ please note the following:

   .. code-block:: ini

-      [plugins]
-      [[mediagoblin.plugins.geolocation]]
+    [plugins]
+    [[mediagoblin.plugins.geolocation]]

 If you have your own theme, you may need to make some adjustments to
 it as some theme related things may have changed in this release.  If