couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [1/3] git commit: updated refs/heads/1781-reorganize-and-improve-docs to ec270f6
Date Wed, 21 Aug 2013 16:55:33 GMT
Updated Branches:
  refs/heads/1781-reorganize-and-improve-docs 360107ba0 -> ec270f679


Fix dead reference.


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

Branch: refs/heads/1781-reorganize-and-improve-docs
Commit: 19d36a21a4cb62aee9e3dacd2dda963c09882a5e
Parents: 360107b
Author: Alexander Shorin <kxepal@apache.org>
Authored: Wed Aug 21 20:43:29 2013 +0400
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Wed Aug 21 20:43:29 2013 +0400

----------------------------------------------------------------------
 share/doc/src/replication/conflicts.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/19d36a21/share/doc/src/replication/conflicts.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/replication/conflicts.rst b/share/doc/src/replication/conflicts.rst
index 404d256..d0149b0 100644
--- a/share/doc/src/replication/conflicts.rst
+++ b/share/doc/src/replication/conflicts.rst
@@ -109,9 +109,10 @@ Conflict avoidance
 ==================
 
 When working on a single node, CouchDB will avoid creating conflicting revisions
-by returning a 409 HTTP error. This is because, when you PUT a new version of a
-document, you must give the ``_rev`` of the previous version. If that ``_rev``
-has already been superseded, the update is rejected with a ``HTTP 409 Conflict``.
+by returning a :http:statuscode:`409` error. This is because, when you
+PUT a new version of a document, you must give the ``_rev`` of the previous
+version. If that ``_rev`` has already been superseded, the update is rejected
+with a  :http:statuscode:`409` response.
 
 So imagine two users on the same node are fetching Bob's business card, updating
 it concurrently, and writing it back:
@@ -237,7 +238,7 @@ arbitrarily large.
 Working with conflicting documents
 ==================================
 
-The basic :ref:`GET /db/bob <api/doc.get>` operation will not show you any
+The basic :http:get:`/{doc}/{docid}` operation will not show you any
 information about conflicts. You see only the deterministically-chosen winner,
 and get no indication as to whether other conflicting revisions exist or not:
 


Mime
View raw message