docs: various updates for release notes for 1.6.0

- closes COUCHDB-1795
- closes COUCHDB-1962

3 files changed, 20 insertions, 2 deletions

diff --git a/share/doc/src/replication/protocol.rst b/share/doc/src/replication/protocol.rst
index 10ba243d7..c5a81819b 100644
--- a/share/doc/src/replication/protocol.rst
+++ b/share/doc/src/replication/protocol.rst
@@ -107,7 +107,7 @@ Algorithm
 
 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 @@ Pull Only
 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`_
diff --git a/share/doc/src/replication/replicator.rst b/share/doc/src/replication/replicator.rst
index 670018698..e93c5791f 100644
--- a/share/doc/src/replication/replicator.rst
+++ b/share/doc/src/replication/replicator.rst
@@ -91,6 +91,19 @@ Special fields set by the replicator start with the prefix
 
    If ``replication_state`` is ``error``, this field contains the reason.
 
+.. code-block:: javascript
+
+    {
+    "_id": "my_rep",
+    "_rev": "2-9f2c0d9372f4ee4dc75652ab8f8e7c70",
+    "source": "foodb",
+    "target": "bardb",
+    "_replication_state": "error",
+    "_replication_state_time": "2013-12-13T18:48:00+01:00",
+    "_replication_state_reason": "db_not_found: could not open foodb",
+    "_replication_id": "fe965cdc47b4d5f6c02811d9d351ac3d"
+    }
+
 When the replication finishes, it will update the ``_replication_state``
 field (and ``_replication_state_time``) with the value ``completed``, so
 the document will look like:
diff --git a/share/doc/src/whatsnew/1.6.rst b/share/doc/src/whatsnew/1.6.rst
index df573209a..2a0fc6ec0 100644
--- a/share/doc/src/whatsnew/1.6.rst
+++ b/share/doc/src/whatsnew/1.6.rst
@@ -46,3 +46,8 @@ Version 1.6.0
 * :issue:`1922`: Fix CORS exposed headers :commit:`4f619833`
 * Rename ``proxy_authentification_handler`` to ``proxy_authentication_handler``
   :commit:`c66ac4a8`
+* :issue:`1795`: Ensure startup script couchdb clears pid file on termination
+  :commit:`818ef4f9`
+* :issue:`1962`: Various replicator enhancements
+  :commit:`1d5fe2aa` write access for checkpoints is not required on source db
+  :commit:`0693f98e` make the replication checkpoint interval configurable