diff --git a/doc/man/man1/sinfo.1 b/doc/man/man1/sinfo.1
index a9bc7015f8985ea6d9f8c89f8e7da86d7fa6b4ac..995d0055f861309b162eb9692e9fdf991a12d6b3 100644
--- a/doc/man/man1/sinfo.1
+++ b/doc/man/man1/sinfo.1
@@ -1,4 +1,4 @@
-.TH sinfo "1" "Slurm Commands" "September 2020" "Slurm Commands"
+.TH sinfo "1" "Slurm Commands" "October 2020" "Slurm Commands"
 
 .SH "NAME"
 sinfo \- View information about Slurm nodes and partitions.
@@ -135,8 +135,25 @@ to align the sinfo output, then a second pass is made over the records to
 print them.
 Note that the literal character "#" itself is not a valid field length
 specification, but is only used to document this behaviour.
+
 .IP
-The field specifications available include:
+The format of each field is "%[[.]size]type[suffix]"
+.RS 10
+.TP
+\fIsize\fR
+Minimum field size. If no size is specified, whatever is needed to print the
+information will be used.
+.TP
+\fI.\fR
+Indicates the output should be right justified and size must be specified.
+By default output is left justified.
+.TP
+\fIsuffix\fR
+Arbitrary string to append to the end of the field.
+.RE
+
+.IP
+Valid \fItype\fR specifications include:
 .RS
 .TP 6
 \fB%all\fR
@@ -276,12 +293,6 @@ Number of threads per core.
 .TP
 \fB%z\fR
 Extended processor information: number of sockets, cores, threads (S:C:T) per node.
-.TP
-\fB%.<*>\fR
-Right justification of the field.
-.TP
-\fB%<Number><*>\fR
-Size of the field.
 .RE
 
 .TP
@@ -293,16 +304,19 @@ does not support access to all fields because we ran out of letters).
 Requests a comma separated list of job information to be displayed.
 
 .IP
-The format of each field is "type[:[.]size]"
-.RS
-.TP 8
+The format of each field is "type[:[.][size][suffix]]"
+.RS 10
+.TP
 \fIsize\fR
 The minimum field size.
 If no size is specified, 20 characters will be allocated to print the information.
 .TP
-\fI .\fR
+\fI.\fR
 Indicates the output should be right justified and size must be specified.
 By default, output is left justified.
+.TP
+\fIsuffix\fR
+Arbitrary string to append to the end of the field.
 .RE
 
 .IP
diff --git a/doc/man/man1/squeue.1 b/doc/man/man1/squeue.1
index 60f701a47dcbc6df07060cc935f4c723a5eddb3b..7b97bc7c6a1b2958147b78cd37410743e00eb0b4 100644
--- a/doc/man/man1/squeue.1
+++ b/doc/man/man1/squeue.1
@@ -1,4 +1,4 @@
-.TH squeue "1" "Slurm Commands" "September 2020" "Slurm Commands"
+.TH squeue "1" "Slurm Commands" "October 2020" "Slurm Commands"
 
 .SH "NAME"
 squeue \- view information about jobs located in the Slurm scheduling queue.
@@ -124,8 +124,8 @@ If the command is executed in an federated cluster environment and information
 about more than one cluster is to be displayed and the \fB\-h, \-\-noheader\fR
 option is used, then the cluster name will be displayed before the default
 output formats shown below.
-The default formats with various options are
 
+The default formats with various options are:
 .RS
 .TP 15
 \fIdefault\fR
@@ -139,16 +139,19 @@ The default formats with various options are
 .RE
 
 .IP
-The format of each field is "%[[.]size]type".
-.RS
-.TP 8
+The format of each field is "%[[.]size]type[suffix]"
+.RS 10
+.TP
 \fIsize\fR
-is the minimum field size.
-If no size is specified, whatever is needed to print the information will be used.
+Minimum field size. If no size is specified, whatever is needed to print the
+information will be used.
+.TP
+\fI.\fR
+Indicates the output should be right justified and size must be specified.
+By default output is left justified.
 .TP
-\fI .\fR
-indicates the output should be right justified and size must be specified.
-By default, output is left justified.
+\fIsuffix\fR
+Arbitrary string to append to the end of the field.
 .RE
 
 .IP
@@ -449,16 +452,19 @@ does not support access to all fields because we ran out of letters).
 Requests a comma separated list of job information to be displayed.
 
 .IP
-The format of each field is "type[:[.]size]"
-.RS
-.TP 8
+The format of each field is "type[:[.][size][sufix]]"
+.RS 10
+.TP
 \fIsize\fR
-is the minimum field size.
-If no size is specified, 20 characters will be allocated to print the information.
+Minimum field size. If no size is specified, 20 characters will be allocated
+to print the information.
+.TP
+\fI.\fR
+Indicates the output should be right justified and size must be specified.
+By default output is left justified.
 .TP
-\fI .\fR
-indicates the output should be right justified and size must be specified.
-By default, output is left justified.
+\fIsufix\fR
+Arbitrary string to append to the end of the field.
 .RE
 
 .IP