heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	docs/source/siteadmin/relnotes.rst
This commit is contained in:
Rodney Ewing 2013-07-31 15:27:22 -07:00
commit 2119ee3b90
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Makefile
View File

@ -2,7 +2,7 @@
# #
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = SPHINXOPTS = -W
SPHINXBUILD = sphinx-build SPHINXBUILD = sphinx-build
PAPER = PAPER =
BUILDDIR = build BUILDDIR = build

1
docs/source/plugindocs/raven.rst
View File

@ -1,2 +1 @@
.. _raven-setup: Set up the raven plugin
.. include:: ../../../mediagoblin/plugins/raven/README.rst .. include:: ../../../mediagoblin/plugins/raven/README.rst

4
docs/source/siteadmin/relnotes.rst
View File

@ -108,8 +108,8 @@ please note the following:
.. code-block:: ini .. code-block:: ini
[plugins] [plugins]
[[mediagoblin.plugins.geolocation]] [[mediagoblin.plugins.geolocation]]
If you have your own theme, you may need to make some adjustments to 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 it as some theme related things may have changed in this release. If