summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-04-16 14:54:15 (GMT)
committerGeorg Brandl <georg@python.org>2011-04-16 14:54:15 (GMT)
commit340d2690b3db594edfa1eb27cda2afe957235ba6 (patch)
treef22b08c068046af863111557ddc9526fff1d93cf /Doc/library
parent219cc776f6420c9cc9c3c5e96960d25fc42546a3 (diff)
downloadcpython-340d2690b3db594edfa1eb27cda2afe957235ba6.zip
cpython-340d2690b3db594edfa1eb27cda2afe957235ba6.tar.gz
cpython-340d2690b3db594edfa1eb27cda2afe957235ba6.tar.bz2
Small wording fix.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/json.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index 0b42012..6bb48e8 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -158,9 +158,10 @@ Basic Usage
.. note::
- Unlike :mod:`pickle` and :mod:`marshal`, JSON is not a framed protocol so
- trying to serialize more objects with repeated calls to :func:`dump` and
- the same *fp* will result in an invalid JSON file.
+ Unlike :mod:`pickle` and :mod:`marshal`, JSON is not a framed protocol,
+ so trying to serialize multiple objects with repeated calls to
+ :func:`dump` using the same *fp* will result in an invalid JSON file.
+
.. function:: load(fp, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw)