From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 11 Aug 2018 09:13:04 +0000 (-0700)
Subject: bpo-34379: Doc: Move note for json.dump (GH-8730)
X-Git-Tag: v3.6.7rc1~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb6ed12f486f184cb00fc35662d012dbb1f30d2e;p=thirdparty%2FPython%2Fcpython.git

bpo-34379: Doc: Move note for json.dump (GH-8730)

(cherry picked from commit 9e840848510d20e644a19c723b803877377d3765)

Co-authored-by: Evan Allrich <eallrich@gmail.com>
---

diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index d6dcd5209928..aa9da9130308 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -188,6 +188,11 @@ Basic Usage
    .. versionchanged:: 3.6
       All optional parameters are now :ref:`keyword-only <keyword-only_parameter>`.
 
+   .. note::
+
+      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:: dumps(obj, *, skipkeys=False, ensure_ascii=True, \
                     check_circular=True, allow_nan=True, cls=None, \
@@ -198,12 +203,6 @@ Basic Usage
    table <py-to-json-table>`.  The arguments have the same meaning as in
    :func:`dump`.
 
-   .. note::
-
-      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.
-
    .. note::
 
       Keys in key/value pairs of JSON are always of the type :class:`str`. When