Merge lp:~jderose/ubuntu/utopic/couchdb/1.6.0 into lp:ubuntu/utopic/couchdb

[Jason Gerard DeRose]

* Merge upstream 1.6.0 tarball, sha1:62f99077c201ad632c1cd144fcaf6f10fa5949ed

* Bump Standards-Version to 3.9.5

* Get rid of the unneeded .pc/ cruft

Note: as there are currently no patches being carried, and as from what I understand, current UDD best practice is to not keep .pc/ under version control, I went ahead and removed the .pc/ directory that was lingering around from CouchDB 1.0 days.

[Martin Pitt (pitti)]

I (and most other sponsors I know) don't actually upload the branch as-is. I just let bzr bd build a source, debdiff/check/upload that, and let the package importer worry about the UDD branch (it's humanly impossible to deal with .pc/ and quilt patches sensibly in UDD, I'm afraid).

To be honest, a debian/ only debdiff attached to a bug would be much easier to review and sponsor.

Thanks!

review: Approve

[Jason Gerard DeRose (jderose)]

Martin,

Thanks for the review! Is the preferred merge workflow documented somewhere?

[Martin Pitt (pitti)]

Jason Gerard DeRose [2014-08-01 19:02 -0000]:
> Thanks for the review! Is the preferred merge workflow documented somewhere?

Well, the UDD way currenlty is the documented workflow:
http://packaging.ubuntu.com/html/udd-sponsorship.html

I just think it makes things unnecessarily complicated and error prone
for sponsors and sponsorees especially when patches are involved.

But don't mind my whining too much :-)

=== removed directory '.pc'
=== removed file '.pc/.quilt_patches'
--- .pc/.quilt_patches	2012-04-10 21:14:05 +0000
+++ .pc/.quilt_patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/patches

=== removed file '.pc/.quilt_series'
--- .pc/.quilt_series	2012-04-10 21:14:05 +0000
+++ .pc/.quilt_series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-series

=== removed file '.pc/.version'
--- .pc/.version	2011-08-06 09:33:58 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed file '.pc/applied-patches'
=== modified file 'AUTHORS'
--- AUTHORS	2013-08-28 16:28:32 +0000
+++ AUTHORS	2014-07-28 15:45:29 +0000
@@ -20,11 +20,15 @@
  * Bob Dionne <[e-mail]>
  * Dave Cottlehuber <[e-mail]>
  * Jason Smith <[e-mail]>
- * Joan Touzet <[e-mail]>
+ * Joan Touzet <[e-mail]>
  * Dale Harvey <[e-mail]>
  * Dirkjan Ochtman <[e-mail]>
  * Alexander Shorin <[e-mail]>
  * Garren Smith <[e-mail]>
  * Sue Lockwood <[e-mail]>
+ * Andy Wenk <[e-mail]>
+ * Klaus Trainer <[e-mail]>
+ * Benjamin Young <[e-mail]>
+ * Robert Kowalski <[e-mail]>
 
 For a list of other credits see the `THANKS` file.

=== modified file 'INSTALL.Unix'
--- INSTALL.Unix	2013-08-28 16:28:32 +0000
+++ INSTALL.Unix	2014-07-28 15:45:29 +0000
@@ -1,4 +1,4 @@
-Apache CouchDB README.Unix
+Apache CouchDB INSTALL.Unix
 ==========================
 
 A high-level guide to Unix-like systems, inc. Mac OS X and Ubuntu.
@@ -6,12 +6,16 @@
 Community installation guides are available on the wiki:
 
     http://wiki.apache.org/couchdb/Installation
+
+If you are trying to build CouchDB from a git checkout rather than
+a .tar.gz, see the `DEVELOPERS` file.
     
-This document is the canonical source of installation information. However, many
-systems have gotchas that you need to be aware of. In addition, dependencies
-frequently change as distributions update their archives. If you're running into
-trouble, be sure to check out the wiki. If you have any tips to share, please
-also update the wiki so that others can benefit from your experience.
+This document is the canonical source of installation
+information. However, many systems have gotchas that you need to be
+aware of. In addition, dependencies frequently change as distributions
+update their archives. If you're running into trouble, be sure to
+check out the wiki. If you have any tips to share, please also update
+the wiki so that others can benefit from your experience.
 
 Troubleshooting
 ---------------
@@ -35,10 +39,10 @@
 
 You should have the following installed:
 
