Merge branch 'slurm-2.6'

doc/man/man1/squeue.1

@@ -413,7 +413,7 @@ ascending (default) and descending order respectively.
 For example, a sort value of "P,U" will sort the
 records by partition name then by user id.
 The default value of sort for jobs is "P,t,\-p" (increasing partition
-name then within a given partition by increasing node state and then
+name then within a given partition by increasing job state and then
 decreasing priority).
 The default value of sort for job steps is "P,i" (increasing partition
 name then within a given partition by increasing step id).