Fix format problem in salloc man page
Merge branch 'slurm-2.5'