diff options
| author | Aditi Mittal <aditi.iitr@gmail.com> | 2013-08-31 12:34:02 +0530 |
|---|---|---|
| committer | Aditi Mittal <aditi.iitr@gmail.com> | 2013-08-31 12:34:02 +0530 |
| commit | a7f02e9514ca9256412d138c9bba89b299431efa (patch) | |
| tree | 351079460e45f2ee50fbdb363473f5708857171c /docs/source | |
| parent | dc56835a79d8b77fd90064711ca745583f38a111 (diff) | |
| parent | 6b61a51e4527379a26b2c5cfd892dd351bce62bb (diff) | |
| download | mediagoblin-a7f02e9514ca9256412d138c9bba89b299431efa.tar.lz mediagoblin-a7f02e9514ca9256412d138c9bba89b299431efa.tar.xz mediagoblin-a7f02e9514ca9256412d138c9bba89b299431efa.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'docs/source')
| -rw-r--r-- | docs/source/api/client_register.rst | 2 | ||||
| -rw-r--r-- | docs/source/index.rst | 1 | ||||
| -rw-r--r-- | docs/source/siteadmin/relnotes.rst | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/source/api/client_register.rst b/docs/source/api/client_register.rst index 4ad7908e..08f92c47 100644 --- a/docs/source/api/client_register.rst +++ b/docs/source/api/client_register.rst @@ -49,7 +49,7 @@ redirect_uri Response -------- -You will get back a response:: +You will get back a response: client_id This identifies a client diff --git a/docs/source/index.rst b/docs/source/index.rst index 777c4d26..e7fda4ad 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -56,7 +56,6 @@ Part 2: Core plugin documentation plugindocs/flatpagesfile plugindocs/sampleplugin - plugindocs/oauth plugindocs/trim_whitespace plugindocs/raven plugindocs/basic_auth diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index 40e84766..e7bf003a 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -141,6 +141,7 @@ please note the following: **New features** + * PDF media type! * Improved plugin system. More flexible, better documented, with a new plugin authoring section of the docs. |