You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2016/09/07 09:54:47 UTC
[1/3] documentation commit: updated refs/heads/master to 57741f6
Repository: couchdb-documentation
Updated Branches:
refs/heads/master 162b7a0c6 -> 57741f6b4
Update document API to remove number from update sequence
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/6c7ba78c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/6c7ba78c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/6c7ba78c
Branch: refs/heads/master
Commit: 6c7ba78cb021040140f55f31eec069dd9e67a0dc
Parents: 2614cfd
Author: Samuel Tardieu <sa...@rfc1149.net>
Authored: Wed Sep 7 09:03:24 2016 +0200
Committer: Samuel Tardieu <sa...@rfc1149.net>
Committed: Wed Sep 7 09:03:24 2016 +0200
----------------------------------------------------------------------
src/api/document/common.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/6c7ba78c/src/api/document/common.rst
----------------------------------------------------------------------
diff --git a/src/api/document/common.rst b/src/api/document/common.rst
index 021c557..249de7e 100644
--- a/src/api/document/common.rst
+++ b/src/api/document/common.rst
@@ -90,7 +90,7 @@
conflicted revisions. Default is ``false``
:query boolean latest: Forces retrieving latest "leaf" revision, no matter
what `rev` was requested. Default is ``false``
- :query boolean local_seq: Includes last update sequence number for the
+ :query boolean local_seq: Includes last update sequence for the
document. Default is ``false``
:query boolean meta: Acts same as specifying all `conflicts`,
`deleted_conflicts` and `open_revs` query parameters. Default is
@@ -121,7 +121,7 @@
requested with ``conflicts=true`` query parameter
:>json array _deleted_conflicts: List of deleted conflicted revisions.
Available if requested with ``deleted_conflicts=true`` query parameter
- :>json number _local_seq: Document's sequence number in current database.
+ :>json string _local_seq: Document's update sequence in current database.
Available if requested with ``local_seq=true`` query parameter
:>json array _revs_info: List of objects with information about local
revisions and their status. Available if requested with ``open_revs``
[3/3] documentation commit: updated refs/heads/master to 57741f6
Posted by rn...@apache.org.
Merge remote-tracking branch 'sam/document-common'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/57741f6b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/57741f6b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/57741f6b
Branch: refs/heads/master
Commit: 57741f6b4bea86fda4ffecafd0040a7f6461457a
Parents: 162b7a0 c406ac7
Author: Robert Newson <rn...@apache.org>
Authored: Wed Sep 7 10:53:56 2016 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Sep 7 10:53:56 2016 +0100
----------------------------------------------------------------------
src/api/document/common.rst | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] documentation commit: updated refs/heads/master to 57741f6
Posted by rn...@apache.org.
Explain the new_edits=false option when PUTing a document
Fixes COUCHDB-3136.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/c406ac7d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/c406ac7d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/c406ac7d
Branch: refs/heads/master
Commit: c406ac7d30216b14e907f6c96ea73fe6b141ad7b
Parents: 6c7ba78
Author: Samuel Tardieu <sa...@rfc1149.net>
Authored: Wed Sep 7 09:14:04 2016 +0200
Committer: Samuel Tardieu <sa...@rfc1149.net>
Committed: Wed Sep 7 09:14:04 2016 +0200
----------------------------------------------------------------------
src/api/document/common.rst | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c406ac7d/src/api/document/common.rst
----------------------------------------------------------------------
diff --git a/src/api/document/common.rst b/src/api/document/common.rst
index 249de7e..117412d 100644
--- a/src/api/document/common.rst
+++ b/src/api/document/common.rst
@@ -185,7 +185,13 @@
:config:option:`commit policy <couchdb/delayed_commits>`. Possible values
are: ``false`` and ``true``. *Optional*
:query string batch: Stores document in :ref:`batch mode
- <api/doc/batch-writes>` Possible values: ``ok``. *Optional*
+ <api/doc/batch-writes>`. Possible values: ``ok``. *Optional*
+ :query boolean new_edits: Prevents insertion of a :ref:`conflicting
+ document <replication/conflicts>`. Possible values: ``true`` (default)
+ and ``false``. If ``false``, a well-formed ``_rev`` must be included in
+ the document. ``new_edits=false`` is used by the replicator to insert
+ documents into the target database even if that leads to the creation
+ of conflicts. *Optional*
:>header Content-Type: - :mimetype:`application/json`
- :mimetype:`text/plain; charset=utf-8`
:>header ETag: Quoted document's new revision