merge with 3.5

diff --cc Doc/faq/programming.rst
Simple merge

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

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

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

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

diff --cc Doc/library/zipfile.rst
index 54b8cc5a2d4f7eb55d0276a25b440cc5d96f964d,9b0d18a3659fb90be2a3026160eb866cdb6c2674..19b354daeef76a098c0f67a18016503d0233cfb3
--- 1/Doc/library/zipfile.rst
--- 2/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@@ -591,10 -573,4 +589,5 @@@ Instances have the following attributes
  
     Size of the uncompressed file.
  
- There is one method:
 +
- .. method:: ZipInfo.is_dir()
- 
-    Return ``True`` if the ZipInfo represents a directory.
- 
-    .. versionadded:: 3.6
+ .. _PKZIP Application Note: https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT

diff --cc Doc/using/mac.rst
Simple merge

diff --cc Misc/NEWS
Simple merge