Merge doc and comment fixes from 3.5

author Martin Panter <vadmium+py@gmail.com>

Tue, 19 Apr 2016 23:23:16 +0000 (23:23 +0000)

committer Martin Panter <vadmium+py@gmail.com>

Tue, 19 Apr 2016 23:23:16 +0000 (23:23 +0000)
author Martin Panter <vadmium+py@gmail.com>
Tue, 19 Apr 2016 23:23:16 +0000 (23:23 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Tue, 19 Apr 2016 23:23:16 +0000 (23:23 +0000)
diff --cc Doc/library/test.rst
Simple merge
diff --cc Lib/optparse.py
Simple merge
diff --cc Lib/test/test_tracemalloc.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_io/stringio.c
Simple merge
diff --cc Objects/typeobject.c
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Tue, 19 Apr 2016 23:23:16 +0000 (23:23 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Tue, 19 Apr 2016 23:23:16 +0000 (23:23 +0000)
		1	2
Doc/library/test.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/optparse.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_tracemalloc.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_io/stringio.c	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/typeobject.c	patch \|	diff1 \|	diff2 \|	blob \| history