[Python-checkins] cpython (merge 3.1 -> 3.2): Merge with 3.1

[georg.brandl]

http://hg.python.org/cpython/rev/f1e3f77b8af8
changeset:   69396:f1e3f77b8af8
branch:      3.2
parent:      69392:2596389a993d
parent:      69395:ff735436c247
user:        Georg Brandl <georg at python.org>
date:        Sat Apr 16 16:59:32 2011 +0200
summary:
  Merge with 3.1

files:
  Doc/library/json.rst |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -160,9 +160,10 @@
 
    .. 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)
 

-- 
Repository URL: http://hg.python.org/cpython