From 301a37af802b4a1407157334c6bac84ff6222bc9 Mon Sep 17 00:00:00 2001 From: Chris Snow Date: Mon, 3 Nov 2014 08:09:58 +0000 Subject: [PATCH 1/2] Move the note below the delete paragraph The note is related to the delete paragraph text, not to the seealso text so move the note to improve readability. --- src/api/document/common.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/document/common.rst b/src/api/document/common.rst index 8602bbc7..25061794 100644 --- a/src/api/document/common.rst +++ b/src/api/document/common.rst @@ -247,14 +247,14 @@ (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 ` - .. note:: 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. + .. seealso:: + :ref:`Retrieving Deleted Documents ` + :param db: Database name :param docid: Document ID :
Date: Mon, 3 Nov 2014 08:13:11 +0000 Subject: [PATCH 2/2] Clarify the purpose of tombstones --- src/api/document/common.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/document/common.rst b/src/api/document/common.rst index 25061794..5512d882 100644 --- a/src/api/document/common.rst +++ b/src/api/document/common.rst @@ -248,9 +248,9 @@ :header:`If-Match` header to specify the revision. .. note:: - 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. + CouchDB doesn't completely delete the specified document. Instead, it leaves + a tombstone with very basic information about the document. The tombstone + is required so that the delete action can be replicated across databases. .. seealso:: :ref:`Retrieving Deleted Documents `