Repository: couchdb Updated Branches: refs/heads/master a7a6d2eec -> 292561490
fix wording in json-structure Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ebbee3c5 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ebbee3c5 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ebbee3c5 Branch: refs/heads/master Commit: ebbee3c58390430b5095ba9977720f7f409bab3f Parents: a7a6d2e Author: Andy Wenk <[email protected]> Authored: Thu Jan 30 22:00:28 2014 +0100 Committer: Andy Wenk <[email protected]> Committed: Fri Mar 21 22:54:29 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/ebbee3c5/share/doc/src/json-structure.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/json-structure.rst b/share/doc/src/json-structure.rst index ab3ae45..68137d2 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 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.
