Merge with 3.1

10fe23b4 · Georg Brandl · a2860e8b · 340d2690 · 10fe23b4
Kaydet (Commit) 10fe23b4 authored Nis 16, 2011 tarafından Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

json.rst Doc/library/json.rst +4 -3

No files found.
--- 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
+      Unlike :mod:`pickle` and :mod:`marshal`, JSON is not a framed protocol,
-      trying to serialize more objects with repeated calls to :func:`dump` and
+      so trying to serialize multiple objects with repeated calls to
-      the same *fp* will result in an invalid JSON file.
+      :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)