You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2014/11/03 10:26:34 UTC

[1/2] documentation commit: updated refs/heads/master to 332c40b

Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 167619f03 -> 332c40bff


Clarify the purpose of tombstones

Signed-off-by: Alexander Shorin <kx...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/332c40bf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/332c40bf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/332c40bf

Branch: refs/heads/master
Commit: 332c40bff2fb74d6a79f47bbc65c2b92d0b22e35
Parents: d974f51
Author: Chris Snow <ch...@cloudant.com>
Authored: Mon Nov 3 08:13:11 2014 +0000
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Nov 3 12:24:33 2014 +0300

----------------------------------------------------------------------
 src/api/document/common.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/332c40bf/src/api/document/common.rst
----------------------------------------------------------------------
diff --git a/src/api/document/common.rst b/src/api/document/common.rst
index 2506179..5512d88 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 <api/doc/retrieving-deleted-documents>`


[2/2] documentation commit: updated refs/heads/master to 332c40b

Posted by kx...@apache.org.
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.

This closes #5

Signed-off-by: Alexander Shorin <kx...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/d974f51b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/d974f51b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/d974f51b

Branch: refs/heads/master
Commit: d974f51b571bedf640b09f5316277deccb6c1735
Parents: 167619f
Author: Chris Snow <ch...@cloudant.com>
Authored: Mon Nov 3 08:09:58 2014 +0000
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Nov 3 12:24:33 2014 +0300

----------------------------------------------------------------------
 src/api/document/common.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d974f51b/src/api/document/common.rst
----------------------------------------------------------------------
diff --git a/src/api/document/common.rst b/src/api/document/common.rst
index 8602bbc..2506179 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 <api/doc/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 <api/doc/retrieving-deleted-documents>`
+
   :param db: Database name
   :param docid: Document ID
   :<header Accept: - :mimetype:`application/json`