Merge doc fixups from 3.5

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

Mon, 21 Nov 2016 04:22:22 +0000 (04:22 +0000)

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

Mon, 21 Nov 2016 04:22:22 +0000 (04:22 +0000)
author Martin Panter <vadmium+py@gmail.com>
Mon, 21 Nov 2016 04:22:22 +0000 (04:22 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Mon, 21 Nov 2016 04:22:22 +0000 (04:22 +0000)
diff --cc Doc/howto/clinic.rst
Simple merge
diff --cc Doc/library/functions.rst
Simple merge
diff --cc Doc/library/pdb.rst
Simple merge
diff --cc Doc/library/shutil.rst
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Mon, 21 Nov 2016 04:22:22 +0000 (04:22 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Mon, 21 Nov 2016 04:22:22 +0000 (04:22 +0000)
		1	2
Doc/howto/clinic.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/functions.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/pdb.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/shutil.rst	patch \|	diff1 \|	diff2 \|	blob \| history