]> granicus.if.org Git - python/commitdiff
Issue #27125: Merge typo fixes from 3.5
authorMartin Panter <vadmium+py@gmail.com>
Sun, 29 May 2016 09:05:06 +0000 (09:05 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Sun, 29 May 2016 09:05:06 +0000 (09:05 +0000)
Also merge changes from Issue #27117; no actual code changes to 3.6.

1  2 
Doc/library/collections.rst
Doc/library/multiprocessing.rst
Doc/library/os.rst
Doc/library/typing.rst
Lib/collections/__init__.py
Lib/tkinter/tix.py
Objects/object.c
README

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc README
Simple merge