- * Erlang OTP (>=R13B04, <R17)  (http://erlang.org/)
+ * Erlang OTP (>=R14B01, =<R17) (http://erlang.org/)
  * ICU                          (http://icu-project.org/)
  * OpenSSL                      (http://www.openssl.org/)
- * Mozilla SpiderMonkey (1.7)   (http://www.mozilla.org/js/spidermonkey/)
+ * Mozilla SpiderMonkey (1.8.5) (http://www.mozilla.org/js/spidermonkey/)
  * GNU Make                     (http://www.gnu.org/software/make/)
  * GNU Compiler Collection      (http://gcc.gnu.org/)
  * libcurl                      (http://curl.haxx.se/libcurl/)
@@ -46,10 +50,11 @@
  * Python (>=2.7) for docs      (http://python.org/)
  * Python Sphinx (>=1.1.3)      (http://pypi.python.org/pypi/Sphinx)
 
-It is recommended that you install Erlang OTP R13B-4 or above where possible.
-You will only need libcurl if you plan to run the JavaScript test suite. And
-help2man is only need if you plan on installing the CouchDB man pages.
-Python and Sphinx are only required for building the online documentation.
+It is recommended that you install Erlang OTP R13B-4 or above where
+possible.  You will only need libcurl if you plan to run the
+JavaScript test suite. And help2man is only need if you plan on
+installing the CouchDB man pages.  Python and Sphinx are only required
+for building the online documentation.
 
 Debian-based Systems
 ~~~~~~~~~~~~~~~~~~~~
@@ -67,11 +72,13 @@
     sudo apt-get install libcurl4-openssl-dev
     sudo apt-get install pkg-config
 
-There are lots of Erlang packages. If there is a problem with your install, try
-a different mix. There is more information on the wiki. Additionally, you might
-want to install some of the optional Erlang tools which may also be useful.
+There are lots of Erlang packages. If there is a problem with your
+install, try a different mix. There is more information on the
+wiki. Additionally, you might want to install some of the optional
+Erlang tools which may also be useful.
 
-Be sure to update the version numbers to match your system's available packages.
+Be sure to update the version numbers to match your system's available
+packages.
 
 For up to date instructions, please see:
 
@@ -79,35 +86,38 @@
 
   http://wiki.apache.org/couchdb/Installing_on_Ubuntu
 
-Unfortunately, it seems that installing dependencies on Ubuntu is troublesome.
+Unfortunately, it seems that installing dependencies on Ubuntu is
+troublesome.
 
 RedHat-based (Fedora, Centos, RHEL) Systems
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can install the dependencies by running:
 
-    sudo yum groupinstall "Development Tools"
     sudo yum install autoconf
     sudo yum install autoconf-archive
     sudo yum install automake
-    sudo yum install libtool
-    sudo yum install perl-Test-Harness
-    sudo yum install erlang-etap
+    sudo yum install curl-devel
+    sudo yum install erlang-asn1
     sudo yum install erlang-erts
+    sudo yum install erlang-eunit
     sudo yum install erlang-os_mon
-    sudo yum install erlang-eunit
+    sudo yum install erlang-xmerl
+    sudo yum install help2man
+    sudo yum install js-devel
     sudo yum install libicu-devel
-    sudo yum install js-devel
-    sudo yum install curl-devel
-    sudo yum install pkg-config
+    sudo yum install libtool
+    sudo yum install perl-Test-Harness
 
-While CouchDB builds against the default js-devel-1.7.0 included in some
-distributions, it's recommended to use a more recent js-devel-1.8.5.
+While CouchDB builds against the default js-devel-1.7.0 included in
+some distributions, it's recommended to use a more recent
+js-devel-1.8.5.
 
 Mac OS X
 ~~~~~~~~
 
-To build CouchDB from source on Mac OS X, you will need to install Xcode.
+To build CouchDB from source on Mac OS X, you will need to install
+Xcode.
 
 You can install the other dependencies by running:
 
@@ -127,10 +137,11 @@
 
     http://mxcl.github.com/homebrew/
 
-Some versions of Mac OS X ship a problematic OpenSSL library. If you're
-experiencing troubles with CouchDB crashing intermittently with a segmentation
-fault or a bus error, you will need to install your own version of OpenSSL. See
-the troubleshooting guide, mentioned above, for more information.
+Some versions of Mac OS X ship a problematic OpenSSL library. If
+you're experiencing troubles with CouchDB crashing intermittently with
+a segmentation fault or a bus error, you will need to install your own
+version of OpenSSL. See the troubleshooting guide, mentioned above,
+for more information.
 
 Installing
 ----------
@@ -139,9 +150,11 @@
 
     ./configure
 
-This script will configure CouchDB to be installed into `/usr/local` by default.
+This script will configure CouchDB to be installed into `/usr/local`
+by default.
 
-If you wish to customise the installation, pass `--help` to this script.
+If you wish to customize the installation, pass `--help` to this
+script.
 
 If everything was successful you should see the following message:
 
@@ -170,9 +183,11 @@
 
     sudo -i -u couchdb couchdb
 
-This uses the `sudo` command to run the `couchdb` command as the `couchdb` user.
+This uses the `sudo` command to run the `couchdb` command as the
+`couchdb` user.
 
-When CouchDB starts it should eventually display the following message:
+When CouchDB starts it should eventually display the following
+message:
 
     Apache CouchDB has started, time to relax.
 
@@ -248,7 +263,8 @@
 
     /usr/local/etc/rc.d
 
-We use the `[init.d|rc.d]` notation to refer to both of these directories.
+We use the `[init.d|rc.d]` notation to refer to both of these
+directories.
 
 You can control the CouchDB daemon by running:
 
@@ -258,13 +274,15 @@
 
     /usr/local/etc/default/couchdb
 
-Comment out the `COUCHDB_USER` setting if you're running as a non-superuser.
+Comment out the `COUCHDB_USER` setting if you're running as a
+non-superuser.
 
 To start the daemon on boot, copy the init script to:
 
     /etc/[init.d|rc.d]
 
-You should then configure your system to run the init script automatically.
+You should then configure your system to run the init script
+automatically.
 
 You may be able to run:
 
@@ -278,7 +296,8 @@
 
 Consult your `logrotate` documentation for more information.
 
-It is critical that the CouchDB logs are rotated so as not to fill your disk.
+It is critical that the CouchDB logs are rotated so as not to fill
+your disk.
 
 Mac OS X
 ~~~~~~~~

=== modified file 'INSTALL.Windows'
--- INSTALL.Windows	2013-08-28 16:28:32 +0000
+++ INSTALL.Windows	2014-07-28 15:45:29 +0000
@@ -1,4 +1,4 @@
-Apache CouchDB README.Windows
+Apache CouchDB INSTALL.Windows
 ==============================
 
 For a high-level guide to Microsoft Windows.

=== modified file 'LICENSE'
--- LICENSE	2013-12-01 16:55:05 +0000
+++ LICENSE	2014-07-28 15:45:29 +0000
@@ -689,7 +689,7 @@
 
 For src/fauxton/assets/js/libs/d3.js
 
-	Copyright (c) 2012, Michael Bostock
+	Copyright (c) 2010-2014, Michael Bostock
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -716,29 +716,6 @@
 	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 	EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-For src/fauxton/assets/js/libs/jshint.js
-
-	Copyright 2012 Anton Kovalyov (http://jshint.com)
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the
-	"Software"), to deal in the Software without restriction, including
-	without limitation the rights to use, copy, modify, merge, publish,
-	distribute, sublicense, and/or sell copies of the Software, and to
-	permit persons to whom the Software is furnished to do so, subject to
-	the following conditions:
-
-	The above copyright notice and this permission notice shall be
-	included in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-	LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-	OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 For src/fauxton/assets/js/libs/lodash.js
 
 	Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
@@ -838,58 +815,6 @@
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
-For src/fauxton/assets/js/libs/codemirror.js
-
-	Copyright (C) 2013 by Marijn Haverbeke <[e-mail]>
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
-
-	Please note that some subdirectories of the CodeMirror distribution
-	include their own LICENSE files, and are released under different
-	licences.
-
-For src/fauxton/assets/js/plugins/codemirror-javascript.js
-
-	Copyright (C) 2013 by Marijn Haverbeke <[e-mail]>
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
-
-	Please note that some subdirectories of the CodeMirror distribution
-	include their own LICENSE files, and are released under different
-	licences.
-
 For the src/couch_dbupdates component
 
   2009-2012 (c) Benoît Chesneau <[e-mail]>
@@ -1126,3 +1051,261 @@
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+for src/fauxton/assets/js/lib/ace/*
+
+Copyright (c) 2010, Ajax.org B.V.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Ajax.org B.V. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+for src/fauxton/assets/js/plugins/beautify.js
+The MIT License (MIT)
+
+Copyright (c) 2007-2013 Einar Lielmanis and contributors.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+for src/fauxton/assets/js/plugins/cloudant.pagingcollection.js
+
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

=== modified file 'Makefile.am'
--- Makefile.am	2013-12-01 16:55:05 +0000
+++ Makefile.am	2014-07-28 15:45:29 +0000
@@ -42,7 +42,8 @@
     build-aux/dist-error \
     build-aux/sphinx-build \
     build-aux/sphinx-touch \
-    license.skip
+    license.skip \
+    Vagrantfile
 
 AUTHORS.gz: AUTHORS
 	gzip -9 < $< > $@

=== modified file 'Makefile.in'
--- Makefile.in	2013-12-01 16:55:05 +0000
+++ Makefile.in	2014-07-28 15:45:29 +0000
@@ -374,7 +374,8 @@
     build-aux/dist-error \
     build-aux/sphinx-build \
     build-aux/sphinx-touch \
-    license.skip
+    license.skip \
+    Vagrantfile
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

=== modified file 'NOTICE'
--- NOTICE	2013-12-01 16:55:05 +0000
+++ NOTICE	2014-07-28 15:45:29 +0000
@@ -1,5 +1,5 @@
 Apache CouchDB
-Copyright 2009-2013 The Apache Software Foundation
+Copyright 2009-2014 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -102,10 +102,6 @@
 
   Copyright 2012, Michael Bostock
 
- * JSHint (http://jshint.com/)
-
-  Copyright 2002, Douglas Crockford, modifications by JSHint Community
-
  * Lodash (http://lodash.com/)
 
   Copyright 2012, John-David Dalton <http://allyoucanleet.com/>
@@ -130,14 +126,6 @@
 
    Copyright (c) 2010-2011, The Dojo Foundation
 
- * codemirror.js (https://github.com/marijnh/CodeMirror)
-
-   Copyright (C) 2013 by Marijn Haverbeke <[e-mail]>
-
- * codemirror-javascript.js (https://github.com/marijnh/CodeMirror)
-
-   Copyright (C) 2013 by Marijn Haverbeke <[e-mail]>
-
  * jquery.form.js (https://github.com/malsup/form/)
 
    Copyright 2006-2013 (c) M. Alsup
@@ -193,3 +181,11 @@
  * sandbox.js https://github.com/KlausTrainer/sandbox.js
 
    (c) 2013 Klaus Trainer
+
+ * ace editor https://github.com/ajaxorg/ace
+
+   Copyright (c) 2010, Ajax.org B.V.
+
+ * src/fauxton/asserts/js/plugins/cloudant.pagingcollection.js
+
+   Copyright (c) 2014, Cloudant http://cloudant.com

=== modified file 'THANKS'
--- THANKS	2013-12-01 16:55:05 +0000
+++ THANKS	2014-07-28 15:45:29 +0000
@@ -64,10 +64,8 @@
  * David Rose <[e-mail]>
  * Lim Yue Chuan <[e-mail]>
  * David Davis <[e-mail]>
- * Klaus Trainer <[e-mail]>
  * Juuso Väänänen <[e-mail]>
  * Jeff Zellner <[e-mail]>
- * Benjamin Young <[e-mail]>
  * Gabriel Farrell <[e-mail]>
  * Mike Leddy <[e-mail]>
  * Wayne Conrad <[e-mail]>
@@ -98,45 +96,59 @@
  * Alexander Dorofeev <[e-mail]>
  * Alexander Shorin <[e-mail]>
  * Andrey Somov <[e-mail]>
+ * Andy Wenk <[e-mail]>
+ * Anthony Ananich <[e-mail]>
  * Anthony S Baker <[e-mail]>
  * Ben Reser <[e-mail]>
+ * Ben Russell <[e-mail]>
  * Benjamin Nortier <[e-mail]>
+    27	BigBlueHat <[e-mail]>
  * Bob Dionne <[e-mail]>
  * Bob Ippolito <[e-mail]>
  * Caleb Case <[e-mail]>
+ * Christian Hogan <[e-mail]>
  * Christopher Bonhage <[e-mail]>
  * Dale Harvey <[e-mail]>
  * Damjan Georgievski <[e-mail]>
- * Dirkjan Ochtman <[e-mail]>
+    23	Dirkjan Ochtman <[e-mail]>
  * Dustin Sallings <[e-mail]>
  * Ewan McDougall <[e-mail]>
  * Fedor Indutny <[e-mail]>
  * Filippo Fadda <[e-mail]>
-   107	Garren Smith <[e-mail]>
+   185	Garren Smith <[e-mail]>
  * Jakub <[e-mail]>
  * Jason Smith (work) <[e-mail]>
  * Jason Smith (work) <[e-mail]>
  * Jason Smith (work) <[e-mail]>
+ * Jens Rantil <[e-mail]>
  * Joel Reed <[e-mail]>
  * Johannes J. Schmidt <[e-mail]>
+ * Julian Duque <[e-mail]>
+ * Keith Gable <[e-mail]>
  * Keks Keksov <[e-mail]>
  * Klaus Trainer <[e-mail]>
+ * Kyle Snavely <[e-mail]>
  * Magnus Hoff <[e-mail]>
+ * Mariano Guerra <[e-mail]>
  * Martin Higham <[e-mail]>
  * Michael Jackson <[e-mail]>
  * Michael Rhodes <[e-mail]>
  * Michael Wallace <[e-mail]>
+ * Michael Wheeler <[e-mail]>
  * Mike McKay <[e-mail]>
  * Mike Wallace <[e-mail]>
  * NickNorth <[e-mail]>
+ * Noah Slater <[e-mail]>
  * Paul J. Davis <[e-mail]>
  * Paul Mietz Egli <[e-mail]>
  * Peter Lemenkov <[e-mail]>
+    34	Robert Kowalski <[e-mail]>
+ * Robert Newson <[e-mail]>
  * Robin Berjon <[e-mail]>
  * Ronny Pfannschmidt <[e-mail]>
-    91	Russell Branca <[e-mail]>
+    94	Russell Branca <[e-mail]>
  * Ryan Ramage <[e-mail]>
-    74	Simon Metson <[e-mail]>
+    78	Simon Metson <[e-mail]>
     10	Simon Metson <[e-mail]>
  * Sriram Melkote <[e-mail]>
  * Stefan Kögl <[e-mail]>
@@ -144,8 +156,12 @@
  * Volker Mische <[e-mail]>
  * Wei Cao <[e-mail]>
  * Wendall Cada <[e-mail]>
+ * Will Holley <[e-mail]>
+ * dileepbapat <[e-mail]>
+ * karlin <[e-mail]>
  * nvdev <[e-mail]>
  * sean barclay <[e-mail]>
-    54	suelockwood <[e-mail]>
+    76	suelockwood <[e-mail]>
+ * telis94 <[e-mail]>
 
 For a list of authors see the `AUTHORS` file.

=== added file 'Vagrantfile'
--- Vagrantfile	1970-01-01 00:00:00 +0000
+++ Vagrantfile	2014-07-28 15:45:29 +0000
@@ -0,0 +1,69 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+BOX_NAME = ENV['BOX_NAME'] || "ubuntu"
+BOX_URI = ENV['BOX_URI'] || "http://files.vagrantup.com/precise64.box"
+AWS_REGION = ENV['AWS_REGION'] || "us-east-1"
+AWS_AMI    = ENV['AWS_AMI']    || "ami-d0f89fb9"
+
+Vagrant::Config.run do |config|
+  # Setup virtual machine box. This VM configuration code is always executed.
+  config.vm.box = BOX_NAME
+  config.vm.box_url = BOX_URI
+
+  # Install couchdb dependencies if deployment was not done
+  if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?
+    # install build-essential
+    pkg_cmd = "apt-get update -qq; apt-get install -q -y build-essential git " \
+        "autoconf autoconf-archive gnu-standards help2man texinfo; "
+
+    # Install erlang
+    pkg_cmd << "apt-get install -q -y erlang-base-hipe erlang-dev " \
+        "erlang-manpages erlang-eunit erlang-nox erlang-xmerl erlang-inets; "
+
+    # couchdb developper dependencies
+    pkg_cmd << "apt-get install -q -y libmozjs185-dev libicu-dev " \
+        "curl libcurl4-gnutls-dev libtool; "
+
+    # doc dependencies
+    pkg_cmd << "apt-get install -q -y help2man texinfo python-sphinx python-pip; " \
+        "pip install -U pygments; "
+
+    config.vm.provision :shell, :inline => pkg_cmd
+  end
+end
+
+
+# Providers were added on Vagrant >= 1.1.0
+Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|
+  config.vm.provider :aws do |aws, override|
+    aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]
+    aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
+    aws.keypair_name = ENV["AWS_KEYPAIR_NAME"]
+    override.ssh.private_key_path = ENV["AWS_SSH_PRIVKEY"]
+    override.ssh.username = "ubuntu"
+    aws.region = AWS_REGION
+    aws.ami    = AWS_AMI
+    aws.instance_type = "t1.micro"
+  end
+
+  config.vm.provider :rackspace do |rs|
+    config.ssh.private_key_path = ENV["RS_PRIVATE_KEY"]
+    rs.username = ENV["RS_USERNAME"]
+    rs.api_key  = ENV["RS_API_KEY"]
+    rs.public_key_path = ENV["RS_PUBLIC_KEY"]
+    rs.flavor   = /512MB/
+    rs.image    = /Ubuntu/
+  end
+
+  config.vm.provider :virtualbox do |vb|
+    config.vm.box = BOX_NAME
+    config.vm.box_url = BOX_URI
+  end
+
+  config.vm.provider :lxc do |lxc|
+    config.vm.box = BOX_NAME
+    config.vm.box_url = BOX_URI
+    lxc.customize 'cgroup.memory.limit_in_bytes', '1024M'
+  end
+end

=== modified file 'acinclude.m4'
--- acinclude.m4	2013-12-01 16:55:05 +0000
+++ acinclude.m4	2014-07-28 15:45:29 +0000
@@ -17,7 +17,7 @@
 m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
 m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB])
 m4_define([LOCAL_VERSION_MAJOR], [1])
-m4_define([LOCAL_VERSION_MINOR], [5])
+m4_define([LOCAL_VERSION_MINOR], [6])
 m4_define([LOCAL_VERSION_REVISION], [0])
 m4_define([LOCAL_VERSION_STAGE], [])
 m4_define([LOCAL_VERSION_RELEASE], [])

=== modified file 'aclocal.m4'
--- aclocal.m4	2013-08-28 16:28:32 +0000
+++ aclocal.m4	2014-07-28 15:45:29 +0000
@@ -499,14 +499,14 @@
 #
 # LICENSE
 #
-#   Copyright (c) 2008 Andrew Collier <[e-mail]>
+#   Copyright (c) 2008 Andrew Collier
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 5
+#serial 6
 
 AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE])
 AC_DEFUN([AX_PYTHON_MODULE],[
@@ -1486,6 +1486,25 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008

=== modified file 'bin/couchdb.1'
--- bin/couchdb.1	2013-12-01 16:55:05 +0000
+++ bin/couchdb.1	2014-07-28 15:45:29 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.11.
-.TH COUCHDB "1" "October 2013" "couchdb - Apache CouchDB 1.5.0" "User Commands"
+.TH COUCHDB "1" "May 2014" "couchdb - Apache CouchDB 1.6.0" "User Commands"
 .SH NAME
 couchdb \- Apache CouchDB database server
 .SH SYNOPSIS

=== modified file 'bin/couchdb.tpl.in'
--- bin/couchdb.tpl.in	2013-12-01 16:55:05 +0000
+++ bin/couchdb.tpl.in	2014-07-28 15:45:29 +0000
@@ -270,6 +270,9 @@
         echo "Apache CouchDB has started, time to relax."
     else
         if test "$RECURSED" = "true"; then
+            # close stdout / stderr
+            exec 1>&-
+            exec 2>&-
             while true; do
                 export HEART_COMMAND
                 export HEART_BEAT_TIMEOUT
@@ -304,6 +307,10 @@
     PID=`_get_pid`
     STOP_TIMEOUT=60
     if test -n "$PID"; then
+        if test "$1" = "false"; then
+            echo > $PID_FILE
+        fi
+
         if kill -0 $PID 2> /dev/null; then
             if kill -TERM $PID 2> /dev/null; then
                 count=0

=== modified file 'build-aux/config.guess'
--- build-aux/config.guess	2013-08-28 18:21:32 +0000
+++ build-aux/config.guess	2014-07-28 15:45:29 +0000
@@ -1,10 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-12-30'
+timestamp='2013-11-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -52,9 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -137,22 +133,20 @@
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "${UNAME_SYSTEM}" in
-Linux|GNU/*)
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
 	eval $set_cc_for_build
 	cat <<-EOF > $dummy.c
 	#include <features.h>
-	#ifdef __UCLIBC__
-	# ifdef __UCLIBC_CONFIG_VERSION__
-	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-	# else
+	#if defined(__UCLIBC__)
 	LIBC=uclibc
-	# endif
-	#else
-	# ifdef __dietlibc__
+	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	# else
+	#else
 	LIBC=gnu
-	# endif
 	#endif
 	EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
@@ -910,6 +904,9 @@
 	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -972,6 +969,9 @@
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -995,8 +995,14 @@
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-${LIBC}
 	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1014,7 +1020,18 @@
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	eval $set_cc_for_build
+	X86_64_ABI=
+	# If there is a compiler, see if it is configured for 32-bit objects.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_X32 >/dev/null
+	    then
+		X86_64_ABI=x32
+	    fi
+	fi
+	echo x86_64-unknown-linux-gnu${X86_64_ABI}
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1250,19 +1267,31 @@
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)

=== modified file 'build-aux/config.sub'
--- build-aux/config.sub	2013-08-28 18:21:32 +0000
+++ build-aux/config.sub	2014-07-28 15:45:29 +0000
@@ -1,10 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2013-01-11'
+timestamp='2013-10-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -70,9 +68,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -256,12 +252,12 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc \
+	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx | dvp \
 	| epiphany \
 	| fido | fr30 | frv \
@@ -269,6 +265,7 @@
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -297,10 +294,10 @@
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -328,7 +325,7 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -370,13 +367,13 @@
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -385,6 +382,7 @@
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -414,7 +412,7 @@
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
@@ -798,7 +796,7 @@
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -852,7 +850,7 @@
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1568,6 +1566,9 @@
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
@@ -1611,6 +1612,9 @@
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;

=== modified file 'configure'
--- configure	2013-12-01 16:55:05 +0000
+++ configure	2014-07-28 15:45:29 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac 1.5.0.
+# From configure.ac 1.6.0.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Apache CouchDB 1.5.0.
+# Generated by GNU Autoconf 2.69 for Apache CouchDB 1.6.0.
 #
 # Report bugs to <https://issues.apache.org/jira/browse/COUCHDB>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='Apache CouchDB'
 PACKAGE_TARNAME='apache-couchdb'
-PACKAGE_VERSION='1.5.0'
-PACKAGE_STRING='Apache CouchDB 1.5.0'
+PACKAGE_VERSION='1.6.0'
+PACKAGE_STRING='Apache CouchDB 1.6.0'
 PACKAGE_BUGREPORT='https://issues.apache.org/jira/browse/COUCHDB'
 PACKAGE_URL=''
 
@@ -1434,7 +1434,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Apache CouchDB 1.5.0 to adapt to many kinds of systems.
+\`configure' configures Apache CouchDB 1.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1504,7 +1504,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Apache CouchDB 1.5.0:";;
+     short | recursive ) echo "Configuration of Apache CouchDB 1.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1661,7 +1661,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Apache CouchDB configure 1.5.0
+Apache CouchDB configure 1.6.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2405,7 +2405,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Apache CouchDB $as_me 1.5.0, which was
+It was created by Apache CouchDB $as_me 1.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3230,7 +3230,7 @@
 
 # Define the identity of the package.
  PACKAGE='apache-couchdb'
- VERSION='1.5.0'
+ VERSION='1.6.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3264,7 +3264,88 @@
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar plaintar pax cpio none'
+_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      { echo "$as_me:$LINENO: $_am_tar --version" >&5
+   ($_am_tar --version) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && break
+    done
+    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x ustar -w "$$tardir"'
+    am__tar_='pax -L -x ustar -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+    am__untar='cpio -i -H ustar -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_ustar}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+   (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+   ($am__untar <conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+if ${am_cv_prog_tar_ustar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_prog_tar_ustar=$_am_tool
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+$as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
@@ -18475,24 +18556,26 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
 $as_echo_n "checking Erlang version compatibility... " >&6; }
-erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and <R17 (erts-5.11)"
+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
 
 version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
 major_version=`echo $version | ${AWK} "{print \\$1}"`
 minor_version=`echo $version | ${AWK} "{print \\$2}"`
 patch_version=`echo $version | ${AWK} "{print \\$3}"`
+echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
 
-if test $major_version -ne 5; then
-    as_fn_error $? "$erlang_version_error" "$LINENO" 5
+if test $major_version -lt 5 -o $major_version -gt 6; then
+    as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
 fi
 
-if test $minor_version -lt 8 -o $minor_version -gt 10; then
-    as_fn_error $? "$erlang_version_error" "$LINENO" 5
+if test $major_version -eq 5 -a $minor_version -lt 8; then
+    as_fn_error $? "$erlang_version_error minor_version does not match" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: compatible" >&5
 $as_echo "compatible" >&6; }
 
+# returns 17 for erts-6.0, and R14B03 or similar for earlier releases
 otp_release="`\
     ${ERL} -noshell \
     -eval 'io:put_chars(erlang:system_info(otp_release)).' \
@@ -18500,7 +18583,7 @@
 
 
 
- if test x$otp_release \> xR13B03; then
+ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then
   USE_OTP_NIFS_TRUE=
   USE_OTP_NIFS_FALSE='#'
 else
@@ -18508,7 +18591,7 @@
   USE_OTP_NIFS_FALSE=
 fi
 
- if test x$otp_release \> xR14B03; then
+ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then
   USE_EJSON_COMPARE_NIF_TRUE=
   USE_EJSON_COMPARE_NIF_FALSE='#'
 else
@@ -19131,11 +19214,11 @@
 package_name="Apache CouchDB"
 
 
-version="1.5.0"
+version="1.6.0"
 
 version_major="1"
 
-version_minor="5"
+version_minor="6"
 
 version_revision="0"
 
@@ -19858,7 +19941,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Apache CouchDB $as_me 1.5.0, which was
+This file was extended by Apache CouchDB $as_me 1.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19924,7 +20007,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Apache CouchDB config.status 1.5.0
+Apache CouchDB config.status 1.6.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2013-12-01 16:55:05 +0000
+++ configure.ac	2014-07-28 15:45:29 +0000
@@ -24,7 +24,7 @@
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_HEADERS([src/snappy/google-snappy/config.h])
 
-AM_INIT_AUTOMAKE([1.6.3 foreign])
+AM_INIT_AUTOMAKE([1.6.3 foreign tar-ustar])
 
 AC_USE_SYSTEM_EXTENSIONS
 AC_ENABLE_SHARED
@@ -411,23 +411,25 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
 $as_echo_n "checking Erlang version compatibility... " >&6; }
-erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and <R17 (erts-5.11)"
+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
 
 version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0"
 major_version=`echo $version | ${AWK} "{print \\$1}"`
 minor_version=`echo $version | ${AWK} "{print \\$2}"`
 patch_version=`echo $version | ${AWK} "{print \\$3}"`
+echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
 
-if test $major_version -ne 5; then
-    as_fn_error $? "$erlang_version_error" "$LINENO" 5
+if test $major_version -lt 5 -o $major_version -gt 6; then
+    as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
 fi
 
-if test $minor_version -lt 8 -o $minor_version -gt 10; then
-    as_fn_error $? "$erlang_version_error" "$LINENO" 5
+if test $major_version -eq 5 -a $minor_version -lt 8; then
+    as_fn_error $? "$erlang_version_error minor_version does not match" "$LINENO" 5
 fi
 
 AC_MSG_RESULT(compatible)
 
+# returns 17 for erts-6.0, and R14B03 or similar for earlier releases
 otp_release="`\
     ${ERL} -noshell \
     -eval 'io:put_chars(erlang:system_info(otp_release)).' \
@@ -435,8 +437,10 @@
 
 AC_SUBST(otp_release)
 
-AM_CONDITIONAL([USE_OTP_NIFS], [test x$otp_release \> xR13B03])
-AM_CONDITIONAL([USE_EJSON_COMPARE_NIF], [test x$otp_release \> xR14B03])
+AM_CONDITIONAL([USE_OTP_NIFS],
+    [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)")])
+AM_CONDITIONAL([USE_EJSON_COMPARE_NIF],
+    [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)")])
 
 has_crypto=`\
     ${ERL} -eval "\

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-01 16:55:05 +0000
+++ debian/changelog	2014-07-28 15:45:29 +0000
@@ -1,3 +1,10 @@
+couchdb (1.6.0-0ubuntu1) utopic; urgency=low
+
+  * New upstream release (LP: #1212481)
+  * debian/control: bump Standards-Version to 3.9.5
+
+ -- Jason Gerard DeRose <[e-mail]>  Sun, 20 Jul 2014 16:31:46 -0600
+
 couchdb (1.5.0-0ubuntu1) trusty; urgency=low
 
   * New upstream release (LP: #1254371)

=== modified file 'debian/control'
--- debian/control	2013-12-01 16:55:05 +0000
+++ debian/control	2014-07-28 15:45:29 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <[e-mail]>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9),
                erlang-dev (>= 1:14.b.4),
                erlang-crypto,

=== modified file 'etc/couchdb/default.ini.tpl.in'
--- etc/couchdb/default.ini.tpl.in	2013-12-01 16:55:05 +0000
+++ etc/couchdb/default.ini.tpl.in	2014-07-28 15:45:29 +0000
@@ -50,8 +50,11 @@
 ;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
 ; For more socket options, consult Erlang's module 'inet' man page.
 ;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
+socket_options = [{recbuf, 262144}, {sndbuf, 262144}]
 log_max_chunk_size = 1000000
 enable_cors = false
+; CouchDB can optionally enforce a maximum uri length;
+; max_uri_length = 8000
 
 [ssl]
 port = 6984
@@ -69,6 +72,8 @@
 auth_cache_size = 50 ; size is number of cache entries
 allow_persistent_cookies = false ; set to true to allow persistent cookies
 iterations = 10 ; iterations for password hashing
+; min_iterations = 1
+; max_iterations = 1000000000
 ; comma-separated list of public fields, 404 if empty
 ; public_fields =
 
@@ -215,6 +220,8 @@
 ; The utc_id_suffix value will be appended to uuids generated by the utc_id algorithm.
 ; Replicating instances should have unique utc_id_suffix values to ensure uniqueness of utc_id ids.
 utc_id_suffix =
+# Maximum number of UUIDs retrievable from /_uuids in a single request
+max_count = 1000
 
 [stats]
 ; rate is in milliseconds

=== modified file 'license.skip'
--- license.skip	2013-12-01 16:55:05 +0000
+++ license.skip	2014-07-28 15:45:29 +0000
@@ -81,6 +81,11 @@
 ^share/www/script/test/lorem.*
 ^share/www/style/jquery-ui-1.8.11.custom.css
 ^share/www/fauxton/img/.*
+^share/www/fauxton/js/ace/mode-javascript.js
+^share/www/fauxton/js/ace/mode-json.js
+^share/www/fauxton/js/ace/theme-crimson_editor.js
+^share/www/fauxton/js/ace/worker-javascript.js
+^share/www/fauxton/js/ace/worker-json.js
 ^src/Makefile
 ^src/Makefile.in
 ^src/couch_index/Makefile
@@ -118,23 +123,36 @@
 ^src/couch_dbupdates
 ^src/ejson/.*
 ^src/etap/.*
-^src/fauxton/app/app.js
-^src/fauxton/app/config.js
-^src/fauxton/app/main.js
-^src/fauxton/app/modules/pouchdb/*
-^src/fauxton/assets/.*
-^src/fauxton/couchapp.js
+^src/fauxton/app/addons/config/assets/less/config.less
+^src/fauxton/assets/css/codemirror.css
+^src/fauxton/assets/css/nv.d3.css
+^src/fauxton/assets/img/.*
+^src/fauxton/assets/js/libs/.*.js
+^src/fauxton/assets/js/libs/ace/.*.js
+^src/fauxton/assets/js/libs/ace/snippets/.*.js
+^src/fauxton/assets/js/plugins/.*.js
+^src/fauxton/assets/js/plugins/zeroclipboard/ZeroClipboard.swf
+^src/fauxton/assets/less/bootstrap/.*.less
+^src/fauxton/assets/less/bootstrap/tests/css-tests.css
+^src/fauxton/assets/less/bootstrap/tests/buttons.html
 ^src/fauxton/favicon.ico
 ^src/fauxton/package.json
+^src/fauxton/extensions.md
 ^src/fauxton/readme.md
 ^src/fauxton/writing_addons.md
 ^src/fauxton/TODO.md
+^src/fauxton/CONTRIBUTING.md
 ^src/fauxton/settings.json.*
-^src/fauxton/test/.*
+^src/fauxton/test/test.config.underscore
+^src/fauxton/test/mocha/chai.js
+^src/fauxton/test/mocha/mocha.css
+^src/fauxton/test/mocha/mocha.js
+^src/fauxton/test/mocha/sinon.js
+^src/fauxton/test/mocha/sinon-chai.js
 ^src/fauxton/tasks/addon/rename.json
-^src/fauxton/app/addons/activetasks/assets/less/activetasks.less
-^src/fauxton/app/addons/auth/assets/less/auth.less
-^src/fauxton/app/addons/permissions/assets/less/permissions.less
+^src/fauxton/assets/lib/ace/.*
+^src/fauxton/app/addons/pouchdb/pouch.collate.js
+^src/fauxton/app/addons/pouchdb/pouchdb.mapreduce.js
 ^src/ibrowse/.*
 ^src/mochiweb/.*
 ^src/my-first-couchdb-plugin/priv/*/*
@@ -167,3 +185,7 @@
 ^var/Makefile
 ^var/Makefile.in
 ^Vagrantfile
+^share/www/fauxton/Makefile
+^share/www/fauxton/Makefile.in
+^share/www/Makefile
+^share/www/Makefile.in

=== modified file 'share/Makefile.am'
--- share/Makefile.am	2013-12-01 16:55:05 +0000
+++ share/Makefile.am	2014-07-28 15:45:29 +0000
@@ -90,6 +90,11 @@
     www/fauxton/img/minilogo.png \
     www/fauxton/index.html \
     www/fauxton/js/require.js \
+    www/fauxton/js/ace/mode-javascript.js \
+    www/fauxton/js/ace/mode-json.js \
+    www/fauxton/js/ace/theme-crimson_editor.js \
+    www/fauxton/js/ace/worker-javascript.js \
+    www/fauxton/js/ace/worker-json.js \
     www/favicon.ico \
     www/image/add.png \
     www/image/apply.gif \

=== modified file 'share/Makefile.in'
--- share/Makefile.in	2013-12-01 16:55:05 +0000
+++ share/Makefile.in	2014-07-28 15:45:29 +0000
@@ -387,6 +387,11 @@
     www/fauxton/img/minilogo.png \
     www/fauxton/index.html \
     www/fauxton/js/require.js \
+    www/fauxton/js/ace/mode-javascript.js \
+    www/fauxton/js/ace/mode-json.js \
+    www/fauxton/js/ace/theme-crimson_editor.js \
+    www/fauxton/js/ace/worker-javascript.js \
+    www/fauxton/js/ace/worker-json.js \
     www/favicon.ico \
     www/image/add.png \
     www/image/apply.gif \

=== modified file 'share/doc/build/Makefile.am'
--- share/doc/build/Makefile.am	2013-12-01 16:55:05 +0000
+++ share/doc/build/Makefile.am	2014-07-28 15:45:29 +0000
@@ -160,6 +160,7 @@
     html/_sources/whatsnew/1.3.txt \
     html/_sources/whatsnew/1.4.txt \
     html/_sources/whatsnew/1.5.txt \
+    html/_sources/whatsnew/1.6.txt \
     html/_sources/whatsnew/index.txt \
     html/_sources/about.txt \
     html/_sources/contents.txt \
@@ -281,6 +282,7 @@
     html/whatsnew/1.3.html \
     html/whatsnew/1.4.html \
     html/whatsnew/1.5.html \
+    html/whatsnew/1.6.html \
     html/whatsnew/index.html \
     html/about.html \
     html/config-ref.html \
@@ -388,6 +390,7 @@
     ../src/cve/2012-5641.rst \
     ../src/cve/2012-5649.rst \
     ../src/cve/2012-5650.rst \
+    ../src/cve/2014-2668.rst \
     ../src/cve/index.rst \
     ../src/fauxton/addons.rst \
     ../src/fauxton/index.rst \
@@ -428,6 +431,7 @@
     ../src/whatsnew/1.3.rst \
     ../src/whatsnew/1.4.rst \
     ../src/whatsnew/1.5.rst \
+    ../src/whatsnew/1.6.rst \
     ../src/whatsnew/index.rst \
     ../src/about.rst \
     ../src/contents.rst \
@@ -446,13 +450,13 @@
     ../templates/layout.html \
     ../templates/help.html \
     ../templates/searchbox.html \
+    ../templates/tracking.html \
     ../templates/utilities.html
 
 sphinx_extensions = \
     ../ext/configdomain.py \
     ../ext/github.py \
-    ../ext/httpdomain.py \
-    ../ext/http-api-descr.json
+    ../ext/httpdomain.py
 
 EXTRA_DIST = \
     $(image_files) \

=== modified file 'share/doc/build/Makefile.in'
--- share/doc/build/Makefile.in	2013-12-01 16:55:05 +0000
+++ share/doc/build/Makefile.in	2014-07-28 15:45:29 +0000
@@ -389,6 +389,7 @@
     html/_sources/whatsnew/1.3.txt \
     html/_sources/whatsnew/1.4.txt \
     html/_sources/whatsnew/1.5.txt \
+    html/_sources/whatsnew/1.6.txt \
     html/_sources/whatsnew/index.txt \
     html/_sources/about.txt \
     html/_sources/contents.txt \
@@ -510,6 +511,7 @@
     html/whatsnew/1.3.html \
     html/whatsnew/1.4.html \
     html/whatsnew/1.5.html \
+    html/whatsnew/1.6.html \
     html/whatsnew/index.html \
     html/about.html \
     html/config-ref.html \
@@ -613,6 +615,7 @@
     ../src/cve/2012-5641.rst \
     ../src/cve/2012-5649.rst \
     ../src/cve/2012-5650.rst \
+    ../src/cve/2014-2668.rst \
     ../src/cve/index.rst \
     ../src/fauxton/addons.rst \
     ../src/fauxton/index.rst \
@@ -653,6 +656,7 @@
     ../src/whatsnew/1.3.rst \
     ../src/whatsnew/1.4.rst \
     ../src/whatsnew/1.5.rst \
+    ../src/whatsnew/1.6.rst \
     ../src/whatsnew/index.rst \
     ../src/about.rst \
     ../src/contents.rst \
@@ -671,13 +675,13 @@
     ../templates/layout.html \
     ../templates/help.html \
     ../templates/searchbox.html \
+    ../templates/tracking.html \
     ../templates/utilities.html
 
 sphinx_extensions = \
     ../ext/configdomain.py \
     ../ext/github.py \
-    ../ext/httpdomain.py \
-    ../ext/http-api-descr.json
+    ../ext/httpdomain.py
 
 EXTRA_DIST = \
     $(image_files) \

=== modified file 'share/doc/build/html/_sources/api/database/bulk-api.txt'
--- share/doc/build/html/_sources/api/database/bulk-api.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/database/bulk-api.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 =================
 
 .. http:get:: /{db}/_all_docs
+  :synopsis: Returns a built-in view of all documents in this database
 
   Returns a JSON structure of all of the documents in a given database.
   The information is returned as a JSON structure containing meta
@@ -134,6 +135,7 @@
 
 
 .. http:post:: /{db}/_all_docs
+  :synopsis: Returns certain rows from the built-in view of all documents
 
   The ``POST`` to ``_all_docs`` allows to specify multiple keys to be
   selected from the database. This enables you to request multiple
@@ -191,6 +193,7 @@
 ==================
 
 .. http:post:: /{db}/_bulk_docs
+  :synopsis: Inserts or updates multiple documents in to the database in a single request
 
   The bulk document API allows you to create and update multiple documents
   at the same time within a single request. The basic operation is similar
@@ -211,25 +214,25 @@
   :<header Content-Type: :mimetype:`application/json`
   :<header X-Couch-Full-Commit: Overrides server's
     :config:option:`commit policy <couchdb/delayed_commits>`. Possible values
-    are: ``false`` and ``true``. *Optional*.
+    are: ``false`` and ``true``. *Optional*
   :<json boolean all_or_nothing: Sets the database commit mode to use
-    `all-or-nothing` semantics. Default is ``false``. *Optional*.
+    :ref:`all-or-nothing <api/db/bulk_docs/semantics>` semantics.
+    Default is ``false``. *Optional*
   :<json array docs: List of documents objects
   :<json boolean new_edits: If ``false``, prevents the database from assigning
-    them new revision IDs. Default is ``true``. *Optional*.
+    them new revision IDs. Default is ``true``. *Optional*
   :>header Content-Type: - :mimetype:`application/json`
                          - :mimetype:`text/plain; charset=utf-8`
   :>jsonarr string id: Document ID
-  :>jsonarr string rev: New document revision token. *Optional*. Available
-    if document have saved without errors.
-  :>jsonarr string error: Error type. *Optional*.
-  :>jsonarr string reason: Error reason. *Optional*.
+  :>jsonarr string rev: New document revision token. Available
+    if document have saved without errors. *Optional*
+  :>jsonarr string error: Error type. *Optional*
+  :>jsonarr string reason: Error reason. *Optional*
   :code 201: Document(s) have been created or updated
-  :code 400: The request provided invalid JSON data. Check that your data
-    is both ``utf-8`` and complies to the `JSON specification`_. Tools such as
-    `yajl`_ are available on all platforms that CouchDB runs on to assist with
-    validation and pretty printing.
-  :code 500: Malformed data provided
+  :code 400: The request provided invalid JSON data
+  :code 417: Occurs when ``all_or_nothing`` option set as ``true`` and
+    at least one document was rejected by :ref:`validation function <vdufun>`
+  :code 500: Malformed data provided, while it's still valid JSON
 
   **Request**:
 
@@ -278,9 +281,6 @@
       }
     ]
 
-.. _JSON specification: http://json.org/
-.. _yajl: http://lloyd.github.io/yajl/
-
 
 Inserting Documents in Bulk
 ---------------------------
@@ -294,64 +294,78 @@
 database. The constraints are detailed in :ref:`api/db/bulk_docs/semantics`.
 
 To insert documents in bulk into a database you need to supply a JSON
-structure with the array of documents that you want to add to the
-database. Using this method you can either include a document ID, or
-allow the document ID to be automatically generated.
+structure with the array of documents that you want to add to the database.
+You can either include a document ID, or allow the document ID to be
+automatically generated.
 
 For example, the following update inserts three new documents, two with the
 supplied document IDs, and one which will have a document ID generated:
 
-.. code-block:: javascript
-
-    {
-       "docs" : [
-          {
-             "_id" : "FishStew",
-             "servings" : 4,
-             "subtitle" : "Delicious with fresh bread",
-             "title" : "Fish Stew"
-          },
-          {
-             "_id" : "LambStew",
-             "servings" : 6,
-             "subtitle" : "Delicious with scone topping",
-             "title" : "Lamb Stew"
-          },
-          {
-             "servings" : 8,
-             "subtitle" : "Delicious with suet dumplings",
-             "title" : "Beef Stew"
-          },
-       ]
-    }
-
-
-The return type from a bulk insertion will be 201, with the content of
-the returned structure indicating specific success or otherwise messages
-on a per-document basis.
+.. code-block:: http
+
+  POST /source/_bulk_docs HTTP/1.1
+  Accept: application/json
+  Content-Length: 323
+  Content-Type: application/json
+  Host: localhost:5984
+
+  {
+      "docs": [
+          {
+              "_id": "FishStew",
+              "servings": 4,
+              "subtitle": "Delicious with freshly baked bread",
+              "title": "FishStew"
+          },
+          {
+              "_id": "LambStew",
+              "servings": 6,
+              "subtitle": "Serve with a whole meal scone topping",
+              "title": "LambStew"
+          },
+          {
+              "_id": "BeefStew",
+              "servings": 8,
+              "subtitle": "Hand-made dumplings make a great accompaniment",
+              "title": "BeefStew"
+          }
+      ]
+  }
+
+
+The return type from a bulk insertion will be :statuscode:`201`,
+with the content of the returned structure indicating specific success
+or otherwise messages on a per-document basis.
 
 The return structure from the example above contains a list of the
 documents created, here with the combination and their revision IDs:
 
 .. code-block:: http
 
-    POST http://couchdb:5984/recipes/_bulk_docs
-    Content-Type: application/json
+  HTTP/1.1 201 Created
+  Cache-Control: must-revalidate
+  Content-Length: 215
+  Content-Type: application/json
+  Date: Sat, 26 Oct 2013 00:10:39 GMT
+  Server: CouchDB (Erlang OTP)
 
-    [
-       {
-          "id" : "FishStew",
-          "rev" : "1-9c65296036141e575d32ba9c034dd3ee",
-       },
-       {
-          "id" : "LambStew",
-          "rev" : "1-34c318924a8f327223eed702ddfdc66d",
-       },
-       {
-          "id" : "7f7638c86173eb440b8890839ff35433",
-          "rev" : "1-857c7cbeb6c8dd1dd34a0c73e8da3c44",
-       }
-    ]
+  [
+      {
+          "id": "FishStew",
+          "ok": true,
+          "rev": "1-6a466d5dfda05e613ba97bd737829d67"
+      },
+      {
+          "id": "LambStew",
+          "ok": true,
+          "rev": "1-648f1b989d52b8e43f05aa877092cc7c"
+      },
+      {
+          "id": "BeefStew",
+          "ok": true,
+          "rev": "1-e4602845fc4c99674f50b1d5a804fdfa"
+      }
+  ]
 
 
 The content and structure of the returned JSON will depend on the transaction
@@ -370,62 +384,76 @@
 
 .. code-block:: http
 
-    POST http://couchdb:5984/recipes/_bulk_docs
-    Content-Type: application/json
+  POST /recipes/_bulk_docs HTTP/1.1
+  Accept: application/json
+  Content-Length: 464
+  Content-Type: application/json
+  Host: localhost:5984
 
-    {
-       "docs" : [
-          {
-             "_id" : "FishStew",
-             "_rev" : "1-9c65296036141e575d32ba9c034dd3ee",
-             "servings" : 4,
-             "subtitle" : "Delicious with freshly baked bread",
-             "title" : "Fish Stew"
-          },
-          {
-             "_id" : "LambStew",
-             "_rev" : "1-34c318924a8f327223eed702ddfdc66d",
-             "servings" : 6,
-             "subtitle" : "Serve with a wholemeal scone topping",
-             "title" : "Lamb Stew"
-          },
-          {
-             "_id" : "7f7638c86173eb440b8890839ff35433"
-             "_rev" : "1-857c7cbeb6c8dd1dd34a0c73e8da3c44",
-             "servings" : 8,
-             "subtitle" : "Hand-made dumplings make a great accompaniment",
-             "title" : "Beef Stew"
+  {
+      "docs": [
+          {
+              "_id": "FishStew",
+              "_rev": "1-6a466d5dfda05e613ba97bd737829d67",
+              "servings": 4,
+              "subtitle": "Delicious with freshly baked bread",
+              "title": "FishStew"
+          },
+          {
+              "_id": "LambStew",
+              "_rev": "1-648f1b989d52b8e43f05aa877092cc7c",
+              "servings": 6,
+              "subtitle": "Serve with a whole meal scone topping",
+              "title": "LambStew"
+          },
+          {
+              "_id": "BeefStew",
+              "_rev": "1-e4602845fc4c99674f50b1d5a804fdfa",
+              "servings": 8,
+              "subtitle": "Hand-made dumplings make a great accompaniment",
+              "title": "BeefStew"
           }
-       ]
-    }
+      ]
+  }
 
 The return structure is the JSON of the updated documents, with the new
 revision and ID information:
 
-.. code-block:: javascript
-
-    [
-       {
-          "id" : "FishStew",
-          "rev" : "2-e7af4c4e9981d960ecf78605d79b06d1"
-       },
-       {
-          "id" : "LambStew",
-          "rev" : "2-0786321986194c92dd3b57dfbfc741ce"
-       },
-       {
-          "id" : "7f7638c86173eb440b8890839ff35433",
-          "rev" : "2-bdd3bf3563bee516b96885a66c743f8e"
-       }
-    ]
+.. code-block:: http
+
+  HTTP/1.1 201 Created
+  Cache-Control: must-revalidate
+  Content-Length: 215
+  Content-Type: application/json
+  Date: Sat, 26 Oct 2013 00:10:39 GMT
+  Server: CouchDB (Erlang OTP)
+
+  [
+      {
+          "id": "FishStew",
+          "ok": true,
+          "rev": "2-2bff94179917f1dec7cd7f0209066fb8"
+      },
+      {
+          "id": "LambStew",
+          "ok": true,
+          "rev": "2-6a7aae7ac481aa98a2042718d09843c4"
+      },
+      {
+          "id": "BeefStew",
+          "ok": true,
+          "rev": "2-9801936a42f06a16f16c30027980d96f"
+      }
+  ]
+
 
 You can optionally delete documents during a bulk update by adding the
 ``_deleted`` field with a value of ``true`` to each document ID/revision
 combination within the submitted JSON structure.
 
-The return type from a bulk insertion will be :code:`201`, with the content of
-the returned structure indicating specific success or otherwise messages
-on a per-document basis.
+The return type from a bulk insertion will be :statuscode:`201`, with the
+content of the returned structure indicating specific success or otherwise
+messages on a per-document basis.
 
 The content and structure of the returned JSON will depend on the transaction
 semantics being used for the bulk update; see :ref:`api/db/bulk_docs/semantics`
@@ -442,9 +470,9 @@
 the state of the documents in the event of system failure, and the level
 of conflict checking performed on each document. The two modes are:
 
--  ``non-atomic``
+-  **non-atomic**
 
-   The default mode is non-atomic, that is, CouchDB will only guarantee
+   The default mode is `non-atomic`, that is, CouchDB will only guarantee
    that some of the documents will be saved when you send the request.
    The response will contain the list of documents successfully inserted
    or updated during the process. In the event of a crash, some of the
@@ -470,7 +498,7 @@
              "reason" : "Document update conflict."
           },
           {
-             "id" : "7f7638c86173eb440b8890839ff35433",
+             "id" : "BeefStew",
              "error" : "conflict",
              "reason" : "Document update conflict."
           }
@@ -481,9 +509,9 @@
    submit the document update, with the correct revision tag, to update
    the document.
 
--  ``all-or-nothing``
+-  **all-or-nothing**
 
-   In all-or-nothing mode, either all documents are written to the
+   In `all-or-nothing` mode, either all documents are written to the
    database, or no documents are written to the database, in the event
    of a system failure during commit.
 
@@ -493,22 +521,32 @@
    The returned structure contains the list of documents with new
    revisions:
 
-   .. code-block:: javascript
-
-       [
-          {
-             "id" : "FishStew",
-             "rev" : "2-e7af4c4e9981d960ecf78605d79b06d1"
-          },
-          {
-             "id" : "LambStew",
-             "rev" : "2-0786321986194c92dd3b57dfbfc741ce"
-          },
-          {
-             "id" : "7f7638c86173eb440b8890839ff35433",
-             "rev" : "2-bdd3bf3563bee516b96885a66c743f8e"
+   .. code-block:: http
+
+      HTTP/1.1 201 Created
+      Cache-Control: must-revalidate
+      Content-Length: 215
+      Content-Type: application/json
+      Date: Sat, 26 Oct 2013 00:13:33 GMT
+      Server: CouchDB (Erlang OTP)
+
+      [
+          {
+              "id": "FishStew",
+              "ok": true,
+              "rev": "1-6a466d5dfda05e613ba97bd737829d67"
+          },
+          {
+              "id": "LambStew",
+              "ok": true,
+              "rev": "1-648f1b989d52b8e43f05aa877092cc7c"
+          },
+          {
+              "id": "BeefStew",
+              "ok": true,
+              "rev": "1-e4602845fc4c99674f50b1d5a804fdfa"
           }
-       ]
+      ]
 
    When updating documents using this mode the revision of a document
    included in views will be arbitrary. You can check the conflict
@@ -545,7 +583,7 @@
 Replication of documents is independent of the type of insert or update.
 The documents and revisions created during a bulk insert or update are
 replicated in the same way as any other document. This can mean that if
-you make use of the all-or-nothing mode the exact list of documents,
+you make use of the `all-or-nothing` mode the exact list of documents,
 revisions (and their conflict state) may or may not be replicated to
 other databases correctly.
 
@@ -565,7 +603,7 @@
 determine error type and course of action. Errors will be one of the
 following type:
 
--  ``conflict``
+-  **conflict**
 
    The document as submitted is in conflict. If you used the default
    bulk transaction mode then the new revision will not have been
@@ -577,23 +615,32 @@
    is identical to the resolution procedures used when resolving
    conflict errors during replication.
 
--  ``forbidden``
+-  **forbidden**
 
    Entries with this error type indicate that the validation routine
    applied to the document during submission has returned an error.
 
-   For example, if your validation routine includes the following:
+   For example, if your :ref:`validation routine <vdufun>` includes
+   the following:
 
    .. code-block:: javascript
 
         throw({forbidden: 'invalid recipe ingredient'});
 
-   The error returned will be:
-
-   .. code-block:: javascript
+   The error response returned will be:
+
+   .. code-block:: http
+
+       HTTP/1.1 417 Expectation Failed
+       Cache-Control: must-revalidate
+       Content-Length: 120
+       Content-Type: application/json
+       Date: Sat, 26 Oct 2013 00:05:17 GMT
+       Server: CouchDB (Erlang OTP)
 
        {
-          "id" : "7f7638c86173eb440b8890839ff35433",
-          "error" : "forbidden",
-          "reason" : "invalid recipe ingredient"
+           "error": "forbidden",
+           "id": "LambStew",
+           "reason": "invalid recipe ingredient",
+           "rev": "1-34c318924a8f327223eed702ddfdc66d"
        }

=== modified file 'share/doc/build/html/_sources/api/database/changes.txt'
--- share/doc/build/html/_sources/api/database/changes.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/database/changes.txt	2014-07-28 15:45:29 +0000
@@ -18,6 +18,7 @@
 ================
 
 .. http:get:: /{db}/_changes
+  :synopsis: Returns changes for the given database
 
   Returns a sorted list of changes made to documents in the database, in time
   order of application, can be obtained from the database's ``_changes``
@@ -39,8 +40,8 @@
     previous connection. Overrides `since` query parameter.
   :query array doc_ids: List of document IDs to filter the changes feed as
    valid JSON array. Used with :ref:`_doc_ids <changes/filter/doc_ids>` filter.
-   Since `length of URL is limited`_, you better use :post:`/{db}/_changes`
-   method instead.
+   Since `length of URL is limited`_, it is better to use
+   :post:`/{db}/_changes` instead.
   :query boolean conflicts: Includes `conflicts` information in response.
     Ignored if `include_docs` isn't ``true``. Default is ``false``.
   :query boolean descending: Return the change results in descending sequence
@@ -48,7 +49,8 @@
   :query string feed: see :ref:`changes`. Default is ``normal``.
   :query string filter: Reference to a :ref:`filter function <filterfun>`
     from a design document that will filter whole stream emitting only filtered
-    events. See the `section in the book`_ for more information.
+    events. See the section `Change Notifications in the book
+    CouchDB The Definitive Guide`_ for more information.
   :query number heartbeat: Period in *milliseconds* after which an empty line is
     sent in the results. Only applicable for :ref:`longpoll <changes/longpoll>`
     or :ref:`continuous <changes/continuous>` feeds. Overrides any timeout to
@@ -57,6 +59,13 @@
   :query boolean include_docs: Include the associated document with each result.
     If there are conflicts, only the winning revision is returned.
     Default is ``false``.
+  :query boolean attachments: Include the Base64-encoded content of
+    :ref:`attachments <api/doc/attachments>` in the documents that are included
+    if `include_docs` is ``true``. Ignored if `include_docs` isn't ``true``.
+    Default is ``false``.
+  :query boolean att_encoding_info: Include encoding information in attachment
+    stubs if `include_docs` is ``true`` and the particular attachment is
+    compressed. Ignored if `include_docs` isn't ``true``. Default is ``false``.
   :query number last-event-id: Alias of `Last-Event-ID` header.
   :query number limit: Limit number of result rows to the specified value
     (note that using ``0`` here has the same effect as ``1``).
@@ -160,13 +169,22 @@
    listen changes since current seq number.
 .. versionchanged:: 1.3.0 ``eventsource`` feed type added.
 .. versionchanged:: 1.4.0 Support ``Last-Event-ID`` header.
+.. versionchanged:: 1.6.0 added ``attachments`` and ``att_encoding_info``
+   parameters
+
+.. warning::
+   Using the ``attachments`` parameter to include attachments in the changes
+   feed is not recommended for large attachment sizes. Also note that the
+   Base64-encoding that is used leads to a 33% overhead (i.e. one third) in
+   transfer size for attachments.
 
 
 .. http:post:: /{db}/_changes
+  :synopsis: Returns changes for the given database for certain document IDs
 
   Requests the database changes feed in the same way as
-  :get:`/{db}/_changes` does, but this method is widely used with
-  ``?filter=_doc_ids`` query parameter and allows to pass larger list of
+  :get:`/{db}/_changes` does, but is widely used with
+  ``?filter=_doc_ids`` query parameter and allows one to pass a larger list of
   document IDs to filter.
 
   **Request**:
@@ -340,7 +358,7 @@
 Obviously, `... tum tee tum ...` does not appear in the actual response, but
 represents a long pause before the change with seq 6 occurred.  
 
-.. _section in the book: http://guide.couchdb.org/draft/notifications.html
+.. _Change Notifications in the book CouchDB The Definitive Guide: http://guide.couchdb.org/draft/notifications.html
 
 .. _changes/eventsource:
 
@@ -495,9 +513,9 @@
 
 .. versionadded:: 1.2
 
-The special filter ``_view`` allows to use existed :ref:`map function <mapfun>`
+The special filter ``_view`` allows to use existing :ref:`map function <mapfun>`
 as the :ref:`filter <filterfun>`. If the map function emits anything for the
-processed document he counts as accepted and the changes event emits to the
+processed document it counts as accepted and the changes event emits to the
 feed. For most use-practice cases `filter` functions are very similar to `map`
 ones, so this feature helps to reduce amount of duplicated code.
 
@@ -513,7 +531,7 @@
    Using ``_view`` filter doesn't queries the view index files, so you cannot
    use common :ref:`view query parameters <api/ddoc/view>` to additionally
    filter the changes feed by index key. Also, CouchDB doesn't returns
-   the result instantly as he does for views - it really uses the specified
+   the result instantly as it does for views - it really uses the specified
    map function as filter.
 
    Moreover, you cannot make such filters dynamic e.g. process the request

=== modified file 'share/doc/build/html/_sources/api/database/common.txt'
--- share/doc/build/html/_sources/api/database/common.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/database/common.txt	2014-07-28 15:45:29 +0000
@@ -16,10 +16,12 @@
 =======
 
 .. http:head:: /{db}
+  :synopsis: Checks the database existence
 
   Returns the HTTP Headers containing a minimal amount of information
-  about the specified database. Since the response body is empty this method
-  is a lightweight way to check if the database exists already or not.
+  about the specified database. Since the response body is empty, using the
+  HEAD method is a lightweight way to check if the database exists already or
+  not.
 
   :param db: Database name
   :code 200: Database exists
@@ -44,6 +46,7 @@
 
 
 .. http:get:: /{db}
+  :synopsis: Returns the database information
 
   Gets information about the specified database.
 
@@ -58,6 +61,7 @@
   :>json string db_name: The name of the database.
   :>json number disk_format_version: The version of the physical format used
     for the data when it is stored on disk.
+  :>json number data_size: Actual data size in bytes of the database data.
   :>json number disk_size: Size in bytes of the data as stored on the disk.
     Views indexes are not included in the calculation.
   :>json number doc_count: A count of the documents in the specified database.
@@ -104,6 +108,7 @@
 
 
 .. http:put:: /{db}
+  :synopsis: Creates a new database
 
   Creates a new database. The database name ``{db}`` must be composed by
   following next rules:
@@ -213,10 +218,17 @@
 
 
 .. http:delete:: /{db}
+  :synopsis: Deletes an existing database
 
   Deletes the specified database, and all the documents and attachments
   contained within it.
 
+  .. note::
+
+    To avoid deleting a database, CouchDB will respond with the HTTP status code 400
+    when the request URL includes a ?rev= parameter. This suggests that one wants to delete
+    a document but forgot to add the document id to the URL.
+
   :param db: Database name
   :<header Accept: - :mimetype:`application/json`
                    - :mimetype:`text/plain`
@@ -224,7 +236,7 @@
                          - :mimetype:`text/plain; charset=utf-8`
   :>json boolean ok: Operation status
   :code 200: Database removed successfully
-  :code 400: Invalid database name
+  :code 400: Invalid database name or forgotten document id by accident
   :code 401: CouchDB Server Administrator privileges required
   :code 404: Database doesn't exist
 
@@ -253,6 +265,7 @@
 
 
 .. http:post:: /{db}
+  :synopsis: Creates a new document with generated ID if _id is not specified
 
   Creates a new document in the specified database, using the supplied JSON
   document structure.

=== modified file 'share/doc/build/html/_sources/api/database/compact.txt'
--- share/doc/build/html/_sources/api/database/compact.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/database/compact.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 ================
 
 .. http:post:: /{db}/_compact
+  :synopsis: Starts a compaction for the database
 
   Request compaction of the specified database. Compaction compresses the
   disk database file by performing the following operations:
@@ -86,10 +87,11 @@
 ===========================
 
 .. http:post:: /{db}/_compact/{ddoc}
+  :synopsis: Starts a compaction for all the views in the selected design document
 
   Compacts the view indexes associated with the specified design document.
   If may be that compacting a large view can return more storage than
-  compacting the atual db. Thus, you can use this in place of the full
+  compacting the actual db. Thus, you can use this in place of the full
   database compaction if you know a specific set of view indexes have been
   affected by a recent database change.
 
@@ -143,6 +145,7 @@
 ===========================
 
 .. http:post:: /{db}/_ensure_full_commit
+  :synopsis: Makes sure all uncommitted changes are written and synchronized to the disk
 
   Commits any recent changes to the specified database to disk. You should
   call this if you want to ensure that recent changes have been flushed.
@@ -196,6 +199,7 @@
 =====================
 
 .. http:post:: /{db}/_view_cleanup
+  :synopsis: Removes view files that are not used by any design document
 
   Removes view index files that are no longer required by CouchDB as a result
   of changed views within design documents. As the view filename is based on

=== modified file 'share/doc/build/html/_sources/api/database/index.txt'
--- share/doc/build/html/_sources/api/database/index.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/database/index.txt	2014-07-28 15:45:29 +0000
@@ -12,14 +12,14 @@
 
 .. _api/database:
 
-================
-Database Methods
-================
-
-The Database methods provide an interface to an entire database withing
-CouchDB. These are database, rather than document, level requests.
-
-For all the database methods, the database name within the URL path
+=========
+Databases
+=========
+
+The Database endpoint provides an interface to an entire database with in
+CouchDB. These are database-level, rather than document-level requests.
+
+For all these requests, the database name within the URL path
 should be the database name that you wish to perform the operation on.
 For example, to obtain the meta information for the database
 ``recipes``, you would use the HTTP request:

=== modified file 'share/doc/build/html/_sources/api/database/misc.txt'
--- share/doc/build/html/_sources/api/database/misc.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/database/misc.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 ==============
 
 .. http:post:: /{db}/_purge
+  :synopsis: Purges some historical documents entirely from database history
 
   A database purge permanently removes the references to deleted documents
   from the database. Normal deletion of a document within CouchDB does not
@@ -129,6 +130,7 @@
 =====================
 
 .. http:post:: /{db}/_missing_revs
+  :synopsis: By given list of document revisions returns the document revisions that do not exist in the database
 
   With given a list of document revisions, returns the document revisions that
   do not exist in the database.
@@ -187,6 +189,7 @@
 ==================
 
 .. http:post:: /{db}/_revs_diff
+  :synopsis: By given list of document revisions returns differences between the given revisions and ones that are in the database
 
   Given a set of document/revision IDs, returns the subset of those that do
   not correspond to revisions stored in the database.
@@ -202,9 +205,9 @@
 
   - In the request, a value is an array of revision IDs for that document.
 
-  - In the response, a value is an object with a "missing": key, whose value
+  - In the response, a value is an object with a ``missing``: key, whose value
     is a list of revision IDs for that document (the ones that are not stored
-    in the database) and optionally a "possible_ancestors" key, whose value is
+    in the database) and optionally a ``possible_ancestors`` key, whose value is
     an array of revision IDs that are known that might be ancestors of
     the missing revisions.
 
@@ -215,7 +218,9 @@
   :<json object: Mapping of document ID to list of revisions to lookup
   :>header Content-Type: - :mimetype:`application/json`
                          - :mimetype:`text/plain; charset=utf-8`
-  :>json object missing_revs: Mapping of document ID to list of missed revisions
+  :>json array missing: List of missed revisions for specified document
+  :>json array possible_ancestors: List of revisions that *may be* ancestors
+    for specified document and its current revision in requested database
   :code 200: Request completed successfully
   :code 400: Invalid database name or JSON payload
 
@@ -232,7 +237,8 @@
     {
       "190f721ca3411be7aa9477db5f948bbb": [
         "3-bb72a7682290f94a985f7afac8b27137",
-        "4-10265e5a26d807a3cfa459cf1a82ef2e"
+        "4-10265e5a26d807a3cfa459cf1a82ef2e",
+        "5-067a00dff5e02add41819138abb3284d"
       ]
     }
 
@@ -250,7 +256,11 @@
     {
       "190f721ca3411be7aa9477db5f948bbb": {
         "missing": [
-          "3-bb72a7682290f94a985f7afac8b27137"
+          "3-bb72a7682290f94a985f7afac8b27137",
+          "5-067a00dff5e02add41819138abb3284d"
+        ],
+        "possible_ancestors": [
+          "4-10265e5a26d807a3cfa459cf1a82ef2e"
         ]
       }
     }
@@ -262,6 +272,7 @@
 ===================
 
 .. http:get:: /{db}/_revs_limit
+  :synopsis: Returns the limit of historical revisions to store for a single document in the database
 
   Gets the current ``revs_limit`` (revision limit) setting.
 
@@ -295,6 +306,7 @@
 
 
 .. http:put:: /{db}/_revs_limit
+  :synopsis: Sets the limit of historical revisions to store for a single document in the database
 
   Sets the maximum number of document revisions that will be tracked by
   CouchDB, even after compaction has occurred. You can set the revision

=== modified file 'share/doc/build/html/_sources/api/database/security.txt'
--- share/doc/build/html/_sources/api/database/security.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/database/security.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 =================
 
 .. http:get:: /{db}/_security
+  :synopsis: Returns the special security object for the database
 
   Returns the current security object from the specified database.
 
@@ -117,6 +118,7 @@
 
 
 .. http:put:: /{db}/_security
+  :synopsis: Sets the special security object for the database
 
   Sets the security object for the given database.
 

=== modified file 'share/doc/build/html/_sources/api/database/temp-views.txt'
--- share/doc/build/html/_sources/api/database/temp-views.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/database/temp-views.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 ==================
 
 .. http:post:: /{db}/_temp_view
+  :synopsis: Executes a given view function for all documents and returns the result
 
   Creates (and executes) a temporary view based on the view function
   supplied in the JSON request.

=== modified file 'share/doc/build/html/_sources/api/ddoc/common.txt'
--- share/doc/build/html/_sources/api/ddoc/common.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/ddoc/common.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 ==========================
 
 .. http:head:: /{db}/_design/{ddoc}
+  :synopsis: Returns bare information in the HTTP Headers for the design document
 
   Returns the HTTP Headers containing a minimal amount of information
   about the specified design document.
@@ -27,10 +28,11 @@
 
 
 .. http:get:: /{db}/_design/{ddoc}
+  :synopsis: Returns the design document
 
-  Returns design document with the specified design document` from the specified
-  database. Unless you request a specific revision, the latest revision of the
-  document will always be returned.
+  Returns the contents of the design document specified with the name of the design 
+  document and from the specified database from the URL. Unless you request a specific
+  revision, the latest revision of the document will always be returned.
 
   .. seealso::
 
@@ -38,12 +40,13 @@
 
 
 .. http:put:: /{db}/_design/{ddoc}
+  :synopsis: Creates a new design document or new version of an existing one
 
   The :method:`PUT` method creates a new named design document, or creates
   a new revision of the existing design document.
 
   The design documents have some agreement upon their fields and structure.
-  Currently it is the next:
+  Currently it is the following:
 
   * **language** (*string*): Defines :ref:`Query Server <query-server>`
     :config:section:`key <query_servers>` to process design document functions
@@ -68,6 +71,7 @@
 
 
 .. http:delete:: /{db}/_design/{ddoc}
+  :synopsis: Deletes the design document
 
   Deletes the specified document from the database. You must supply the
   current (latest) revision, either by using the ``rev`` parameter to
@@ -78,6 +82,7 @@
     :delete:`/{db}/{docid}`
 
 .. http:copy:: /{db}/_design/{ddoc}
+  :synopsis: Copies the design document
 
   The :method:`COPY` (which is non-standard HTTP) copies an existing
   design document to a new or existing one.
@@ -98,6 +103,7 @@
 =====================================
 
 .. http:head:: /{db}/_design/{ddoc}/{attname}
+  :synopsis: Returns bare information in the HTTP Headers for the attachment
 
   Returns the HTTP headers containing a minimal amount of information
   about the specified attachment.
@@ -107,6 +113,7 @@
     :head:`/{db}/{docid}/{attname}`
 
 .. http:get:: /{db}/_design/{ddoc}/{attname}
+  :synopsis: Gets the attachment of a design document
 
   Returns the file attachment associated with the design document.
   The raw data of the associated attachment is returned (just as if you were
@@ -117,6 +124,7 @@
     :get:`/{db}/{docid}/{attname}`
 
 .. http:put:: /{db}/_design/{ddoc}/{attname}
+  :synopsis: Adds an attachment of a design document
 
   Uploads the supplied content as an attachment to the specified design
   document. The attachment name provided must be a URL encoded string.
@@ -126,6 +134,7 @@
     :put:`/{db}/{docid}/{attname}`
 
 .. http:delete:: /{db}/_design/{ddoc}/{attname}
+  :synopsis: Deletes an attachment of a design document
 
   Deletes the attachment of the specified design document.
 
@@ -140,6 +149,7 @@
 ================================
 
 .. http:get:: /{db}/_design/{ddoc}/_info
+  :synopsis: Returns view index information for the specified design document
 
   Obtains information about the specified design document, including the index,
   index size and current status of the design document and associated

=== modified file 'share/doc/build/html/_sources/api/ddoc/index.txt'
--- share/doc/build/html/_sources/api/ddoc/index.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/ddoc/index.txt	2014-07-28 15:45:29 +0000
@@ -13,9 +13,9 @@
 
 .. _api/design-docs:
 
-=======================
-Design Document Methods
-=======================
+================
+Design Documents
+================
 
 In CouchDB, design documents provide the main interface for building a
 CouchDB application. The design document defines the views used to

=== modified file 'share/doc/build/html/_sources/api/ddoc/render.txt'
--- share/doc/build/html/_sources/api/ddoc/render.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/ddoc/render.txt	2014-07-28 15:45:29 +0000
@@ -17,7 +17,10 @@
 ==========================================
 
 .. http:get:: /{db}/_design/{ddoc}/_show/{func}
+  :synopsis: Executes a show function against null document
+
 .. http:post:: /{db}/_design/{ddoc}/_show/{func}
+  :synopsis: Same as GET method for the related endpoint
 
   Applies :ref:`show function <showfun>` for `null` document.
 
@@ -74,7 +77,9 @@
 =================================================
 
 .. http:get:: /{db}/_design/{ddoc}/_show/{func}/{docid}
+  :synopsis: Executes a show function against the specified document
 .. http:post:: /{db}/_design/{ddoc}/_show/{func}/{docid}
+  :synopsis: Same as GET method for the related endpoint
 
   Applies :ref:`show function <showfun>` for the specified document.
 
@@ -132,7 +137,9 @@
 ====================================================
 
 .. http:get:: /{db}/_design/{ddoc}/_list/{func}/{view}
+  :synopsis: Executes a list function against the view from the same design document
 .. http:post:: /{db}/_design/{ddoc}/_list/{func}/{view}
+  :synopsis: Same as GET method for the related endpoint
 
   Applies :ref:`list function <listfun>` for the :ref:`view function <viewfun>`
   from the same design document.
@@ -194,7 +201,9 @@
 ===============================================================
 
 .. http:get:: /{db}/_design/{ddoc}/_list/{func}/{other-ddoc}/{view}
+  :synopsis: Executes a list function against the view from other design document
 .. http:post:: /{db}/_design/{ddoc}/_list/{func}/{other-ddoc}/{view}
+  :synopsis: Same as GET method for the related endpoint
 
   Applies :ref:`list function <listfun>` for the :ref:`view function <viewfun>`
   from the other design document.
@@ -257,6 +266,7 @@
 ==============================================
 
 .. http:post:: /{db}/_design/{ddoc}/_update/{func}
+  :synopsis: Executes an update function against the null document
 
   Executes :ref:`update function <updatefun>` on server side for ``null``
   document.
@@ -320,7 +330,7 @@
 =====================================================
 
 .. http:put:: /{db}/_design/{ddoc}/_update/{func}/{docid}
-
+  :synopsis: Executes an update function against the specified document
 
   Executes :ref:`update function <updatefun>` on server side for the specified
   document.

=== modified file 'share/doc/build/html/_sources/api/ddoc/rewrites.txt'
--- share/doc/build/html/_sources/api/ddoc/rewrites.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/ddoc/rewrites.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 ========================================
 
 .. http:any:: /{db}/_design/{ddoc}/_rewrite/{path}
+  :synopsis: Rewrites HTTP request for the specified path by using stored routing rules
 
   Rewrites the specified path by rules defined in the specified design document.
 
@@ -28,8 +29,8 @@
   - **to** (*string*): Rule to rewrite an url. It can contain variables
     depending on  binding variables discovered during pattern matching and
     query args (url args and from the query member)
-  - **method** (*string*): Method to bind the request method to the rule.
-    Default is ``"*"``
+  - **method** (*string*): HTTP request method to bind the request method to
+    the rule. Default is ``"*"``
   - **query** (*object*): Query args you want to define they can contain
     dynamic variable by binding the key
 
@@ -49,18 +50,18 @@
   - If all tokens are matched and all `pathterms` are used, then the `pathspec`
     matches
 
-  The pattern matching is done by first matching the request method to a rule.
-  By default all methods match a rule. (method is equal to ``"*"`` by default).
-  Then It will try to match the path to one rule. If no rule match, then a
-  :statuscode:`404` response returned.
+  The pattern matching is done by first matching the HTTP request method to a
+  rule. ``method`` is equal to ``"*"`` by default, and will match any HTTP
+  method. It will then try to match the path to one rule. If no rule matches,
+  then a :statuscode:`404` response returned.
 
   Once a rule is found we rewrite the request url using the ``to`` and ``query``
   fields. The identified token are matched to the rule and will replace var.
   If ``'*'`` is found in the rule it will contain the remaining part if it
   exists.
-  
+
   Examples:
-  
+
   +--------------------------------------+----------+------------------+-------+
   |               Rule                   |    Url   |  Rewrite to      | Tokens|
   +======================================+==========+==================+=======+
@@ -82,7 +83,7 @@
   +--------------------------------------+----------+------------------+-------+
 
   Request method, header, query parameters, request payload and response body
-  are depended on endpoint to which url will be rewrited.
+  are depended on endpoint to which url will be rewritten.
 
   :param db: Database name
   :param ddoc: Design document name

=== modified file 'share/doc/build/html/_sources/api/ddoc/views.txt'
--- share/doc/build/html/_sources/api/ddoc/views.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/ddoc/views.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 ==========================================
 
 .. http:get:: /{db}/_design/{ddoc}/_view/{view}
+  :synopsis: Returns results for the specified stored view
 
   Executes the specified view function from the specified design document.
 
@@ -40,8 +41,15 @@
   :query boolean group: Group the results using the reduce function to a group
     or single row. Default is ``false``
   :query number group_level: Specify the group level to be used. *Optional*
-  :query boolean include_docs: Include the full content of the documents in
-    the return. Default is ``false``
+  :query boolean include_docs: Include the associated document with each row.
+    Default is ``false``.
+  :query boolean attachments: Include the Base64-encoded content of
+    :ref:`attachments <api/doc/attachments>` in the documents that are included
+    if `include_docs` is ``true``. Ignored if `include_docs` isn't ``true``.
+    Default is ``false``.
+  :query boolean att_encoding_info: Include encoding information in attachment
+    stubs if `include_docs` is ``true`` and the particular attachment is
+    compressed. Ignored if `include_docs` isn't ``true``. Default is ``false``.
   :query boolean inclusive_end: Specifies whether the specified end key should
     be included in the result. Default is ``true``
   :query string key: Return only documents that match the specified key.
@@ -122,12 +130,22 @@
         "total_rows": 3
     }
 
+.. versionchanged:: 1.6.0 added ``attachments`` and ``att_encoding_info``
+   parameters
+
+.. warning::
+   Using the ``attachments`` parameter to include attachments in view results
+   is not recommended for large attachment sizes. Also note that the
+   Base64-encoding that is used leads to a 33% overhead (i.e. one third) in
+   transfer size for attachments.
+
 
 .. http:post:: /{db}/_design/{ddoc}/_view/{view}
+  :synopsis: Returns certain rows for the specified stored view
 
   Executes the specified view function from the specified design document.
-  Unlike the :get:`/{db}/_design/{ddoc}/_view/{view}`  method
-  for accessing views, the :method:`POST` method supports the specification
+  Unlike :get:`/{db}/_design/{ddoc}/_view/{view}` for accessing views, the
+  :method:`POST` method supports the specification
   of explicit keys to be retrieved from the view results. The remainder of the
   :method:`POST` view functionality is identical to the
   :get:`/{db}/_design/{ddoc}/_view/{view}` API.
@@ -341,107 +359,107 @@
   ETag: "8LA1LZPQ37B6R9U8BK9BGQH27"
   Server: CouchDB (Erlang/OTP)
   Transfer-Encoding: chunked
-  
+
   {
-      "offset": 0, 
+      "offset": 0,
       "rows": [
           {
-              "id": "dummy-doc", 
-              "key": null, 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": false, 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": true, 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": 0, 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": 1, 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": 10, 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": 42, 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": "10", 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": "hello", 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": "Hello", 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
+              "id": "dummy-doc",
+              "key": null,
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": false,
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": true,
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": 0,
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": 1,
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": 10,
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": 42,
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": "10",
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": "hello",
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": "Hello",
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
               "key": "\u043f\u0440\u0438\u0432\u0435\u0442",
               "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": [], 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": [
-                  1, 
-                  2, 
-                  3
-              ], 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": [
-                  2, 
-                  3
-              ], 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": [
-                  3
-              ], 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
-              "key": {}, 
-              "value": null
-          }, 
-          {
-              "id": "dummy-doc", 
+          },
+          {
+              "id": "dummy-doc",
+              "key": [],
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": [
+                  1,
+                  2,
+                  3
+              ],
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": [
+                  2,
+                  3
+              ],
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": [
+                  3
+              ],
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
+              "key": {},
+              "value": null
+          },
+          {
+              "id": "dummy-doc",
               "key": {
                   "foo": "bar"
-              }, 
+              },
               "value": null
           }
-      ], 
+      ],
       "total_rows": 17
   }
 
@@ -469,7 +487,7 @@
   ETag: "Z4N468R15JBT98OM0AMNSR8U"
   Server: CouchDB (Erlang/OTP)
   Transfer-Encoding: chunked
-  
+
   {
       "offset": 0,
       "rows": [

=== modified file 'share/doc/build/html/_sources/api/document/attachments.txt'
--- share/doc/build/html/_sources/api/document/attachments.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/document/attachments.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 ======================
 
 .. http:head:: /{db}/{docid}/{attname}
+  :synopsis: Returns bare information in the HTTP Headers for the attachment
 
   Returns the HTTP headers containing a minimal amount of information
   about the specified attachment. The method supports the same query
@@ -70,6 +71,7 @@
 
 
 .. http:get:: /{db}/{docid}/{attname}
+  :synopsis: Gets the attachment of a document
 
   Returns the file attachment associated with the document.
   The raw data of the associated attachment is returned (just as if you were
@@ -102,6 +104,7 @@
 
 
 .. http:put:: /{db}/{docid}/{attname}
+  :synopsis: Adds an attachment of a document
 
   Uploads the supplied content as an attachment to the specified document.
   The attachment name provided must be a URL encoded string. You must also
@@ -182,6 +185,7 @@
 
 
 .. http:delete:: /{db}/{docid}/{attname}
+  :synopsis: Deletes an attachment of a document
 
   Deletes the attachment ``attachment`` of the specified ``doc``. You must
   supply the ``rev`` query parameter or :header:`If-Match` with the current

=== modified file 'share/doc/build/html/_sources/api/document/common.txt'
--- share/doc/build/html/_sources/api/document/common.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/document/common.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 ===========
 
 .. http:head:: /{db}/{docid}
+  :synopsis: Returns bare information in the HTTP Headers for the document
 
   Returns the HTTP Headers containing a minimal amount of information
   about the specified document. The method supports the same query
@@ -63,6 +64,7 @@
 
 
 .. http:get:: /{db}/{docid}
+  :synopsis: Returns the document
 
   Returns document by the specified ``docid`` from the specified ``db``.
   Unless you request a specific revision, the latest revision of the
@@ -78,8 +80,8 @@
 
   :query boolean attachments: Includes attachments bodies in response.
     Default is ``false``
-  :query boolean att_encoding_info: Includes encoding information into
-    attachment's stubs for compressed ones. Default is ``false``
+  :query boolean att_encoding_info: Includes encoding information in attachment
+    stubs if the particular attachment is compressed. Default is ``false``.
   :query array atts_since: Includes attachments only since specified revisions.
     Doesn't includes attachments for specified revisions. *Optional*
   :query boolean conflicts: Includes information about conflicts in document.
@@ -165,9 +167,10 @@
     }
 
 .. http:put:: /{db}/{docid}
+  :synopsis: Creates a new document or new version of an existing document
 
   The :method:`PUT` method creates a new named document, or creates a new
-  revision of the existing document. Unlike the :post:`/{db}` method, you
+  revision of the existing document. Unlike the :post:`/{db}`, you
   must specify the document ID in the request URL.
 
   :param db: Database name
@@ -235,17 +238,22 @@
         "rev": "1-917fa2381192822767f010b95b45325b"
     }
 
-
 .. http:delete:: /{db}/{docid}
-
-  Deletes the specified document from the database. You must supply the
-  current (latest) revision, either by using the ``rev`` parameter to
-  specify the revision.
+  :synopsis: Deletes the document
+
+  Marks the specified document as deleted by adding a field ``_deleted`` with
+  the value ``true``. Documents with this field will not be returned within
+  requests anymore, but stay in the database. You must supply the current
+  (latest) revision, either by using the ``rev`` parameter or by using the
+  :header:`If-Match` header to specify the revision.
+
+  .. seealso::
+    :ref:`Retrieving Deleted Documents <api/doc/retrieving-deleted-documents>`
 
   .. note::
-    Note that deletion of a record increments the revision number.
-    The use of a revision for deletion of the record allows replication of
-    the database to correctly track the deletion in synchronized copies.
+    CouchDB doesn't actually delete documents. The reason is the need to track
+    them correctly during the replication process between databases to prevent
+    accidental document recovery for any previous state.
 
   :param db: Database name
   :param docid: Document ID
@@ -309,6 +317,7 @@
 
 
 .. http:copy:: /{db}/{docid}
+  :synopsis: Copies the document within the same database
 
   The :method:`COPY` (which is non-standard HTTP) copies an existing
   document to a new or existing document.
@@ -341,7 +350,7 @@
   :code 202: Request was accepted, but changes are not yet stored on disk
   :code 400: Invalid request body or parameters
   :code 401: Read or write privileges required
-  :code 404: Specified database, document ID  or his revision doesn't exists
+  :code 404: Specified database, document ID  or revision doesn't exists
   :code 409: Document with the specified ID already exists or specified
     revision is not latest for target document
 
@@ -391,16 +400,34 @@
 
 - **content_type** (*string*): Attachment MIME type
 - **data** (*string*): Base64-encoded content. Available if attachment content
-  requested by using ``attachments=true`` or ``atts_since`` query parameters
+  is requested by using the following query parameters:
+
+    - ``attachments=true`` when querying a document
+    - ``attachments=true&include_docs=true`` when querying a
+      :ref:`changes feed <api/db/changes>` or a :ref:`view <api/ddoc/view>`
+    - ``atts_since``.
+
 - **digest** (*string*): Content hash digest.
   It starts with prefix which announce hash type (``md5-``) and continues with
   Base64-encoded hash digest
-- **encoded_length** (*number*): Compressed attachment size in bytes
-  Available when query parameter ``att_encoding_info=true`` was specified and
-  ``content_type`` is in :config:option:`list of compressiable types
-  <attachments/compressible_types>`
-- **encoding** (*string*): Compression codec. Available when query parameter
-  ``att_encoding_info=true`` was specified
+- **encoded_length** (*number*): Compressed attachment size in bytes.
+  Available if ``content_type`` is in :config:option:`list of compressible types
+  <attachments/compressible_types>` when the attachment was added and the
+  following query parameters are specified:
+
+    - ``att_encoding_info=true`` when querying a document
+    - ``att_encoding_info=true&include_docs=true`` when querying a
+      :ref:`changes feed <api/db/changes>` or a :ref:`view <api/ddoc/view>`
+
+- **encoding** (*string*): Compression codec. Available if ``content_type`` is
+  in :config:option:`list of compressible types
+  <attachments/compressible_types>` when the attachment was added and the
+  following query parameters are specified:
+
+    - ``att_encoding_info=true`` when querying a document
+    - ``att_encoding_info=true&include_docs=true`` when querying a
+      :ref:`changes feed <api/db/changes>` or a :ref:`view <api/ddoc/view>`
+
 - **length** (*number*): Real attachment size in bytes. Not available if attachment
   content requested
 - **revpos** (*number*): Revision *number* when attachment was added
@@ -466,6 +493,7 @@
       "name": "Spaghetti with meatballs"
   }
 
+.. _api/doc/retrieving-deleted-documents:
 
 Retrieving Attachments Content
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -842,7 +870,7 @@
 ``_revisions`` structure that includes the revision information in next form:
 
 - **ids** (*array*): Array of valid revision IDs, in reverse order
-    (latest first)
+  (latest first)
 - **start** (*number*): Prefix number for the latest revision
 
 
@@ -918,7 +946,7 @@
   }
 
 
-The returned document contains ``_rev_info`` field with extended revision
+The returned document contains ``_revs_info`` field with extended revision
 information, including the availability and status of each revision. This array
 field contains objects with following structure:
 

=== modified file 'share/doc/build/html/_sources/api/document/index.txt'
--- share/doc/build/html/_sources/api/document/index.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/document/index.txt	2014-07-28 15:45:29 +0000
@@ -13,12 +13,11 @@
 
 .. _api/document:
 
-================
-Document Methods
-================
+=========
+Documents
+=========
 
-The CouchDB API Server Document methods detail how to create, read,
-update and delete documents within a database.
+Details on how to create, read, update and delete documents within a database.
 
 .. toctree::
 

=== modified file 'share/doc/build/html/_sources/api/local.txt'
--- share/doc/build/html/_sources/api/local.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/local.txt	2014-07-28 15:45:29 +0000
@@ -12,9 +12,9 @@
 
 .. _api/local:
 
-========================================
-Local (non-replicating) Document Methods
-========================================
+=================================
+Local (non-replicating) Documents
+=================================
 
 The Local (non-replicating) document interface allows you to create
 local documents that are not replicated to other databases. These
@@ -56,24 +56,28 @@
 ========================
 
 .. http:get:: /{db}/_local/{docid}
+  :synopsis: Returns the latest revision of the local document
 
   Gets the specified local document. The semantics are identical to
   accessing a standard document in the specified database, except that the
   document is not replicated. See :get:`/{db}/{docid}`.
 
 .. http:put:: /{db}/_local/{docid}
+  :synopsis: Inserts a new version of the local document
 
   Stores the specified local document. The semantics are identical to
   storing a standard document in the specified database, except that the
   document is not replicated. See :put:`/{db}/{docid}`.
 
 .. http:delete:: /{db}/_local/{docid}
+  :synopsis: Deletes the local document
 
   Deletes the specified local document. The semantics are identical to
   deleting a standard document in the specified database, except that the
   document is not replicated. See :delete:`/{db}/{docid}`.
 
 .. http:copy:: /{db}/_local/{docid}
+  :synopsis: Copies the local document within the same database
 
   Copies the specified local document. The semantics are identical to
   copying a standard document in the specified database, except that the

=== modified file 'share/doc/build/html/_sources/api/server/authn.txt'
--- share/doc/build/html/_sources/api/server/authn.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/server/authn.txt	2014-07-28 15:45:29 +0000
@@ -12,12 +12,11 @@
 
 .. _api/auth:
 
-======================
-Authentication Methods
-======================
+==============
+Authentication
+==============
 
-The CouchDB Authentication methods provide an interface for obtaining
-session and authorization data.
+Interfaces for obtaining session and authorization data.
 
 .. note:: We're also strongly recommend you to
    :ref:`setup SSL <config/ssl>` to improve all authentication methods security.
@@ -85,10 +84,11 @@
 
 .. _api/auth/session:
 
-``_session``
-------------
+``/_session``
+-------------
 
 .. http:post:: /_session
+  :synopsis: Authenticates user by Cookie-based user login
 
   Initiates new session for specified user credentials by providing `Cookie`
   value.
@@ -179,6 +179,7 @@
 
 
 .. http:get:: /_session
+  :synopsis: Returns Cookie-based login user information
 
   Returns complete information about authenticated user.
   This information contains :ref:`userctx_object`, authentication method and
@@ -231,6 +232,7 @@
 
 
 .. http:delete:: /_session
+  :synopsis: Logout Cookie-based user
 
   Closes user's session.
 

=== modified file 'share/doc/build/html/_sources/api/server/common.txt'
--- share/doc/build/html/_sources/api/server/common.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/server/common.txt	2014-07-28 15:45:29 +0000
@@ -17,6 +17,7 @@
 =====
 
 .. http:get:: /
+  :synopsis: Returns the welcome message and version information
 
   Accessing the root of a CouchDB instance returns meta information about
   the instance. The response is a JSON structure containing information
@@ -65,6 +66,7 @@
 ==================
 
 .. http:get:: /_active_tasks
+  :synopsis: Obtains a list of the tasks running in the server
 
   List of running tasks, including the task type, name, status
   and process ID. The result is a JSON array of the currently running tasks,
@@ -168,6 +170,7 @@
 =============
 
 .. http:get:: /_all_dbs
+  :synopsis: Returns a list of all the databases
 
   Returns a list of all the databases in the CouchDB instance.
 
@@ -213,6 +216,7 @@
 .. versionadded:: 1.4
 
 .. http:get:: /_db_updates
+  :synopsis: Return the server changes of databases
 
   Returns a list of all database events in the CouchDB instance.
 
@@ -269,6 +273,7 @@
 =========
 
 .. http:get:: /_log
+  :synopsis: Returns the server log file
 
   Gets the CouchDB log, equivalent to accessing the local log file of the
   corresponding CouchDB instance.
@@ -341,6 +346,7 @@
 ===============
 
 .. http:post:: /_replicate
+  :synopsis: Starts or cancels the replication
 
   Request, configure, or stop, a replication operation.
 
@@ -353,7 +359,7 @@
     Required administrator's privileges on target server.
   :<json array doc_ids: Array of document IDs to be synchronized
   :<json string proxy: Address of a proxy server through which replication
-    should occur
+    should occur (protocol can be "http" or "socks5")
   :<json string source: Source database name or URL
   :<json string target: Target database name or URL
   :>header Content-Type: - :mimetype:`application/json`
@@ -664,6 +670,7 @@
 =============
 
 .. http:post:: /_restart
+  :synopsis: Restarts the server
 
   Restarts the CouchDB instance. You must be authenticated as a user with
   administration privileges for this to work.
@@ -708,6 +715,7 @@
 ===========
 
 .. http:get:: /_stats
+  :synopsis: Returns server statistics
 
   The ``_stats`` resource returns a JSON object containing the statistics
   for the running server. The object is structured with top-level sections
@@ -888,6 +896,7 @@
 ===========
 
 .. http:get:: /_utils
+  :synopsis: Redirects to /_utils/
 
   Accesses the built-in Futon administration interface for CouchDB.
 
@@ -895,6 +904,7 @@
   :code 301: Redirects to :get:`/_utils/`
 
 .. http:get:: /_utils/
+  :synopsis: CouchDB administration interface (Futon)
 
   :>header Content-Type: :mimetype:`text/html`
   :>header Last-Modified: Static files modification timestamp
@@ -906,7 +916,10 @@
 ``/_uuids``
 ===========
 
+.. versionchanged:: 1.5.1
+
 .. http:get:: /_uuids
+  :synopsis: Generates a list of UUIDs from the server
 
   Requests one or more Universally Unique Identifiers (UUIDs) from the
   CouchDB instance. The response is a JSON object providing a list of
@@ -919,6 +932,8 @@
                          - :mimetype:`text/plain; charset=utf-8`
   :>header ETag: Response hash
   :code 200: Request completed successfully
+  :code 403: Requested more UUIDs than is :config:option:`allowed
+             <uuids/max_count>` to retrieve
 
   **Request**:
 
@@ -992,6 +1007,7 @@
 ================
 
 .. http:get:: /favicon.ico
+  :synopsis: Returns the site icon
 
   Binary content for the `favicon.ico` site icon.
 

=== modified file 'share/doc/build/html/_sources/api/server/configuration.txt'
--- share/doc/build/html/_sources/api/server/configuration.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/server/configuration.txt	2014-07-28 15:45:29 +0000
@@ -12,18 +12,18 @@
 
 .. _api/config:
 
-=====================
-Configuration Methods
-=====================
+=============
+Configuration
+=============
 
-The CouchDB API Server Configuration Methods provide an interface to
-query and update the various configuration values within a running
-CouchDB instance.
+The CouchDB Server Configuration API provide an interface to query and update
+the various configuration values within a running CouchDB instance.
 
 ``/_config``
 ============
 
 .. http:get:: /_config
+  :synopsis: Obtains a list of the entire server configuration
 
   Returns the entire CouchDB server configuration as a JSON structure. The
   structure is organized by different configuration sections, with
@@ -152,7 +152,7 @@
           "algorithm": "utc_random"
       }
     }
-        
+
 
 .. _api/config/section:
 
@@ -160,6 +160,7 @@
 ====================
 
 .. http:get:: /_config/{section}
+  :synopsis: Returns all the configuration values for the specified section
 
   Gets the configuration structure for a single section.
 
@@ -209,6 +210,7 @@
 ========================
 
 .. http:get:: /_config/{section}/{key}
+  :synopsis: Returns a specific section/configuration value
 
   Gets a single configuration value from within a specific configuration
   section.
@@ -251,6 +253,7 @@
 
 
 .. http:put:: /_config/{section}/{key}
+  :synopsis: Sets the specified configuration value
 
   Updates a configuration value. The new value should be supplied in the
   request body in the corresponding JSON format. If you are setting a string
@@ -296,6 +299,7 @@
 
 
 .. http:delete:: /_config/{section}/{key}
+  :synopsis: Removes the current setting
 
   Deletes a configuration value. The returned JSON will be the value of
   the configuration parameter before it was deleted.

=== modified file 'share/doc/build/html/_sources/api/server/index.txt'
--- share/doc/build/html/_sources/api/server/index.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/api/server/index.txt	2014-07-28 15:45:29 +0000
@@ -13,9 +13,9 @@
 
 .. _api/server:
 
-==============
-Server Methods
-==============
+======
+Server
+======
 
 The CouchDB server interface provides the basic interface to a
 CouchDB server for obtaining CouchDB information and getting and setting

=== modified file 'share/doc/build/html/_sources/config/auth.txt'
--- share/doc/build/html/_sources/config/auth.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/config/auth.txt	2014-07-28 15:45:29 +0000
@@ -166,6 +166,30 @@
       [couch_httpd_auth]
       iterations = 10000
 
+  .. config:option:: min_iterations :: Minimum PBKDF2 iterations count
+
+    .. versionadded:: 1.6
+
+    The minimum number of iterations allowed for passwords hashed by
+    the PBKDF2 algorithm. Any user with fewer iterations is forbidden.
+
+    ::
+
+      [couch_httpd_auth]
+      min_iterations = 100
+
+  .. config:option:: max_iterations :: Maximum PBKDF2 iterations count
+
+    .. versionadded:: 1.6
+
+    The maximum number of iterations allowed for passwords hashed by
+    the PBKDF2 algorithm. Any user with greater iterations is forbidden.
+
+    ::
+
+      [couch_httpd_auth]
+      max_iterations = 100000
+
 
   .. config:option:: proxy_use_secret :: Force proxy auth use secret token
 

=== modified file 'share/doc/build/html/_sources/config/http.txt'
--- share/doc/build/html/_sources/config/http.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/config/http.txt	2014-07-28 15:45:29 +0000
@@ -530,7 +530,7 @@
 .. config:section:: vhosts :: Virtual Hosts
 
   CouchDB can map requests to different locations based on the ``Host`` header,
-  even if they arrive on the some inbound IP address.
+  even if they arrive on the same inbound IP address.
 
   This allows different virtual hosts on the same machine to map to different
   databases or design documents, etc. The most common use case is to map a

=== modified file 'share/doc/build/html/_sources/config/intro.txt'
--- share/doc/build/html/_sources/config/intro.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/config/intro.txt	2014-07-28 15:45:29 +0000
@@ -23,6 +23,14 @@
 Configuration files
 -------------------
 
+.. warning::
+   The following section covering load order of config files
+   applies only to UNIX-ish systems.
+   For Windows, only the provided ``default.ini`` and ``local.ini``
+   files are relevant. These can of course have content
+   appended, which achieves the same type of functionality
+   as outlined for UNIX-ish systems below.
+
 By default, CouchDB reads configuration files from the following locations,
 in the following order:
 
@@ -126,7 +134,7 @@
 
 .. note::
    In case when you'd like to remove some parameter from the `default.ini`
-   without his modification, you may specify him within the `local.ini`, but
+   without modifying that file, you may override in `local.ini`, but
    without any value::
 
      [httpd_global_handlers]
@@ -148,7 +156,7 @@
 
 Alternatively, configuration parameters could be set via the
 :ref:`HTTP API <api/config>`. This API allows to change CouchDB configuration
-on-fly without need for server restart::
+on-the-fly without requiring a server restart::
 
   curl -X PUT http://localhost:5984/_config/uuids/algorithm -d '"random"'
 
@@ -157,16 +165,17 @@
   "sequential"
 
 You should be careful with changing configuration via the HTTP API since it's
-easy to make CouchDB unavailable. For instance, you'd like to change the
-:option:`httpd/bind_address` for new one::
+easy to make CouchDB unavailable. For instance, if you'd like to change the
+:option:`httpd/bind_address` for a new one::
 
   curl -X PUT http://localhost:5984/_config/httpd/bind_address -d '"10.10.0.128"'
 
-However, if you would made a typo or the specified IP address is not available
-from your network, you'll make CouchDB unavailable for you in both cases and
-you will have the only way to fix the problem by edit the configuration file
-and restart the server. To protect yourself against such accidents you may
-setup the :option:`httpd/config_whitelist` of configuration parameters that
-are allowed to edit via the HTTP API. For others you'll need to directly edit
-the configuration file so you may quick fix any problems that had occurred due
-to misconfiguring.
+However, if you make a typo, or the specified IP address is not available
+from your network, CouchDB will be unavailable for you in both cases and
+the only way to resolve this will be by remoting into the server, correcting
+the errant file, and restarting CouchDB. To protect yourself against such
+accidents you may set the :option:`httpd/config_whitelist` of permitted
+configuration parameters for updates via the HTTP API. Once this option is set,
+further changes to non-whitelisted parameters must take place via the
+configuration file, and in most cases, also requires a server restart before
+hand-edited options take effect.

=== modified file 'share/doc/build/html/_sources/config/misc.txt'
--- share/doc/build/html/_sources/config/misc.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/config/misc.txt	2014-07-28 15:45:29 +0000
@@ -202,6 +202,17 @@
       [uuid]
       utc_id_suffix = my-awesome-suffix
 
+  .. config:option:: max_count :: Per-Request UUID Limit
+
+    .. versionadded:: 1.5.1
+
+    No more than this number of UUIDs will be sent in a single request. If
+    more UUIDs are requested, an HTTP error response will be thrown.
+
+    ::
+
+      [uuid]
+      max_count = 1000
 
 
 .. _config/vendor:

=== modified file 'share/doc/build/html/_sources/config/query-servers.txt'
--- share/doc/build/html/_sources/config/query-servers.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/config/query-servers.txt	2014-07-28 15:45:29 +0000
@@ -41,7 +41,7 @@
   - ``LANGUAGE``: is a programming language which code this query server may
     execute. For instance, there are `python`, `ruby`, `clojure` and other query
     servers in wild. This value is also used for `ddoc` field ``language``
-    to determine query server that will process his functions.
+    to determine which query server processes the functions.
 
     Note, that you may setup multiple query servers for the same programming
     language, but you have to name them different (like `python-dev` etc.).

=== modified file 'share/doc/build/html/_sources/config/replicator.txt'
--- share/doc/build/html/_sources/config/replicator.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/config/replicator.txt	2014-07-28 15:45:29 +0000
@@ -111,6 +111,39 @@
     .. _inet: http://www.erlang.org/doc/man/inet.html#setopts-2
 
 
+  .. config:option:: checkpoint_interval
+
+    .. versionadded:: 1.6
+
+    Defines replication checkpoint interval in milliseconds. :ref:`Replicator
+    <replicator>` will :get:`requests </{db}>` from the Source database at
+    the specified interval::
+
+      [replicator]
+      checkpoint_interval = 5000
+
+    Lower intervals may be useful for frequently changing data, while higher
+    values will lower bandwidth and make fewer requests for infrequently
+    updated databases.
+
+
+  .. config:option:: use_checkpoints
+
+     .. versionadded:: 1.6
+
+     If ``use_checkpoints`` is set to ``true``, CouchDB will make checkpoints
+     during replication and at the completion of replication. CouchDB can
+     efficiently resume replication from any of these checkpoints::
+
+      [replicator]
+      use_checkpoints = true
+
+     .. note:: Checkpoints are stored in :ref:`local documents <api/local>`
+        on both the source and target databases (which requires write access).
+
+     .. warning:: Disabling checkpoints is **not recommended** as CouchDB
+        will scan the Source database's changes feed from the beginning.
+
 
   .. config:option:: cert_file
 

=== modified file 'share/doc/build/html/_sources/couchapp/ddocs.txt'
--- share/doc/build/html/_sources/couchapp/ddocs.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/couchapp/ddocs.txt	2014-07-28 15:45:29 +0000
@@ -126,12 +126,12 @@
 .. code-block:: javascript
 
     // could be replaced by _sum
-    function(keys, values){
-      sum(values);
+    function(keys, values) {
+      return sum(values);
     }
 
     // could be replaced by _count
-    function(keys, values, rereduce){
+    function(keys, values, rereduce) {
       if (rereduce) {
         return sum(values);
       } else {
@@ -140,21 +140,31 @@
     }
 
     // could be replaced by _stats
-    function(keys, values, rereduce){
-      return {
-        'sum': sum(values),
-        'min': Math.min.apply(null, values),
-        'max': Math.max.apply(null, values),
-        'count': values.length,
-        'sumsqr': (function(){
-          var sumsqr = 0;
-
-          values.forEach(function (value) {
-            sumsqr += value * value;
-          });
-
-          return sumsqr;
-        })(),
+    function(keys, values, rereduce) {
+      if (rereduce) {
+        return {
+          'sum': values.reduce(function(a, b) { return a + b.sum }, 0),
+          'min': values.reduce(function(a, b) { return Math.min(a, b.min) }, Infinity),
+          'max': values.reduce(function(a, b) { return Math.max(a, b.max) }, -Infinity),
+          'count': values.reduce(function(a, b) { return a + b.count }, 0),
+          'sumsqr': values.reduce(function(a, b) { return a + b.sumsqr }, 0)
+        }
+      } else {
+        return {
+          'sum': sum(values),
+          'min': Math.min.apply(null, values),
+          'max': Math.max.apply(null, values),
+          'count': values.length,
+          'sumsqr': (function() {
+            var sumsqr = 0;
+
+            values.forEach(function (value) {
+              sumsqr += value * value;
+            });
+
+            return sumsqr;
+          })(),
+        }
       }
     }
 
@@ -409,7 +419,7 @@
 
     function(doc, req){
         if (!doc){
-            if ('id' in req){
+            if ('id' in req && req['id']){
                 // create new document
                 return [{'_id': req['id']}, 'New World']
             }
@@ -437,10 +447,10 @@
    :param doc: Processed document object.
    :param req: :ref:`request_object`
    :return: Boolean value: ``true`` means that `doc` passes the filter rules,
-            ``false`` that not.
+            ``false`` means that it does not.
 
-Filter functions are mostly acts like :ref:`showfun` and :ref:`listfun`: they
-formats, but more correctly to say, they *filters* :ref:`changes feed<changes>`.
+Filter functions mostly act like :ref:`showfun` and :ref:`listfun`: they
+format, or *filter* the :ref:`changes feed<changes>`.
 
 Classic filters
 ---------------
@@ -448,12 +458,11 @@
 By default the changes feed emits all database documents changes. But if you're
 waiting for some special changes, processing all documents is inefficient.
 
-Filters are special design document functions that allows changes feed to emit
+Filters are special design document functions that allow the changes feed to emit
 only specific documents that pass filter rules.
 
-Lets assume that our database is a mailbox and we need to to handle only new mails
-(documents with status `new`) events. Assuming that, our filter function
-will looks like next one:
+Let's assume that our database is a mailbox and we need to handle only new mail
+events (documents with status `new`). Our filter function will look like this:
 
 .. code-block:: javascript
 
@@ -469,8 +478,8 @@
     return true; // passed!
   }
  
-Filter functions must return ``true`` in fact if document passed all defined
-rules. Now, if you apply this function to changes feed it will emit only changes
+Filter functions must return ``true`` if a document passed all defined
+rules. Now, if you apply this function to the changes feed it will emit only changes
 about "new mails"::
 
     GET /somedatabase/_changes?filter=mailbox/new_mail HTTP/1.1
@@ -483,20 +492,20 @@
     ],
     "last_seq":27}
 
-Note, that ``last_seq`` number is 27, but we'd received only two records.
-Seems like any other changes was about documents that hasn't passed our filter.
-
-Probably, we also need to filter changes feed of our mailbox not only by single
-status value: we're also interested in statuses like "spam" to update
-spam-filter heuristic rules, "outgoing" to let mail daemon actually send mails
-and so on. Creating a lot of similar functions that actually does similar work
-isn't good idea - so we need dynamic filter to go.
-
-If you have noted, filter functions takes second argument as
-:ref:`request <request_object>` object - it allows to create dynamic filters
+Note that the value of ``last_seq`` is 27, but we'd received only two records.
+Seems like any other changes were for documents that haven't passed our filter.
+
+We probably need to filter the changes feed of our mailbox by more than a single
+status value. We're also interested in statuses like "spam" to update
+spam-filter heuristic rules, "outgoing" to let a mail daemon actually send mails,
+and so on. Creating a lot of similar functions that actually do similar work
+isn't good idea - so we need a dynamic filter.
+
+You may have noticed that filter functions take a second argument named
+:ref:`request <request_object>` - it allows creating dynamic filters
 based on query parameters, :ref:`user context <userctx_object>` and more.
 
-The dynamic version of our filter now will be next:
+The dynamic version of our filter looks like this:
 
 .. code-block:: javascript
 
@@ -512,7 +521,7 @@
     return true; // passed!
   }
 
-and now we have pass `status` query parameter in request to let filter match
+and now we have passed the `status` query parameter in request to let our filter match
 only required documents::
 
     GET /somedatabase/_changes?filter=mailbox/by_status&status=new HTTP/1.1
@@ -525,7 +534,7 @@
     ],
     "last_seq":27}
 
-and we can change filter behavior with easy::
+and we can easily change filter behavior with::
 
     GET /somedatabase/_changes?filter=mailbox/by_status&status=spam HTTP/1.1
 
@@ -537,7 +546,7 @@
     "last_seq":27}
 
 
-Combining filters with `continuous` feed allows to create powerful event-driven
+Combining filters with a `continuous` feed allows creating powerful event-driven
 systems.
 
 .. _viewfilter:

=== modified file 'share/doc/build/html/_sources/couchapp/views/collation.txt'
--- share/doc/build/html/_sources/couchapp/views/collation.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/couchapp/views/collation.txt	2014-07-28 15:45:29 +0000
@@ -32,8 +32,8 @@
     }
   }
 
-CouchDB allows arbitrary JSON structures to be used as keys. You can use complex
-keys for fine-grained control over sorting and grouping.
+CouchDB allows arbitrary JSON structures to be used as keys. You can use JSON
+arrays as keys for fine-grained control over sorting and grouping.
 
 Examples
 ========
@@ -49,12 +49,17 @@
 
   function(doc) {
     if (doc.Type == "customer") {
-      emit([doc._id, 0], doc);
+      emit([doc._id, 0], null);
     } else if (doc.Type == "order") {
-      emit([doc.customer_id, 1], doc);
+      emit([doc.customer_id, 1], null);
     }
   }
 
+To list a specific customer with ``_id`` XYZ, and all of that customer's orders, limit the startkey and endkey ranges to cover only documents for that customer's ``_id``::
+
+  startkey=["XYZ"]&endkey=["XYZ", {}]
+
+It is not recommended to emit the document itself in the view. Instead, to include the bodies of the documents when requesting the view, request the view with ``?include_docs=true``.
 
 Sorting by Dates
 ================
@@ -67,14 +72,14 @@
 
 .. code-block:: javascript
 
-  emit(Date.parse(doc.created_at).getTime(), doc);
+  emit(Date.parse(doc.created_at).getTime(), null);
 
 Alternatively, if you use a date format which sorts lexicographically,
 such as ``"2013/06/09 13:52:11 +0000"`` you can just
 
 .. code-block:: javascript
 
-  emit(doc.created_at, doc);
+  emit(doc.created_at, null);
 
 and avoid the conversion. As a bonus, this date format is compatible with the
 JavaScript date parser, so you can use ``new Date(doc.created_at)`` in your

=== modified file 'share/doc/build/html/_sources/couchapp/views/nosql.txt'
--- share/doc/build/html/_sources/couchapp/views/nosql.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/couchapp/views/nosql.txt	2014-07-28 15:45:29 +0000
@@ -20,7 +20,7 @@
 This is a collection of some common SQL queries and how to get the same result
 in CouchDB. The key to remember here is that CouchDB does not work like an SQL
 database at all and that best practices from the SQL world do not translate well
-or at all to CouchDB. This chapter’s “cookbook” assumes that you are familiar
+or at all to CouchDB. This documents’s “cookbook” assumes that you are familiar
 with the CouchDB basics such as creating and updating databases and documents.
 
 Using Views
@@ -331,7 +331,7 @@
 sum of all years of life for the news headline,
 `“786 life years present at event.”` A little contrived, but very simple and
 thus good for demonstration purposes. Consider the documents and the map view we
-used earlier in this chapter.
+used earlier in this document.
 
 The reduce function to calculate the total age of all girls is:
 

=== modified file 'share/doc/build/html/_sources/couchapp/views/pagination.txt'
--- share/doc/build/html/_sources/couchapp/views/pagination.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/couchapp/views/pagination.txt	2014-07-28 15:45:29 +0000
@@ -77,7 +77,7 @@
 if we’re not on the first page.
 
 We learned how to use the ``startkey``, ``limit``, and ``skip`` parameters in
-earlier chapters. We’ll use these again here. First, let’s have a look at
+earlier documents. We’ll use these again here. First, let’s have a look at
 the full result set:
 
 .. code-block:: javascript
@@ -125,12 +125,11 @@
     page.display_link('next');
   }
 
-Slow Paging (Do Not Use)
-========================
+Paging
+======
 
-**Don’t use this method!** We just show it because it might seem natural to use,
-and you need to know why it is a bad idea. To get the first five rows from
-the view result, you use the ``?limit=5`` query parameter::
+To get the first five rows from the view result, you use the ``?limit=5``
+query parameter::
 
   curl -X GET http://127.0.0.1:5984/artists/_design/artists/_view/by-name?limit=5
 
@@ -194,34 +193,17 @@
     return page != last_page;
   }
 
-The dealbreaker
----------------
-
-This all looks easy and straightforward, but it has one fatal flaw. Remember
-how view results are generated from the underlying B-tree index: CouchDB
-jumps to the first row (or the first row that matches ``startkey``,
-if provided) and reads one row after the other from the index until there are
-no more rows (or ``limit`` or ``endkey`` match, if provided).
-
-The ``skip`` argument works like this: in addition to going to the first row and
-starting to read, skip will skip as many rows as specified, but CouchDB will
-still read from the first row; it just won’t return any values for the skipped
-rows. If you specify ``skip=100``, CouchDB will read 100 rows and not create
-output for them. This doesn’t sound too bad, but it is very bad, when you use
-1000 or even 10000 as skip values. CouchDB will have to look at a lot of rows
-unnecessarily.
-
-As a rule of thumb, skip should be used only with single digit values. While
-it’s possible that there are legitimate use cases where you specify a larger
-value, they are a good indicator for potential problems with your solution.
-Finally, for the calculations to work, you need to add a reduce function and
-make two calls to the view per page to get all the numbering right,
-and there’s still a potential for error.
-
-Fast Paging (Do Use)
-====================
-
-The correct solution is not much harder. Instead of slicing the result set
+Paging (Alternate Method)
+=========================
+
+The method described above performed poorly with large skip values until
+CouchDB 1.2. Additionally, some use cases may call for the following
+alternate method even with newer versions of CouchDB. One such case is when
+duplicate results should be prevented. Using skip alone it is possible for
+new documents to be inserted during pagination which could change the offset
+of the start of the subsequent page.
+
+A correct solution is not much harder. Instead of slicing the result set
 into equally sized pages, we look at 10 rows at a time and use ``startkey`` to
 jump to the next 10 rows. We even use skip, but only with the value 1.
 

=== modified file 'share/doc/build/html/_sources/install/freebsd.txt'
--- share/doc/build/html/_sources/install/freebsd.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/install/freebsd.txt	2014-07-28 15:45:29 +0000
@@ -37,7 +37,7 @@
     couchdb_enablelogs="YES"
     couchdb_user="couchdb"
 
-After enabling couchdb rc service use the following to start CouchDB::
+After enabling the couchdb rc service use the following command to start CouchDB::
 
     /usr/local/etc/rc.d/couchdb start
 

=== modified file 'share/doc/build/html/_sources/install/mac.txt'
--- share/doc/build/html/_sources/install/mac.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/install/mac.txt	2014-07-28 15:45:29 +0000
@@ -23,7 +23,7 @@
 Installation using the Apache CouchDB native application
 ========================================================
 
-The easiest way to run CouchDB on Mac OS X is through his native Mac OS X
+The easiest way to run CouchDB on Mac OS X is through the native Mac OS X
 application. Just follow the below instructions:
 
 #. `Download Apache CouchDB for Mac OS X`_.

=== modified file 'share/doc/build/html/_sources/install/unix.txt'
--- share/doc/build/html/_sources/install/unix.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/install/unix.txt	2014-07-28 15:45:29 +0000
@@ -52,10 +52,10 @@
 
 You should have the following installed:
 
-* `Erlang OTP (>=R13B04, <R17)  <http://erlang.org/>`_
+* `Erlang OTP (>=R14B01, =<R17) <http://erlang.org/>`_
 * `ICU                          <http://icu-project.org/>`_
 * `OpenSSL                      <http://www.openssl.org/>`_
-* `Mozilla SpiderMonkey (1.7)   <http://www.mozilla.org/js/spidermonkey/>`_
+* `Mozilla SpiderMonkey (1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_
 * `GNU Make                     <http://www.gnu.org/software/make/>`_
 * `GNU Compiler Collection      <http://gcc.gnu.org/>`_
 * `libcurl                      <http://curl.haxx.se/libcurl/>`_
@@ -102,19 +102,20 @@
 
 You can install the dependencies by running::
 
-    sudo yum groupinstall "Development Tools"
     sudo yum install autoconf
     sudo yum install autoconf-archive
     sudo yum install automake
-    sudo yum install libtool
-    sudo yum install perl-Test-Harness
-    sudo yum install erlang-etap
+    sudo yum install curl-devel
+    sudo yum install erlang-asn1
     sudo yum install erlang-erts
+    sudo yum install erlang-eunit
     sudo yum install erlang-os_mon
-    sudo yum install erlang-eunit
+    sudo yum install erlang-xmerl
+    sudo yum install help2man
+    sudo yum install js-devel
     sudo yum install libicu-devel
-    sudo yum install js-devel
-    sudo yum install curl-devel
+    sudo yum install libtool
+    sudo yum install perl-Test-Harness
 
 While CouchDB builds against the default js-devel-1.7.0 included in some
 distributions, it's recommended to use a more recent js-devel-1.8.5.
@@ -175,7 +176,9 @@
 
     http://127.0.0.1:5984/_utils/index.html
 
-From here you should run the test suite in Firefox.
+From here you should verify your installation by pointing your web browser to::
+
+    http://localhost:5984/_utils/verify_install.html
 
 Security Considerations
 -----------------------

=== modified file 'share/doc/build/html/_sources/install/windows.txt'
--- share/doc/build/html/_sources/install/windows.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/install/windows.txt	2014-07-28 15:45:29 +0000
@@ -33,7 +33,7 @@
    - Accept the License agreement
    - Select the installation directory
    - Specify "Start Menu" group name
-   - Approve that you'd like to install CouchDB as service and let him been
+   - Approve that you'd like to install CouchDB as service and let it be
      started automatically after installation (probably, you'd like so)
    - Verify installation settings
    - Install CouchDB

=== modified file 'share/doc/build/html/_sources/intro/api.txt'
--- share/doc/build/html/_sources/intro/api.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/intro/api.txt	2014-07-28 15:45:29 +0000
@@ -17,18 +17,18 @@
 The Core API
 ============
 
-This chapter explores the CouchDB in minute detail. It shows all the
+This document explores the CouchDB in minute detail. It shows all the
 nitty-gritty and clever bits. We show you best practices and guide you around
 common pitfalls.
 
-We start out by revisiting the basic operations we ran in the last chapter,
-looking behind the scenes. We also show what Futon needs to do behind its
-user interface to give us the nice features we saw earlier.
+We start out by revisiting the basic operations we ran in the previous document
+:ref:`intro/tour`, looking behind the scenes. We also show what Futon needs to 
+do behind its user interface to give us the nice features we saw earlier.
 
-This chapter is both an introduction to the core CouchDB API as well as a
+This document is both an introduction to the core CouchDB API as well as a
 reference. If you can't remember how to run a particular request or why some
 parameters are needed, you can always come back here and look things up (we
-are probably the heaviest users of this chapter).
+are probably the heaviest users of this document).
 
 While explaining the API bits and pieces, we sometimes need to take a larger
 detour to explain the reasoning for a particular request. This is a good
@@ -322,7 +322,7 @@
 opened in the beginning open for a moment, but then closed it after it
 received the entire response.
 
-Throughout the book, we'll show more requests with the ``-v`` option,
+Throughout the documents, we'll show more requests with the ``-v`` option,
 but we'll omit some of the headers we've seen here and include only those
 that are important for the particular request.
 
@@ -496,12 +496,12 @@
 code is static.
 
 The revision system also has positive effects on replication and storage
-mechanisms, but we'll explore these later in the book.
+mechanisms, but we'll explore these later in the documents.
 
 .. warning::
 
   The terms *version* and *revision* might sound familiar (if you are
-  programming without version control, drop this book right now and start
+  programming without version control, stop reading this guide right now and start
   learning one of the popular systems). Using new versions for document changes
   works a lot like version control, but there's an important difference:
   **CouchDB does not guarantee that older versions are kept around**.
@@ -567,7 +567,7 @@
 Attachments get their own URL where you can upload data. Say we want to add
 the album artwork to the ``6e1295ed6c29495e54cc05947f18c8af`` document
 (*"There is Nothing Left to Lose"*), and let's also say the artwork is in a file
-artwork `.jpg` in the current directory::
+`artwork.jpg` in the current directory::
 
   curl -vX PUT http://127.0.0.1:5984/albums/6e1295ed6c29495e54cc05947f18c8af/artwork.jpg?rev=2-2739352689 \
        --data-binary @artwork.jpg -H "Content-Type:image/jpg"
@@ -636,8 +636,8 @@
 document revisions are on *source* that are not yet on *target*, and will
 proceed  to move the missing documents and revisions over.
 
-We'll take an in-depth look at replication later in the book; in this
-chapter, we'll just show you how to use it.
+We'll take an in-depth look at replication in the document :ref:`replication/intro`;
+in this document, we'll just show you how to use it.
 
 First, we'll create a target database. Note that CouchDB won't automatically
 create a target database for you, and will return a replication failure if
@@ -747,7 +747,7 @@
   requests don't look very RESTy to the trained eye. What's up with that?
   While CouchDB's core database, document, and attachment API are RESTful,
   not all of CouchDB's API is. The replication API is one example. There are
-  more, as we'll see later in the book.
+  more, as we'll see later in the documents.
 
   Why are there RESTful and non-RESTful APIs mixed up here? Have the developers
   been too lazy to go REST all the way? Remember, REST is an architectural

=== modified file 'share/doc/build/html/_sources/intro/consistency.txt'
--- share/doc/build/html/_sources/intro/consistency.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/intro/consistency.txt	2014-07-28 15:45:29 +0000
@@ -17,8 +17,8 @@
 Eventual Consistency
 ====================
 
-In the previous chapter, we saw that CouchDB's flexibility allows us to
-evolve our data as our applications grow and change. In this chapter,
+In the previous document :ref:`intro/why`, we saw that CouchDB's flexibility allows us to
+evolve our data as our applications grow and change. In this topic,
 we'll explore how working "with the grain" of CouchDB promotes simplicity in
 our applications and helps us naturally build scalable, distributed systems.
 

=== modified file 'share/doc/build/html/_sources/intro/overview.txt'
--- share/doc/build/html/_sources/intro/overview.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/intro/overview.txt	2014-07-28 15:45:29 +0000
@@ -66,13 +66,13 @@
 Documents are indexed in `B-trees`_ by their name (DocID) and a Sequence ID.
 Each update to a database instance generates a new sequential number.
 Sequence IDs are used later for incrementally finding changes in a database.
-TheseBb-tree indexes are updated simultaneously when documents are saved or
+These B-tree indexes are updated simultaneously when documents are saved or
 deleted. The index updates always occur at the end of the file (append-only
 updates).
 
 Documents have the advantage of data being already conveniently packaged for
 storage rather than split out across numerous tables and rows in most
-databases systems. When documents are committed to disk, the document fields
+database systems. When documents are committed to disk, the document fields
 and metadata are packed into buffers, sequentially one document after another
 (helpful later for efficient building of views).
 
@@ -105,14 +105,14 @@
 database file exceeds a certain amount of wasted space, the compaction process
 clones all the active data to a new file and then discards the old file.
 The database remains completely online the entire time and all updates and
-reads are allowed to complete successfully. The old file is deleted only when
+reads are allowed to complete successfully. The old database file is deleted only when
 all the data has been copied and all users transitioned to the new file.
 
 
 Views
 =====
 
-ACID properties only deal with storage and updates, we also need the ability
+ACID properties only deal with storage and updates, but we also need the ability
 to show our data in interesting and useful ways. Unlike SQL databases where
 data must be carefully decomposed into tables, data in CouchDB is stored in
 semi-structured documents. CouchDB documents are flexible and each has its
@@ -136,7 +136,7 @@
 To address this problem of adding structure back to unstructured and
 semi-structured data, CouchDB integrates a view model. Views are the method
 of aggregating and reporting on the documents in a database, and are built
-on-demand to aggregate, join and report on database documents. Views are built
+on-demand to aggregate, join and report on database documents. Because views are built
 dynamically and don’t affect the underlying document, you can have as many
 different view representations of the same data as you like.
 
@@ -198,9 +198,10 @@
 is concurrently being refreshed for other clients without causing problems
 for the readers.
 
-As documents are examined, their previous row values are removed from the
-view indexes, if they exist. If the document is selected by a view function,
-the function results are inserted into the view as a new row.
+As documents are processed by the view engine through your 'map' and 'reduce'
+functions, their previous row values are removed from the view indexes, if
+they exist. If the document is selected by a view function, the function results
+are inserted into the view as a new row.
 
 When view index changes are written to disk, the updates are always appended
 at the end of the file, serving to both reduce disk head seek times during
@@ -260,9 +261,9 @@
 Distributed Updates and Replication
 ===================================
 
-CouchDB is a peer-based distributed database system, it allows for users and
-servers to access and update the same shared data while disconnected and then
-bi-directionally replicate those changes later.
+CouchDB is a peer-based distributed database system. It allows users and servers
+to access and update the same shared data while disconnected. Those changes can
+then be replicated bi-directionally later.
 
 The CouchDB document storage, view and security models are designed to work
 together to make true bi-directional replication efficient and reliable.

=== modified file 'share/doc/build/html/_sources/intro/security.txt'
--- share/doc/build/html/_sources/intro/security.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/intro/security.txt	2014-07-28 15:45:29 +0000
@@ -17,7 +17,7 @@
 Security
 ********
 
-In this chapter, we'll look at the basic security mechanisms in CouchDB: the
+In this document, we'll look at the basic security mechanisms in CouchDB: the
 `Admin Party`, `Basic Authentication`, `Cookie Authentication`; how CouchDB
 handles users and protects their credentials.
 
@@ -65,16 +65,16 @@
 - Setup a database security (:put:`PUT /database/_security
   </{db}/_security>`)
 - Creating a design document (:put:`PUT /database/_design/app
-  </{db}/_design/{ddocname}>`)
+  </{db}/_design/{ddoc}>`)
 - Updating a design document (:put:`PUT /database/_design/app?rev=1-4E2
-  </{db}/_design/{ddocname}>`)
+  </{db}/_design/{ddoc}>`)
 - Deleting a design document (:delete:`DELETE /database/_design/app?rev=2-6A7
-  </{db}/_design/{ddocname}>`)
+  </{db}/_design/{ddoc}>`)
 - Execute a temporary view (:post:`POST /database/_temp_view
   </{db}/_temp_view>`)
 - Triggering compaction (:post:`POST /database/_compact </{db}/_compact>`)
 - Reading the task status list (:get:`GET /_active_tasks </_active_tasks>`)
-- Restarting the server (:post:`:POST /_restart </_restart>`)
+- Restarting the server (:post:`POST /_restart </_restart>`)
 - Reading the active configuration (:get:`GET /_config </_config>`)
 - Updating the active configuration (:put:`PUT /_config/section/key
   </_config/{section}/{key}>`)
@@ -281,7 +281,7 @@
   any document (to be honest, that they always can do)
 - There is special design document ``_auth`` that cannot be modified
 - Every document (of course, except `design documents`) represents registered
-  CouchDB users and belong to him
+  CouchDB users and belong to them
 - Users may only access (:get:`GET /_users/org.couchdb.user:Jan
   </{db}/{docid}>`) or modify (:put:`PUT /_users/org.couchdb.user:Jan
   </{db}/{docid}>`) documents that they owns
@@ -318,8 +318,8 @@
 - **type** (*string*): Document type. Constantly have value ``user``
 
 Additionally, you may specify any custom fields that are relates to the target
-user. This is good place to store user's private information because only he and
-CouchDB administrators may browse it.
+user. This is good place to store user's private information because only the
+target user and CouchDB administrators may browse it.
 
 .. _org.couchdb.user:
 
@@ -396,7 +396,7 @@
 Password Changing
 =================
 
-This is quite common situation: user had forgot his password, it was leaked
+This is quite common situation: user had forgot their password, it was leaked
 somehow (via copy-paste, screenshot, or by typing in wrong chat window) or
 something else. Let's change password for our user `jan`.
 
@@ -466,7 +466,7 @@
   {"ok":true,"name":"jan","roles":[]}
 
 Hooray! You may wonder why so complex: need to retrieve user's document, add
-special field to him, post it back - where is one big button that changes the
+special field to it, post it back - where is one big button that changes the
 password without worry about document's content? Actually, :ref:`Futon
 <intro/futon>` has such at the right bottom corner if you have logged in -
 all implementation details are hidden from your sight.
@@ -483,7 +483,7 @@
 .. versionadded:: 1.4
 
 Sometimes users *wants* to share some information with the World. For instance,
-their contact email to let other users get in touch with him. To solve this
+their contact email to let other users get in touch with them. To solve this
 problem, but still keep sensitive and private information secured there is
 special :ref:`configuration <config>` option :config:option:`public_fields
 <couch_httpd_auth/public_fields>`. In this options you may define comma
@@ -503,7 +503,7 @@
 
 Now let's share field ``name``. First, setup the ``public_fields`` configuration
 option. Remember, that this action requires administrator's privileges and
-the next command will ask for password for user `admin`, assuming that he is
+the next command will ask for password for user `admin`, assuming that they are
 the server administrator::
 
   curl -X PUT http://localhost:5984/_config/couch_http_auth/public_fields \

=== modified file 'share/doc/build/html/_sources/intro/tour.txt'
--- share/doc/build/html/_sources/intro/tour.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/intro/tour.txt	2014-07-28 15:45:29 +0000
@@ -17,7 +17,7 @@
 Getting Started
 ===============
 
-In this chapter, we'll take a quick tour of CouchDB's features,
+In this document, we'll take a quick tour of CouchDB's features,
 familiarizing ourselves with Futon, the built-in administration interface.
 We'll create our first document and experiment with CouchDB views.
 
@@ -28,7 +28,7 @@
 We'll have a very quick look at CouchDB's bare-bones Application Programming
 Interface (API) by using the command-line utility curl. Please note that this
 is not the only way of talking to CouchDB. We will show you plenty more
-throughout the rest of the book. What's interesting about curl is that it
+throughout the rest of the documents. What's interesting about curl is that it
 gives you control over raw HTTP requests, and you can see exactly what is
 going on "underneath the hood" of your database.
 
@@ -175,8 +175,8 @@
   http://127.0.0.1:5984/_utils/
 
 If you're running version 0.9 or later, you should see something similar to
-:ref:`intro/tour-01`. In later chapters, we'll focus on using CouchDB from
-server-side languages such as Ruby and Python. As such, this chapter is a great
+:ref:`intro/tour-01`. In later documents, we'll focus on using CouchDB from
+server-side languages such as Ruby and Python. As such, this document is a great
 opportunity to showcase an example of natively serving up a dynamic web
 application using nothing more than CouchDB's integrated web server, something
 you may wish to do with your own applications.
@@ -260,7 +260,7 @@
 You can experiment with other JSON values; e.g., ``[1, 2, "c"]`` or
 ``{"foo": "bar"}``. Once you've entered your values into the document,
 make a note of its ``_rev`` attribute and click "Save Document." The result
-should look like :ref:`intro/tour-04` document in Futon".
+should look like :ref:`intro/tour-04`.
 
 
 .. _intro/tour-03:
@@ -282,7 +282,7 @@
 
 
 You'll notice that the document's _rev has changed. We'll go into more detail
-about this in later chapters, but for now, the important thing to note is
+about this in later documents, but for now, the important thing to note is
 that _rev acts like a safety feature when saving a document. As long as you
 and CouchDB agree on the most recent _rev of a document, you can successfully 
 save your changes.
@@ -534,7 +534,7 @@
 
 Now that you've seen most of Futon's features, you'll be prepared to dive in
 and inspect your data as we build our example application in the next few
-chapters. Futon's pure JavaScript approach to managing CouchDB shows how it's
+documents. Futon's pure JavaScript approach to managing CouchDB shows how it's
 possible to build a fully featured web application using only CouchDB's HTTP
 API and integrated web server.
 

=== modified file 'share/doc/build/html/_sources/intro/why.txt'
--- share/doc/build/html/_sources/intro/why.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/intro/why.txt	2014-07-28 15:45:29 +0000
@@ -18,11 +18,11 @@
 ============
 
 Apache CouchDB is one of a new breed of database management systems.
-This chapter explains why there's a need for new systems as well as the
+This topic explains why there's a need for new systems as well as the
 motivations behind building CouchDB.
 
 As CouchDB developers, we're naturally very excited to be using CouchDB.
-In this chapter we'll share with you the reasons for our enthusiasm.
+In this topic we'll share with you the reasons for our enthusiasm.
 We'll show you how CouchDB's schema-free document model is a better fit
 for common applications, how the built-in query engine is a powerful way
 to use and process your data, and how CouchDB's design lends itself
@@ -32,9 +32,8 @@
 Relax
 =====
 
-If there's one word to describe CouchDB, it is *relax*. It is in the title of
-this book, it is the byline to CouchDB's official logo,
-and when you start CouchDB, you see::
+If there's one word to describe CouchDB, it is *relax*. It is the byline 
+to CouchDB's official logo and when you start CouchDB, you see::
 
   Apache CouchDB has started. Time to relax.
 
@@ -198,7 +197,7 @@
 
 There are a multitude of knobs you could turn to make a system work better in
 one area, but you'll affect another area when doing so. One example would be
-the CAP theorem discussed in the next chapter. To give you an idea of other
+the CAP theorem discussed in :ref:`intro/consistency`. To give you an idea of other
 things that affect storage systems, see :ref:`Figure 2 <intro/why-figure-02>`
 and :ref:`Figure 3 <intro/why-figure-03>`.
 
@@ -311,5 +310,6 @@
 Wrapping Up
 ===========
 
-The next chapter further explores the distributed nature of CouchDB. We
-should have given you enough bites to whet your interest. Let's go!
+The next document :ref:`intro/consistency` further explores the distributed nature 
+of CouchDB. We should have given you enough bites to whet your interest. 
+Let's go!

=== modified file 'share/doc/build/html/_sources/json-structure.txt'
--- share/doc/build/html/_sources/json-structure.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/json-structure.txt	2014-07-28 15:45:29 +0000
@@ -119,30 +119,30 @@
 +================================+=============================================+
 | db_name                        | The name of the database.                   |
 +--------------------------------+---------------------------------------------+
-| committed_update_seq           | The number of committed update.             |
-+--------------------------------+---------------------------------------------+
-| doc_count                      | A count of the documents in the specified   |
-|                                | database.                                   |
-+--------------------------------+---------------------------------------------+
-| doc_del_count                  | Number of deleted documents                 |
+| committed_update_seq           | The number of committed updates.            |
++--------------------------------+---------------------------------------------+
+| doc_count                      | The number of documents in the database.    |
++--------------------------------+---------------------------------------------+
+| doc_del_count                  | The number of deleted documents.            |
 +--------------------------------+---------------------------------------------+
 | compact_running                | Set to true if the database compaction      |
 |                                | routine is operating on this database.      |
 +--------------------------------+---------------------------------------------+
 | disk_format_version            | The version of the physical format used for |
-|                                | the data when it is stored on disk.         |
+|                                | the data when it is stored on hard disk.    |
 +--------------------------------+---------------------------------------------+
-| disk_size                      | Size in bytes of the data as stored on the  |
-|                                | disk. Views indexes are not included in the |
+| disk_size                      | Size in bytes of the data as stored on disk.|
+|                                | View indexes are not included in the        |
 |                                | calculation.                                |
 +--------------------------------+---------------------------------------------+
-| instance_start_time            | Timestamp of when the database was opened,  |
-|                                | expressed in microseconds since the epoch.  |
+| instance_start_time            | Timestamp indicating when the database was  |
+|                                | opened, expressed in microseconds since the |
+|                                | epoch.                                      |
 +--------------------------------+---------------------------------------------+
 | purge_seq                      | The number of purge operations on the       |
 |                                | database.                                   |
 +--------------------------------+---------------------------------------------+
-| update_seq                     | The current number of updates to the        |
+| update_seq                     | The current number of updates made in the   |
 |                                | database.                                   |
 +--------------------------------+---------------------------------------------+
 
@@ -227,7 +227,7 @@
 +--------------------------------+---------------------------------------------+
 | Field                          | Description                                 |
 +================================+=============================================+
-| tasks [array]                  | Active Task                                 |
+| tasks [array]                  | Active Tasks                                |
 +--------------------------------+---------------------------------------------+
 |     pid                        | Process ID                                  |
 +--------------------------------+---------------------------------------------+
@@ -265,11 +265,16 @@
 |                                | start                                       |
 +--------------------------------+---------------------------------------------+
 | filter (optional)              | name of the filter function in the form of  |
-|                                | ddoc/myfilter                               |
-+--------------------------------+---------------------------------------------+
-| query_params (optional)        | query parameter that are passed to the      |
-|                                | filter function; value should be a document |
-|                                | containing parameters as members            |
+|                                | ``ddoc/myfilter``                           |
++--------------------------------+---------------------------------------------+
+| query_params (optional)        | Query parameter that are passed to the      |
+|                                | filter function; the value should be a      |
+|                                | document containing parameters as members   |
++--------------------------------+---------------------------------------------+
+| use_checkpoints (optional)     | Whether to use replication checkpoints      |
+|                                | or not                                      |
++--------------------------------+---------------------------------------------+
+| checkpoint_interval (optional) | Specifies the checkpoint interval in ms.    |
 +--------------------------------+---------------------------------------------+
 
 .. _replication-status:
@@ -284,7 +289,7 @@
 +--------------------------------+---------------------------------------------+
 | session_id                     | Unique session ID                           |
 +--------------------------------+---------------------------------------------+
-| source_last_seq                | Last sequence number read from source       |
+| source_last_seq                | Last sequence number read from the source   |
 |                                | database                                    |
 +--------------------------------+---------------------------------------------+
 | history [array]                | Replication History                         |
@@ -321,16 +326,16 @@
 | Field                          | Description                                 |
 +================================+=============================================+
 | body                           | Request body data as `string`.              |
-|                                | If request method is `GET` method contains  |
-|                                | this field contains ``"undefined"`` value,  |
-|                                | while if `DELETE` or `HEAD` value is ``""`` |
-|                                | (empty string)                              |
+|                                | If the request method is `GET` this field   |
+|                                | contains the value ``"undefined"``. If the  |
+|                                | method is `DELETE` or `HEAD` the value is   |
+|                                | ``""`` (empty string).                      |
 +--------------------------------+---------------------------------------------+
 | cookie                         | Cookies `object`.                           |
 +--------------------------------+---------------------------------------------+
 | form                           | Form data `object`.                         |
-|                                | Contains decoded body as key-value pairs if |
-|                                | `Content-Type` header was                   |
+|                                | Contains the decoded body as key-value      |
+|                                | pairs if the `Content-Type` header was      |
 |                                | ``application/x-www-form-urlencoded``.      |
 +--------------------------------+---------------------------------------------+
 | headers                        | Request headers `object`.                   |
@@ -341,18 +346,18 @@
 | info                           | :ref:`Database information <dbinfo_object>` |
 +--------------------------------+---------------------------------------------+
 | method                         | Request method as `string` or `array`.      |
-|                                | String value is method is one of: `HEAD`,   |
+|                                | String value is a method as one of: `HEAD`, |
 |                                | `GET`, `POST`, `PUT`, `DELETE`, `OPTIONS`,  |
-|                                | and `TRACE`, otherwise it will be           |
-|                                | represented as array of char codes.         |
+|                                | and `TRACE`. Otherwise it will be           |
+|                                | represented as an array of char codes.      |
 +--------------------------------+---------------------------------------------+
 | path                           | List of requested path sections.            |
 +--------------------------------+---------------------------------------------+
 | peer                           | Request source IP address.                  |
 +--------------------------------+---------------------------------------------+
 | query                          | URL query parameters `object`.              |
-|                                | Note that multiple keys not supported and   |
-|                                | last key value suppress others.             |
+|                                | Note that multiple keys are not supported   |
+|                                | and the last key value suppresses others.   |
 +--------------------------------+---------------------------------------------+
 | requested_path                 | List of actual requested path section.      |
 +--------------------------------+---------------------------------------------+
@@ -362,8 +367,8 @@
 +--------------------------------+---------------------------------------------+
 | userCtx                        | :ref:`userctx_object`.                      |
 +--------------------------------+---------------------------------------------+
-| uuid                           | Generated UUID by specified algorithm in    |
-|                                | config file.                                |
+| uuid                           | Generated UUID by a specified algorithm in  |
+|                                | the config file.                            |
 +--------------------------------+---------------------------------------------+
 
 .. code-block:: javascript
@@ -476,15 +481,15 @@
 +--------------------------------+---------------------------------------------+
 
 .. warning::
-   ``body``, ``base64`` and ``json`` object keys are overlaps each other and
-   the last wins. Since most realizations of key-value objects doesn't preserve
-   key order mixing them may create confusing situation. Try to use only one of
-   them.
+   The ``body``, ``base64`` and ``json`` object keys are overlapping each other
+   where the last one wins. Since most realizations of key-value objects do
+   not preserve the key order or if they are mixed, confusing situations can
+   occure. Try to use only one of them.
 
 .. note::
-   Any custom property makes CouchDB raise internal exception.
-   Also `Response object` could be a simple string value which would be
-   implicitly wrapped into ``{"body": ...}`` object.
+   Any custom property makes CouchDB raise an internal exception.
+   Furthermore, the `Response object` could be a simple string value which would
+   be implicitly wrapped into a ``{"body": ...}`` object.
 
 
 Returned CouchDB Document with Detailed Revision Info
@@ -498,7 +503,7 @@
 | _rev (optional)                | Revision ID (when updating an existing      |
 |                                | document)                                   |
 +--------------------------------+---------------------------------------------+
-| _revs_info [array]             | CouchDB Document Extended Revision Info     |
+| _revs_info [array]             | CouchDB document extended revision info     |
 +--------------------------------+---------------------------------------------+
 |         rev                    | Full revision string                        |
 +--------------------------------+---------------------------------------------+
@@ -516,7 +521,7 @@
 | _rev (optional)                | Revision ID (when updating an existing      |
 |                                | document)                                   |
 +--------------------------------+---------------------------------------------+
-| _revisions                     | CouchDB Document Revisions                  |
+| _revisions                     | CouchDB document revisions                  |
 +--------------------------------+---------------------------------------------+
 |     ids [array]                | Array of valid revision IDs, in reverse     |
 |                                | order (latest first)                        |
@@ -535,7 +540,7 @@
 | _rev (optional)                | Revision ID (when updating an existing      |
 |                                | document)                                   |
 +--------------------------------+---------------------------------------------+
-| _attachments (optional)        | Document Attachment                         |
+| _attachments (optional)        | Document attachment                         |
 +--------------------------------+---------------------------------------------+
 |     filename                   | Attachment                                  |
 +--------------------------------+---------------------------------------------+
@@ -596,8 +601,8 @@
 +--------------------------------+---------------------------------------------+
 | Field                          | Description                                 |
 +================================+=============================================+
-| db                             | Database name in context of provided        |
-|                                | operation.                                  |
+| db                             | Database name in the context of the         |
+|                                | provided operation.                         |
 +--------------------------------+---------------------------------------------+
 | name                           | User name.                                  |
 +--------------------------------+---------------------------------------------+

=== modified file 'share/doc/build/html/_sources/maintenance/compaction.txt'
--- share/doc/build/html/_sources/maintenance/compaction.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/maintenance/compaction.txt	2014-07-28 15:45:29 +0000
@@ -27,8 +27,8 @@
 first for the available disk space - it should be *twice greater* than the
 compacted file's data.
 
-When all actual data successful transferred to the `compacted` file CouchDB
-*removes* the `target` replacing him with it.
+When all actual data is successfully transferred to the `compacted` file CouchDB
+replaces the `target` with the `compacted` file.
 
 
 .. _compact/db:

=== modified file 'share/doc/build/html/_sources/query-server/javascript.txt'
--- share/doc/build/html/_sources/query-server/javascript.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/query-server/javascript.txt	2014-07-28 15:45:29 +0000
@@ -273,12 +273,12 @@
        "views": {
           "lib": {
              "security": "function user_context(userctx, secobj) { ... }"
-          },
-          "validate_doc_update": "function(newdoc, olddoc, userctx, secobj) {
-            user = require('lib/security').user(userctx, secobj);
-            return user.is_admin();
-          }"
+          }
        },
+       "validate_doc_update": "function(newdoc, olddoc, userctx, secobj) {
+          user = require('lib/security').user(userctx, secobj);
+          return user.is_admin();
+       }"
        "_id": "_design/test"
     }
 

=== modified file 'share/doc/build/html/_sources/query-server/protocol.txt'
--- share/doc/build/html/_sources/query-server/protocol.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/query-server/protocol.txt	2014-07-28 15:45:29 +0000
@@ -515,7 +515,7 @@
      ]
 
    When there is no more view rows to process, CouchDB sends special message,
-   that signs about that there is no more data to send from his side::
+   that signs about that there is no more data to send from its side::
 
      ["list_end"]
 
@@ -573,7 +573,7 @@
 Note, that now the Query Server sends response by lightweight chunks and if
 our communication process was extremely slow, the client will see how response
 data appears on their screen. Chunk by chunk, without waiting for the complete
-result, like he have for our previous list function.
+result, like they have for our previous list function.
 
 .. _qs/ddoc/updates:
 

=== modified file 'share/doc/build/html/_sources/replication/protocol.txt'
--- share/doc/build/html/_sources/replication/protocol.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/replication/protocol.txt	2014-07-28 15:45:29 +0000
@@ -40,7 +40,7 @@
 
 The CouchDB_ replication protocol is using the `CouchDB REST API
 <http://wiki.apache.org/couchdb/Reference>`_ and so is based on HTTP and
-the Apache CouchDB MVC Data model. The primary goal of this
+the Apache CouchDB MVCC Data model. The primary goal of this
 specification is to describe the CouchDB replication algorithm.
 
 
@@ -107,7 +107,7 @@
 
 5. GET each revisions from the source Database by calling the URL
    `/<source>/<docid>?revs=true&open_revs`=<revision>` . This
-   will get the document with teh parent revisions. Also don't forget to
+   will get the document with its parent revisions. Also don't forget to
    get attachments that aren't already stored at the target. As an
    optimisation you can use the HTTP multipart api to get all.
 
@@ -190,7 +190,7 @@
 Reference
 ---------
 
-* `TouchDB Ios wiki <https://github.com/couchbaselabs/TouchDB-iOS/wiki/Replication-Algorithm>`_
+* `TouchDB iOS wiki <https://github.com/couchbaselabs/TouchDB-iOS/wiki/Replication-Algorithm>`_
 * `CouchDB documentation
   <http://wiki.apache.org/couchdb/Replication>`_
 * CouchDB `change notifications`_

=== modified file 'share/doc/build/html/_sources/replication/replicator.txt'
--- share/doc/build/html/_sources/replication/replicator.txt	2013-12-01 16:55:05 +0000
+++ share/doc/build/html/_sources/replication/replicator.txt	2014-07-28 15:45:29 +0000
@@ -15,13 +15,18 @@
 Replicator Database
 ===================
 
-A database where you ``PUT``/``POST`` documents to trigger replications
-and you ``DELETE`` to cancel ongoing replications. These documents have
-exactly the same content as the JSON objects we used to ``POST`` to
-``_replicate`` (fields ``source``, ``target``, ``create_target``,
-``continuous``, ``doc_ids``, ``filter``, ``query_params``.
-
-Replication documents can have a user defined ``_id``. Design documents
+The ``_replicator`` database works like any other in CouchDB, but documents
+added to it will trigger replications. Creating (``PUT`` or ``POST``) a
+document to start a replication. ``DELETE`` a replicaiton document to
+cancel an ongoing replication.
+
+These documents have exactly the same content as the JSON objects we use to
+``POST`` to ``_replicate`` (fields ``source``, ``target``, ``create_target``,
+``continuous``, ``doc_ids``, ``filter``, ``query_params``, ``use_checkpoints``,
+``checkpoint_interval``).
+
+Replication documents can have a user defined ``_id`` (handy for finding a
+specific replication request later). Design Documents
 (and ``_local`` documents) added to the replicator database are ignored.
 
 The default name of this database is ``_replicator``. The name can be
@@ -31,7 +36,7 @@