diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-07-31 15:27:22 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-07-31 15:27:22 -0700 |
| commit | 2119ee3b90446264db48f5259d8cce30e397dee3 (patch) | |
| tree | 8d0c231ab2fac0c98b1b7848ce8e0ecda20292c9 /docs/source | |
| parent | 9b60486894e437b90592ec5354f76d7c40ffd6b6 (diff) | |
| parent | 5058cd51000a5ed3093816b6f786aed7126a15ba (diff) | |
| download | mediagoblin-2119ee3b90446264db48f5259d8cce30e397dee3.tar.lz mediagoblin-2119ee3b90446264db48f5259d8cce30e397dee3.tar.xz mediagoblin-2119ee3b90446264db48f5259d8cce30e397dee3.zip | |
Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin into 55
Conflicts:
docs/source/siteadmin/relnotes.rst
Diffstat (limited to 'docs/source')
| -rw-r--r-- | docs/source/plugindocs/raven.rst | 1 | ||||
| -rw-r--r-- | docs/source/siteadmin/relnotes.rst | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docs/source/plugindocs/raven.rst b/docs/source/plugindocs/raven.rst index 71e284d0..ae96f3f8 100644 --- 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 diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index 35415b66..72fcb3d4 100644 --- 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 |