[32/32] git commit: updated refs/heads/1781-reorganize-and-improve-docs to 11fd32a

[kx...@apache.org]

Update list of available auth handlers.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/db0e1c5a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/db0e1c5a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/db0e1c5a

Branch: refs/heads/1781-reorganize-and-improve-docs
Commit: db0e1c5a73ee14a3fdb7b35215932d46d671309e
Parents: b70cee2
Author: Alexander Shorin <kx...@apache.org>
Authored: Fri Jun 14 12:09:10 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Fri Jun 14 12:21:37 2013 +0400

----------------------------------------------------------------------
 share/doc/src/config/httpd.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/db0e1c5a/share/doc/src/config/httpd.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/httpd.rst b/share/doc/src/config/httpd.rst
index 9c18b49..dfb9569 100644
--- a/share/doc/src/config/httpd.rst
+++ b/share/doc/src/config/httpd.rst
@@ -46,9 +46,12 @@ of provided methods::
   [httpd]
   authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}
 
-- ``{couch_httpd_oauth, oauth_authentication_handler}`` - handles OAuth;
-- ``{couch_httpd_auth, cookie_authentication_handler}`` - used for Cookie auth;
-- ``{couch_httpd_auth, default_authentication_handler}`` - used for Basic auth;
+- ``{couch_httpd_oauth, oauth_authentication_handler}``: handles OAuth;
+- ``{couch_httpd_auth, cookie_authentication_handler}``: used for Cookie auth;
+- ``{couch_httpd_auth, proxy_authentication_handler}``: used for Proxy auth;
+- ``{couch_httpd_auth, default_authentication_handler}``: used for Basic auth;
+- ``{couch_httpd_auth, null_authentication_handler}``: disables auth.
+  Everlasting `Admin Party`!
 
 
 .. _config/httpd/bind_address: