Merge branch 'GlenKaukola_manpages' into manpages

Conflicts:
	shell_tools_101.rst