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 2014/07/10 11:47:01 UTC

[02/50] documentation commit: updated refs/heads/import-master to fe7f7bf

Fix documentation wording

The warning regarding the Response Object was unclear.


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

Branch: refs/heads/import-master
Commit: 2023ccbc867eef816802ba9c54a16245cf991832
Parents: efce3c2
Author: Andy Wenk <an...@apache.org>
Authored: Thu Feb 20 20:57:11 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Feb 20 20:57:11 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/2023ccbc/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index 4ab2f65..8eae7df 100644
--- a/src/json-structure.rst
+++ b/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.