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

[rn...@apache.org]

fix wording in json-structure


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

Branch: refs/heads/import-master
Commit: 5a4a2efc4912ec6f4708918458746587fd3e33c0
Parents: 32ff4aa
Author: Andy Wenk <an...@nms.de>
Authored: Thu Jan 30 22:00:28 2014 +0100
Committer: Andy Wenk <an...@nms.de>
Committed: Fri Mar 21 22:54:29 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/5a4a2efc/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index ab3ae45..68137d2 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 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.
+   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.
 
 .. note::
    Any custom property makes CouchDB raise an internal exception.