Documentation fixes for formatting and spelling problems
Merge branch 'slurm-2.5'

Conflicts:
	doc/man/man5/slurm.conf.5