Man page typos
Merge branch 'slurm-2.6'

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