[couchdb-documentation] 01/01: Merge branch 'master' into all_docs

[fl...@apache.org]

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

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

commit 8a7373dcafcd4ef9eb90a4ebd57ae12cc223f15a
Merge: f15c437 7f8c3ab
Author: Jonathan Hall <fl...@flimzy.com>
AuthorDate: Fri Nov 17 20:31:24 2017 +0100

    Merge branch 'master' into all_docs

 src/api/server/common.rst        |  64 ++++++++++++++++++++---
 src/api/server/configuration.rst |   7 +++
 src/config/intro.rst             |  47 ++++++++++-------
 src/cve/2017-12635.rst           |  67 ++++++++++++++++++++++++
 src/cve/2017-12636.rst           |  54 ++++++++++++++++++++
 src/whatsnew/1.7.rst             | 108 +++++++++++++++++++++++++++++++++++++++
 src/whatsnew/2.1.rst             |   5 ++
 src/whatsnew/index.rst           |   1 +
 8 files changed, 329 insertions(+), 24 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.