Merge with 3.1

birkenfeld · birkenfeld · commit 10fe23b49548 · 2011-04-16T16:59:32.000+02:00
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
@@ -160,9 +160,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)
 
