couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject [30/50] [abbrv] couchdb commit: updated refs/heads/2041-update-ibrowse to 948e7d9
Date Fri, 07 Mar 2014 00:18:13 GMT
Fix documentation wording

The warning regarding the Response Object was unclear.


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

Branch: refs/heads/2041-update-ibrowse
Commit: 08cf09fc0ae828e05c3ab01b11d561b4e717e0c4
Parents: dea6cef
Author: Andy Wenk <andywenk@apache.org>
Authored: Thu Feb 20 20:57:11 2014 +0100
Committer: Andy Wenk <andywenk@apache.org>
Committed: Thu Feb 20 20:57:11 2014 +0100

----------------------------------------------------------------------
 share/doc/src/json-structure.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/08cf09fc/share/doc/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/json-structure.rst b/share/doc/src/json-structure.rst
index 4ab2f65..8eae7df 100644
--- a/share/doc/src/json-structure.rst
+++ b/share/doc/src/json-structure.rst
@@ -481,10 +481,10 @@ Response object
 +--------------------------------+---------------------------------------------+
 
 .. warning::
-   The ``body``, ``base64`` and ``json`` object keys are overlapping each other
-   where the last one wins. Since most realizations of key-value objects do
-   not preserve the key order or if they are mixed, confusing situations can
-   occure. Try to use only one of them.
+   The ``body``, ``base64`` and ``json`` object keys overlapp each other
+   where in the last one wins. Since most implementations of key-value objects do
+   not preserve the key order, confusing situations can emerge. The same applies,
+   when they are mixed. Try to use only one of them.
 
 .. note::
    Any custom property makes CouchDB raise an internal exception.


Mime
View raw message