[couchdb-documentation] branch master updated (1014ee9 -> 4baf07d)

[ja...@apache.org]

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

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


    from 1014ee9  Merge pull request #291 from apache/fix/proxyauth
     add 35f460c  fix proxy auth docs, goes with https://github.com/apache/couchdb/pull/1436
     new 4baf07d  Merge pull request #293 from apache/fix/proxox

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[couchdb-documentation] 01/01: Merge pull request #293 from apache/fix/proxox

[ja...@apache.org]

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

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

commit 4baf07d4eef1d8682fc2d5d0cc03bd52ddf56be9
Merge: 1014ee9 35f460c
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Fri Jul 13 19:49:42 2018 +0200

    Merge pull request #293 from apache/fix/proxox
    
    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(-)