Fix some typos in documentation
Merge branch 'slurm-2.5'