Merge pull request #3650 from cbrueffer/misc

DOC : Typo fixes.
Conflicts:
	lib/matplotlib/axis.py

Conflicts due to pep8 work on master branch.