diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-09-20 07:32:52 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-09-20 07:32:52 -0500 |
| commit | d33a954cad55457b52028f7ac57a59a07297c48a (patch) | |
| tree | 3eadf7ee11518238545fdcbeaba0632efc7a1fc7 /docs | |
| parent | 81008d25a2252e2747a571e35846885dc060d036 (diff) | |
| parent | b1ac6795922bded7e8dbe8dcf769e57b410a4915 (diff) | |
| download | mediagoblin-d33a954cad55457b52028f7ac57a59a07297c48a.tar.lz mediagoblin-d33a954cad55457b52028f7ac57a59a07297c48a.tar.xz mediagoblin-d33a954cad55457b52028f7ac57a59a07297c48a.zip | |
Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap'
Conflicts:
docs/source/index.rst
mediagoblin/templates/mediagoblin/auth/login.html
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/index.rst | 1 | ||||
| -rw-r--r-- | docs/source/plugindocs/ldap.rst | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/docs/source/index.rst b/docs/source/index.rst index e7fda4ad..75a5b66e 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -61,6 +61,7 @@ Part 2: Core plugin documentation plugindocs/basic_auth plugindocs/openid plugindocs/persona + plugindocs/ldap Part 3: Plugin Writer's Guide diff --git a/docs/source/plugindocs/ldap.rst b/docs/source/plugindocs/ldap.rst new file mode 100644 index 00000000..3938c0c7 --- /dev/null +++ b/docs/source/plugindocs/ldap.rst @@ -0,0 +1,2 @@ +.. include:: ../../../mediagoblin/plugins/ldap/README.rst + |