[couchdb-documentation] branch fix/proxox updated (866e841 -> 35f460c)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jan pushed a change to branch fix/proxox
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


    omit 866e841  fix proxy auth docs, goes with https://github.com/apache/couchdb/pull/1436
     new 35f460c  fix proxy auth docs, goes with https://github.com/apache/couchdb/pull/1436

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (866e841)
            \
             N -- N -- N   refs/heads/fix/proxox (35f460c)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/api/server/authn.rst | 5 +++++
 1 file changed, 5 insertions(+)

[couchdb-documentation] 01/01: fix proxy auth docs, goes with https://github.com/apache/couchdb/pull/1436

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch fix/proxox
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git

commit 35f460c024d6c21277b777539b3df0f05d75ac8c
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Fri Jul 13 17:27:14 2018 +0200

    fix proxy auth docs, goes with https://github.com/apache/couchdb/pull/1436
---
 src/api/server/authn.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/server/authn.rst b/src/api/server/authn.rst
index 040b571..e33a78d 100644
--- a/src/api/server/authn.rst
+++ b/src/api/server/authn.rst
@@ -274,13 +274,13 @@ Proxy Authentication
 
 .. note::
     To use this authentication method make sure that the
-    ``{couch_httpd_auth, proxy_authentication_handler}`` value in added to the
+    ``{chttpd_auth, proxy_authentication_handler}`` value in added to the
     list of the active :config:option:`chttpd/authentication_handlers`:
 
     .. code-block:: ini
 
         [chttpd]
-        authentication_handlers = {chttpd_auth, cookie_authentication_handler}, {couch_httpd_auth, proxy_authentication_handler}, {chttpd_auth, default_authentication_handler}
+        authentication_handlers = {chttpd_auth, cookie_authentication_handler}, {chttpd_auth, proxy_authentication_handler}, {chttpd_auth, default_authentication_handler}
 
 `Proxy authentication` is very useful in case your application already uses
 some external authentication service and you don't want to duplicate users and