Issue #25161: Merge full stops from 3.4 into 3.5

diff --cc Doc/c-api/gen.rst
index 3ab073b1914bb3896748280ec47e883e9339a618,0c851a75efbe1dba04fefda992eff1338190c2c7..1efbae4fcba098486d6c5bed66774e76b68fe716
--- 1/Doc/c-api/gen.rst
--- 2/Doc/c-api/gen.rst
+++ b/Doc/c-api/gen.rst
@@@ -17,10 -17,10 +17,10 @@@ than explicitly calling :c:func:`PyGen_
  
  .. c:var:: PyTypeObject PyGen_Type
  
-    The type object corresponding to generator objects
+    The type object corresponding to generator objects.
  
  
 -.. c:function:: int PyGen_Check(ob)
 +.. c:function:: int PyGen_Check(PyObject *ob)
  
     Return true if *ob* is a generator object; *ob* must not be *NULL*.
  

diff --cc Doc/distutils/apiref.rst
Simple merge

diff --cc Doc/glossary.rst
Simple merge

diff --cc Doc/library/argparse.rst
Simple merge

diff --cc Doc/library/asyncio-protocol.rst
Simple merge

diff --cc Doc/library/contextlib.rst
Simple merge

diff --cc Doc/library/decimal.rst
Simple merge

diff --cc Doc/library/enum.rst
Simple merge

diff --cc Doc/library/exceptions.rst
Simple merge

diff --cc Doc/library/fractions.rst
Simple merge

diff --cc Doc/library/http.cookies.rst
Simple merge

diff --cc Doc/library/importlib.rst
Simple merge

diff --cc Doc/library/json.rst
index 49bb0905e01dca2d2e1ddea30685c40fda408652,a01e63649608e62f2919124895b4fb820f9576e8..d62f14be60e3eda48a777d38260b8d1af11487d9
--- 1/Doc/library/json.rst
--- 2/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@@ -339,11 -337,8 +339,11 @@@ Encoders and Decoder
     .. method:: decode(s)
  
        Return the Python representation of *s* (a :class:`str` instance
-       containing a JSON document)
+       containing a JSON document).
  
 +      :exc:`JSONDecodeError` will be raised if the given JSON document is not
 +      valid.
 +
     .. method:: raw_decode(s)
  
        Decode a JSON document from *s* (a :class:`str` beginning with a

diff --cc Doc/library/locale.rst
Simple merge

diff --cc Doc/library/logging.handlers.rst
Simple merge

diff --cc Doc/library/multiprocessing.rst
Simple merge

diff --cc Doc/library/pickle.rst
Simple merge

diff --cc Doc/library/platform.rst
Simple merge

diff --cc Doc/library/shutil.rst
Simple merge

diff --cc Doc/library/sys.rst
Simple merge

diff --cc Doc/library/urllib.request.rst
Simple merge

diff --cc Doc/library/wsgiref.rst
Simple merge

diff --cc Doc/reference/datamodel.rst
Simple merge

diff --cc Doc/reference/expressions.rst
Simple merge

diff --cc Misc/ACKS
index 3d257cd16e3fb411fd11cb2b25805eafd56bdb7d,d0ba52f1937a1e2c61fa2cfc63bf2f8c176ae62d..120956ee231d155dbcaa0cd6dfd02f5a3aae3215
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1403,9 -1365,9 +1403,10 @@@ Thenault Sylvai
  Péter Szabó
  John Szakmeister
  Amir Szekely
 +Maciej Szulik
  Arfrever Frehtes Taifersar Arahesis
  Hideaki Takahashi
+ Takase Arihiro
  Indra Talip
  Neil Tallim
  Geoff Talvola