[couchdb-documentation] branch putAttWithoutRev updated (febe659 -> f690c93)

[fl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

flimzy pushed a change to branch putAttWithoutRev
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


 discard febe659  Update the PUT {attachment} docs to reflect observed behavior.
     new f690c93  Update the PUT {attachment} docs to reflect observed behavior.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (febe659)
            \
             N -- N -- N   refs/heads/putAttWithoutRev (f690c93)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/api/document/attachments.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].

[couchdb-documentation] 01/01: Update the PUT {attachment} docs to reflect observed behavior.

[fl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

flimzy pushed a commit to branch putAttWithoutRev
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git

commit f690c93967d34354d63b8aef576490b74dbe474a
Author: Jonathan Hall <fl...@flimzy.com>
AuthorDate: Fri Oct 27 00:02:38 2017 +0200

    Update the PUT {attachment} docs to reflect observed behavior.
---
 src/api/document/attachments.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/api/document/attachments.rst b/src/api/document/attachments.rst
index 7d64289..ad99dd3 100644
--- a/src/api/document/attachments.rst
+++ b/src/api/document/attachments.rst
@@ -109,10 +109,11 @@
     :synopsis: Adds an attachment of a document
 
     Uploads the supplied content as an attachment to the specified document.
-    The attachment name provided must be a URL encoded string. You must also
-    supply either the ``rev`` query argument or the :header:`If-Match` HTTP
-    header for validation, and the HTTP headers (to set the attachment content
-    type).
+    The attachment name provided must be a URL encoded string. You must supply
+    the Content-Type header, and for an existing document you must also supply
+    either the ``rev`` query argument or the :header:`If-Match` HTTP header. If
+    the revision is omitted, a new, otherwise empty document will be created
+    with the provided attachment, or a conflict will occur.
 
     If case when uploading an attachment using an existing attachment name,
     CouchDB will update the corresponding stored content of the database. Since
@@ -129,7 +130,7 @@
     :param attname: Attachment name
     :<header Content-Type: Attachment MIME type. *Required*
     :<header If-Match: Document revision. Alternative to `rev` query parameter
-    :query string rev: Document revision. *Required*
+    :query string rev: Document revision. *Optional*
     :>json string id: Document ID
     :>json boolean ok: Operation status
     :>json string rev: Revision MVCC token

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.