Merge doc touch-ups and fixes for #9831 and #9223 from 3.1

author Éric Araujo <merwok@netwok.org>

Sat, 28 May 2011 22:29:56 +0000 (00:29 +0200)

committer Éric Araujo <merwok@netwok.org>

Sat, 28 May 2011 22:29:56 +0000 (00:29 +0200)
author Éric Araujo <merwok@netwok.org>
Sat, 28 May 2011 22:29:56 +0000 (00:29 +0200)
committer Éric Araujo <merwok@netwok.org>
Sat, 28 May 2011 22:29:56 +0000 (00:29 +0200)
diff --cc Doc/distutils/apiref.rst
Simple merge
diff --cc Doc/glossary.rst
Simple merge
diff --cc Doc/library/functions.rst
Simple merge
author	Éric Araujo <merwok@netwok.org>
	Sat, 28 May 2011 22:29:56 +0000 (00:29 +0200)
committer	Éric Araujo <merwok@netwok.org>
	Sat, 28 May 2011 22:29:56 +0000 (00:29 +0200)
		1	2
Doc/distutils/apiref.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/glossary.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/functions.rst	patch \|	diff1 \|	diff2 \|	blob \| history