diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index 9a950b286..387458d02 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -118,12 +118,17 @@ and more, using a more compact and configurable output format.
 .
 .SH USAGE
 .
+Display output in columns like lvs.
+.br
+.P
 \fBlvdisplay\fP \fB-C\fP|\fB--columns\fP
 .br
 .RS 4
 .ad l
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
 .br
+[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
+.br
 [    \fB--aligned\fP ]
 .br
 [    \fB--binary\fP ]
@@ -153,6 +158,9 @@ and more, using a more compact and configurable output format.
 .P
 \(em
 .P
+Generate colon separated output.
+.br
+.P
 \fBlvdisplay\fP \fB-c\fP|\fB--colon\fP
 .br
 .RS 4
@@ -191,8 +199,6 @@ Common options for command:
 .br
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
 .br
-[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.br
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
 .br
 [    \fB--foreign\fP ]
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 07d2aed24..05da127f2 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -31,10 +31,10 @@ if information changes between commands.
 .br
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
 .br
-[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.br
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
 .br
+[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
+.br
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
 .br
 [    \fB--foreign\fP ]
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index 1a657f709..3f9a9be04 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -29,10 +29,10 @@ lvs produces formatted output about LVs.
 .br
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
 .br
-[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.br
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
 .br
+[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
+.br
 [    \fB--segments\fP ]
 .br
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index 812ec6cf8..14122daef 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -118,12 +118,17 @@ and more, using a more compact and configurable output format.
 .
 .SH USAGE
 .
+Display output in columns like pvs.
+.br
+.P
 \fBpvdisplay\fP \fB-C\fP|\fB--columns\fP
 .br
 .RS 4
 .ad l
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
 .br
+[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
+.br
 [    \fB--aligned\fP ]
 .br
 [    \fB--binary\fP ]
@@ -153,6 +158,9 @@ and more, using a more compact and configurable output format.
 .P
 \(em
 .P
+Generate colon separated output.
+.br
+.P
 \fBpvdisplay\fP \fB-c\fP|\fB--colon\fP
 .br
 .RS 4
@@ -191,8 +199,6 @@ Common options for command:
 .br
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
 .br
-[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.br
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
 .br
 [    \fB--foreign\fP ]
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index 1174963ac..47bd7d7b4 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -29,10 +29,10 @@ pvs produces formatted output about PVs.
 .br
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
 .br
-[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.br
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
 .br
+[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
+.br
 [    \fB--segments\fP ]
 .br
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index 1c5686d50..bc19ddadf 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -115,12 +115,17 @@ and more, using a more compact and configurable output format.
 .
 .SH USAGE
 .
+Display output in columns like vgs.
+.br
+.P
 \fBvgdisplay\fP \fB-C\fP|\fB--columns\fP
 .br
 .RS 4
 .ad l
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
 .br
+[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
+.br
 [    \fB--aligned\fP ]
 .br
 [    \fB--binary\fP ]
@@ -150,6 +155,9 @@ and more, using a more compact and configurable output format.
 .P
 \(em
 .P
+Generate colon separated output.
+.br
+.P
 \fBvgdisplay\fP \fB-c\fP|\fB--colon\fP
 .br
 .RS 4
@@ -188,8 +196,6 @@ Common options for command:
 .br
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
 .br
-[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.br
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
 .br
 [    \fB--foreign\fP ]
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index a688c084e..99b90c910 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -27,10 +27,10 @@ vgs produces formatted output about VGs.
 .br
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
 .br
-[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.br
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
 .br
+[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
+.br
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
 .br
 [    \fB--foreign\fP ]
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 9820a6bc1..37a4aec75 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -211,7 +211,7 @@ OO_ALL: --commandprofile String, --config String, --debug,
 #
 OO_REPORTING: --all, --configreport ConfigReport, --foreign,
 --ignorelockingfailure, --logonly, --readonly, --reportformat ReportFmt,
---select String, --shared, --sort String, --units Units
+--select String, --shared, --units Units
 
 #
 # options for pvs, lvs, vgs, fullreport
@@ -219,7 +219,7 @@ OO_REPORTING: --all, --configreport ConfigReport, --foreign,
 OO_REPORT: OO_REPORTING, --aligned, --binary,
 --headings HeadingsType, --nameprefixes, --noheadings,
 --nosuffix, --options String, --rows, --separator String,
---unbuffered, --unquoted
+--sort String, --unbuffered, --unquoted
 
 #
 # options for config, dumpconfig, lvmconfig
@@ -1397,12 +1397,14 @@ OP: VG|LV|Tag ...
 IO: --partial, --ignoreskippedcluster
 RULE: --noheadings not --headings
 ID: lvdisplay_columns
+DESC: Display output in columns like lvs.
 
 lvdisplay --colon
 OO: OO_REPORTING, --history, --segments
 OP: VG|LV|Tag ...
 IO: --partial, --ignoreskippedcluster
 ID: lvdisplay_colon
+DESC: Generate colon separated output.
 
 lvdisplay
 OO: OO_REPORTING, --history, --segments, --maps
@@ -1641,12 +1643,14 @@ OP: PV|Tag ...
 IO: --partial, --ignoreskippedcluster
 RULE: --noheadings not --headings
 ID: pvdisplay_columns
+DESC: Display output in columns like pvs.
 
 pvdisplay --colon
 OO: OO_REPORTING, --segments
 OP: PV|Tag ...
 IO: --partial, --ignoreskippedcluster
 ID: pvdisplay_colon
+DESC: Generate colon separated output.
 
 pvdisplay
 OO: OO_REPORTING, --maps, --segments, --short
@@ -1873,12 +1877,14 @@ OP: VG|Tag ...
 IO: --partial, --ignoreskippedcluster
 RULE: --noheadings not --headings
 ID: vgdisplay_columns
+DESC: Display output in columns like vgs.
 
 vgdisplay --colon
 OO: OO_REPORTING, --activevolumegroups
 OP: VG|Tag ...
 IO: --partial, --ignoreskippedcluster
 ID: vgdisplay_colon
+DESC: Generate colon separated output.
 
 vgdisplay
 OO: OO_REPORTING, --activevolumegroups, --short