Merge remote-tracking branch 'origin/slurm-2.2'

doc/man/man1/sprio.1

@@ -42,14 +42,14 @@ Display the normalized priority factors for the selected jobs.
 
 .TP
 \fB\-o <output_format>\fR, \fB\-\-format=<output_format>\fR
-Specify the information to be displayed, its size and position
-(right or left justified).
-The default formats with various options are
+Specify the information to be displayed, its size and position (right
+or left justified).  The default formats when all factors have been
+assigned non-zero weights are
 
 .RS
 .TP 15
 \fIdefault\fR
-"%.7i %.8u %.10A %.10F %.10J %.10P %.10Q"
+"%.7i %.10Y %.10A %.10F %.10J %.10P %.10Q"
 .TP
 \fI\-l, \-\-long\fR
 "%.7i %.8u %.10Y %.10A %.10F %.10J %.10P %.10Q %.6N"