[couchdb-documentation] 01/01: Merge branch '2.2.0-release-notes' of https://github.com/apache/couchdb-documentation into 2.2.0-release-notes

[wo...@apache.org]

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

wohali pushed a commit to branch 2.2.0-release-notes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git

commit e0ad9ce5c508144a3dc52fd37c261c574ab716c6
Merge: 5d583ad f628731
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Mon Jul 23 20:13:45 2018 -0400

    Merge branch '2.2.0-release-notes' of https://github.com/apache/couchdb-documentation into 2.2.0-release-notes

 src/whatsnew/2.2.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --cc src/whatsnew/2.2.rst
index 9b8931c,9b8931c..bea41b1
--- a/src/whatsnew/2.2.rst
+++ b/src/whatsnew/2.2.rst
@@@ -29,7 -29,7 +29,7 @@@ Upgrade Note
  
  * TODO WORDING: Recommend increasing PBKDF2 / bcrypt work factor and auth_plugins to
    couch_replicator_auth_session,couch_replicator_auth_noop. Do not do this, if an older 
--  version of CouchDB is replicating TO this instance/cluster. Replicating FROM older 
++  version of CouchDB is replicating TO this instance/cluster. Replicating FROM older
    versions is fine. A future version will make this a default.
  
  * :ghissue:`820`, :ghissue:`1032`: Multiple queries can now be made at the
@@@ -37,8 -37,8 +37,8 @@@
    ``POST /{db}/_local_docs/queries`` endpoints. Also, a new endpoint
    ``POST /{db}/_design/{ddoc}/_view/{view}/queries`` has been introduced to replace
    the ``?queries`` parameter formerly provided for making multiple queries to a view.
--  The old ``?queries`` parameter *is now deprecated and will be removed in a future release
--  of CouchDB.*
++  The old ``?queries`` parameter *is now deprecated and will be removed in a future
++  release of CouchDB.*
  
  * The maximum http request limit, which had been lowered in 2.1.0, has been re-raised
    to a 4GB limit for now. (:ghissue:`1446`). Ongoing discussion about the path forward
@@@ -50,7 -50,7 +50,6 @@@
    regularly act as replication clients to use this new feature, which is enabled by
    default (:ghissue:`1462`).
  
--
  Version 2.2.0
  =============
  
@@@ -177,7 -177,7 +176,6 @@@ Mang
  * Multiple fixes related to using Mango as a front-end for full text indexing (a feature
    not shipped with couch, but for which support is in place as a compile-time addon).
  
--
  Other
  -----