All of lore.kernel.org
 help / color / mirror / Atom feed
* main - make: generate
@ 2021-04-23 21:06 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2021-04-23 21:06 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9cdd4dcca7e6d166e44270a81425a50e598836f4
Commit:        9cdd4dcca7e6d166e44270a81425a50e598836f4
Parent:        64a8505b96548631ed8fb251dce794077402ad77
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Thu Apr 22 11:28:56 2021 +0200
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Apr 23 23:02:58 2021 +0200

make: generate

---
 conf/example.conf.in   |  15 +++---
 man/lvconvert.8_pregen |  26 ++++++-----
 man/lvcreate.8_pregen  | 121 ++++++++++++++++++++++---------------------------
 man/lvextend.8_pregen  |   2 +-
 man/lvreduce.8_pregen  |   2 +-
 man/lvresize.8_pregen  |   2 +-
 6 files changed, 79 insertions(+), 89 deletions(-)

diff --git a/conf/example.conf.in b/conf/example.conf.in
index 19efe6b6d..b4a55ae6a 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -1084,13 +1084,14 @@ global {
 
 	# Configuration option global/event_activation.
 	# Activate LVs based on system-generated device events.
-	# When a device appears on the system, a system-generated event runs
-	# the pvscan command to activate LVs if the new PV completes the VG.
-	# When event_activation is disabled, the system will generally run
-	# a direct activation command to activate LVs in complete VGs.
-	# Activation commands that are run by the system, either from events
-	# or at fixed points during startup, use autoactivation (-aay).  See
-	# the --setautoactivation option or the auto_activation_volume_list
+	# When a PV appears on the system, a system-generated uevent triggers
+	# the lvm2-pvscan service which runs the pvscan --cache -aay command.
+	# If the new PV completes a VG, pvscan autoactivates LVs in the VG.
+	# When event_activation is disabled, the lvm2-activation services are
+	# generated and run at fixed points during system startup.  These
+	# services run vgchange -aay to autoactivate LVs in VGs that happen
+	# to be present at that point in time.
+	# See the --setautoactivation option or the auto_activation_volume_list
 	# setting to configure autoactivation for specific VGs or LVs.
 	# This configuration option has an automatic default value.
 	# event_activation = 1
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index a921438b6..84b4ac75e 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -1650,23 +1650,22 @@ LV1 types: mirror
 .P
 \(em
 .P
-Convert LV to a thin LV, using the original LV as an external origin 
-.br
-(infers --type thin).
+Convert LV to a thin LV, using the original LV as an external origin.
 .br
 .P
 \fBlvconvert\fP \fB-T\fP|\fB--thin\fP \fB--thinpool\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
+[ \fB--type thin\fP ] (implied)
+.br
+.br
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
 .br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
 .br
-[    \fB--type\fP \fBthin\fP ]
-.br
 [    \fB--originname\fP \fILV\fP\fI_new\fP ]
 .br
 [    \fB--poolmetadata\fP \fILV\fP ]
@@ -1687,21 +1686,22 @@ LV1 types: linear striped thin cache raid error zero
 .P
 \(em
 .P
-Attach a cache pool to an LV (infers --type cache).
+Attach a cache pool to an LV.
 .br
 .P
 \fBlvconvert\fP \fB-H\fP|\fB--cache\fP \fB--cachepool\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
+[ \fB--type cache\fP ] (implied)
+.br
+.br
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
 .br
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
 .br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--type\fP \fBcache\fP ]
-.br
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
 .br
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
@@ -1766,6 +1766,9 @@ Convert LV to type vdopool.
 .br
 .RS 4
 .ad l
+[ \fB--type vdo-pool\fP ] (implied)
+.br
+.br
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
 .br
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
@@ -1774,8 +1777,6 @@ Convert LV to type vdopool.
 .br
 [ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
 .br
-[    \fB--type\fP \fBvdo-pool\fP ]
-.br
 [    \fB--metadataprofile\fP \fIString\fP ]
 .br
 [    \fB--compression\fP \fBy\fP|\fBn\fP ]
@@ -1875,12 +1876,13 @@ origin LV (first arg) to reverse a splitsnapshot command.
 .br
 .RS 4
 .ad l
+[ \fB--type snapshot\fP ] (implied)
+.br
+.br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
 .br
-[    \fB--type\fP \fBsnapshot\fP ]
-.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index c73d1bafc..b642ad0c2 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -225,9 +225,9 @@ Create a linear LV.
 .br
 .RS 4
 .ad l
-[ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
+[ \fB--type linear\fP ] (implied)
 .br
-[    \fB--type\fP \fBlinear\fP ]
+[ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -238,19 +238,19 @@ Create a linear LV.
 .P
 \(em
 .P
-Create a striped LV (infers --type striped).
+Create a striped LV.
 .br
 .P
 \fBlvcreate\fP \fB-i\fP|\fB--stripes\fP \fINumber\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fIVG\fP
 .br
 .RS 4
 .ad l
+[ \fB--type striped\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--type\fP \fBstriped\fP ]
-.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -260,16 +260,16 @@ Create a striped LV (infers --type striped).
 .P
 \(em
 .P
-Create a raid1 or mirror LV (infers --type raid1|mirror).
+Create a raid1 or mirror LV.
 .br
 .P
 \fBlvcreate\fP \fB-m\fP|\fB--mirrors\fP \fINumber\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fIVG\fP
 .br
 .RS 4
 .ad l
-[ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
+[ \fB--type raid1\fP|\fBmirror\fP ] (implied)
 .br
-[ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
+[ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
 .br
@@ -336,6 +336,8 @@ Create a raid10 LV.
 .br
 .RS 4
 .ad l
+[ \fB--type raid10\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
@@ -362,6 +364,8 @@ Create a COW snapshot LV of an origin LV.
 .br
 .RS 4
 .ad l
+[ \fB--type snapshot\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
@@ -370,8 +374,6 @@ Create a COW snapshot LV of an origin LV.
 .br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--type\fP \fBsnapshot\fP ]
-.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -455,16 +457,17 @@ Create a cache pool.
 .P
 \(em
 .P
-Create a thin LV in a thin pool (infers --type thin).
+Create a thin LV in a thin pool.
 .br
 .P
 \fBlvcreate\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fB--thinpool\fP \fILV\fP \fIVG\fP
 .br
 .RS 4
 .ad l
-[ \fB-T\fP|\fB--thin\fP ]
+[ \fB--type thin\fP ] (implied)
+.br
 .br
-[    \fB--type\fP \fBthin\fP ]
+[ \fB-T\fP|\fB--thin\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -472,16 +475,15 @@ Create a thin LV in a thin pool (infers --type thin).
 .P
 \(em
 .P
-Create a thin LV that is a snapshot of an existing thin LV 
-.br
-(infers --type thin).
+Create a thin LV that is a snapshot of an existing thin LV.
 .br
 .P
 \fBlvcreate\fP \fB-s\fP|\fB--snapshot\fP \fILV1\fP
 .br
 .RS 4
 .ad l
-[    \fB--type\fP \fBthin\fP ]
+[ \fB--type thin\fP ] (implied)
+.br
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -1685,13 +1687,15 @@ Create a sparse COW snapshot LV of a virtual origin LV
 .P
 \(em
 .P
-Create a thin pool (infers --type thin-pool).
+Create a thin pool.
 .br
 .P
 \fBlvcreate\fP \fB-T\fP|\fB--thin\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fIVG\fP
 .br
 .RS 4
 .ad l
+[ \fB--type thin-pool\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
@@ -1700,8 +1704,6 @@ Create a thin pool (infers --type thin-pool).
 .br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--type\fP \fBthin-pool\fP ]
-.br
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
 .br
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
@@ -1719,15 +1721,15 @@ Create a thin pool (infers --type thin-pool).
 .P
 \(em
 .P
-Create a thin pool named by the --thinpool arg 
-.br
-(infers --type thin-pool).
+Create a thin pool named in --thinpool.
 .br
 .P
 \fBlvcreate\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fB--thinpool\fP \fILV\fP\fI_new\fP \fIVG\fP
 .br
 .RS 4
 .ad l
+[ \fB--type thin-pool\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
@@ -1738,8 +1740,6 @@ Create a thin pool named by the --thinpool arg
 .br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--type\fP \fBthin-pool\fP ]
-.br
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
 .br
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
@@ -1841,18 +1841,17 @@ LV1 types: thinpool
 .P
 Create a thin LV in the thin pool named in the first arg 
 .br
-(variant, infers --type thin, also see --thinpool for 
-.br
-naming pool.)
+(also see --thinpool for naming pool.)
 .br
 .P
 \fBlvcreate\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fILV1\fP
 .br
 .RS 4
 .ad l
-[ \fB-T\fP|\fB--thin\fP ]
+[ \fB--type thin\fP ] (implied)
 .br
-[    \fB--type\fP \fBthin\fP ]
+.br
+[ \fB-T\fP|\fB--thin\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -1883,16 +1882,15 @@ LV1 types: thin
 .P
 \(em
 .P
-Create a thin LV that is a snapshot of an existing thin LV 
-.br
-(infers --type thin).
+Create a thin LV that is a snapshot of an existing thin LV.
 .br
 .P
 \fBlvcreate\fP \fB-T\fP|\fB--thin\fP \fILV1\fP
 .br
 .RS 4
 .ad l
-[    \fB--type\fP \fBthin\fP ]
+[ \fB--type thin\fP ] (implied)
+.br
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -1904,16 +1902,15 @@ LV1 types: thin
 .P
 \(em
 .P
-Create a thin LV that is a snapshot of an external origin LV 
-.br
-(infers --type thin).
+Create a thin LV that is a snapshot of an external origin LV.
 .br
 .P
 \fBlvcreate\fP \fB-s\fP|\fB--snapshot\fP \fB--thinpool\fP \fILV\fP \fILV\fP
 .br
 .RS 4
 .ad l
-[    \fB--type\fP \fBthin\fP ]
+[ \fB--type thin\fP ] (implied)
+.br
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -1928,6 +1925,8 @@ Create a VDO LV with VDO pool.
 .br
 .RS 4
 .ad l
+[ \fB--type vdo\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
@@ -1936,8 +1935,6 @@ Create a VDO LV with VDO pool.
 .br
 [ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
 .br
-[    \fB--type\fP \fBvdo\fP ]
-.br
 [    \fB--vdopool\fP \fILV\fP\fI_new\fP ]
 .br
 [    \fB--compression\fP \fBy\fP|\fBn\fP ]
@@ -1960,6 +1957,8 @@ Create a VDO LV with VDO pool.
 .br
 .RS 4
 .ad l
+[ \fB--type vdo\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
@@ -1968,10 +1967,6 @@ Create a VDO LV with VDO pool.
 .br
 [ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
 .br
-[    \fB--vdo\fP ]
-.br
-[    \fB--type\fP \fBvdo\fP ]
-.br
 [    \fB--compression\fP \fBy\fP|\fBn\fP ]
 .br
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
@@ -2026,9 +2021,7 @@ where the new thin pool is named by the --thinpool arg.
 .P
 Create a thin LV, first creating a thin pool for it, 
 .br
-where the new thin pool is named by the --thinpool arg 
-.br
-(variant, infers --type thin).
+where the new thin pool is named by --thinpool.
 .br
 .P
 \fBlvcreate\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT]
@@ -2038,6 +2031,8 @@ where the new thin pool is named by the --thinpool arg
 .br
 .RS 4
 .ad l
+[ \fB--type thin\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
@@ -2048,8 +2043,6 @@ where the new thin pool is named by the --thinpool arg
 .br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--type\fP \fBthin\fP ]
-.br
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
 .br
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
@@ -2116,7 +2109,7 @@ where the new thin pool is named in the first arg,
 .br
 or the new thin pool name is generated when the first 
 .br
-arg is a VG name (variant, infers --type thin).
+arg is a VG name.
 .br
 .P
 \fBlvcreate\fP \fB-T\fP|\fB--thin\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
@@ -2126,6 +2119,8 @@ arg is a VG name (variant, infers --type thin).
 .br
 .RS 4
 .ad l
+[ \fB--type thin\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
@@ -2134,8 +2129,6 @@ arg is a VG name (variant, infers --type thin).
 .br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--type\fP \fBthin\fP ]
-.br
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
 .br
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
@@ -2153,15 +2146,11 @@ arg is a VG name (variant, infers --type thin).
 .P
 \(em
 .P
-Create a thin LV, first creating a thin pool for it 
-.br
-(infers --type thin). 
+Create a thin LV, first creating a thin pool for it. 
 .br
 Create a sparse snapshot of a virtual origin LV 
 .br
-(infers --type snapshot). 
-.br
-Chooses --type thin or --type snapshot according to 
+Chooses type thin or snapshot according to 
 .br
 config setting sparse_segtype_default.
 .br
@@ -2170,6 +2159,8 @@ config setting sparse_segtype_default.
 .br
 .RS 4
 .ad l
+[ \fB--type thin\fP|\fBsnapshot\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
@@ -2182,8 +2173,6 @@ config setting sparse_segtype_default.
 .br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--type\fP \fIString\fP ]
-.br
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
 .br
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
@@ -2203,15 +2192,15 @@ config setting sparse_segtype_default.
 .P
 Create a new LV, then attach the specified cachepool 
 .br
-which converts the new LV to type cache 
-.br
-(variant, infers --type cache.)
+which converts the new LV to type cache.
 .br
 .P
 \fBlvcreate\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fB--cachepool\fP \fILV\fP \fIVG\fP
 .br
 .RS 4
 .ad l
+[ \fB--type cache\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
@@ -2222,8 +2211,6 @@ which converts the new LV to type cache
 .br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--type\fP \fBcache\fP ]
-.br
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
 .br
 [    \fB--cachepolicy\fP \fIString\fP ]
@@ -2302,6 +2289,8 @@ and attach it to the LV arg (alternative, use lvconvert.)
 .br
 .RS 4
 .ad l
+[ \fB--type cache\fP ] (implied)
+.br
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
 .br
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
@@ -2310,8 +2299,6 @@ and attach it to the LV arg (alternative, use lvconvert.)
 .br
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--type\fP \fBcache\fP ]
-.br
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
 .br
 [    \fB--cachepolicy\fP \fIString\fP ]
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index fc4d55233..fa0aec63a 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -456,7 +456,7 @@ output in JSON format. See \fBlvmreport\fP(7) for more information.
 .HP
 \fB-r\fP|\fB--resizefs\fP
 .br
-Resize underlying filesystem together with the LV using fsadm(8).
+Resize underlying filesystem together with the LV using \fBfsadm\fP(8).
 .
 .HP
 \fB-L\fP|\fB--size\fP [\fB+\fP]\fISize\fP[m|UNIT]
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index 13522bb70..0a659e1c8 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -234,7 +234,7 @@ output in JSON format. See \fBlvmreport\fP(7) for more information.
 .HP
 \fB-r\fP|\fB--resizefs\fP
 .br
-Resize underlying filesystem together with the LV using fsadm(8).
+Resize underlying filesystem together with the LV using \fBfsadm\fP(8).
 .
 .HP
 \fB-L\fP|\fB--size\fP [\fB-\fP]\fISize\fP[m|UNIT]
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index 4e27cf4ee..36c1760fc 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -409,7 +409,7 @@ output in JSON format. See \fBlvmreport\fP(7) for more information.
 .HP
 \fB-r\fP|\fB--resizefs\fP
 .br
-Resize underlying filesystem together with the LV using fsadm(8).
+Resize underlying filesystem together with the LV using \fBfsadm\fP(8).
 .
 .HP
 \fB-L\fP|\fB--size\fP [\fB+\fP|\fB-\fP]\fISize\fP[m|UNIT]



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2023-06-23 16:09 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2023-06-23 16:09 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9756824f6447fb8c6096760e802d4f616929f710
Commit:        9756824f6447fb8c6096760e802d4f616929f710
Parent:        46fe47b8e0ad8069bb3736d2aa3e78befdccb38d
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Fri Jun 23 11:39:46 2023 +0200
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Jun 23 18:08:10 2023 +0200

make: generate

---
 conf/example.conf.in  | 28 +++++++++++++++++++++++++++-
 man/lvcreate.8_pregen |  6 ++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/conf/example.conf.in b/conf/example.conf.in
index 0b9b06a17..35837c013 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -1201,7 +1201,7 @@ global {
 
 	# Configuration option global/thin_check_executable.
 	# The full path to the thin_check command.
-	# LVM uses this command to check that a thin metadata device is in a
+	# LVM uses this command to check that a thin pool metadata device is in a
 	# usable state. When a thin pool is activated and after it is
 	# deactivated, this command is run. Activation will only proceed if
 	# the command has an exit status of 0. Set to "" to skip this check.
@@ -1225,6 +1225,14 @@ global {
 	# This configuration option has an automatic default value.
 	# thin_repair_executable = "@THIN_REPAIR_CMD@"
 
+	# Configuration option global/thin_restore_executable.
+	# The full path to the thin_restore command.
+	# LVM uses this command to restore generated data for a thin pool metadata device.
+	# Also see thin_restore_options.
+	# (See package device-mapper-persistent-data or thin-provisioning-tools)
+	# This configuration option has an automatic default value.
+	# thin_restore_executable = "@THIN_RESTORE_CMD@"
+
 	# Configuration option global/thin_check_options.
 	# List of options passed to the thin_check command.
 	# With thin_check version 2.1 or newer you can add the option
@@ -1239,6 +1247,11 @@ global {
 	# This configuration option has an automatic default value.
 	# thin_repair_options = [ "" ]
 
+	# Configuration option global/thin_restore_options.
+	# List of options passed to the thin_restore command.
+	# This configuration option has an automatic default value.
+	# thin_restore_options = [ "" ]
+
 	# Configuration option global/thin_disabled_features.
 	# Features to not use in the thin driver.
 	# This can be helpful for testing, or to avoid using a feature that is
@@ -1287,6 +1300,14 @@ global {
 	# This configuration option has an automatic default value.
 	# cache_repair_executable = "@CACHE_REPAIR_CMD@"
 
+	# Configuration option global/cache_restore_executable.
+	# The full path to the cache_restore command.
+	# LVM uses this command to restore generated data for a cache metadata device.
+	# Also see cache_restore_options.
+	# (See package device-mapper-persistent-data or thin-provisioning-tools)
+	# This configuration option has an automatic default value.
+	# cache_restore_executable = "@CACHE_RESTORE_CMD@"
+
 	# Configuration option global/cache_check_options.
 	# List of options passed to the cache_check command.
 	# With cache_check version 5.0 or newer you should include the option
@@ -1299,6 +1320,11 @@ global {
 	# This configuration option has an automatic default value.
 	# cache_repair_options = [ "" ]
 
+	# Configuration option global/cache_restore_options.
+	# List of options passed to the cache_restore command.
+	# This configuration option has an automatic default value.
+	# cache_restore_options = [ "" ]
+
 	# Configuration option global/vdo_format_executable.
 	# The full path to the vdoformat command.
 	# LVM uses this command to initial data volume for VDO type logical volume
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index 528a9db9c..27a93d890 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -491,6 +491,8 @@ Create a thin LV that is a snapshot of an existing thin LV.
 [ \fB--type thin\fP ] (implied)
 .br
 .br
+[ \fB-T\fP|\fB--thin\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -1917,6 +1919,8 @@ Create a thin LV that is a snapshot of an existing thin LV.
 .ad l
 [ \fB-T\fP|\fB--thin\fP ]
 .br
+[ \fB-s\fP|\fB--snapshot\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -1937,6 +1941,8 @@ Create a thin LV that is a snapshot of an existing thin LV.
 [ \fB--type thin\fP ] (implied)
 .br
 .br
+[ \fB-s\fP|\fB--snapshot\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2023-03-22 12:44 Tony Asleson
  0 siblings, 0 replies; 24+ messages in thread
From: Tony Asleson @ 2023-03-22 12:44 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6204fda003804e2bad022347baab510cb845f315
Commit:        6204fda003804e2bad022347baab510cb845f315
Parent:        49dbeb9b4566df684164f40ca6ebdab3d6696836
Author:        Marian Csontos <mcsontos@redhat.com>
AuthorDate:    Tue Mar 21 13:33:14 2023 +0100
Committer:     Marian Csontos <mcsontos@redhat.com>
CommitterDate: Tue Mar 21 13:33:14 2023 +0100

make: generate

---
 man/vgchange.8_pregen | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 5ab59204d..4665e98c8 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -68,6 +68,8 @@ vgchange \(em Change volume group attributes
  \fB-l\fP|\fB--logicalvolume\fP \fINumber\fP
 .br
     \fB--longhelp\fP
+.br
+    \fB--majoritypvs\fP
 .br
  \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
@@ -348,6 +350,8 @@ Change the system ID of a VG.
 .ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
 .br
+[    \fB--majoritypvs\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -666,6 +670,12 @@ Sets the maximum number of LVs allowed in a VG.
 Display long help text.
 .
 .HP
+\fB--majoritypvs\fP
+.br
+Change the VG system ID if the majority of PVs in the VG
+are present (one more than half).
+.
+.HP
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
 Sets the maximum number of PVs that can belong to the VG.


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2023-03-21 12:39 Marian Csontos
  0 siblings, 0 replies; 24+ messages in thread
From: Marian Csontos @ 2023-03-21 12:39 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6204fda003804e2bad022347baab510cb845f315
Commit:        6204fda003804e2bad022347baab510cb845f315
Parent:        49dbeb9b4566df684164f40ca6ebdab3d6696836
Author:        Marian Csontos <mcsontos@redhat.com>
AuthorDate:    Tue Mar 21 13:33:14 2023 +0100
Committer:     Marian Csontos <mcsontos@redhat.com>
CommitterDate: Tue Mar 21 13:33:14 2023 +0100

make: generate

---
 man/vgchange.8_pregen | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 5ab59204d..4665e98c8 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -68,6 +68,8 @@ vgchange \(em Change volume group attributes
  \fB-l\fP|\fB--logicalvolume\fP \fINumber\fP
 .br
     \fB--longhelp\fP
+.br
+    \fB--majoritypvs\fP
 .br
  \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
@@ -348,6 +350,8 @@ Change the system ID of a VG.
 .ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
 .br
+[    \fB--majoritypvs\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -666,6 +670,12 @@ Sets the maximum number of LVs allowed in a VG.
 Display long help text.
 .
 .HP
+\fB--majoritypvs\fP
+.br
+Change the VG system ID if the majority of PVs in the VG
+are present (one more than half).
+.
+.HP
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
 Sets the maximum number of PVs that can belong to the VG.


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2022-11-10 13:22 Marian Csontos
  0 siblings, 0 replies; 24+ messages in thread
From: Marian Csontos @ 2022-11-10 13:22 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6b96bf7bc2f548e7ce1de879251c8b90ab40b634
Commit:        6b96bf7bc2f548e7ce1de879251c8b90ab40b634
Parent:        403779333be419352d6062da592ea78e6096e12b
Author:        Marian Csontos <mcsontos@redhat.com>
AuthorDate:    Thu Nov 10 09:57:57 2022 +0100
Committer:     Marian Csontos <mcsontos@redhat.com>
CommitterDate: Thu Nov 10 13:58:09 2022 +0100

make: generate

---
 man/vgchange.8_pregen | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 9df1ef733..7fa1cbb10 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -342,10 +342,12 @@ Reactivate LVs using the latest metadata.
 Change the system ID of a VG.
 .br
 .P
-\fBvgchange\fP \fB--systemid\fP \fIString\fP \fIVG\fP
+\fBvgchange\fP \fB--systemid\fP \fIString\fP \fIVG\fP|\fITag\fP|\fISelect\fP
 .br
 .RS 4
 .ad l
+[ \fB-S\fP|\fB--select\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2022-09-21 12:59 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2022-09-21 12:59 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e97cf8552c7e47ab0a85e9dbec2d3581e34e2cc3
Commit:        e97cf8552c7e47ab0a85e9dbec2d3581e34e2cc3
Parent:        3a7aeebf7d7c58e53158321d73542c239896a3d7
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Fri Sep 16 12:52:28 2022 +0200
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Wed Sep 21 14:58:34 2022 +0200

make: generate

---
 man/lvextend.8_pregen | 59 +++++++++++++++++++++++++++++++++++++++++++++------
 man/lvreduce.8_pregen | 43 +++++++++++++++++++++++++++++++++----
 man/lvresize.8_pregen | 51 ++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 139 insertions(+), 14 deletions(-)

diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index 3c2bfa6bf..2e0ed3068 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -36,6 +36,10 @@ lvextend \(em Add space to a logical volume
  \fB-l\fP|\fB--extents\fP [\fB+\fP]\fINumber\fP[PERCENT]
 .br
  \fB-f\fP|\fB--force\fP
+.br
+    \fB--fs\fP \fIString\fP
+.br
+    \fB--fsmode\fP \fIString\fP
 .br
  \fB-h\fP|\fB--help\fP
 .br
@@ -123,6 +127,10 @@ Extend an LV by a specified size.
 .br
 [    \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT] ]
 .br
+[    \fB--fs\fP \fIString\fP ]
+.br
+[    \fB--fsmode\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -145,6 +153,10 @@ Extend an LV by specified PV extents.
 .br
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
 .br
+[    \fB--fs\fP \fIString\fP ]
+.br
+[    \fB--fsmode\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -170,7 +182,7 @@ Extend a pool metadata SubLV by a specified size.
 .RE
 .P
 .RS 4
-LV1 types: thinpool
+LV1 types: linear thinpool
 .RE
 .P
 \(em
@@ -184,6 +196,10 @@ Extend an LV according to a predefined policy.
 .ad l
 [ \fB-r\fP|\fB--resizefs\fP ]
 .br
+[    \fB--fs\fP \fIString\fP ]
+.br
+[    \fB--fsmode\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -192,7 +208,7 @@ Extend an LV according to a predefined policy.
 .RE
 .P
 .RS 4
-LV1 types: snapshot thinpool
+LV1 types: snapshot thinpool vdopool
 .RE
 .P
 \(em
@@ -377,6 +393,36 @@ Override various checks, confirmations and protections.
 Use with extreme caution.
 .
 .HP
+\fB--fs\fP \fIString\fP
+.br
+Control file system resizing when resizing an LV.
+\fBchecksize\fP: Check the fs size and reduce the LV if the fs is not
+using the reduced space (fs reduce is not needed.) If the reduced space
+is used by the fs, then do not resize the fs or LV, and return an error.
+(checksize only applies when reducing, and does nothing for extend.)
+\fBresize\fP: Resize the fs by calling the fs-specific resize command.
+This may also include mounting, unmounting, or running fsck. See --fsmode to
+control mounting behavior, and --nofsck to disable fsck.
+\fBresize_fsadm\fP: Use the old method of calling fsadm to handle the fs
+(deprecated.) Warning: this option does not prevent lvreduce from destroying
+file systems that are unmounted (or mounted if prompts are skipped.)
+\fBignore\fP: Resize the LV without checking for or handling a file system.
+Warning: using ignore when reducing the LV size may destroy the file system.
+.
+.HP
+\fB--fsmode\fP \fIString\fP
+.br
+Control file system mounting behavior for fs resize.
+\fBmanage\fP: Mount or unmount the fs as needed to resize the fs,
+and attempt to restore the original mount state at the end.
+\fBnochange\fP: Do not mount or unmount the fs. If mounting or unmounting
+is required to resize the fs, then do not resize the fs or the LV and fail
+the command.
+\fBoffline\fP: Unmount the fs if it is mounted, and resize the fs while it
+is unmounted. If mounting is required to resize the fs, then do not resize
+the fs or the LV and fail the command.
+.
+.HP
 \fB-h\fP|\fB--help\fP
 .br
 Display help text.
@@ -410,9 +456,7 @@ Not used.
 .HP
 \fB-n\fP|\fB--nofsck\fP
 .br
-Do not perform fsck before resizing filesystem when filesystem
-requires it. You may need to use --force to proceed with
-this option.
+Do not perform fsck when resizing the file system with --resizefs.
 .
 .HP
 \fB--nohints\fP
@@ -485,7 +529,10 @@ See \fBlvmreport\fP(7) for more information.
 .HP
 \fB-r\fP|\fB--resizefs\fP
 .br
-Resize underlying filesystem together with the LV using \fBfsadm\fP(8).
+Resize the fs using the fs-specific resize command.
+May include mounting, unmounting, or running fsck. See --fsmode to control
+mounting behavior, and --nofsck to disable fsck. See --fs for more options
+(--resizefs is equivalent to --fs resize.)
 .
 .HP
 \fB-L\fP|\fB--size\fP [\fB+\fP]\fISize\fP[m|UNIT]
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index 4f6615449..61b71e4d9 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -52,6 +52,10 @@ the options section.
 .br
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
+[    \fB--fs\fP \fIString\fP ]
+.br
+[    \fB--fsmode\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -179,6 +183,36 @@ Override various checks, confirmations and protections.
 Use with extreme caution.
 .
 .HP
+\fB--fs\fP \fIString\fP
+.br
+Control file system resizing when resizing an LV.
+\fBchecksize\fP: Check the fs size and reduce the LV if the fs is not
+using the reduced space (fs reduce is not needed.) If the reduced space
+is used by the fs, then do not resize the fs or LV, and return an error.
+(checksize only applies when reducing, and does nothing for extend.)
+\fBresize\fP: Resize the fs by calling the fs-specific resize command.
+This may also include mounting, unmounting, or running fsck. See --fsmode to
+control mounting behavior, and --nofsck to disable fsck.
+\fBresize_fsadm\fP: Use the old method of calling fsadm to handle the fs
+(deprecated.) Warning: this option does not prevent lvreduce from destroying
+file systems that are unmounted (or mounted if prompts are skipped.)
+\fBignore\fP: Resize the LV without checking for or handling a file system.
+Warning: using ignore when reducing the LV size may destroy the file system.
+.
+.HP
+\fB--fsmode\fP \fIString\fP
+.br
+Control file system mounting behavior for fs resize.
+\fBmanage\fP: Mount or unmount the fs as needed to resize the fs,
+and attempt to restore the original mount state at the end.
+\fBnochange\fP: Do not mount or unmount the fs. If mounting or unmounting
+is required to resize the fs, then do not resize the fs or the LV and fail
+the command.
+\fBoffline\fP: Unmount the fs if it is mounted, and resize the fs while it
+is unmounted. If mounting is required to resize the fs, then do not resize
+the fs or the LV and fail the command.
+.
+.HP
 \fB-h\fP|\fB--help\fP
 .br
 Display help text.
@@ -207,9 +241,7 @@ Display long help text.
 .HP
 \fB-n\fP|\fB--nofsck\fP
 .br
-Do not perform fsck before resizing filesystem when filesystem
-requires it. You may need to use --force to proceed with
-this option.
+Do not perform fsck when resizing the file system with --resizefs.
 .
 .HP
 \fB--nohints\fP
@@ -259,7 +291,10 @@ See \fBlvmreport\fP(7) for more information.
 .HP
 \fB-r\fP|\fB--resizefs\fP
 .br
-Resize underlying filesystem together with the LV using \fBfsadm\fP(8).
+Resize the fs using the fs-specific resize command.
+May include mounting, unmounting, or running fsck. See --fsmode to control
+mounting behavior, and --nofsck to disable fsck. See --fs for more options
+(--resizefs is equivalent to --fs resize.)
 .
 .HP
 \fB-L\fP|\fB--size\fP [\fB-\fP]\fISize\fP[m|UNIT]
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index 1671741ce..89261f38d 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -36,6 +36,10 @@ lvresize \(em Resize a logical volume
  \fB-l\fP|\fB--extents\fP [\fB+\fP|\fB-\fP]\fINumber\fP[PERCENT]
 .br
  \fB-f\fP|\fB--force\fP
+.br
+    \fB--fs\fP \fIString\fP
+.br
+    \fB--fsmode\fP \fIString\fP
 .br
  \fB-h\fP|\fB--help\fP
 .br
@@ -109,6 +113,10 @@ Resize an LV by a specified size.
 .br
 [    \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT] ]
 .br
+[    \fB--fs\fP \fIString\fP ]
+.br
+[    \fB--fsmode\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -127,6 +135,10 @@ Resize an LV by specified PV extents.
 .ad l
 [ \fB-r\fP|\fB--resizefs\fP ]
 .br
+[    \fB--fs\fP \fIString\fP ]
+.br
+[    \fB--fsmode\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -335,6 +347,36 @@ Override various checks, confirmations and protections.
 Use with extreme caution.
 .
 .HP
+\fB--fs\fP \fIString\fP
+.br
+Control file system resizing when resizing an LV.
+\fBchecksize\fP: Check the fs size and reduce the LV if the fs is not
+using the reduced space (fs reduce is not needed.) If the reduced space
+is used by the fs, then do not resize the fs or LV, and return an error.
+(checksize only applies when reducing, and does nothing for extend.)
+\fBresize\fP: Resize the fs by calling the fs-specific resize command.
+This may also include mounting, unmounting, or running fsck. See --fsmode to
+control mounting behavior, and --nofsck to disable fsck.
+\fBresize_fsadm\fP: Use the old method of calling fsadm to handle the fs
+(deprecated.) Warning: this option does not prevent lvreduce from destroying
+file systems that are unmounted (or mounted if prompts are skipped.)
+\fBignore\fP: Resize the LV without checking for or handling a file system.
+Warning: using ignore when reducing the LV size may destroy the file system.
+.
+.HP
+\fB--fsmode\fP \fIString\fP
+.br
+Control file system mounting behavior for fs resize.
+\fBmanage\fP: Mount or unmount the fs as needed to resize the fs,
+and attempt to restore the original mount state at the end.
+\fBnochange\fP: Do not mount or unmount the fs. If mounting or unmounting
+is required to resize the fs, then do not resize the fs or the LV and fail
+the command.
+\fBoffline\fP: Unmount the fs if it is mounted, and resize the fs while it
+is unmounted. If mounting is required to resize the fs, then do not resize
+the fs or the LV and fail the command.
+.
+.HP
 \fB-h\fP|\fB--help\fP
 .br
 Display help text.
@@ -363,9 +405,7 @@ Display long help text.
 .HP
 \fB-n\fP|\fB--nofsck\fP
 .br
-Do not perform fsck before resizing filesystem when filesystem
-requires it. You may need to use --force to proceed with
-this option.
+Do not perform fsck when resizing the file system with --resizefs.
 .
 .HP
 \fB--nohints\fP
@@ -438,7 +478,10 @@ See \fBlvmreport\fP(7) for more information.
 .HP
 \fB-r\fP|\fB--resizefs\fP
 .br
-Resize underlying filesystem together with the LV using \fBfsadm\fP(8).
+Resize the fs using the fs-specific resize command.
+May include mounting, unmounting, or running fsck. See --fsmode to control
+mounting behavior, and --nofsck to disable fsck. See --fs for more options
+(--resizefs is equivalent to --fs resize.)
 .
 .HP
 \fB-L\fP|\fB--size\fP [\fB+\fP|\fB-\fP]\fISize\fP[m|UNIT]


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2022-08-11 11:06 Peter Rajnoha
  0 siblings, 0 replies; 24+ messages in thread
From: Peter Rajnoha @ 2022-08-11 11:06 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b318c9c20f40be1583e7d0751a733f77be173012
Commit:        b318c9c20f40be1583e7d0751a733f77be173012
Parent:        efd083f66883e674a6f24370d8c7cc06aa4fafe7
Author:        Peter Rajnoha <prajnoha@redhat.com>
AuthorDate:    Fri Aug 5 10:31:08 2022 +0200
Committer:     Peter Rajnoha <prajnoha@redhat.com>
CommitterDate: Thu Aug 11 11:10:11 2022 +0200

make: generate

---
 conf/example.conf.in         |  6 ++++++
 man/lvchange.8_pregen        | 10 ++++++----
 man/lvcreate.8_pregen        | 10 ++++++----
 man/lvextend.8_pregen        | 10 ++++++----
 man/lvm-fullreport.8_pregen  |  8 +++++---
 man/lvreduce.8_pregen        |  8 +++++---
 man/lvremove.8_pregen        |  8 +++++---
 man/lvrename.8_pregen        |  8 +++++---
 man/lvresize.8_pregen        | 10 ++++++----
 man/lvs.8_pregen             |  8 +++++---
 man/lvscan.8_pregen          |  8 +++++---
 man/pvchange.8_pregen        |  8 +++++---
 man/pvcreate.8_pregen        |  8 +++++---
 man/pvdisplay.8_pregen       |  8 +++++---
 man/pvmove.8_pregen          |  8 +++++---
 man/pvremove.8_pregen        |  8 +++++---
 man/pvresize.8_pregen        |  8 +++++---
 man/pvs.8_pregen             |  8 +++++---
 man/pvscan.8_pregen          | 14 ++++++++------
 man/vgcfgbackup.8_pregen     |  8 +++++---
 man/vgchange.8_pregen        | 18 ++++++++++--------
 man/vgck.8_pregen            |  8 +++++---
 man/vgconvert.8_pregen       |  8 +++++---
 man/vgcreate.8_pregen        |  8 +++++---
 man/vgexport.8_pregen        |  8 +++++---
 man/vgextend.8_pregen        |  8 +++++---
 man/vgimport.8_pregen        |  8 +++++---
 man/vgimportdevices.8_pregen |  8 +++++---
 man/vgmknodes.8_pregen       |  8 +++++---
 man/vgreduce.8_pregen        | 10 ++++++----
 man/vgremove.8_pregen        |  8 +++++---
 man/vgrename.8_pregen        |  8 +++++---
 man/vgs.8_pregen             |  8 +++++---
 man/vgscan.8_pregen          |  8 +++++---
 34 files changed, 184 insertions(+), 112 deletions(-)

diff --git a/conf/example.conf.in b/conf/example.conf.in
index 5fadeac12..10810d8b8 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -1951,6 +1951,12 @@ activation {
 	#     name for identification.
 	#   json
 	#     JSON format.
+	#   json_std
+	#     JSON format that is more compliant with JSON standard.
+	#     Compared to original "json" format:
+	#       - it does not use double quotes around numeric values,
+	#       - it uses 'null' for undefined numeric values,
+	#       - it prints string list as proper JSON array of strings instead of a single string.
 	# This configuration option has an automatic default value.
 	# output_format = "basic"
 
diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index e46a3b9b2..90aec5483 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -111,7 +111,7 @@ lvchange \(em Change the attributes of logical volume(s)
 .br
     \fB--refresh\fP
 .br
-    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
     \fB--resync\fP
 .br
@@ -397,7 +397,7 @@ Common options for command:
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .ad b
 .RE
 .P
@@ -847,14 +847,16 @@ if something has gone wrong, or if some form of manual LV
 sharing is being used.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB--resync\fP
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index 3940aa77e..cde896b7a 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -129,7 +129,7 @@ lvcreate \(em Create a logical volume
 .br
  \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT]
 .br
-    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
  \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
 .br
@@ -781,7 +781,7 @@ Common options for command:
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--setautoactivation\fP \fBy\fP|\fBn\fP ]
 .ad b
@@ -1299,14 +1299,16 @@ Size of each raid or mirror synchronization region.
 configure a default.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index 445afc25e..3c2bfa6bf 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -63,7 +63,7 @@ lvextend \(em Add space to a logical volume
 .br
  \fB-q\fP|\fB--quiet\fP
 .br
-    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
  \fB-r\fP|\fB--resizefs\fP
 .br
@@ -219,7 +219,7 @@ Common options for command:
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--type\fP \c
 .nh
@@ -471,14 +471,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-r\fP|\fB--resizefs\fP
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 4bcfba4f8..7e9348e1d 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -55,7 +55,7 @@ if information changes between commands.
 .br
 [    \fB--readonly\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--rows\fP ]
 .br
@@ -308,14 +308,16 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB--rows\fP
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index e8953bc8f..4f6615449 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -50,7 +50,7 @@ the options section.
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -245,14 +245,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-r\fP|\fB--resizefs\fP
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index f47181213..7ae83f1bb 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -56,7 +56,7 @@ former LV completely.
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -229,14 +229,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-S\fP|\fB--select\fP \fIString\fP
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index 278e8e989..2c0c4e1b9 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -42,7 +42,7 @@ Common options for command:
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .ad b
 .RE
 .P
@@ -200,14 +200,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index 625fed0a1..1671741ce 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -61,7 +61,7 @@ lvresize \(em Resize a logical volume
 .br
  \fB-q\fP|\fB--quiet\fP
 .br
-    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
  \fB-r\fP|\fB--resizefs\fP
 .br
@@ -177,7 +177,7 @@ Common options for command:
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--type\fP \c
 .nh
@@ -424,14 +424,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-r\fP|\fB--resizefs\fP
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index d055851f5..3f35dc652 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -55,7 +55,7 @@ lvs produces formatted output about LVs.
 .br
 [    \fB--readonly\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--rows\fP ]
 .br
@@ -318,14 +318,16 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB--rows\fP
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index 012479618..e2938dee4 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -33,7 +33,7 @@ comprehensive information about LVs.
 .br
 [    \fB--readonly\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -207,14 +207,16 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index 57d1570c4..0b35a2013 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -79,7 +79,7 @@ Common options for command:
 .br
 [ \fB-u\fP|\fB--uuid\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .ad b
 .RE
 .P
@@ -265,14 +265,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-S\fP|\fB--select\fP \fIString\fP
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index 67b5c27d0..3445898d0 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -124,7 +124,7 @@ pe_start value.
 .br
 [    \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT] ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--restorefile\fP \fIString\fP ]
 .br
@@ -353,14 +353,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB--restorefile\fP \fIString\fP
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index e7767d0c4..92dda936f 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -61,7 +61,7 @@ and more, using a more compact and configurable output format.
 .br
 [    \fB--readonly\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--separator\fP \fIString\fP ]
 .br
@@ -322,14 +322,16 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-S\fP|\fB--select\fP \fIString\fP
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index 28b0ea4e8..53f8a2ac6 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -54,7 +54,7 @@ Move PV extents.
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -296,14 +296,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index a086724b8..0d4802187 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -29,7 +29,7 @@ an existing VG. Normally, \fBvgreduce\fP(8) should be used instead.
 .ad l
 [ \fB-f\fP|\fB--force\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -181,14 +181,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index 708b7d72a..fda57a246 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -24,7 +24,7 @@ LVs allocated on it.
 .ad l
 [    \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT] ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -170,14 +170,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT]
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index 485e651a7..d08e92818 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -53,7 +53,7 @@ pvs produces formatted output about PVs.
 .br
 [    \fB--readonly\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--rows\fP ]
 .br
@@ -308,14 +308,16 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB--rows\fP
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index cb837b8ca..20aec7267 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -66,7 +66,7 @@ pvscan \(em List all physical volumes
 .br
  \fB-q\fP|\fB--quiet\fP
 .br
-    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
  \fB-s\fP|\fB--short\fP
 .br
@@ -157,7 +157,7 @@ Display PV information.
 .br
 [    \fB--ignorelockingfailure\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -176,7 +176,7 @@ Record that a PV is online or offline.
 .br
 [    \fB--ignorelockingfailure\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--minor\fP \fINumber\fP ]
 .br
@@ -202,7 +202,7 @@ Record that a PV is online and autoactivate the VG if complete.
 .br
 [    \fB--ignorelockingfailure\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--minor\fP \fINumber\fP ]
 .br
@@ -499,14 +499,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-s\fP|\fB--short\fP
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index e732a7d43..62707ed1f 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -46,7 +46,7 @@ It may also be useful to regularly back up the files in
 .br
 [    \fB--readonly\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -224,14 +224,16 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index d70f1e5ac..9df1ef733 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -97,7 +97,7 @@ vgchange \(em Change volume group attributes
 .br
     \fB--refresh\fP
 .br
-    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
  \fB-x\fP|\fB--resizeable\fP \fBy\fP|\fBn\fP
 .br
@@ -184,7 +184,7 @@ required, after which the others are optional.
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -218,7 +218,7 @@ Start or stop monitoring LVs from dmeventd.
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -248,7 +248,7 @@ Start or stop processing LV conversions.
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -294,7 +294,7 @@ Activate or deactivate LVs.
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -328,7 +328,7 @@ Reactivate LVs using the latest metadata.
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -780,14 +780,16 @@ if something has gone wrong, or if some form of manual LV
 sharing is being used.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-x\fP|\fB--resizeable\fP \fBy\fP|\fBn\fP
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index 23bd7ea6d..d0fe0403e 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -26,7 +26,7 @@ Read and display information about a VG.
 .br
 .RS 4
 .ad l
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -186,14 +186,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index cdeee39fa..41baaf9ad 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -35,7 +35,7 @@ convert VGs from the LVM1 format to LVM2.
 .br
 [    \fB--metadatasize\fP \fISize\fP[m|UNIT] ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -234,14 +234,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index 2c0c548b5..07fc9e485 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -63,7 +63,7 @@ device.
 .br
 [    \fB--\fP[\fBvg\fP]\fBmetadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--dataalignment\fP \fISize\fP[k|UNIT] ]
 .br
@@ -351,14 +351,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB--setautoactivation\fP \fBy\fP|\fBn\fP
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index 25f767bc8..4fa6eadbf 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -63,7 +63,7 @@ Common options for command:
 .
 .RS 4
 .ad l
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .ad b
 .RE
 .P
@@ -211,14 +211,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-S\fP|\fB--select\fP \fIString\fP
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index af5679118..a1ed2f3e3 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -51,7 +51,7 @@ will initialize them. In this case pvcreate options can be used, e.g.
 .br
 [    \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT] ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--restoremissing\fP ]
 .br
@@ -265,14 +265,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB--restoremissing\fP
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index fee109849..f23f8f4f1 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -51,7 +51,7 @@ Common options for command:
 .ad l
 [ \fB-f\fP|\fB--force\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .ad b
 .RE
 .P
@@ -206,14 +206,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-S\fP|\fB--select\fP \fIString\fP
diff --git a/man/vgimportdevices.8_pregen b/man/vgimportdevices.8_pregen
index c030c01a5..1cce85766 100644
--- a/man/vgimportdevices.8_pregen
+++ b/man/vgimportdevices.8_pregen
@@ -56,7 +56,7 @@ Common options for command:
 .ad l
 [    \fB--foreign\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .ad b
 .RE
 .P
@@ -210,14 +210,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-S\fP|\fB--select\fP \fIString\fP
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index 511d579bd..60e693571 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -31,7 +31,7 @@ interoperating correctly.
 .br
 [    \fB--refresh\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -194,14 +194,16 @@ if something has gone wrong, or if some form of manual LV
 sharing is being used.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index 278aa0fac..ca6ab6786 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -50,7 +50,7 @@ vgreduce \(em Remove physical volume(s) from a volume group
 .br
     \fB--removemissing\fP
 .br
-    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
  \fB-t\fP|\fB--test\fP
 .br
@@ -116,7 +116,7 @@ Common options for command:
 .br
 [ \fB-f\fP|\fB--force\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .ad b
 .RE
 .P
@@ -296,14 +296,16 @@ If LVs spanned several disks, including ones that are lost, salvaging
 some data first may be possible by activating LVs in partial mode.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index 9e6051ade..df6588115 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -35,7 +35,7 @@ without confirmation.
 .br
 [    \fB--noudevsync\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -195,14 +195,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-S\fP|\fB--select\fP \fIString\fP
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index 932a51103..d55b6a0f9 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -55,7 +55,7 @@ Common options for command:
 .br
 [ \fB-f\fP|\fB--force\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .ad b
 .RE
 .P
@@ -211,14 +211,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index 0c89c5b5e..8b1f69c4f 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -51,7 +51,7 @@ vgs produces formatted output about VGs.
 .br
 [    \fB--readonly\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [    \fB--rows\fP ]
 .br
@@ -305,14 +305,16 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB--rows\fP
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index 600c2c978..7b4ffb615 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -27,7 +27,7 @@ vgscan scans all supported LVM block devices in the system for VGs.
 .br
 [    \fB--notifydbus\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP ]
 .br
 [ COMMON_OPTIONS ]
 .ad b
@@ -192,14 +192,16 @@ Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP|\fBjson_std\fP
 .br
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
+output in JSON format. \fBjson_std\fP produces report output in
+JSON format which is more compliant with JSON standard.
+See \fBlvmreport\fP(7) for more information.
 .
 .HP
 \fB-t\fP|\fB--test\fP


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2022-07-10 23:22 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2022-07-10 23:22 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c0f8e6675c62332263acdc7c3c2f61eca20bd60f
Commit:        c0f8e6675c62332263acdc7c3c2f61eca20bd60f
Parent:        4d2f9a4ff3fbfe4ee0df08478d81ea10f75823de
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Mon Jul 11 01:02:22 2022 +0200
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Jul 11 01:18:24 2022 +0200

make: generate

---
 man/pvdisplay.8_pregen | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index 23d41b29b..e7767d0c4 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -61,6 +61,8 @@ and more, using a more compact and configurable output format.
 .br
 [    \fB--readonly\fP ]
 .br
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+.br
 [    \fB--separator\fP \fIString\fP ]
 .br
 [    \fB--shared\fP ]
@@ -320,6 +322,16 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+.br
+Overrides current output format for reports which is defined globally by
+the report/output_format setting in \fBlvm.conf\fP(5).
+\fBbasic\fP is the original format with columns and rows.
+If there is more than one report per command, each report is prefixed
+with the report name for identification. \fBjson\fP produces report
+output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
+.HP
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
 Select objects for processing and reporting based on specified criteria.


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2022-05-18 16:15 Marian Csontos
  0 siblings, 0 replies; 24+ messages in thread
From: Marian Csontos @ 2022-05-18 16:15 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9aa3ea1c9859aa6a1d8b9ac918fa47ae24927735
Commit:        9aa3ea1c9859aa6a1d8b9ac918fa47ae24927735
Parent:        7ec0726ce331a4dc1ab5dc5e1b9ae503e5d758da
Author:        Marian Csontos <mcsontos@redhat.com>
AuthorDate:    Wed May 18 18:15:30 2022 +0200
Committer:     Marian Csontos <mcsontos@redhat.com>
CommitterDate: Wed May 18 18:15:30 2022 +0200

make: generate

---
 man/lvchange.8_pregen        | 5 +++--
 man/lvconvert.8_pregen       | 5 +++--
 man/lvcreate.8_pregen        | 5 +++--
 man/lvdisplay.8_pregen       | 5 +++--
 man/lvextend.8_pregen        | 5 +++--
 man/lvm-fullreport.8_pregen  | 5 +++--
 man/lvm-lvpoll.8_pregen      | 5 +++--
 man/lvmconfig.8_pregen       | 5 +++--
 man/lvmdevices.8_pregen      | 5 +++--
 man/lvmdiskscan.8_pregen     | 5 +++--
 man/lvreduce.8_pregen        | 5 +++--
 man/lvremove.8_pregen        | 5 +++--
 man/lvrename.8_pregen        | 5 +++--
 man/lvresize.8_pregen        | 5 +++--
 man/lvs.8_pregen             | 5 +++--
 man/lvscan.8_pregen          | 5 +++--
 man/pvchange.8_pregen        | 5 +++--
 man/pvck.8_pregen            | 5 +++--
 man/pvcreate.8_pregen        | 5 +++--
 man/pvdisplay.8_pregen       | 5 +++--
 man/pvmove.8_pregen          | 5 +++--
 man/pvremove.8_pregen        | 5 +++--
 man/pvresize.8_pregen        | 5 +++--
 man/pvs.8_pregen             | 5 +++--
 man/pvscan.8_pregen          | 5 +++--
 man/vgcfgbackup.8_pregen     | 5 +++--
 man/vgcfgrestore.8_pregen    | 5 +++--
 man/vgchange.8_pregen        | 5 +++--
 man/vgck.8_pregen            | 5 +++--
 man/vgconvert.8_pregen       | 5 +++--
 man/vgcreate.8_pregen        | 5 +++--
 man/vgdisplay.8_pregen       | 5 +++--
 man/vgexport.8_pregen        | 5 +++--
 man/vgextend.8_pregen        | 5 +++--
 man/vgimport.8_pregen        | 5 +++--
 man/vgimportclone.8_pregen   | 5 +++--
 man/vgimportdevices.8_pregen | 5 +++--
 man/vgmerge.8_pregen         | 5 +++--
 man/vgmknodes.8_pregen       | 5 +++--
 man/vgreduce.8_pregen        | 5 +++--
 man/vgremove.8_pregen        | 5 +++--
 man/vgrename.8_pregen        | 5 +++--
 man/vgs.8_pregen             | 5 +++--
 man/vgscan.8_pregen          | 5 +++--
 man/vgsplit.8_pregen         | 5 +++--
 45 files changed, 135 insertions(+), 90 deletions(-)

diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index babeb1b29..e46a3b9b2 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -614,8 +614,9 @@ See \fBlvm.conf\fP(5) for more information about profiles.
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index 156ae00ce..22de7467f 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -1136,8 +1136,9 @@ See \fBlvmvdo\fP(7) for more information about VDO usage.
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index a454d175f..efca91c19 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -1008,8 +1008,9 @@ See \fBlvmvdo\fP(7) for more information about VDO usage.
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index 03235ef1a..b89d188de 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -186,8 +186,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index 8bc2c2523..445afc25e 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -328,8 +328,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 115f50d4a..4bcfba4f8 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -169,8 +169,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen
index 43696c1b7..bfdfafab8 100644
--- a/man/lvm-lvpoll.8_pregen
+++ b/man/lvm-lvpoll.8_pregen
@@ -115,8 +115,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen
index bab5d6056..a29255cf4 100644
--- a/man/lvmconfig.8_pregen
+++ b/man/lvmconfig.8_pregen
@@ -156,8 +156,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
index 90d3af455..86fe7e015 100644
--- a/man/lvmdevices.8_pregen
+++ b/man/lvmdevices.8_pregen
@@ -370,8 +370,9 @@ then it will override the default type that lvm would use.
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen
index 0d5fdc741..4db9c2021 100644
--- a/man/lvmdiskscan.8_pregen
+++ b/man/lvmdiskscan.8_pregen
@@ -102,8 +102,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index 6c55ae158..e8953bc8f 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -130,8 +130,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index 5b471f0e5..f47181213 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -136,8 +136,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index 9624611d1..278e8e989 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -120,8 +120,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index bacad4f46..625fed0a1 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -286,8 +286,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index 8540816d3..d055851f5 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -172,8 +172,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index 20a51ae99..012479618 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -119,8 +119,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index 1ace1b6b4..57d1570c4 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -179,8 +179,9 @@ multiple tags at once. See \fBlvm\fP(8) for information about tags.
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen
index 3f60ff818..156e3b789 100644
--- a/man/pvck.8_pregen
+++ b/man/pvck.8_pregen
@@ -351,8 +351,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index 043f067f7..67b5c27d0 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -229,8 +229,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index 4c681c955..23d41b29b 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -183,8 +183,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index ea300bb9d..28b0ea4e8 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -206,8 +206,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index ce01d3398..a086724b8 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -103,8 +103,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index 85078e18d..708b7d72a 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -98,8 +98,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index e9f981a9e..485e651a7 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -169,8 +169,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index 00743a7d4..cb837b8ca 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -383,8 +383,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index 0f051b75e..e732a7d43 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -123,8 +123,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen
index 67e8ae8e8..d9d4a2a76 100644
--- a/man/vgcfgrestore.8_pregen
+++ b/man/vgcfgrestore.8_pregen
@@ -208,8 +208,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 1dafeafd0..07626ee1b 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -568,8 +568,9 @@ See \fBlvm.conf\fP(5) for more information about profiles.
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index 76ef1a284..23bd7ea6d 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -114,8 +114,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index 8fe27ca2e..cdeee39fa 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -124,8 +124,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index 7b8b81885..d07741ffc 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -206,8 +206,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index 3fd7e55c2..db2e48b01 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -180,8 +180,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index 3709434bb..25f767bc8 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -139,8 +139,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index 3ea40988a..af5679118 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -147,8 +147,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index 0eb9d627d..fee109849 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -128,8 +128,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen
index 151fa9282..87a830807 100644
--- a/man/vgimportclone.8_pregen
+++ b/man/vgimportclone.8_pregen
@@ -113,8 +113,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgimportdevices.8_pregen b/man/vgimportdevices.8_pregen
index 3f09499e0..c030c01a5 100644
--- a/man/vgimportdevices.8_pregen
+++ b/man/vgimportdevices.8_pregen
@@ -132,8 +132,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen
index 298e30868..b4be7bb24 100644
--- a/man/vgmerge.8_pregen
+++ b/man/vgmerge.8_pregen
@@ -107,8 +107,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index f57440ef3..511d579bd 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -108,8 +108,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index 759160a6c..278aa0fac 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -199,8 +199,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index fa601b8cf..9e6051ade 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -109,8 +109,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index 615559bb0..932a51103 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -133,8 +133,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index 7c4a06d6d..0c89c5b5e 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -166,8 +166,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index c0a3de185..600c2c978 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -101,8 +101,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP
diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen
index fb217beed..b128fb8e2 100644
--- a/man/vgsplit.8_pregen
+++ b/man/vgsplit.8_pregen
@@ -175,8 +175,9 @@ messages sent to the log file and/or syslog (if configured).
 .HP
 \fB--devices\fP \fIPV\fP
 .br
-Devices that the command can use. This option can be repeated
-or accepts a comma separated list of devices. This overrides
+Restricts the devices that are visible and accessible to the command.
+Devices not listed will appear to be missing. This option can be
+repeated, or accepts a comma separated list of devices. This overrides
 the devices file.
 .
 .HP


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2022-05-03 17:11 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2022-05-03 17:11 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ff6022d400430df2f51160ce9eec4010ac55696c
Commit:        ff6022d400430df2f51160ce9eec4010ac55696c
Parent:        5e060b8fa71dcf7ad2ff2daca8dbfa009f691852
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Mon May 2 13:16:25 2022 +0200
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Tue May 3 19:09:52 2022 +0200

make: generate

---
 man/lvchange.8_pregen        | 31 ++++++++++++++++++++++++-------
 man/lvconvert.8_pregen       | 33 ++++++++++++++++++++++++++-------
 man/lvcreate.8_pregen        | 35 ++++++++++++++++++++++++++++-------
 man/lvdisplay.8_pregen       |  3 ++-
 man/lvextend.8_pregen        |  3 ++-
 man/lvm-fullreport.8_pregen  |  3 ++-
 man/lvm-lvpoll.8_pregen      |  3 ++-
 man/lvmconfig.8_pregen       |  3 ++-
 man/lvmdevices.8_pregen      | 14 ++++++++++----
 man/lvmdiskscan.8_pregen     |  3 ++-
 man/lvreduce.8_pregen        |  3 ++-
 man/lvremove.8_pregen        |  3 ++-
 man/lvrename.8_pregen        |  3 ++-
 man/lvresize.8_pregen        |  3 ++-
 man/lvs.8_pregen             |  3 ++-
 man/lvscan.8_pregen          |  3 ++-
 man/pvchange.8_pregen        |  3 ++-
 man/pvck.8_pregen            |  3 ++-
 man/pvcreate.8_pregen        |  3 ++-
 man/pvdisplay.8_pregen       |  3 ++-
 man/pvmove.8_pregen          |  3 ++-
 man/pvremove.8_pregen        |  3 ++-
 man/pvresize.8_pregen        |  3 ++-
 man/pvs.8_pregen             |  3 ++-
 man/pvscan.8_pregen          |  3 ++-
 man/vgcfgbackup.8_pregen     |  3 ++-
 man/vgcfgrestore.8_pregen    |  3 ++-
 man/vgchange.8_pregen        |  3 ++-
 man/vgck.8_pregen            |  3 ++-
 man/vgconvert.8_pregen       |  3 ++-
 man/vgcreate.8_pregen        |  3 ++-
 man/vgdisplay.8_pregen       |  3 ++-
 man/vgexport.8_pregen        |  3 ++-
 man/vgextend.8_pregen        |  3 ++-
 man/vgimport.8_pregen        |  3 ++-
 man/vgimportclone.8_pregen   |  3 ++-
 man/vgimportdevices.8_pregen |  3 ++-
 man/vgmerge.8_pregen         |  3 ++-
 man/vgmknodes.8_pregen       |  3 ++-
 man/vgreduce.8_pregen        |  3 ++-
 man/vgremove.8_pregen        |  3 ++-
 man/vgrename.8_pregen        |  3 ++-
 man/vgs.8_pregen             |  3 ++-
 man/vgscan.8_pregen          |  3 ++-
 man/vgsplit.8_pregen         |  3 ++-
 45 files changed, 170 insertions(+), 66 deletions(-)

diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index b559c89c9..babeb1b29 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -126,6 +126,8 @@ lvchange \(em Change the attributes of logical volume(s)
     \fB--sysinit\fP
 .br
  \fB-t\fP|\fB--test\fP
+.br
+    \fB--vdosettings\fP \fIString\fP
 .br
  \fB-v\fP|\fB--verbose\fP
 .br
@@ -202,6 +204,8 @@ required, after which the others are optional.
      \fB--\fP[\fBraid\fP]\fBminrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
      \fB--\fP[\fBraid\fP]\fBmaxrecoveryrate\fP \fISize\fP[k|UNIT]
+.br
+     \fB--vdosettings\fP \fIString\fP
 .br
      \fB--\fP[\fBraid\fP]\fBwritebehind\fP \fINumber\fP
 .br
@@ -545,12 +549,13 @@ See \fBlvmcache\fP(7) for more information.
 .HP
 \fB--cachesettings\fP \fIString\fP
 .br
-Specifies tunable values for a cache LV in "Key = Value" form.
-Repeat this option to specify multiple values.
-(The default values should usually be adequate.)
-The special string value \fBdefault\fP switches
-settings back to their default kernel values and removes
-them from the list of settings stored in LVM metadata.
+Specifies tunable kernel options for dm-cache or dm-writecache LVs.
+Use the form 'option=value' or 'option1=value option2=value', or
+repeat --cachesettings for each option being set.
+These settings override the default kernel behaviors which are
+usually adequate. To remove cachesettings and revert to the default
+kernel behaviors, use --cachesettings 'default' for dm-cache or
+an empty string --cachesettings '' for dm-writecache.
 See \fBlvmcache\fP(7) for more information.
 .
 .HP
@@ -752,7 +757,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--noudevsync\fP
@@ -927,6 +933,17 @@ error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
 .
 .HP
+\fB--vdosettings\fP \fIString\fP
+.br
+Specifies tunable VDO options for VDO LVs.
+Use the form 'option=value' or 'option1=value option2=value', or
+repeat --vdosettings for each option being set.
+These settings override the default VDO behaviors.
+To remove vdosettings and revert to the default
+VDO behaviors, use --vdosettings 'default'.
+See \fBlvmvdo\fP(7) for more information.
+.
+.HP
 \fB-v\fP|\fB--verbose\fP ...
 .br
 Set verbose level. Repeat from 1 to 4 times to increase the detail
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index 679519303..156ae00ce 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -155,6 +155,8 @@ lvconvert \(em Change logical volume layout
     \fB--usepolicies\fP
 .br
     \fB--vdopool\fP \fILV\fP
+.br
+    \fB--vdosettings\fP \fIString\fP
 .br
  \fB-v\fP|\fB--verbose\fP
 .br
@@ -742,6 +744,8 @@ Convert LV to type vdopool.
 .br
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--vdosettings\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -1064,12 +1068,13 @@ The name of a cache pool.
 .HP
 \fB--cachesettings\fP \fIString\fP
 .br
-Specifies tunable values for a cache LV in "Key = Value" form.
-Repeat this option to specify multiple values.
-(The default values should usually be adequate.)
-The special string value \fBdefault\fP switches
-settings back to their default kernel values and removes
-them from the list of settings stored in LVM metadata.
+Specifies tunable kernel options for dm-cache or dm-writecache LVs.
+Use the form 'option=value' or 'option1=value option2=value', or
+repeat --cachesettings for each option being set.
+These settings override the default kernel behaviors which are
+usually adequate. To remove cachesettings and revert to the default
+kernel behaviors, use --cachesettings 'default' for dm-cache or
+an empty string --cachesettings '' for dm-writecache.
 See \fBlvmcache\fP(7) for more information.
 .
 .HP
@@ -1303,7 +1308,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--noudevsync\fP
@@ -1535,6 +1541,17 @@ The name of a VDO pool LV.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
 .
 .HP
+\fB--vdosettings\fP \fIString\fP
+.br
+Specifies tunable VDO options for VDO LVs.
+Use the form 'option=value' or 'option1=value option2=value', or
+repeat --vdosettings for each option being set.
+These settings override the default VDO behaviors.
+To remove vdosettings and revert to the default
+VDO behaviors, use --vdosettings 'default'.
+See \fBlvmvdo\fP(7) for more information.
+.
+.HP
 \fB-v\fP|\fB--verbose\fP ...
 .br
 Set verbose level. Repeat from 1 to 4 times to increase the detail
@@ -1808,6 +1825,8 @@ Convert LV to type vdopool.
 .br
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--vdosettings\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index 2cccbbe56..a454d175f 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -157,6 +157,8 @@ lvcreate \(em Create a logical volume
     \fB--vdo\fP
 .br
     \fB--vdopool\fP \fILV\fP
+.br
+    \fB--vdosettings\fP \fIString\fP
 .br
  \fB-v\fP|\fB--verbose\fP
 .br
@@ -537,6 +539,8 @@ Create a LV that returns VDO when used.
 .br
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--vdosettings\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -927,12 +931,13 @@ The name of a cache pool.
 .HP
 \fB--cachesettings\fP \fIString\fP
 .br
-Specifies tunable values for a cache LV in "Key = Value" form.
-Repeat this option to specify multiple values.
-(The default values should usually be adequate.)
-The special string value \fBdefault\fP switches
-settings back to their default kernel values and removes
-them from the list of settings stored in LVM metadata.
+Specifies tunable kernel options for dm-cache or dm-writecache LVs.
+Use the form 'option=value' or 'option1=value option2=value', or
+repeat --cachesettings for each option being set.
+These settings override the default kernel behaviors which are
+usually adequate. To remove cachesettings and revert to the default
+kernel behaviors, use --cachesettings 'default' for dm-cache or
+an empty string --cachesettings '' for dm-writecache.
 See \fBlvmcache\fP(7) for more information.
 .
 .HP
@@ -1190,7 +1195,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--nosync\fP
@@ -1438,6 +1444,17 @@ The name of a VDO pool LV.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
 .
 .HP
+\fB--vdosettings\fP \fIString\fP
+.br
+Specifies tunable VDO options for VDO LVs.
+Use the form 'option=value' or 'option1=value option2=value', or
+repeat --vdosettings for each option being set.
+These settings override the default VDO behaviors.
+To remove vdosettings and revert to the default
+VDO behaviors, use --vdosettings 'default'.
+See \fBlvmvdo\fP(7) for more information.
+.
+.HP
 \fB-v\fP|\fB--verbose\fP ...
 .br
 Set verbose level. Repeat from 1 to 4 times to increase the detail
@@ -1966,6 +1983,8 @@ Create a VDO LV with VDO pool.
 .br
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--vdosettings\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -1996,6 +2015,8 @@ Create a VDO LV with VDO pool.
 .br
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--vdosettings\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index 04aab4c09..03235ef1a 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -278,7 +278,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--nosuffix\fP
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index be6992e94..8bc2c2523 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -423,7 +423,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--nosync\fP
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 02b38ef40..115f50d4a 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -254,7 +254,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--nosuffix\fP
diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen
index 7f45f6eb3..43696c1b7 100644
--- a/man/lvm-lvpoll.8_pregen
+++ b/man/lvm-lvpoll.8_pregen
@@ -181,7 +181,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--polloperation\fP \fBpvmove\fP|\fBconvert\fP|\fBmerge\fP|\fBmerge_thin\fP
diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen
index 51946e1ec..bab5d6056 100644
--- a/man/lvmconfig.8_pregen
+++ b/man/lvmconfig.8_pregen
@@ -261,7 +261,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
index a2391a62b..90d3af455 100644
--- a/man/lvmdevices.8_pregen
+++ b/man/lvmdevices.8_pregen
@@ -24,7 +24,7 @@ lvmdevices \(em Manage the devices file
 .br
  \fB-d\fP|\fB--debug\fP
 .br
-    \fB--deldev\fP \fIPV\fP
+    \fB--deldev\fP \fIString\fP
 .br
     \fB--delpvid\fP \fIString\fP
 .br
@@ -152,6 +152,7 @@ is used for dm crypt devices, reported by sysfs.
 .IP \[bu] 2
 .B md_uuid
 is used for md devices, reported by sysfs.
+.IP \[bu] 2
 .B lvmlv_uuid
 is used if a PV is placed on top of an lvm LV, reported by sysfs.
 .IP \[bu] 2
@@ -226,10 +227,12 @@ Add a device to the devices file.
 Remove a device from the devices file.
 .br
 .P
-\fBlvmdevices\fP \fB--deldev\fP \fIPV\fP
+\fBlvmdevices\fP \fB--deldev\fP \fIString\fP|\fIPV\fP
 .br
 .RS 4
 .ad l
+[    \fB--deviceidtype\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -346,9 +349,11 @@ Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
 .
 .HP
-\fB--deldev\fP \fIPV\fP
+\fB--deldev\fP \fIString\fP
 .br
 Remove a device from the devices file.
+When used alone, --deldev specifies a device name.
+When used with --deviceidtype, --deldev specifies a device id.
 .
 .HP
 \fB--delpvid\fP \fIString\fP
@@ -420,7 +425,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen
index 7fd3d941d..0d5fdc741 100644
--- a/man/lvmdiskscan.8_pregen
+++ b/man/lvmdiskscan.8_pregen
@@ -162,7 +162,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index ea960eb53..6c55ae158 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -220,7 +220,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--noudevsync\fP
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index 2bd7997a3..5b471f0e5 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -204,7 +204,8 @@ metadata/record_lvs_history is enabled.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--noudevsync\fP
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index d41a4c241..9624611d1 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -175,7 +175,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--noudevsync\fP
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index f3ea2536c..bacad4f46 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -376,7 +376,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--nosync\fP
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index 2b2c5f193..8540816d3 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -264,7 +264,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--nosuffix\fP
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index f459ab35b..20a51ae99 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -180,7 +180,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index 4add9ca69..1ace1b6b4 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -248,7 +248,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen
index 88200f21e..3f60ff818 100644
--- a/man/pvck.8_pregen
+++ b/man/pvck.8_pregen
@@ -435,7 +435,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index a74a5ec2a..043f067f7 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -319,7 +319,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--norestorefile\fP
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index 2f26a8727..4c681c955 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -266,7 +266,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--nosuffix\fP
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index 0f70497a2..ea300bb9d 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -271,7 +271,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--noudevsync\fP
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index 3d4a86c09..ce01d3398 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -164,7 +164,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index 87d87c8ce..85078e18d 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -153,7 +153,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index 32c28e4d1..e9f981a9e 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -254,7 +254,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--nosuffix\fP
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index 4622e145e..00743a7d4 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -469,7 +469,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--noudevsync\fP
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index 5e658093a..0f051b75e 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -197,7 +197,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen
index 695e05582..67e8ae8e8 100644
--- a/man/vgcfgrestore.8_pregen
+++ b/man/vgcfgrestore.8_pregen
@@ -291,7 +291,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 9dbad3faa..1dafeafd0 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -694,7 +694,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--noudevsync\fP
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index a8fa33f4b..76ef1a284 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -169,7 +169,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index 4d54c2b27..8fe27ca2e 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -206,7 +206,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index 9bb8d3868..7b8b81885 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -313,7 +313,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT]
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index 0a12b3c39..3fd7e55c2 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -258,7 +258,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--nosuffix\fP
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index a87058946..3709434bb 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -194,7 +194,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index 2b2650527..3ea40988a 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -237,7 +237,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index 5cd8fab84..0eb9d627d 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -189,7 +189,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen
index bf0af5841..151fa9282 100644
--- a/man/vgimportclone.8_pregen
+++ b/man/vgimportclone.8_pregen
@@ -179,7 +179,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgimportdevices.8_pregen b/man/vgimportdevices.8_pregen
index 5897e29ad..3f09499e0 100644
--- a/man/vgimportdevices.8_pregen
+++ b/man/vgimportdevices.8_pregen
@@ -193,7 +193,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen
index a36e0c7bd..298e30868 100644
--- a/man/vgmerge.8_pregen
+++ b/man/vgmerge.8_pregen
@@ -167,7 +167,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index 0a03e1582..f57440ef3 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -169,7 +169,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index f3178a618..759160a6c 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -265,7 +265,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index 779c0f13e..fa601b8cf 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -170,7 +170,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--noudevsync\fP
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index d3e776ca4..615559bb0 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -194,7 +194,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--profile\fP \fIString\fP
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index ee5083a93..7c4a06d6d 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -251,7 +251,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--nosuffix\fP
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index 824e7f673..c0a3de185 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -168,7 +168,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--notifydbus\fP
diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen
index 065c8b52a..fb217beed 100644
--- a/man/vgsplit.8_pregen
+++ b/man/vgsplit.8_pregen
@@ -255,7 +255,8 @@ perform standard hint file invalidation where appropriate.
 .HP
 \fB--nolocking\fP
 .br
-Disable locking.
+Disable locking. Use with caution, concurrent commands may produce
+incorrect results.
 .
 .HP
 \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2022-02-07 19:03 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2022-02-07 19:03 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=13122bcc3329f3c1aee0a1cc478eda8906cd96df
Commit:        13122bcc3329f3c1aee0a1cc478eda8906cd96df
Parent:        f83b3962c10bf4e196fec0e3e735820ba908661f
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Sun Feb 6 20:05:54 2022 +0100
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Feb 7 20:02:11 2022 +0100

make: generate

---
 conf/example.conf.in    | 15 ++++------
 man/lvdisplay.8_pregen  | 12 --------
 man/lvmdevices.8_pregen |  3 +-
 man/pvdisplay.8_pregen  | 12 --------
 man/pvscan.8_pregen     | 77 ++++++++++++++++++++++++++-----------------------
 man/vgchange.8_pregen   | 12 ++++++++
 man/vgdisplay.8_pregen  | 12 --------
 7 files changed, 60 insertions(+), 83 deletions(-)

diff --git a/conf/example.conf.in b/conf/example.conf.in
index a78ed7333..94f7a23fd 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -1151,16 +1151,11 @@ global {
 	# lvdisplay_shows_full_device_path = 0
 
 	# Configuration option global/event_activation.
-	# Activate LVs based on system-generated device events.
-	# When a PV appears on the system, a system-generated uevent triggers
-	# the lvm2-pvscan service which runs the pvscan --cache -aay command.
-	# If the new PV completes a VG, pvscan autoactivates LVs in the VG.
-	# When event_activation is disabled, the lvm2-activation services are
-	# generated and run at fixed points during system startup.  These
-	# services run vgchange -aay to autoactivate LVs in VGs that happen
-	# to be present at that point in time.
-	# See the --setautoactivation option or the auto_activation_volume_list
-	# setting to configure autoactivation for specific VGs or LVs.
+	# Disable event based autoactivation commands.
+	# WARNING: setting this to zero may cause machine startup to fail.
+	# Previously, setting this to zero would enable static autoactivation
+	# services (via the lvm2-activation-generator), but the autoactivation
+	# services and generator have been removed.
 	# This configuration option has an automatic default value.
 	# event_activation = 1
 
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index a1740ebed..04aab4c09 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -61,8 +61,6 @@ and more, using a more compact and configurable output format.
 .br
 [    \fB--readonly\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.br
 [    \fB--segments\fP ]
 .br
 [    \fB--separator\fP \fIString\fP ]
@@ -332,16 +330,6 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.br
-Overrides current output format for reports which is defined globally by
-the report/output_format setting in \fBlvm.conf\fP(5).
-\fBbasic\fP is the original format with columns and rows.
-If there is more than one report per command, each report is prefixed
-with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
-.
-.HP
 \fB--segments\fP
 .br
 .
diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
index d64c3a31a..a2391a62b 100644
--- a/man/lvmdevices.8_pregen
+++ b/man/lvmdevices.8_pregen
@@ -322,7 +322,8 @@ Find a device with the PVID and add the device to the devices file.
 .HP
 \fB--check\fP
 .br
-Check the content of the devices file.
+Checks the content of the devices file.
+Reports incorrect device names or PVIDs for entries.
 .
 .HP
 \fB--commandprofile\fP \fIString\fP
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index 22a0992b5..2f26a8727 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -61,8 +61,6 @@ and more, using a more compact and configurable output format.
 .br
 [    \fB--readonly\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.br
 [    \fB--separator\fP \fIString\fP ]
 .br
 [    \fB--shared\fP ]
@@ -320,16 +318,6 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.br
-Overrides current output format for reports which is defined globally by
-the report/output_format setting in \fBlvm.conf\fP(5).
-\fBbasic\fP is the original format with columns and rows.
-If there is more than one report per command, each report is prefixed
-with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
-.
-.HP
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
 Select objects for processing and reporting based on specified criteria.
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index 9eb6b5bf9..4622e145e 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -15,6 +15,8 @@ pvscan \(em List all physical volumes
 .P
 .ad l
  \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
+.br
+    \fB--autoactivation\fP \fIString\fP
 .br
     \fB--cache\fP
 .br
@@ -91,59 +93,50 @@ like
 or
 .BR pvdisplay (8).
 .P
-When the --cache and -aay options are used, pvscan records which PVs are
-available on the system, and activates LVs in completed VGs.  A VG is
-complete when pvscan sees that the final PV in the VG has appeared.  This
-is used by event-based system startup (systemd, udev) to activate LVs.
-.P
-The four main variations of this are:
+When --cache is used, pvscan updates runtime lvm state on the system, or
+with -aay performs autoactivation.
 .P
 .B pvscan --cache
 .I device
 .P
-If device is present, lvm adds a record that the PV on device is online.
+If device is present, lvm records that the PV on device is online.
 If device is not present, lvm removes the online record for the PV.
-In most cases, the pvscan will only read the named devices.
+pvscan only reads the named device.
 .P
-.B pvscan --cache -aay
-.IR device ...
+.B pvscan --cache
 .P
-This begins by performing the same steps as above.  Afterward, if the VG
-for the specified PV is complete, then pvscan will activate LVs in the VG
-(the same as vgchange -aay vgname would do.)
+Updates the runtime state for all lvm devices.
 .P
-.B pvscan --cache
+.B pvscan --cache -aay
+.I device
 .P
-This first clears all existing PV online records, then scans all devices
-on the system, adding PV online records for any PVs that are found.
+Performs the --cache steps for the device, then checks if the VG using the
+device is complete.  If so, LVs in the VG are autoactivated, the same as
+vgchange -aay vgname would do.  (A device name may be replaced with major
+and minor numbers.)
 .P
 .B pvscan --cache -aay
 .P
-This begins by performing the same steps as pvscan --cache.  Afterward, it
-activates LVs in any complete VGs.
+Performs the --cache steps for all devices, then autoactivates any complete VGs.
 .P
-To prevent devices from being scanned by pvscan --cache, add them
-to
-.BR lvm.conf (5)
-.B devices/global_filter.
-For more information, see:
-.br
-.B lvmconfig --withcomments devices/global_filter
+.B pvscan --cache --listvg|--listlvs
+.I device
 .P
-Auto-activation of VGs or LVs can be enabled/disabled using:
-.br
+Performs the --cache steps for the device, then prints the name of the VG
+using the device, or the names of LVs using the device.  --checkcomplete
+is usually included to check if all PVs for the VG or LVs are online.
+When this command is called by a udev rule, the output must conform to
+udev rule specifications (see --udevoutput.)  The udev rule will use the
+results to perform autoactivation.
+.P
+Autoactivation of VGs or LVs can be enabled/disabled using vgchange or
+lvchange with --setautoactivation y|n, or by adding names to
 .BR lvm.conf (5)
 .B activation/auto_activation_volume_list
 .P
-For more information, see:
-.br
-.B lvmconfig --withcomments activation/auto_activation_volume_list
-.P
-To disable auto-activation, explicitly set this list to an empty list,
-i.e. auto_activation_volume_list = [ ].
-.P
-When this setting is undefined (e.g. commented), then all LVs are
-auto-activated.
+See
+.BR lvmautoactivation (7)
+for more information about how pvscan is used for autoactivation.
 .
 .SH USAGE
 .
@@ -215,6 +208,8 @@ Record that a PV is online and autoactivate the VG if complete.
 .br
 [    \fB--noudevsync\fP ]
 .br
+[    \fB--autoactivation\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -239,6 +234,8 @@ Record that a PV is online and list the VG using the PV.
 .br
 [    \fB--udevoutput\fP ]
 .br
+[    \fB--autoactivation\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -342,6 +339,14 @@ Auto-activate LVs in a VG when the PVs scanned have completed the VG.
 (Only \fBay\fP is applicable.)
 .
 .HP
+\fB--autoactivation\fP \fIString\fP
+.br
+Specify if autoactivation is being used from an event.
+This allows the command to apply settings that are specific
+to event activation, such as device scanning optimizations
+using pvs_online files created by event-based pvscans.
+.
+.HP
 \fB--cache\fP
 .br
 Scan one or more devices and record that they are online.
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 05c67aead..9dbad3faa 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -24,6 +24,8 @@ vgchange \(em Change volume group attributes
 .nh
 \%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
+.br
+    \fB--autoactivation\fP \fIString\fP
 .br
  \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
@@ -286,6 +288,8 @@ Activate or deactivate LVs.
 .br
 [    \fB--poll\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--autoactivation\fP \fIString\fP ]
+.br
 [    \fB--ignoremonitoring\fP ]
 .br
 [    \fB--noudevsync\fP ]
@@ -516,6 +520,14 @@ which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
 .
 .HP
+\fB--autoactivation\fP \fIString\fP
+.br
+Specify if autoactivation is being used from an event.
+This allows the command to apply settings that are specific
+to event activation, such as device scanning optimizations
+using pvs_online files created by event-based pvscans.
+.
+.HP
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 Specifies if metadata should be backed up automatically after a change.
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index 9c694921d..0a12b3c39 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -58,8 +58,6 @@ and more, using a more compact and configurable output format.
 .br
 [    \fB--readonly\fP ]
 .br
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.br
 [    \fB--shared\fP ]
 .br
 [    \fB--separator\fP \fIString\fP ]
@@ -312,16 +310,6 @@ device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
 .
 .HP
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.br
-Overrides current output format for reports which is defined globally by
-the report/output_format setting in \fBlvm.conf\fP(5).
-\fBbasic\fP is the original format with columns and rows.
-If there is more than one report per command, each report is prefixed
-with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
-.
-.HP
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
 Select objects for processing and reporting based on specified criteria.



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-10-14 21:37 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2021-10-14 21:37 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ae92888a7baf3f1882168a6084eca23c9b85b998
Commit:        ae92888a7baf3f1882168a6084eca23c9b85b998
Parent:        0bd5388b16e2a14285ecd91ebf9f5537b5b303cc
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Thu Oct 14 22:41:48 2021 +0200
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Thu Oct 14 23:34:11 2021 +0200

make: generate

---
 conf/example.conf.in | 10 ++--------
 man/pvscan.8_pregen  |  2 ++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/conf/example.conf.in b/conf/example.conf.in
index 1f7c449bf..a78ed7333 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -126,7 +126,7 @@ devices {
 	# be used, regardless of this setting, when the --devicesfile
 	# option is set to a specific file name.
 	# This configuration option has an automatic default value.
-	# use_devicesfile = 1
+	# use_devicesfile = 0
 
 	# Configuration option devices/devicesfile.
 	# The name of the system devices file, listing devices that LVM should use.
@@ -236,12 +236,6 @@ devices {
 	# This configuration option has an automatic default value.
 	# multipath_wwids_file = "/etc/multipath/wwids"
 
-	# Configuration option devices/multipath_wwids_file.
-	# The path to the multipath wwids file used for multipath component detection.
-	# Set this to an empty string to disable the use of the multipath wwids file.
-	# This configuration option has an automatic default value.
-	# multipath_wwids_file = "/etc/multipath/wwids"
-
 	# Configuration option devices/md_component_detection.
 	# Enable detection and exclusion of MD component devices.
 	# An MD component device is a block device that MD uses as part
@@ -842,7 +836,7 @@ log {
 	# Configuration option log/syslog.
 	# Send log messages through syslog.
 	# This configuration option has an automatic default value.
-	# syslog = 1
+	# syslog = 0
 
 	# Configuration option log/file.
 	# Write error and debug log messages to a file specified here.
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index a15138d8b..9eb6b5bf9 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -51,6 +51,8 @@ pvscan \(em List all physical volumes
  \fB-j\fP|\fB--major\fP \fINumber\fP
 .br
     \fB--minor\fP \fINumber\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-10-07 17:43 David Teigland
  0 siblings, 0 replies; 24+ messages in thread
From: David Teigland @ 2021-10-07 17:43 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ca38251b1043c49f5453c2c571876b12aad6b450
Commit:        ca38251b1043c49f5453c2c571876b12aad6b450
Parent:        61bd5e50232d72345b5d55ece237c05025a731ab
Author:        Marian Csontos <mcsontos@redhat.com>
AuthorDate:    Fri Aug 6 13:23:11 2021 +0200
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Thu Oct 7 12:42:44 2021 -0500

make: generate

---
 conf/example.conf.in         | 258 +++++++++++++++++++++++++++++--------------
 man/lvchange.8_pregen        |  14 +++
 man/lvconvert.8_pregen       |  14 +++
 man/lvcreate.8_pregen        |  14 +++
 man/lvdisplay.8_pregen       |  12 ++
 man/lvextend.8_pregen        |  14 +++
 man/lvm-fullreport.8_pregen  |  12 ++
 man/lvm-lvpoll.8_pregen      |  12 ++
 man/lvmconfig.8_pregen       |  12 ++
 man/lvmdevices.8_pregen      |  14 +++
 man/lvmdiskscan.8_pregen     |  12 ++
 man/lvreduce.8_pregen        |  12 ++
 man/lvremove.8_pregen        |  12 ++
 man/lvrename.8_pregen        |  12 ++
 man/lvresize.8_pregen        |  14 +++
 man/lvs.8_pregen             |  12 ++
 man/lvscan.8_pregen          |  12 ++
 man/pvchange.8_pregen        |  12 ++
 man/pvck.8_pregen            |  14 +++
 man/pvcreate.8_pregen        |  12 ++
 man/pvdisplay.8_pregen       |  12 ++
 man/pvmove.8_pregen          |  12 ++
 man/pvremove.8_pregen        |  12 ++
 man/pvresize.8_pregen        |  12 ++
 man/pvs.8_pregen             |  12 ++
 man/pvscan.8_pregen          | 214 ++++++++++++++++++++++++++++++++++-
 man/vgcfgbackup.8_pregen     |  12 ++
 man/vgcfgrestore.8_pregen    |  14 +++
 man/vgchange.8_pregen        |  14 +++
 man/vgck.8_pregen            |  12 ++
 man/vgconvert.8_pregen       |  12 ++
 man/vgcreate.8_pregen        |  12 ++
 man/vgdisplay.8_pregen       |  12 ++
 man/vgexport.8_pregen        |  12 ++
 man/vgextend.8_pregen        |  12 ++
 man/vgimport.8_pregen        |  12 ++
 man/vgimportclone.8_pregen   |  12 ++
 man/vgimportdevices.8_pregen |  12 ++
 man/vgmerge.8_pregen         |  12 ++
 man/vgmknodes.8_pregen       |  12 ++
 man/vgreduce.8_pregen        |  14 +++
 man/vgremove.8_pregen        |  12 ++
 man/vgrename.8_pregen        |  12 ++
 man/vgs.8_pregen             |  12 ++
 man/vgscan.8_pregen          |  12 ++
 man/vgsplit.8_pregen         |  12 ++
 46 files changed, 932 insertions(+), 88 deletions(-)

diff --git a/conf/example.conf.in b/conf/example.conf.in
index 5bcbc65e7..1f7c449bf 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -33,15 +33,18 @@ config {
 	# any configuration mismatch is ignored and the default value is used
 	# without any warning (a message about the configuration key not being
 	# found is issued in verbose mode only).
-	checks = 1
+	# This configuration option has an automatic default value.
+	# checks = 1
 
 	# Configuration option config/abort_on_errors.
 	# Abort the LVM process if a configuration mismatch is found.
-	abort_on_errors = 0
+	# This configuration option has an automatic default value.
+	# abort_on_errors = 0
 
 	# Configuration option config/profile_dir.
 	# Directory where LVM looks for configuration profiles.
-	profile_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_PROFILE_SUBDIR@"
+	# This configuration option has an automatic default value.
+	# profile_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_PROFILE_SUBDIR@"
 }
 
 # Configuration section devices.
@@ -52,12 +55,14 @@ devices {
 	# Directory in which to create volume group device nodes.
 	# Commands also accept this as a prefix on volume group names.
 	# This configuration option is advanced.
-	dir = "/dev"
+	# This configuration option has an automatic default value.
+	# dir = "/dev"
 
 	# Configuration option devices/scan.
 	# Directories containing device nodes to use with LVM.
 	# This configuration option is advanced.
-	scan = [ "/dev" ]
+	# This configuration option has an automatic default value.
+	# scan = [ "/dev" ]
 
 	# Configuration option devices/obtain_device_list_from_udev.
 	# Obtain the list of available devices from udev.
@@ -67,14 +72,16 @@ devices {
 	# setting applies only to the udev-managed device directory; other
 	# directories will be scanned fully. LVM needs to be compiled with
 	# udev support for this setting to apply.
-	obtain_device_list_from_udev = 0
+	# This configuration option has an automatic default value.
+	# obtain_device_list_from_udev = 0
 
 	# Configuration option devices/external_device_info_source.
 	# Enable device information from udev.
 	# If set to "udev", lvm will supplement its own native device information
 	# with information from libudev. This can potentially improve the detection
 	# of MD component devices and multipath component devices.
-	external_device_info_source = "none"
+	# This configuration option has an automatic default value.
+	# external_device_info_source = "none"
 
 	# Configuration option devices/hints.
 	# Use a local file to remember which devices have PVs on them.
@@ -119,7 +126,7 @@ devices {
 	# be used, regardless of this setting, when the --devicesfile
 	# option is set to a specific file name.
 	# This configuration option has an automatic default value.
-	# use_devicesfile = 0
+	# use_devicesfile = 1
 
 	# Configuration option devices/devicesfile.
 	# The name of the system devices file, listing devices that LVM should use.
@@ -200,7 +207,8 @@ devices {
 	# Restrict device scanning to block devices appearing in sysfs.
 	# This is a quick way of filtering out block devices that are not
 	# present on the system. sysfs must be part of the kernel and mounted.)
-	sysfs_scan = 1
+	# This configuration option has an automatic default value.
+	# sysfs_scan = 1
 
 	# Configuration option devices/scan_lvs.
 	# Scan LVM LVs for layered PVs, allowing LVs to be used as PVs.
@@ -214,11 +222,19 @@ devices {
 	# use PVs that exist on LVs, and will not allow a PV to be created on
 	# an LV. The LVs are ignored using a built in device filter that
 	# identifies and excludes LVs.
-	scan_lvs = 0
+	# This configuration option has an automatic default value.
+	# scan_lvs = 0
 
 	# Configuration option devices/multipath_component_detection.
 	# Ignore devices that are components of DM multipath devices.
-	multipath_component_detection = 1
+	# This configuration option has an automatic default value.
+	# multipath_component_detection = 1
+
+	# Configuration option devices/multipath_wwids_file.
+	# The path to the multipath wwids file used for multipath component detection.
+	# Set this to an empty string to disable the use of the multipath wwids file.
+	# This configuration option has an automatic default value.
+	# multipath_wwids_file = "/etc/multipath/wwids"
 
 	# Configuration option devices/multipath_wwids_file.
 	# The path to the multipath wwids file used for multipath component detection.
@@ -235,7 +251,8 @@ devices {
 	# In cases where the MD superblock is located at the end of the
 	# component devices, it is more difficult for LVM to consistently
 	# identify an MD component, see the md_component_checks setting.
-	md_component_detection = 1
+	# This configuration option has an automatic default value.
+	# md_component_detection = 1
 
 	# Configuration option devices/md_component_checks.
 	# The checks LVM should use to detect MD component devices.
@@ -259,7 +276,8 @@ devices {
 	# Ignore devices that are components of firmware RAID devices.
 	# LVM must use an external_device_info_source other than none for this
 	# detection to execute.
-	fw_raid_component_detection = 0
+	# This configuration option has an automatic default value.
+	# fw_raid_component_detection = 0
 
 	# Configuration option devices/md_chunk_alignment.
 	# Align the start of a PV data area with md device's stripe-width.
@@ -268,7 +286,8 @@ devices {
 	# with the value detected for this setting.
 	# This setting is overridden by data_alignment_detection,
 	# data_alignment, and the --dataalignment option.
-	md_chunk_alignment = 1
+	# This configuration option has an automatic default value.
+	# md_chunk_alignment = 1
 
 	# Configuration option devices/default_data_alignment.
 	# Align the start of a PV data area with this number of MiB.
@@ -291,7 +310,8 @@ devices {
 	# if they are not aligned with the value detected for this setting.
 	# This setting is overridden by data_alignment and the --dataalignment
 	# option.
-	data_alignment_detection = 1
+	# This configuration option has an automatic default value.
+	# data_alignment_detection = 1
 
 	# Configuration option devices/data_alignment.
 	# Align the start of a PV data area with this number of KiB.
@@ -299,7 +319,8 @@ devices {
 	# Set to 0 to disable, in which case default_data_alignment
 	# is used to align the first PE in units of MiB.
 	# This setting is overridden by the --dataalignment option.
-	data_alignment = 0
+	# This configuration option has an automatic default value.
+	# data_alignment = 0
 
 	# Configuration option devices/data_alignment_offset_detection.
 	# Shift the start of an aligned PV data area based on sysfs information.
@@ -310,13 +331,15 @@ devices {
 	# is the lowest aligned logical block, the 4KiB sectors start at
 	# LBA -1, and consequently sector 63 is aligned on a 4KiB boundary).
 	# This setting is overridden by the --dataalignmentoffset option.
-	data_alignment_offset_detection = 1
+	# This configuration option has an automatic default value.
+	# data_alignment_offset_detection = 1
 
 	# Configuration option devices/ignore_suspended_devices.
 	# Ignore DM devices that have I/O suspended while scanning devices.
 	# Otherwise, LVM waits for a suspended device to become accessible.
 	# This should only be needed in recovery situations.
-	ignore_suspended_devices = 0
+	# This configuration option has an automatic default value.
+	# ignore_suspended_devices = 0
 
 	# Configuration option devices/ignore_lvm_mirrors.
 	# Do not scan 'mirror' LVs to avoid possible deadlocks.
@@ -335,18 +358,21 @@ devices {
 	# a scan of the mirror's labels. The 'mirror' scanning problems do not
 	# apply to LVM RAID types like 'raid1' which handle failures in a
 	# different way, making them a better choice for VG stacking.
-	ignore_lvm_mirrors = 1
+	# This configuration option has an automatic default value.
+	# ignore_lvm_mirrors = 1
 
 	# Configuration option devices/require_restorefile_with_uuid.
 	# Allow use of pvcreate --uuid without requiring --restorefile.
-	require_restorefile_with_uuid = 1
+	# This configuration option has an automatic default value.
+	# require_restorefile_with_uuid = 1
 
 	# Configuration option devices/pv_min_size.
 	# Minimum size in KiB of block devices which can be used as PVs.
 	# In a clustered environment all nodes must use the same value.
 	# Any value smaller than 512KiB is ignored. The previous built-in
 	# value was 512.
-	pv_min_size = 2048
+	# This configuration option has an automatic default value.
+	# pv_min_size = 2048
 
 	# Configuration option devices/issue_discards.
 	# Issue discards to PVs that are no longer used by an LV.
@@ -359,7 +385,8 @@ devices {
 	# benefit from discards, but SSDs and thinly provisioned LUNs
 	# generally do. If enabled, discards will only be issued if both the
 	# storage and kernel provide support.
-	issue_discards = 0
+	# This configuration option has an automatic default value.
+	# issue_discards = 0
 
 	# Configuration option devices/allow_changes_with_duplicate_pvs.
 	# Allow VG modification while a PV appears on multiple devices.
@@ -372,13 +399,15 @@ devices {
 	# or activating LVs in it while a PV appears on multiple devices.
 	# Enabling this setting allows the VG to be used as usual even with
 	# uncertain devices.
-	allow_changes_with_duplicate_pvs = 0
+	# This configuration option has an automatic default value.
+	# allow_changes_with_duplicate_pvs = 0
 
 	# Configuration option devices/allow_mixed_block_sizes.
 	# Allow PVs in the same VG with different logical block sizes.
 	# When allowed, the user is responsible to ensure that an LV is
 	# using PVs with matching block sizes when necessary.
-	allow_mixed_block_sizes = 0
+	# This configuration option has an automatic default value.
+	# allow_mixed_block_sizes = 0
 }
 
 # Configuration section allocation.
@@ -410,7 +439,8 @@ allocation {
 	# policies to detect more situations where data can be grouped onto
 	# the same disks. This setting can be used to disable the changes
 	# and revert to the previous algorithm.
-	maximise_cling = 1
+	# This configuration option has an automatic default value.
+	# maximise_cling = 1
 
 	# Configuration option allocation/use_blkid_wiping.
 	# Use blkid to detect and erase existing signatures on new PVs and LVs.
@@ -420,7 +450,8 @@ allocation {
 	# code is currently able to recognize: MD device signatures,
 	# swap signature, and LUKS signatures. To see the list of signatures
 	# recognized by blkid, check the output of the 'blkid -k' command.
-	use_blkid_wiping = @DEFAULT_USE_BLKID_WIPING@
+	# This configuration option has an automatic default value.
+	# use_blkid_wiping = @DEFAULT_USE_BLKID_WIPING@
 
 	# Configuration option allocation/wipe_signatures_when_zeroing_new_lvs.
 	# Look for and erase any signatures while zeroing a new LV.
@@ -437,12 +468,14 @@ allocation {
 	# use_blkid_wiping.) Wiping each detected signature must be confirmed.
 	# When this setting is disabled, signatures on new LVs are not detected
 	# or erased unless the --wipesignatures option is used directly.
-	wipe_signatures_when_zeroing_new_lvs = 1
+	# This configuration option has an automatic default value.
+	# wipe_signatures_when_zeroing_new_lvs = 1
 
 	# Configuration option allocation/mirror_logs_require_separate_pvs.
 	# Mirror logs and images will always use different PVs.
 	# The default setting changed in version 2.02.85.
-	mirror_logs_require_separate_pvs = 0
+	# This configuration option has an automatic default value.
+	# mirror_logs_require_separate_pvs = 0
 
 	# Configuration option allocation/raid_stripe_all_devices.
 	# Stripe across all PVs when RAID stripes are not specified.
@@ -791,7 +824,8 @@ log {
 
 	# Configuration option log/verbose.
 	# Controls the messages sent to stdout or stderr.
-	verbose = 0
+	# This configuration option has an automatic default value.
+	# verbose = 0
 
 	# Configuration option log/silent.
 	# Suppress all non-essential messages from stdout.
@@ -802,25 +836,37 @@ log {
 	# for syslog and lvm2_log_fn purposes.
 	# Any 'yes' or 'no' questions not overridden by other arguments are
 	# suppressed and default to 'no'.
-	silent = 0
+	# This configuration option has an automatic default value.
+	# silent = 0
 
 	# Configuration option log/syslog.
 	# Send log messages through syslog.
-	syslog = 1
+	# This configuration option has an automatic default value.
+	# syslog = 1
 
 	# Configuration option log/file.
 	# Write error and debug log messages to a file specified here.
 	# This configuration option does not have a default value defined.
 
+	# Configuration option log/journal.
+	# Record lvm information in the systemd journal.
+	# command: record commands that are run.
+	# output: record default output from commands.
+	# debug: record debug messages from commands.
+	# This configuration option has an automatic default value.
+	# journal = [ ]
+
 	# Configuration option log/overwrite.
 	# Overwrite the log file each time the program is run.
-	overwrite = 0
+	# This configuration option has an automatic default value.
+	# overwrite = 0
 
 	# Configuration option log/level.
 	# The level of log messages that are sent to the log file or syslog.
 	# There are 6 syslog-like log levels currently in use: 2 to 7 inclusive.
 	# 7 is the most verbose (LOG_DEBUG).
-	level = 0
+	# This configuration option has an automatic default value.
+	# level = 0
 
 	# Configuration option log/indent.
 	# Indent messages according to their severity.
@@ -829,7 +875,8 @@ log {
 
 	# Configuration option log/command_names.
 	# Display the command name on each line of output.
-	command_names = 0
+	# This configuration option has an automatic default value.
+	# command_names = 0
 
 	# Configuration option log/prefix.
 	# A prefix to use before the log message text.
@@ -837,12 +884,14 @@ log {
 	# Two spaces allows you to see/grep the severity of each message.
 	# To make the messages look similar to the original LVM tools use:
 	# indent = 0, command_names = 1, prefix = " -- "
-	prefix = "  "
+	# This configuration option has an automatic default value.
+	# prefix = "  "
 
 	# Configuration option log/activation.
 	# Log messages during activation.
 	# Don't use this in low memory situations (can deadlock).
-	activation = 0
+	# This configuration option has an automatic default value.
+	# activation = 0
 
 	# Configuration option log/debug_classes.
 	# Select log messages by class.
@@ -850,7 +899,8 @@ log {
 	# debug output if the class is listed here. Classes currently
 	# available: memory, devices, io, activation, allocation,
 	# metadata, cache, locking, lvmpolld. Use "all" to see everything.
-	debug_classes = [ "memory", "devices", "io", "activation", "allocation", "metadata", "cache", "locking", "lvmpolld", "dbus" ]
+	# This configuration option has an automatic default value.
+	# debug_classes = [ "memory", "devices", "io", "activation", "allocation", "metadata", "cache", "locking", "lvmpolld", "dbus" ]
 
 	# Configuration option log/debug_file_fields.
 	# The fields included in debug output written to log file.
@@ -877,30 +927,36 @@ backup {
 	# Configuration option backup/backup.
 	# Maintain a backup of the current metadata configuration.
 	# Think very hard before turning this off!
-	backup = 1
+	# This configuration option has an automatic default value.
+	# backup = 1
 
 	# Configuration option backup/backup_dir.
 	# Location of the metadata backup files.
 	# Remember to back up this directory regularly!
-	backup_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_BACKUP_SUBDIR@"
+	# This configuration option has an automatic default value.
+	# backup_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_BACKUP_SUBDIR@"
 
 	# Configuration option backup/archive.
 	# Maintain an archive of old metadata configurations.
 	# Think very hard before turning this off.
-	archive = 1
+	# This configuration option has an automatic default value.
+	# archive = 1
 
 	# Configuration option backup/archive_dir.
 	# Location of the metdata archive files.
 	# Remember to back up this directory regularly!
-	archive_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_ARCHIVE_SUBDIR@"
+	# This configuration option has an automatic default value.
+	# archive_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_ARCHIVE_SUBDIR@"
 
 	# Configuration option backup/retain_min.
 	# Minimum number of archives to keep.
-	retain_min = 10
+	# This configuration option has an automatic default value.
+	# retain_min = 10
 
 	# Configuration option backup/retain_days.
 	# Minimum number of days to keep archive files.
-	retain_days = 30
+	# This configuration option has an automatic default value.
+	# retain_days = 30
 }
 
 # Configuration section shell.
@@ -909,7 +965,8 @@ shell {
 
 	# Configuration option shell/history_size.
 	# Number of lines of history to store in ~/.lvm_history.
-	history_size = 100
+	# This configuration option has an automatic default value.
+	# history_size = 100
 }
 
 # Configuration section global.
@@ -919,16 +976,19 @@ global {
 	# Configuration option global/umask.
 	# The file creation mask for any files and directories created.
 	# Interpreted as octal if the first digit is zero.
-	umask = 077
+	# This configuration option has an automatic default value.
+	# umask = 077
 
 	# Configuration option global/test.
 	# No on-disk metadata changes will be made in test mode.
 	# Equivalent to having the -t option on every command.
-	test = 0
+	# This configuration option has an automatic default value.
+	# test = 0
 
 	# Configuration option global/units.
 	# Default value for --units argument.
-	units = "r"
+	# This configuration option has an automatic default value.
+	# units = "r"
 
 	# Configuration option global/si_unit_consistency.
 	# Distinguish between powers of 1024 and 1000 bytes.
@@ -936,13 +996,15 @@ global {
 	# e.g. KiB, MiB, GiB, and powers of 1000 bytes, e.g. KB, MB, GB.
 	# If scripts depend on the old behaviour, disable this setting
 	# temporarily until they are updated.
-	si_unit_consistency = 1
+	# This configuration option has an automatic default value.
+	# si_unit_consistency = 1
 
 	# Configuration option global/suffix.
 	# Display unit suffix for sizes.
 	# This setting has no effect if the units are in human-readable form
 	# (global/units = "h") in which case the suffix is always displayed.
-	suffix = 1
+	# This configuration option has an automatic default value.
+	# suffix = 1
 
 	# Configuration option global/activation.
 	# Enable/disable communication with the kernel device-mapper.
@@ -950,26 +1012,31 @@ global {
 	# activating any logical volumes. If the device-mapper driver
 	# is not present in the kernel, disabling this should suppress
 	# the error messages.
-	activation = 1
+	# This configuration option has an automatic default value.
+	# activation = 1
 
 	# Configuration option global/proc.
 	# Location of proc filesystem.
 	# This configuration option is advanced.
-	proc = "/proc"
+	# This configuration option has an automatic default value.
+	# proc = "/proc"
 
 	# Configuration option global/etc.
 	# Location of /etc system configuration directory.
-	etc = "@CONFDIR@"
+	# This configuration option has an automatic default value.
+	# etc = "@CONFDIR@"
 
 	# Configuration option global/wait_for_locks.
 	# When disabled, fail if a lock request would block.
-	wait_for_locks = 1
+	# This configuration option has an automatic default value.
+	# wait_for_locks = 1
 
 	# Configuration option global/locking_dir.
 	# Directory to use for LVM command file locks.
 	# Local non-LV directory that holds file-based locks while commands are
 	# in progress. A directory like /tmp that may get wiped on reboot is OK.
-	locking_dir = "@DEFAULT_LOCK_DIR@"
+	# This configuration option has an automatic default value.
+	# locking_dir = "@DEFAULT_LOCK_DIR@"
 
 	# Configuration option global/prioritise_write_locks.
 	# Allow quicker VG write access during high volume read access.
@@ -978,7 +1045,8 @@ global {
 	# requests immediately, delay them to allow the read-write requests to
 	# be serviced. Without this setting, write access may be stalled by a
 	# high volume of read-only requests. This option only affects file locks.
-	prioritise_write_locks = 1
+	# This configuration option has an automatic default value.
+	# prioritise_write_locks = 1
 
 	# Configuration option global/library_dir.
 	# Search this directory first for shared libraries.
@@ -988,7 +1056,8 @@ global {
 	# Abort a command that encounters an internal error.
 	# Treat any internal errors as fatal errors, aborting the process that
 	# encountered the internal error. Please only enable for debugging.
-	abort_on_internal_errors = 0
+	# This configuration option has an automatic default value.
+	# abort_on_internal_errors = 0
 
 	# Configuration option global/metadata_read_only.
 	# No operations that change on-disk metadata are permitted.
@@ -996,7 +1065,8 @@ global {
 	# repair will still be allowed to proceed exactly as if the repair had
 	# been performed (except for the unchanged vg_seqno). Inappropriate
 	# use could mess up your system, so seek advice first!
-	metadata_read_only = 0
+	# This configuration option has an automatic default value.
+	# metadata_read_only = 0
 
 	# Configuration option global/mirror_segtype_default.
 	# The segment type used by the short mirroring option -m.
@@ -1022,7 +1092,8 @@ global {
 	#     cluster-aware and cannot be used in a shared (active/active)
 	#     fashion in a cluster.
 	#
-	mirror_segtype_default = "@DEFAULT_MIRROR_SEGTYPE@"
+	# This configuration option has an automatic default value.
+	# mirror_segtype_default = "@DEFAULT_MIRROR_SEGTYPE@"
 
 	# Configuration option global/support_mirrored_mirror_log.
 	# Enable mirrored 'mirror' log type for testing.
@@ -1052,7 +1123,8 @@ global {
 	#     effectively creating a RAID 0+1 array. The layering is suboptimal
 	#     in terms of providing redundancy and performance.
 	#
-	raid10_segtype_default = "@DEFAULT_RAID10_SEGTYPE@"
+	# This configuration option has an automatic default value.
+	# raid10_segtype_default = "@DEFAULT_RAID10_SEGTYPE@"
 
 	# Configuration option global/sparse_segtype_default.
 	# The segment type used by the -V -L combination.
@@ -1072,7 +1144,8 @@ global {
 	#     metadata. It has better performance, especially when more data
 	#     is used. It also supports full snapshots.
 	#
-	sparse_segtype_default = "@DEFAULT_SPARSE_SEGTYPE@"
+	# This configuration option has an automatic default value.
+	# sparse_segtype_default = "@DEFAULT_SPARSE_SEGTYPE@"
 
 	# Configuration option global/lvdisplay_shows_full_device_path.
 	# Enable this to reinstate the previous lvdisplay name format.
@@ -1107,7 +1180,8 @@ global {
 	# Applicable only if LVM is compiled with lockd support in which
 	# case there is also lvmlockd(8) man page available for more
 	# information.
-	use_lvmlockd = 0
+	# This configuration option has an automatic default value.
+	# use_lvmlockd = 0
 
 	# Configuration option global/lvmlockd_lock_retries.
 	# Retry lvmlockd lock requests this many times.
@@ -1280,15 +1354,18 @@ global {
 	#   uname
 	#     Set the system ID from the hostname (uname) of the system.
 	#     System IDs beginning localhost are not permitted.
+	#   appmachineid
+	#     Use an LVM-specific derivation of the local machine-id as the
+	#     system ID. See 'man machine-id'.
 	#   machineid
-	#     Use the contents of the machine-id file to set the system ID.
-	#     Some systems create this file at installation time.
-	#     See 'man machine-id' and global/etc.
+	#     Use the contents of the machine-id file to set the system ID
+	#     (appmachineid is recommended.)
 	#   file
 	#     Use the contents of another file (system_id_file) to set the
 	#     system ID.
 	#
-	system_id_source = "none"
+	# This configuration option has an automatic default value.
+	# system_id_source = "none"
 
 	# Configuration option global/system_id_file.
 	# The full path to the file containing a system ID.
@@ -1308,13 +1385,15 @@ global {
 	# and to use its own control group. When this option is disabled, LVM
 	# commands will supervise long running operations by forking themselves.
 	# Applicable only if LVM is compiled with lvmpolld support.
-	use_lvmpolld = @DEFAULT_USE_LVMPOLLD@
+	# This configuration option has an automatic default value.
+	# use_lvmpolld = @DEFAULT_USE_LVMPOLLD@
 
 	# Configuration option global/notify_dbus.
 	# Enable D-Bus notification from LVM commands.
 	# When enabled, an LVM command that changes PVs, changes VG metadata,
 	# or changes the activation state of an LV will send a notification.
-	notify_dbus = 1
+	# This configuration option has an automatic default value.
+	# notify_dbus = 1
 
 	# Configuration option global/io_memory_size.
 	# The amount of memory in KiB that LVM allocates to perform disk io.
@@ -1335,7 +1414,8 @@ activation {
 	# Useful for debugging problems with activation. Some of the checks may
 	# be expensive, so it's best to use this only when there seems to be a
 	# problem.
-	checks = 0
+	# This configuration option has an automatic default value.
+	# checks = 0
 
 	# Configuration option activation/udev_sync.
 	# Use udev notifications to synchronize udev and LVM.
@@ -1346,14 +1426,16 @@ activation {
 	# that ignore the devices LVM creates. If enabled when udev is not
 	# running, and LVM processes are waiting for udev, run the command
 	# 'dmsetup udevcomplete_all' to wake them up.
-	udev_sync = 1
+	# This configuration option has an automatic default value.
+	# udev_sync = 1
 
 	# Configuration option activation/udev_rules.
 	# Use udev rules to manage LV device nodes and symlinks.
 	# When disabled, LVM will manage the device nodes and symlinks for
 	# active LVs itself. Manual intervention may be required if this
 	# setting is changed while LVs are active.
-	udev_rules = 1
+	# This configuration option has an automatic default value.
+	# udev_rules = 1
 
 	# Configuration option activation/verify_udev_operations.
 	# Use extra checks in LVM to verify udev operations.
@@ -1368,7 +1450,8 @@ activation {
 	# If LV deactivation fails, LVM will retry for a few seconds before
 	# failing. This may happen because a process run from a quick udev rule
 	# temporarily opened the device.
-	retry_deactivation = 1
+	# This configuration option has an automatic default value.
+	# retry_deactivation = 1
 
 	# Configuration option activation/missing_stripe_filler.
 	# Method to fill missing stripes when activating an incomplete LV.
@@ -1379,7 +1462,8 @@ activation {
 	# other than 'error' with mirrored or snapshotted volumes is likely to
 	# result in data corruption.
 	# This configuration option is advanced.
-	missing_stripe_filler = "error"
+	# This configuration option has an automatic default value.
+	# missing_stripe_filler = "error"
 
 	# Configuration option activation/use_linear_target.
 	# Use the linear target to optimize single stripe LVs.
@@ -1501,7 +1585,8 @@ activation {
 	# The clean/dirty state of data is tracked for each region.
 	# The value is rounded down to a power of two if necessary, and
 	# is ignored if it is not a multiple of the machine memory page size.
-	raid_region_size = 2048
+	# This configuration option has an automatic default value.
+	# raid_region_size = 2048
 
 	# Configuration option activation/error_when_full.
 	# Return errors if a thin pool runs out of space.
@@ -1546,7 +1631,8 @@ activation {
 	#     Attempt to use any extra physical volumes in the VG as spares and
 	#     replace faulty devices.
 	#
-	raid_fault_policy = "warn"
+	# This configuration option has an automatic default value.
+	# raid_fault_policy = "warn"
 
 	# Configuration option activation/mirror_image_fault_policy.
 	# Defines how a device failure in a 'mirror' LV is handled.
@@ -1583,13 +1669,15 @@ activation {
 	#     'remove' if no suitable device and space can be allocated for the
 	#     replacement.
 	#
-	mirror_image_fault_policy = "remove"
+	# This configuration option has an automatic default value.
+	# mirror_image_fault_policy = "remove"
 
 	# Configuration option activation/mirror_log_fault_policy.
 	# Defines how a device failure in a 'mirror' log LV is handled.
 	# The mirror_image_fault_policy description for mirrored LVs also
 	# applies to mirrored log LVs.
-	mirror_log_fault_policy = "allocate"
+	# This configuration option has an automatic default value.
+	# mirror_log_fault_policy = "allocate"
 
 	# Configuration option activation/snapshot_autoextend_threshold.
 	# Auto-extend a snapshot when its usage exceeds this percent.
@@ -1604,7 +1692,8 @@ activation {
 	# 840M, it is extended to 1.44G:
 	# snapshot_autoextend_threshold = 70
 	#
-	snapshot_autoextend_threshold = 100
+	# This configuration option has an automatic default value.
+	# snapshot_autoextend_threshold = 100
 
 	# Configuration option activation/snapshot_autoextend_percent.
 	# Auto-extending a snapshot adds this percent extra space.
@@ -1617,7 +1706,8 @@ activation {
 	# 840M, it is extended to 1.44G:
 	# snapshot_autoextend_percent = 20
 	#
-	snapshot_autoextend_percent = 20
+	# This configuration option has an automatic default value.
+	# snapshot_autoextend_percent = 20
 
 	# Configuration option activation/thin_pool_autoextend_threshold.
 	# Auto-extend a thin pool when its usage exceeds this percent.
@@ -1632,7 +1722,8 @@ activation {
 	# 840M, it is extended to 1.44G:
 	# thin_pool_autoextend_threshold = 70
 	#
-	thin_pool_autoextend_threshold = 100
+	# This configuration option has an automatic default value.
+	# thin_pool_autoextend_threshold = 100
 
 	# Configuration option activation/thin_pool_autoextend_percent.
 	# Auto-extending a thin pool adds this percent extra space.
@@ -1645,7 +1736,8 @@ activation {
 	# 840M, it is extended to 1.44G:
 	# thin_pool_autoextend_percent = 20
 	#
-	thin_pool_autoextend_percent = 20
+	# This configuration option has an automatic default value.
+	# thin_pool_autoextend_percent = 20
 
 	# Configuration option activation/vdo_pool_autoextend_threshold.
 	# Auto-extend a VDO pool when its usage exceeds this percent.
@@ -1704,7 +1796,8 @@ activation {
 	# Monitor LVs that are activated.
 	# The --ignoremonitoring option overrides this setting.
 	# When enabled, LVM will ask dmeventd to monitor activated LVs.
-	monitoring = 1
+	# This configuration option has an automatic default value.
+	# monitoring = 1
 
 	# Configuration option activation/polling_interval.
 	# Check pvmove or lvconvert progress at this interval (seconds).
@@ -1746,7 +1839,8 @@ activation {
 	#     This setting should not normally be used, but may sometimes
 	#     assist with data recovery.
 	#
-	activation_mode = "degraded"
+	# This configuration option has an automatic default value.
+	# activation_mode = "degraded"
 
 	# Configuration option activation/lock_start_list.
 	# Locking is started only for VGs selected by this list.
diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index 2ecd491d7..b559c89c9 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -66,6 +66,8 @@ lvchange \(em Change the attributes of logical volume(s)
     \fB--ignorelockingfailure\fP
 .br
     \fB--ignoremonitoring\fP
+.br
+    \fB--journal\fP \fIString\fP
 .br
     \fB--lockopt\fP \fIString\fP
 .br
@@ -421,6 +423,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -678,6 +682,16 @@ Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index db52c588a..679519303 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -66,6 +66,8 @@ lvconvert \(em Change logical volume layout
  \fB-h\fP|\fB--help\fP
 .br
  \fB-i\fP|\fB--interval\fP \fINumber\fP
+.br
+    \fB--journal\fP \fIString\fP
 .br
     \fB--lockopt\fP \fIString\fP
 .br
@@ -965,6 +967,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -1187,6 +1191,16 @@ Display help text.
 Report progress at regular intervals.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index 931613285..2cccbbe56 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -74,6 +74,8 @@ lvcreate \(em Create a logical volume
  \fB-K\fP|\fB--ignoreactivationskip\fP
 .br
     \fB--ignoremonitoring\fP
+.br
+    \fB--journal\fP \fIString\fP
 .br
     \fB--lockopt\fP \fIString\fP
 .br
@@ -807,6 +809,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -1079,6 +1083,16 @@ Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index f74b49190..a1740ebed 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -110,6 +110,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -230,6 +232,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index c0c32dd95..be6992e94 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -38,6 +38,8 @@ lvextend \(em Add space to a logical volume
  \fB-f\fP|\fB--force\fP
 .br
  \fB-h\fP|\fB--help\fP
+.br
+    \fB--journal\fP \fIString\fP
 .br
     \fB--lockopt\fP \fIString\fP
 .br
@@ -253,6 +255,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -377,6 +381,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 19e6c4e56..02b38ef40 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -106,6 +106,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -204,6 +206,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen
index e826a033e..7f45f6eb3 100644
--- a/man/lvm-lvpoll.8_pregen
+++ b/man/lvm-lvpoll.8_pregen
@@ -62,6 +62,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -149,6 +151,16 @@ Display help text.
 Report progress at regular intervals.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen
index ee0ab0255..51946e1ec 100644
--- a/man/lvmconfig.8_pregen
+++ b/man/lvmconfig.8_pregen
@@ -103,6 +103,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -206,6 +208,16 @@ and \fBdiff\fP types include unsupported settings in their output by default,
 all the other types ignore unsupported settings.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB-l\fP|\fB--list\fP
 .br
 List config settings with summarizing comment. This is the same as using
diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
index d2c18d90b..d64c3a31a 100644
--- a/man/lvmdevices.8_pregen
+++ b/man/lvmdevices.8_pregen
@@ -37,6 +37,8 @@ lvmdevices \(em Manage the devices file
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
  \fB-h\fP|\fB--help\fP
+.br
+    \fB--journal\fP \fIString\fP
 .br
     \fB--lockopt\fP \fIString\fP
 .br
@@ -288,6 +290,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -385,6 +389,16 @@ For testing and debugging.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen
index 42b9c50f3..7fd3d941d 100644
--- a/man/lvmdiskscan.8_pregen
+++ b/man/lvmdiskscan.8_pregen
@@ -60,6 +60,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -125,6 +127,16 @@ For testing and debugging.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index bfa7c720c..ea960eb53 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -82,6 +82,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -181,6 +183,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index 86252a627..2bd7997a3 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -88,6 +88,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -165,6 +167,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index 072699ff6..d41a4c241 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -72,6 +72,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -143,6 +145,16 @@ For testing and debugging.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index d1c50ba52..f3ea2536c 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -38,6 +38,8 @@ lvresize \(em Resize a logical volume
  \fB-f\fP|\fB--force\fP
 .br
  \fB-h\fP|\fB--help\fP
+.br
+    \fB--journal\fP \fIString\fP
 .br
     \fB--lockopt\fP \fIString\fP
 .br
@@ -211,6 +213,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -335,6 +339,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index 9e185b5b4..2b2c5f193 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -106,6 +106,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -214,6 +216,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index 7a1bfeb65..f459ab35b 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -65,6 +65,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -148,6 +150,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index f2f96a180..4add9ca69 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -109,6 +109,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -208,6 +210,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen
index 225ac7dc1..88200f21e 100644
--- a/man/pvck.8_pregen
+++ b/man/pvck.8_pregen
@@ -32,6 +32,8 @@ pvck \(em Check metadata on physical volumes
  \fB-f\fP|\fB--file\fP \fIString\fP
 .br
  \fB-h\fP|\fB--help\fP
+.br
+    \fB--journal\fP \fIString\fP
 .br
     \fB--labelsector\fP \fINumber\fP
 .br
@@ -307,6 +309,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -393,6 +397,16 @@ Metadata file to read or write.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--labelsector\fP \fINumber\fP
 .br
 By default the PV is labelled with an LVM2 identifier in its second
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index 1d9914ccf..a74a5ec2a 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -158,6 +158,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -258,6 +260,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--labelsector\fP \fINumber\fP
 .br
 By default the PV is labelled with an LVM2 identifier in its second
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index af8f0804c..22a0992b5 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -108,6 +108,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -220,6 +222,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index 095b592a4..0f70497a2 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -112,6 +112,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -234,6 +236,16 @@ Display help text.
 Report progress at regular intervals.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index 834a51678..3d4a86c09 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -61,6 +61,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -132,6 +134,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index c2f7b6bb4..87d87c8ce 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -56,6 +56,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -121,6 +123,16 @@ For testing and debugging.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index 11313f50c..32c28e4d1 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -104,6 +104,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -204,6 +206,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index 902a3527a..a15138d8b 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -6,12 +6,80 @@ pvscan \(em List all physical volumes
 .
 .SH SYNOPSIS
 .
-\fBpvscan\fP \fIoption_args\fP
+\fBpvscan\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.P
+.ad l
+ \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
+.br
+    \fB--cache\fP
+.br
+    \fB--checkcomplete\fP
+.br
+    \fB--commandprofile\fP \fIString\fP
+.br
+    \fB--config\fP \fIString\fP
+.br
+ \fB-d\fP|\fB--debug\fP
+.br
+    \fB--devices\fP \fIPV\fP
+.br
+    \fB--devicesfile\fP \fIString\fP
+.br
+    \fB--driverloaded\fP \fBy\fP|\fBn\fP
+.br
+ \fB-e\fP|\fB--exported\fP
+.br
+ \fB-h\fP|\fB--help\fP
+.br
+    \fB--ignorelockingfailure\fP
+.br
+    \fB--journal\fP \fIString\fP
+.br
+    \fB--listlvs\fP
+.br
+    \fB--listvg\fP
+.br
+    \fB--lockopt\fP \fIString\fP
+.br
+    \fB--longhelp\fP
+.br
+ \fB-j\fP|\fB--major\fP \fINumber\fP
+.br
+    \fB--minor\fP \fINumber\fP
+.br
+    \fB--nolocking\fP
+.br
+    \fB--noudevsync\fP
+.br
+ \fB-n\fP|\fB--novolumegroup\fP
+.br
+    \fB--profile\fP \fIString\fP
+.br
+ \fB-q\fP|\fB--quiet\fP
+.br
+    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+.br
+ \fB-s\fP|\fB--short\fP
+.br
+ \fB-t\fP|\fB--test\fP
+.br
+    \fB--udevoutput\fP
+.br
+ \fB-u\fP|\fB--uuid\fP
+.br
+ \fB-v\fP|\fB--verbose\fP
+.br
+    \fB--version\fP
+.br
+    \fB--vgonline\fP
+.br
+ \fB-y\fP|\fB--yes\fP
+.ad b
 .
 .SH DESCRIPTION
 .
@@ -92,21 +160,29 @@ Display PV information.
 .br
 [ \fB-u\fP|\fB--uuid\fP ]
 .br
+[    \fB--ignorelockingfailure\fP ]
+.br
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
 .P
-Autoactivate a VG when all PVs are online.
+\(em
+.P
+Record that a PV is online or offline.
 .br
 .P
 \fBpvscan\fP \fB--cache\fP
 .br
 .RS 4
 .ad l
-[ \fB-a\fP|\fB--activate\fP \fBay\fP ]
-.br
 [ \fB-j\fP|\fB--major\fP \fINumber\fP ]
 .br
+[    \fB--ignorelockingfailure\fP ]
+.br
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+.br
 [    \fB--minor\fP \fINumber\fP ]
 .br
 [    \fB--noudevsync\fP ]
@@ -118,16 +194,100 @@ Autoactivate a VG when all PVs are online.
 [ \fIString\fP|\fIPV\fP ... ]
 .RE
 .P
-Common options for command:
-.
+\(em
+.P
+Record that a PV is online and autoactivate the VG if complete.
+.br
+.P
+\fBpvscan\fP \fB--cache\fP \fB-a\fP|\fB--activate\fP \fBay\fP
+.br
 .RS 4
 .ad l
+[ \fB-j\fP|\fB--major\fP \fINumber\fP ]
+.br
 [    \fB--ignorelockingfailure\fP ]
 .br
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+.br
+[    \fB--minor\fP \fINumber\fP ]
+.br
+[    \fB--noudevsync\fP ]
+.br
+[ COMMON_OPTIONS ]
+.ad b
+.RE
+.RS 4
+[ \fIString\fP|\fIPV\fP ... ]
+.RE
+.P
+\(em
+.P
+Record that a PV is online and list the VG using the PV.
+.br
+.P
+\fBpvscan\fP \fB--cache\fP \fB--listvg\fP \fIPV\fP
+.br
+.RS 4
+.ad l
+[    \fB--ignorelockingfailure\fP ]
+.br
+[    \fB--checkcomplete\fP ]
+.br
+[    \fB--vgonline\fP ]
+.br
+[    \fB--udevoutput\fP ]
+.br
+[ COMMON_OPTIONS ]
 .ad b
 .RE
 .P
+\(em
+.P
+Record that a PV is online and list LVs using the PV.
+.br
+.P
+\fBpvscan\fP \fB--cache\fP \fB--listlvs\fP \fIPV\fP
+.br
+.RS 4
+.ad l
+[    \fB--ignorelockingfailure\fP ]
+.br
+[    \fB--checkcomplete\fP ]
+.br
+[    \fB--vgonline\fP ]
+.br
+[ COMMON_OPTIONS ]
+.ad b
+.RE
+.P
+\(em
+.P
+List LVs using the PV.
+.br
+.P
+\fBpvscan\fP \fB--listlvs\fP \fIPV\fP
+.br
+.RS 4
+.ad l
+[ COMMON_OPTIONS ]
+.ad b
+.RE
+.P
+\(em
+.P
+List the VG using the PV.
+.br
+.P
+\fBpvscan\fP \fB--listvg\fP \fIPV\fP
+.br
+.RS 4
+.ad l
+[ COMMON_OPTIONS ]
+.ad b
+.RE
+.P
+\(em
+.P
 Common options for lvm:
 .
 .RS 4
@@ -154,6 +314,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -183,6 +345,15 @@ Auto-activate LVs in a VG when the PVs scanned have completed the VG.
 Scan one or more devices and record that they are online.
 .
 .HP
+\fB--checkcomplete\fP
+.br
+Check if all the devices used by a VG or LV are present,
+and print "complete" or "incomplete" for each listed
+VG or LV.  This option is used as a part of event-based
+autoactivation, so pvscan will do nothing if this option
+is set and event_activation=0 in the config settings.
+.
+.HP
 \fB--commandprofile\fP \fIString\fP
 .br
 The command profile to use for command configuration.
@@ -241,6 +412,26 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
+\fB--listlvs\fP
+.br
+Print a list of LVs that use the device.
+.
+.HP
+\fB--listvg\fP
+.br
+Print the VG that uses the device.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
@@ -323,6 +514,11 @@ error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
 .
 .HP
+\fB--udevoutput\fP
+.br
+Command output is modified to be imported from a udev rule.
+.
+.HP
 \fB-u\fP|\fB--uuid\fP
 .br
 Show UUIDs in addition to device names.
@@ -339,6 +535,12 @@ of messages sent to stdout and stderr.
 Display version information.
 .
 .HP
+\fB--vgonline\fP
+.br
+The first command to see a complete VG will report it uniquely.
+Other commands to see the complete VG will report it differently.
+.
+.HP
 \fB-y\fP|\fB--yes\fP
 .br
 Do not prompt for confirmation interactively but always assume the
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index ae9b476f5..5e658093a 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -81,6 +81,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -165,6 +167,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen
index 2c4d18e30..695e05582 100644
--- a/man/vgcfgrestore.8_pregen
+++ b/man/vgcfgrestore.8_pregen
@@ -31,6 +31,8 @@ vgcfgrestore \(em Restore volume group configuration
     \fB--force\fP
 .br
  \fB-h\fP|\fB--help\fP
+.br
+    \fB--journal\fP \fIString\fP
 .br
  \fB-l\fP|\fB--list\fP
 .br
@@ -164,6 +166,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -244,6 +248,16 @@ thin pool kernel metadata precisely.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB-l\fP|\fB--list\fP
 .br
 List metadata backup and archive files pertaining to the VG.
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 19797daa4..05c67aead 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -52,6 +52,8 @@ vgchange \(em Change volume group attributes
     \fB--ignorelockingfailure\fP
 .br
     \fB--ignoremonitoring\fP
+.br
+    \fB--journal\fP \fIString\fP
 .br
     \fB--lockopt\fP \fIString\fP
 .br
@@ -421,6 +423,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -601,6 +605,16 @@ Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index 5e575f6f7..a8fa33f4b 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -72,6 +72,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -137,6 +139,16 @@ For testing and debugging.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index baf3b5bdd..4d54c2b27 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -67,6 +67,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -153,6 +155,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--labelsector\fP \fINumber\fP
 .br
 By default the PV is labelled with an LVM2 identifier in its second
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index b0d9a04de..9bb8d3868 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -107,6 +107,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -235,6 +237,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--labelsector\fP \fINumber\fP
 .br
 By default the PV is labelled with an LVM2 identifier in its second
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index 50fb24bd6..9c694921d 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -105,6 +105,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -217,6 +219,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index 429483894..a87058946 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -93,6 +93,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -162,6 +164,16 @@ For testing and debugging.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index 6a7ab2bee..2b2650527 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -85,6 +85,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -176,6 +178,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--labelsector\fP \fINumber\fP
 .br
 By default the PV is labelled with an LVM2 identifier in its second
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index 70f8b76f6..5cd8fab84 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -81,6 +81,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -157,6 +159,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen
index 9bc8a4654..bf0af5841 100644
--- a/man/vgimportclone.8_pregen
+++ b/man/vgimportclone.8_pregen
@@ -62,6 +62,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -147,6 +149,16 @@ will not be changed (nor will their associated PVs).
 Add devices to the devices file.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgimportdevices.8_pregen b/man/vgimportdevices.8_pregen
index 30bbb906e..5897e29ad 100644
--- a/man/vgimportdevices.8_pregen
+++ b/man/vgimportdevices.8_pregen
@@ -86,6 +86,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -161,6 +163,16 @@ See \fBlvmsystemid\fP(7) for more information about foreign VGs.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen
index f98ad7403..a36e0c7bd 100644
--- a/man/vgmerge.8_pregen
+++ b/man/vgmerge.8_pregen
@@ -59,6 +59,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -130,6 +132,16 @@ For testing and debugging.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB-l\fP|\fB--list\fP
 .br
 Display merged destination VG like vgdisplay -v.
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index 7432befb0..0a03e1582 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -66,6 +66,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -137,6 +139,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index 1b897a6d3..f3178a618 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -31,6 +31,8 @@ vgreduce \(em Remove physical volume(s) from a volume group
  \fB-f\fP|\fB--force\fP
 .br
  \fB-h\fP|\fB--help\fP
+.br
+    \fB--journal\fP \fIString\fP
 .br
     \fB--lockopt\fP \fIString\fP
 .br
@@ -144,6 +146,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -226,6 +230,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index 0b6ebb522..779c0f13e 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -67,6 +67,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -138,6 +140,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index c600a3fcf..d3e776ca4 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -85,6 +85,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -162,6 +164,16 @@ Use with extreme caution.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index 63d1c7dc3..ee5083a93 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -102,6 +102,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -201,6 +203,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index bd554fa82..824e7f673 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -59,6 +59,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -130,6 +132,16 @@ Allows a command to continue with read-only metadata
 operations after locking failures.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen
index f45cfcabc..065c8b52a 100644
--- a/man/vgsplit.8_pregen
+++ b/man/vgsplit.8_pregen
@@ -102,6 +102,8 @@ Common options for lvm:
 .br
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .br
+[    \fB--journal\fP \fIString\fP ]
+.br
 [    \fB--lockopt\fP \fIString\fP ]
 .br
 [    \fB--longhelp\fP ]
@@ -198,6 +200,16 @@ For testing and debugging.
 Display help text.
 .
 .HP
+\fB--journal\fP \fIString\fP
+.br
+Record information in the systemd journal.
+This information is in addition to information
+enabled by the lvm.conf log/journal setting.
+command: record information about the command.
+output: record the default command output.
+debug: record full command debugging.
+.
+.HP
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-09-23 14:52 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2021-09-23 14:52 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4515acf73430a8734f477b10ae6e3473d02999ae
Commit:        4515acf73430a8734f477b10ae6e3473d02999ae
Parent:        4cfa80f02f769f723fad37d3e1d8697a106ee603
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Wed Sep 22 14:48:58 2021 +0200
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Wed Sep 22 14:48:58 2021 +0200

make: generate

---
 man/lvchange.8_pregen        | 11 +++++++++++
 man/lvconvert.8_pregen       | 11 +++++++++++
 man/lvcreate.8_pregen        | 11 +++++++++++
 man/lvdisplay.8_pregen       |  9 +++++++++
 man/lvextend.8_pregen        | 11 +++++++++++
 man/lvm-fullreport.8_pregen  |  9 +++++++++
 man/lvm-lvpoll.8_pregen      |  9 +++++++++
 man/lvmconfig.8_pregen       |  9 +++++++++
 man/lvmdevices.8_pregen      | 13 +++++++++++++
 man/lvmdiskscan.8_pregen     |  9 +++++++++
 man/lvreduce.8_pregen        |  9 +++++++++
 man/lvremove.8_pregen        |  9 +++++++++
 man/lvrename.8_pregen        |  9 +++++++++
 man/lvresize.8_pregen        | 11 +++++++++++
 man/lvs.8_pregen             |  9 +++++++++
 man/lvscan.8_pregen          |  9 +++++++++
 man/pvchange.8_pregen        |  9 +++++++++
 man/pvck.8_pregen            | 11 +++++++++++
 man/pvcreate.8_pregen        |  9 +++++++++
 man/pvdisplay.8_pregen       |  9 +++++++++
 man/pvmove.8_pregen          |  9 +++++++++
 man/pvremove.8_pregen        |  9 +++++++++
 man/pvresize.8_pregen        |  9 +++++++++
 man/pvs.8_pregen             |  9 +++++++++
 man/pvscan.8_pregen          |  9 +++++++++
 man/vgcfgbackup.8_pregen     |  9 +++++++++
 man/vgcfgrestore.8_pregen    | 11 +++++++++++
 man/vgchange.8_pregen        | 11 +++++++++++
 man/vgck.8_pregen            |  9 +++++++++
 man/vgconvert.8_pregen       |  9 +++++++++
 man/vgcreate.8_pregen        |  9 +++++++++
 man/vgdisplay.8_pregen       |  9 +++++++++
 man/vgexport.8_pregen        |  9 +++++++++
 man/vgextend.8_pregen        |  9 +++++++++
 man/vgimport.8_pregen        |  9 +++++++++
 man/vgimportclone.8_pregen   |  9 +++++++++
 man/vgimportdevices.8_pregen |  9 +++++++++
 man/vgmerge.8_pregen         |  9 +++++++++
 man/vgmknodes.8_pregen       |  9 +++++++++
 man/vgreduce.8_pregen        | 11 +++++++++++
 man/vgremove.8_pregen        |  9 +++++++++
 man/vgrename.8_pregen        |  9 +++++++++
 man/vgs.8_pregen             |  9 +++++++++
 man/vgscan.8_pregen          |  9 +++++++++
 man/vgsplit.8_pregen         |  9 +++++++++
 45 files changed, 427 insertions(+)

diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index 3cfa7330d..2ecd491d7 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -82,6 +82,8 @@ lvchange \(em Change the attributes of logical volume(s)
     \fB--\fP[\fBraid\fP]\fBminrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
     \fB--monitor\fP \fBy\fP|\fBn\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br
@@ -423,6 +425,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -725,6 +729,13 @@ automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index 4fafe5d29..db52c588a 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -86,6 +86,8 @@ lvconvert \(em Change logical volume layout
  \fB-m\fP|\fB--mirrors\fP [\fB+\fP|\fB-\fP]\fINumber\fP
 .br
  \fB-n\fP|\fB--name\fP \fIString\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br
@@ -967,6 +969,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -1276,6 +1280,13 @@ When unspecified, a default name of "lvol#" is
 generated, where # is a number generated by LVM.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index b642ad0c2..931613285 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -96,6 +96,8 @@ lvcreate \(em Create a logical volume
     \fB--monitor\fP \fBy\fP|\fBn\fP
 .br
  \fB-n\fP|\fB--name\fP \fIString\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br
@@ -809,6 +811,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -1163,6 +1167,13 @@ When unspecified, a default name of "lvol#" is
 generated, where # is a number generated by LVM.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index 8ff34bc08..f74b49190 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -114,6 +114,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -257,6 +259,13 @@ Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index fa0aec63a..c0c32dd95 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -46,6 +46,8 @@ lvextend \(em Add space to a logical volume
  \fB-m\fP|\fB--mirrors\fP \fINumber\fP
 .br
  \fB-n\fP|\fB--nofsck\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br
@@ -255,6 +257,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -396,6 +400,13 @@ requires it. You may need to use --force to proceed with
 this option.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 399d4ff9a..19e6c4e56 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -110,6 +110,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -231,6 +233,13 @@ Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen
index cf18ebeec..e826a033e 100644
--- a/man/lvm-lvpoll.8_pregen
+++ b/man/lvm-lvpoll.8_pregen
@@ -66,6 +66,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -158,6 +160,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen
index 6cdb577c1..ee0ab0255 100644
--- a/man/lvmconfig.8_pregen
+++ b/man/lvmconfig.8_pregen
@@ -107,6 +107,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -238,6 +240,13 @@ The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
index e581a8d01..d2c18d90b 100644
--- a/man/lvmdevices.8_pregen
+++ b/man/lvmdevices.8_pregen
@@ -41,6 +41,8 @@ lvmdevices \(em Manage the devices file
     \fB--lockopt\fP \fIString\fP
 .br
     \fB--longhelp\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br
@@ -239,6 +241,8 @@ Find the device with the given PVID and add it to the devices file.
 .br
 .RS 4
 .ad l
+[    \fB--deviceidtype\fP \fIString\fP ]
+.br
 [ COMMON_OPTIONS ]
 .ad b
 .RE
@@ -288,6 +292,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -390,6 +396,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen
index 5f31e8115..42b9c50f3 100644
--- a/man/lvmdiskscan.8_pregen
+++ b/man/lvmdiskscan.8_pregen
@@ -64,6 +64,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -139,6 +141,13 @@ Display long help text.
 Only report PVs.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index 0a659e1c8..bfa7c720c 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -86,6 +86,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -197,6 +199,13 @@ requires it. You may need to use --force to proceed with
 this option.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index a5ed82666..86252a627 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -92,6 +92,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -174,6 +176,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nohistory\fP
 .br
 Do not record history of LVs being removed.
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index 5b5975fa3..072699ff6 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -76,6 +76,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -152,6 +154,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index 36c1760fc..d1c50ba52 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -44,6 +44,8 @@ lvresize \(em Resize a logical volume
     \fB--longhelp\fP
 .br
  \fB-n\fP|\fB--nofsck\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br
@@ -213,6 +215,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -349,6 +353,13 @@ requires it. You may need to use --force to proceed with
 this option.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index d822347a1..9e185b5b4 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -110,6 +110,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -241,6 +243,13 @@ Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index 40438a7d2..7a1bfeb65 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -69,6 +69,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -157,6 +159,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index 577352d2a..f2f96a180 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -113,6 +113,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -225,6 +227,13 @@ not store metadata in the metadata areas of the PV.
 If no, lvm will store metadata on the PV.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen
index 6e55916a3..225ac7dc1 100644
--- a/man/pvck.8_pregen
+++ b/man/pvck.8_pregen
@@ -38,6 +38,8 @@ pvck \(em Check metadata on physical volumes
     \fB--lockopt\fP \fIString\fP
 .br
     \fB--longhelp\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br
@@ -309,6 +311,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -408,6 +412,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index 26e5141fe..1d9914ccf 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -162,6 +162,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -296,6 +298,13 @@ Specifies the type of on-disk metadata to use.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index ff5d9f50a..af8f0804c 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -112,6 +112,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -245,6 +247,13 @@ Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index a764ed9ca..095b592a4 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -116,6 +116,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -248,6 +250,13 @@ Display long help text.
 Move only the extents belonging to the named LV.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index b34f2a042..834a51678 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -65,6 +65,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -141,6 +143,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index ea309b311..c2f7b6bb4 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -60,6 +60,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -130,6 +132,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index 08b5600f5..11313f50c 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -108,6 +108,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -231,6 +233,13 @@ Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index 8025d6c34..902a3527a 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -158,6 +158,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -260,6 +262,13 @@ The major number of a device.
 The minor number of a device.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index ce7102595..ae9b476f5 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -85,6 +85,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -174,6 +176,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen
index 841626728..2c4d18e30 100644
--- a/man/vgcfgrestore.8_pregen
+++ b/man/vgcfgrestore.8_pregen
@@ -39,6 +39,8 @@ vgcfgrestore \(em Restore volume group configuration
     \fB--longhelp\fP
 .br
  \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br
@@ -166,6 +168,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -264,6 +268,13 @@ Specifies the type of on-disk metadata to use.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 31fc458da..19797daa4 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -70,6 +70,8 @@ vgchange \(em Change volume group attributes
     \fB--metadataprofile\fP \fIString\fP
 .br
     \fB--monitor\fP \fBy\fP|\fBn\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br
@@ -423,6 +425,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -655,6 +659,13 @@ automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index ae312424a..5e575f6f7 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -76,6 +76,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -146,6 +148,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index d18e7af08..baf3b5bdd 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -71,6 +71,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -183,6 +185,13 @@ Specifies the type of on-disk metadata to use.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index 7e357a548..b0d9a04de 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -111,6 +111,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -290,6 +292,13 @@ Specifies the type of on-disk metadata to use.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index 467f74506..50fb24bd6 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -109,6 +109,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -237,6 +239,13 @@ Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index 0e6e0b164..429483894 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -97,6 +97,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -171,6 +173,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index e5e01c4c5..6a7ab2bee 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -89,6 +89,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -214,6 +216,13 @@ Specifies the type of on-disk metadata to use.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index c0b815b65..70f8b76f6 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -85,6 +85,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -166,6 +168,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen
index ee9bbe66c..9bc8a4654 100644
--- a/man/vgimportclone.8_pregen
+++ b/man/vgimportclone.8_pregen
@@ -66,6 +66,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -156,6 +158,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgimportdevices.8_pregen b/man/vgimportdevices.8_pregen
index 364ef52a4..30bbb906e 100644
--- a/man/vgimportdevices.8_pregen
+++ b/man/vgimportdevices.8_pregen
@@ -90,6 +90,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -170,6 +172,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen
index e2292182a..f98ad7403 100644
--- a/man/vgmerge.8_pregen
+++ b/man/vgmerge.8_pregen
@@ -63,6 +63,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -144,6 +146,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index 10f235949..7432befb0 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -70,6 +70,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -146,6 +148,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index 1509e4bd0..1b897a6d3 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -37,6 +37,8 @@ vgreduce \(em Remove physical volume(s) from a volume group
     \fB--longhelp\fP
 .br
     \fB--mirrorsonly\fP
+.br
+    \fB--nohints\fP
 .br
     \fB--nolocking\fP
 .br
@@ -146,6 +148,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -238,6 +242,13 @@ Display long help text.
 Only remove missing PVs from mirror LVs.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index cf5c48ce4..0b6ebb522 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -71,6 +71,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -147,6 +149,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index 24ff24744..c600a3fcf 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -89,6 +89,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -171,6 +173,13 @@ See \fBlvmlockd\fP(8) for more information.
 Display long help text.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index ffb4ddc41..63d1c7dc3 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -106,6 +106,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -228,6 +230,13 @@ Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index 959e16190..bd554fa82 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -63,6 +63,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -145,6 +147,13 @@ Also checks the LVM special files in /dev that are needed for active
 LVs and creates any missing ones and removes unused ones.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.
diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen
index 8a0ae597e..f45cfcabc 100644
--- a/man/vgsplit.8_pregen
+++ b/man/vgsplit.8_pregen
@@ -106,6 +106,8 @@ Common options for lvm:
 .br
 [    \fB--longhelp\fP ]
 .br
+[    \fB--nohints\fP ]
+.br
 [    \fB--nolocking\fP ]
 .br
 [    \fB--profile\fP \fIString\fP ]
@@ -232,6 +234,13 @@ Specifies the type of on-disk metadata to use.
 Move only PVs used by the named LV.
 .
 .HP
+\fB--nohints\fP
+.br
+Do not use the hints file to locate devices for PVs. A command may read
+more devices to find PVs when hints are not used. The command will still
+perform standard hint file invalidation where appropriate.
+.
+.HP
 \fB--nolocking\fP
 .br
 Disable locking.



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-08-09 14:27 Marian Csontos
  0 siblings, 0 replies; 24+ messages in thread
From: Marian Csontos @ 2021-08-09 14:27 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b328cfee5288c14e771404821baa646b5f378a3c
Commit:        b328cfee5288c14e771404821baa646b5f378a3c
Parent:        d0ab5bf7f98da83cd5d7ec393554dff309482cf4
Author:        root <root@bot-frawhide-x86-64.lab.eng.brq.redhat.com>
AuthorDate:    Thu Aug 5 21:38:43 2021 +0200
Committer:     root <root@bot-frawhide-x86-64.lab.eng.brq.redhat.com>
CommitterDate: Thu Aug 5 21:38:43 2021 +0200

make: generate

---
 conf/example.conf.in | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/conf/example.conf.in b/conf/example.conf.in
index 50cf6f42b..2dc6dd9e6 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -67,25 +67,13 @@ devices {
 	# setting applies only to the udev-managed device directory; other
 	# directories will be scanned fully. LVM needs to be compiled with
 	# udev support for this setting to apply.
-	obtain_device_list_from_udev = 1
+	obtain_device_list_from_udev = 0
 
 	# Configuration option devices/external_device_info_source.
-	# Select an external device information source.
-	# Some information may already be available in the system and LVM can
-	# use this information to determine the exact type or use of devices it
-	# processes. Using an existing external device information source can
-	# speed up device processing as LVM does not need to run its own native
-	# routines to acquire this information. For example, this information
-	# is used to drive LVM filtering like MD component detection, multipath
-	# component detection, partition detection and others.
-	#
-	# Accepted values:
-	#   none
-	#     No external device information source is used.
-	#   udev
-	#     Reuse existing udev database records. Applicable only if LVM is
-	#     compiled with udev support.
-	#
+	# Enable device information from udev.
+	# If set to "udev", lvm will supplement its own native device information
+	# with information from libudev. This can potentially improve the detection
+	# of MD component devices and multipath component devices.
 	external_device_info_source = "none"
 
 	# Configuration option devices/hints.
@@ -232,6 +220,12 @@ devices {
 	# Ignore devices that are components of DM multipath devices.
 	multipath_component_detection = 1
 
+	# Configuration option devices/multipath_wwids_file.
+	# The path to the multipath wwids file used for multipath component detection.
+	# Set this to an empty string to disable the use of the multipath wwids file.
+	# This configuration option has an automatic default value.
+	# multipath_wwids_file = "/etc/multipath/wwids"
+
 	# Configuration option devices/md_component_detection.
 	# Enable detection and exclusion of MD component devices.
 	# An MD component device is a block device that MD uses as part



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-05-07 15:45 Marian Csontos
  0 siblings, 0 replies; 24+ messages in thread
From: Marian Csontos @ 2021-05-07 15:45 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=64719861ec094607162cd4faa4a0b2f1d8a3421c
Commit:        64719861ec094607162cd4faa4a0b2f1d8a3421c
Parent:        00f603de2c507ee12195487fa007510ee3ff9770
Author:        Marian Csontos <mcsontos@redhat.com>
AuthorDate:    Fri May 7 17:44:43 2021 +0200
Committer:     Marian Csontos <mcsontos@redhat.com>
CommitterDate: Fri May 7 17:44:43 2021 +0200

make: generate

---
 man/lvconvert.8_pregen | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index 84b4ac75e..d733ab64f 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -551,7 +551,7 @@ Attach a writecache to an LV, converts the LV to type writecache.
 .RE
 .P
 .RS 4
-LV1 types: linear striped raid
+LV1 types: linear striped thinpool raid
 .RE
 .P
 \(em
@@ -605,7 +605,7 @@ Add a writecache to an LV, using a specified cache device.
 .RE
 .P
 .RS 4
-LV1 types: linear striped raid
+LV1 types: linear striped thinpool raid
 .RE
 .P
 \(em



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-04-19 13:01 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2021-04-19 13:01 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5eac292925ca96bee9a1f50355ca0e8b0ef4a9a6
Commit:        5eac292925ca96bee9a1f50355ca0e8b0ef4a9a6
Parent:        d1f8978ac5adbe7274faa62011dbb30a95719191
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Thu Apr 15 20:11:52 2021 +0200
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Apr 19 14:54:37 2021 +0200

make: generate

---
 man/lvchange.8_pregen        |  664 +++++---------
 man/lvconvert.8_pregen       | 1449 +++++++++++--------------------
 man/lvcreate.8_pregen        | 1945 +++++++++++-------------------------------
 man/lvdisplay.8_pregen       |  358 +++-----
 man/lvextend.8_pregen        |  454 +++-------
 man/lvm-fullreport.8_pregen  |  334 +++-----
 man/lvm-lvpoll.8_pregen      |  266 ++----
 man/lvmconfig.8_pregen       |  317 ++-----
 man/lvmdevices.8_pregen      |  351 +++-----
 man/lvmdiskscan.8_pregen     |  220 ++---
 man/lvreduce.8_pregen        |  263 ++----
 man/lvremove.8_pregen        |  277 ++----
 man/lvrename.8_pregen        |  250 ++----
 man/lvresize.8_pregen        |  407 +++------
 man/lvs.8_pregen             |  438 +++-------
 man/lvscan.8_pregen          |  234 ++---
 man/pvchange.8_pregen        |  272 ++----
 man/pvck.8_pregen            |  389 +++------
 man/pvcreate.8_pregen        |  329 ++-----
 man/pvdisplay.8_pregen       |  346 +++-----
 man/pvmove.8_pregen          |  367 ++------
 man/pvremove.8_pregen        |  228 ++---
 man/pvresize.8_pregen        |  236 ++---
 man/pvs.8_pregen             |  353 +++-----
 man/pvscan.8_pregen          |  303 ++-----
 man/vgcfgbackup.8_pregen     |  247 ++----
 man/vgcfgrestore.8_pregen    |  308 ++-----
 man/vgchange.8_pregen        |  610 ++++---------
 man/vgck.8_pregen            |  236 ++---
 man/vgconvert.8_pregen       |  250 ++----
 man/vgcreate.8_pregen        |  349 ++------
 man/vgdisplay.8_pregen       |  341 +++-----
 man/vgexport.8_pregen        |  250 ++----
 man/vgextend.8_pregen        |  288 ++-----
 man/vgimport.8_pregen        |  249 ++----
 man/vgimportclone.8_pregen   |  237 ++---
 man/vgimportdevices.8_pregen |  250 ++----
 man/vgmerge.8_pregen         |  228 ++---
 man/vgmknodes.8_pregen       |  241 ++----
 man/vgreduce.8_pregen        |  306 ++-----
 man/vgremove.8_pregen        |  248 ++----
 man/vgrename.8_pregen        |  247 ++----
 man/vgs.8_pregen             |  355 +++-----
 man/vgscan.8_pregen          |  229 ++---
 man/vgsplit.8_pregen         |  277 ++----
 45 files changed, 4733 insertions(+), 12063 deletions(-)

diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index 93c7311b5..3cfa7330d 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -1,8 +1,11 @@
 .TH LVCHANGE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvchange - Change the attributes of logical volume(s)
+.
+lvchange \(em Change the attributes of logical volume(s)
 .
 .SH SYNOPSIS
+.
 \fBlvchange\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
@@ -10,250 +13,136 @@ lvchange - Change the attributes of logical volume(s)
 .P
 .ad l
  \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
-.ad b
 .br
-.ad l
     \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP
-.ad b
 .br
-.ad l
     \fB--addtag\fP \fITag\fP
-.ad b
 .br
-.ad l
-    \fB--alloc\fP 
+    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.ad b
 .br
-.ad l
  \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
-.ad b
 .br
-.ad l
     \fB--cachepolicy\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--cachesettings\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--commandprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--compression\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--config\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-d\fP|\fB--debug\fP
-.ad b
 .br
-.ad l
     \fB--deduplication\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--deltag\fP \fITag\fP
-.ad b
 .br
-.ad l
     \fB--detachprofile\fP
-.ad b
 .br
-.ad l
     \fB--devices\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--devicesfile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
-.ad b
 .br
-.ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-f\fP|\fB--force\fP
-.ad b
 .br
-.ad l
  \fB-h\fP|\fB--help\fP
-.ad b
 .br
-.ad l
  \fB-K\fP|\fB--ignoreactivationskip\fP
-.ad b
 .br
-.ad l
     \fB--ignorelockingfailure\fP
-.ad b
 .br
-.ad l
     \fB--ignoremonitoring\fP
-.ad b
 .br
-.ad l
     \fB--lockopt\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--longhelp\fP
-.ad b
 .br
-.ad l
  \fB-j\fP|\fB--major\fP \fINumber\fP
-.ad b
 .br
-.ad l
-    \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT]
-.ad b
+    \fB--\fP[\fBraid\fP]\fBmaxrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-.ad l
     \fB--metadataprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--minor\fP \fINumber\fP
-.ad b
 .br
-.ad l
-    \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT]
-.ad b
+    \fB--\fP[\fBraid\fP]\fBminrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-.ad l
     \fB--monitor\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--nolocking\fP
-.ad b
 .br
-.ad l
     \fB--noudevsync\fP
-.ad b
 .br
-.ad l
  \fB-P\fP|\fB--partial\fP
-.ad b
 .br
-.ad l
  \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP
-.ad b
 .br
-.ad l
  \fB-M\fP|\fB--persistent\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--poll\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--profile\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-q\fP|\fB--quiet\fP
-.ad b
 .br
-.ad l
  \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
-.ad b
 .br
-.ad l
     \fB--readonly\fP
-.ad b
 .br
-.ad l
     \fB--rebuild\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--refresh\fP
-.ad b
 .br
-.ad l
     \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.ad b
 .br
-.ad l
     \fB--resync\fP
-.ad b
 .br
-.ad l
  \fB-S\fP|\fB--select\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--setautoactivation\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
-    \fB--[raid]syncaction\fP \fBcheck\fP|\fBrepair\fP
-.ad b
+    \fB--\fP[\fBraid\fP]\fBsyncaction\fP \fBcheck\fP|\fBrepair\fP
 .br
-.ad l
     \fB--sysinit\fP
-.ad b
 .br
-.ad l
  \fB-t\fP|\fB--test\fP
-.ad b
 .br
-.ad l
  \fB-v\fP|\fB--verbose\fP
-.ad b
 .br
-.ad l
     \fB--version\fP
-.ad b
 .br
-.ad l
-    \fB--[raid]writebehind\fP \fINumber\fP
-.ad b
+    \fB--\fP[\fBraid\fP]\fBwritebehind\fP \fINumber\fP
 .br
-.ad l
-    \fB--[raid]writemostly\fP \fIPV\fP[\fB:t\fP|\fBn\fP|\fBy\fP]
-.ad b
+    \fB--\fP[\fBraid\fP]\fBwritemostly\fP \fIPV\fP[\fB:t\fP|\fBn\fP|\fBy\fP]
 .br
-.ad l
  \fB-y\fP|\fB--yes\fP
-.ad b
 .br
-.ad l
  \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .ad b
+.
 .SH DESCRIPTION
+.
 lvchange changes LV attributes in the VG, changes LV activation in the
 kernel, and includes other utilities for LV maintenance.
+.
 .SH USAGE
+.
 Change a general LV attribute. 
 .br
 For options listed in parentheses, any one is 
@@ -279,9 +168,9 @@ required, after which the others are optional.
 .br
      \fB--deltag\fP \fITag\fP
 .br
-     \fB--alloc\fP 
+     \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
 .br
      \fB--compression\fP \fBy\fP|\fBn\fP
@@ -306,13 +195,13 @@ required, after which the others are optional.
 .br
      \fB--cachesettings\fP \fIString\fP
 .br
-     \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT]
+     \fB--\fP[\fBraid\fP]\fBminrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-     \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT]
+     \fB--\fP[\fBraid\fP]\fBmaxrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-     \fB--[raid]writebehind\fP \fINumber\fP
+     \fB--\fP[\fBraid\fP]\fBwritebehind\fP \fINumber\fP
 .br
-     \fB--[raid]writemostly\fP \fIPV\fP[\fB:t\fP|\fBn\fP|\fBy\fP] )
+     \fB--\fP[\fBraid\fP]\fBwritemostly\fP \fIPV\fP[\fB:t\fP|\fBn\fP|\fBy\fP] )
 .RE
 .RS 4
  \fIVG\fP|\fILV\fP|\fITag\fP|\fISelect\fP ...
@@ -321,60 +210,72 @@ required, after which the others are optional.
 .RS 4
 .ad l
 [ \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poll\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--monitor\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Resyncronize a mirror or raid LV. 
 .br
 Use to reset 'R' attribute on a not initially synchronized LV.
 .br
 .P
-\fBlvchange\fP \fB--resync\fP \fIVG\fP|\fILV\fP\fI_mirror_raid\fP|\fITag\fP|\fISelect\fP ...
+\fBlvchange\fP \fB--resync\fP \fIVG\fP|\fILV1\fP|\fITag\fP|\fISelect\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: mirror raid
+.RE
+.P
+\(em
+.P
 Resynchronize or check a raid LV.
 .br
 .P
-\fBlvchange\fP \fB--syncaction\fP \fBcheck\fP|\fBrepair\fP \fIVG\fP|\fILV\fP\fI_raid\fP|\fITag\fP|\fISelect\fP ...
+\fBlvchange\fP \fB--syncaction\fP \fBcheck\fP|\fBrepair\fP \fIVG\fP|\fILV1\fP|\fITag\fP|\fISelect\fP ...
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: raid
+.RE
+.P
+\(em
+.P
 Reconstruct data on specific PVs of a raid LV.
 .br
 .P
-\fBlvchange\fP \fB--rebuild\fP \fIPV\fP \fIVG\fP|\fILV\fP\fI_raid\fP|\fITag\fP|\fISelect\fP ...
+\fBlvchange\fP \fB--rebuild\fP \fIPV\fP \fIVG\fP|\fILV1\fP|\fITag\fP|\fISelect\fP ...
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: raid
+.RE
+.P
+\(em
+.P
 Activate or deactivate an LV.
 .br
 .P
@@ -383,41 +284,27 @@ Activate or deactivate an LV.
 .RS 4
 .ad l
 [ \fB-P\fP|\fB--partial\fP ]
-.ad b
 .br
-.ad l
 [ \fB-K\fP|\fB--ignoreactivationskip\fP ]
-.ad b
 .br
-.ad l
 [    \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poll\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--monitor\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--sysinit\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Reactivate an LV using the latest metadata.
 .br
 .P
@@ -426,36 +313,32 @@ Reactivate an LV using the latest metadata.
 .RS 4
 .ad l
 [ \fB-P\fP|\fB--partial\fP ]
-.ad b
 .br
-.ad l
 [    \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poll\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--monitor\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Start or stop monitoring an LV from dmeventd.
 .br
 .P
 \fBlvchange\fP \fB--monitor\fP \fBy\fP|\fBn\fP \fIVG\fP|\fILV\fP|\fITag\fP|\fISelect\fP ...
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Start or stop processing an LV conversion.
 .br
 .P
@@ -464,13 +347,13 @@ Start or stop processing an LV conversion.
 .RS 4
 .ad l
 [    \fB--monitor\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Make the minor device number persistent for an LV.
 .br
 .P
@@ -479,126 +362,81 @@ Make the minor device number persistent for an LV.
 .RS 4
 .ad l
 [ \fB-j\fP|\fB--major\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poll\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--monitor\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignoremonitoring\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
-.ad b
 Change the active state of LVs.
 An active LV can be used through a block device,
 allowing data on the LV to be accessed.
@@ -616,18 +454,17 @@ activation commands.  By default, LVs are autoactivated.
 An autoactivation property can be set on a VG or LV to disable autoactivation,
 see --setautoactivation y|n in vgchange, lvchange, vgcreate, and lvcreate.
 Display the property with vgs or lvs "-o autoactivation".
-The lvm.conf auto_activation_volume_list includes names of VGs or LVs
+The \fBlvm.conf\fP(5) auto_activation_volume_list includes names of VGs or LVs
 that should be autoactivated, and anything not listed is not autoactivated.
 When auto_activation_volume_list is undefined (the default), it has no effect.
 If auto_activation_volume_list is defined and empty, no LVs are autoactivated.
 Items included by auto_activation_volume_list will not be autoactivated if
 the autoactivation property has been disabled.
 See \fBlvmlockd\fP(8) for more information about activation options \fBey\fP and \fBsy\fP for shared VGs.
+.
 .HP
-.ad l
 \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP
 .br
-.ad b
 Determines if LV activation is allowed when PVs are missing,
 e.g. because of a device failure.
 \fBcomplete\fP only allows LVs with no missing PVs to be activated,
@@ -636,23 +473,23 @@ and is the most restrictive mode.
 (This does not include the "mirror" type, see "raid1" instead.)
 \fBpartial\fP allows any LV with missing PVs to be activated, and
 should only be used for recovery or repair.
-For default, see lvm.conf/activation_mode.
+For default, see \fBlvm.conf\fP(5) activation_mode.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--addtag\fP \fITag\fP
 .br
-.ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
+.
 .HP
 .ad l
-\fB--alloc\fP 
+\fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.br
 .ad b
+.br
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -669,18 +506,16 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
 .br
-.ad b
 Specifies when writes to a cache LV should be considered complete.
 \fBwriteback\fP considers a write complete as soon as it is
 stored in the cache pool.
@@ -692,18 +527,16 @@ cache pool LV. With \fBpassthrough\fP, all reads are served
 from the origin LV (all reads miss the cache) and all writes are
 forwarded to the origin LV; additionally, write hits cause cache
 block invalidates. See \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--cachepolicy\fP \fIString\fP
 .br
-.ad b
 Specifies the cache policy for a cache LV.
 See \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--cachesettings\fP \fIString\fP
 .br
-.ad b
 Specifies tunable values for a cache LV in "Key = Value" form.
 Repeat this option to specify multiple values.
 (The default values should usually be adequate.)
@@ -711,90 +544,79 @@ The special string value \fBdefault\fP switches
 settings back to their default kernel values and removes
 them from the list of settings stored in LVM metadata.
 See \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--compression\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls whether compression is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Sets or resets the contiguous allocation policy for LVs.
 Default is no contiguous allocation based on a next free principle.
 It is only possible to change a non-contiguous allocation policy
 to contiguous if all of the allocated physical extents in the LV
 are already contiguous.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--deduplication\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls whether deduplication is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
+.
 .HP
-.ad l
 \fB--deltag\fP \fITag\fP
 .br
-.ad b
 Deletes a tag from a PV, VG or LV. This option can be repeated to delete
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
+.
 .HP
-.ad l
 \fB--detachprofile\fP
 .br
-.ad b
 Detaches a metadata profile from a VG or LV.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
-.ad b
 Specifies how the device-mapper thin pool layer in the kernel should
 handle discards.
 \fBignore\fP causes the thin pool to ignore discards.
@@ -803,18 +625,16 @@ allow reuse of unneeded extents in the thin pool.
 \fBpassdown\fP causes the thin pool to process discards itself
 (like nopassdown) and pass the discards to the underlying device.
 See \fBlvmthin\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies thin pool behavior when data space is exhausted.
 When yes, device-mapper will immediately return an error
 when a thin pool is full and an I/O request requires space.
@@ -823,140 +643,121 @@ period of time to allow the thin pool to be extended.
 Errors are returned if no space is available after the timeout.
 (Also see dm-thin-pool kernel module option no_space_timeout.)
 See \fBlvmthin\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-K\fP|\fB--ignoreactivationskip\fP
 .br
-.ad b
 Ignore the "activation skip" LV flag during activation
 to allow LVs with the flag set to be activated.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--ignoremonitoring\fP
 .br
-.ad b
 Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-j\fP|\fB--major\fP \fINumber\fP
 .br
-.ad b
 Sets the major number of an LV block device.
+.
 .HP
-.ad l
-\fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT]
+\fB--\fP[\fBraid\fP]\fBmaxrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 Sets the maximum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
-.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--minor\fP \fINumber\fP
 .br
-.ad b
 Sets the minor number of an LV block device.
+.
 .HP
-.ad l
-\fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT]
+\fB--\fP[\fBraid\fP]\fBminrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 Sets the minimum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--monitor\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Start (yes) or stop (no) monitoring an LV with dmeventd.
 dmeventd monitors kernel events for an LV, and performs
 automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB-P\fP|\fB--partial\fP
 .br
-.ad b
 Commands will do their best to activate LVs with missing PV extents.
 Missing extents may be replaced with error or zero segments
-according to the lvm.conf missing_stripe_filler setting.
+according to the  missing_stripe_filler setting.
 Metadata may not be changed with this option.
+.
 .HP
-.ad l
 \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP
 .br
-.ad b
 Set access permission to read only \fBr\fP or read and write \fBrw\fP.
+.
 .HP
-.ad l
 \fB-M\fP|\fB--persistent\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 When yes, makes the specified minor number persistent.
+.
 .HP
-.ad l
 \fB--poll\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 When yes, start the background transformation of an LV.
 An incomplete transformation, e.g. pvmove or lvconvert interrupted
 by reboot or crash, can be restarted from the last checkpoint with --poll y.
@@ -964,76 +765,68 @@ When no, background transformation of an LV will not occur, and the
 transformation will not complete. It may not be appropriate to immediately
 poll an LV after activation, in which case --poll n can be used to defer
 polling until a later --poll y command.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
 .br
-.ad b
 Sets read ahead sector count of an LV.
 \fBauto\fP is the default which allows the kernel to choose
 a suitable value automatically.
 \fBnone\fP is equivalent to zero.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--rebuild\fP \fIPV\fP
 .br
-.ad b
 Selects a PV to rebuild in a raid LV. Multiple PVs can be rebuilt by
 repeating this option.
 Use this option in place of --resync or --syncaction repair when the
 PVs with corrupted data are known, and their data should be reconstructed
 rather than reconstructing default (rotating) data.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--refresh\fP
 .br
-.ad b
 If the LV is active, reload its metadata.
 This is not necessary in normal operation, but may be useful
 if something has gone wrong, or if some form of manual LV
 sharing is being used.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--resync\fP
 .br
-.ad b
 Initiates mirror synchronization. Synchronization generally happens
 automatically, but this option forces it to run.
 Also see --rebuild to synchronize a specific PV.
@@ -1041,11 +834,10 @@ During synchronization, data is read from the primary mirror device
 and copied to the others. This can take considerable time, during
 which the LV is without a complete redundant copy of the data.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -1054,22 +846,20 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Persistently sets (yes) or clears (no) the "activation skip" flag on an LV.
 An LV with this flag set is not activated unless the
 --ignoreactivationskip option is used by the activation command.
 This flag is set by default on new thin snapshot LVs.
 The flag is not applied to deactivation.
 The current value of the flag is indicated in the lvs lv_attr bits.
+.
 .HP
-.ad l
 \fB--setautoactivation\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Set the autoactivation property on a VG or LV.
 Display the property with vgs or lvs "-o autoactivation".
 When the autoactivation property is disabled, the VG or LV
@@ -1079,23 +869,21 @@ If autoactivation is disabled on a VG, no LVs will be autoactivated
 in that VG, and the LV autoactivation property has no effect.
 If autoactivation is enabled on a VG, autoactivation can be disabled
 for individual LVs.
+.
 .HP
-.ad l
-\fB--[raid]syncaction\fP \fBcheck\fP|\fBrepair\fP
+\fB--\fP[\fBraid\fP]\fBsyncaction\fP \fBcheck\fP|\fBrepair\fP
 .br
-.ad b
 Initiate different types of RAID synchronization.
 This causes the RAID LV to read all data and parity
 blocks in the array and check for discrepancies
 (mismatches between mirrors or incorrect parity values).
 \fBcheck\fP will count but not correct discrepancies.
 \fBrepair\fP will correct discrepancies.
-See lvs for reporting discrepancies found or repaired.
+See \fBlvs\fP(8) for reporting discrepancies found or repaired.
+.
 .HP
-.ad l
 \fB--sysinit\fP
 .br
-.ad b
 Indicates that vgchange/lvchange is being invoked from early system initialisation
 scripts (e.g. rc.sysinit or an initrd), before writable filesystems are
 available. As such, some functionality needs to be disabled and this option
@@ -1103,45 +891,40 @@ acts as a shortcut which selects an appropriate set of options. Currently,
 this is equivalent to using --ignorelockingfailure, --ignoremonitoring,
 --poll n, and setting env var LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES.
 vgchange/lvchange skip autoactivation, and defer to pvscan autoactivation.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
-\fB--[raid]writebehind\fP \fINumber\fP
+\fB--\fP[\fBraid\fP]\fBwritebehind\fP \fINumber\fP
 .br
-.ad b
 The maximum number of outstanding writes that are allowed to
 devices in a RAID1 LV that is marked write-mostly.
 Once this value is exceeded, writes become synchronous (i.e. all writes
 to the constituent devices must complete before the array signals the
 write has completed). Setting the value to zero clears the preference
 and allows the system to choose the value arbitrarily.
+.
 .HP
-.ad l
-\fB--[raid]writemostly\fP \fIPV\fP[\fB:t\fP|\fBn\fP|\fBy\fP]
+\fB--\fP[\fBraid\fP]\fBwritemostly\fP \fIPV\fP[\fB:t\fP|\fBn\fP|\fBy\fP]
 .br
-.ad b
 Mark a device in a RAID1 LV as write-mostly.  All reads
 to these drives will be avoided unless absolutely necessary. This keeps
 the number of I/Os to the drive to a minimum. The default behavior is to
@@ -1150,133 +933,70 @@ It is also possible to remove the write-mostly flag by adding the
 suffix \fB:n\fP at the end of the PV name, or to toggle the value with
 the suffix \fB:t\fP. Repeat this option to change the attribute on
 multiple PVs.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .HP
-.ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Set zeroing mode for thin pool. Note: already provisioned blocks from pool
 in non-zero mode are not cleared in unwritten parts when setting --zero y.
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fILV\fP
-.br
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-LV followed by _<type> indicates that an LV of the
-given type is required. (raid represents raid<N> type)
-.HP
-\fITag\fP
-.br
+LV1 indicates the LV must have a specific type, where the
+accepted LV types are listed. (raid represents raid<N> type).
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fISelect\fP
-.br
+.TP
+.I Select
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-Change LV permission to read-only:
-.sp
-.B lvchange -pr vg00/lvol1
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index 03e6d62dd..a921438b6 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -1,8 +1,11 @@
 .TH LVCONVERT 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvconvert - Change logical volume layout
+.
+lvconvert \(em Change logical volume layout
 .
 .SH SYNOPSIS
+.
 \fBlvconvert\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
@@ -11,334 +14,196 @@ lvconvert - Change logical volume layout
 .br
 .P
 .ad l
-    \fB--alloc\fP 
+    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.ad b
 .br
-.ad l
  \fB-b\fP|\fB--background\fP
-.ad b
 .br
-.ad l
  \fB-H\fP|\fB--cache\fP
-.ad b
 .br
-.ad l
     \fB--cachedevice\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP
-.ad b
 .br
-.ad l
     \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
-.ad b
 .br
-.ad l
     \fB--cachepolicy\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--cachepool\fP \fILV\fP
-.ad b
 .br
-.ad l
     \fB--cachesettings\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--cachesize\fP \fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
     \fB--cachevol\fP \fILV\fP
-.ad b
 .br
-.ad l
  \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT]
-.ad b
 .br
-.ad l
     \fB--commandprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--compression\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--config\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-d\fP|\fB--debug\fP
-.ad b
 .br
-.ad l
     \fB--deduplication\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--devices\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--devicesfile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
-.ad b
 .br
-.ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-f\fP|\fB--force\fP
-.ad b
 .br
-.ad l
  \fB-h\fP|\fB--help\fP
-.ad b
 .br
-.ad l
  \fB-i\fP|\fB--interval\fP \fINumber\fP
-.ad b
 .br
-.ad l
     \fB--lockopt\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--longhelp\fP
-.ad b
 .br
-.ad l
     \fB--merge\fP
-.ad b
 .br
-.ad l
     \fB--mergemirrors\fP
-.ad b
 .br
-.ad l
     \fB--mergesnapshot\fP
-.ad b
 .br
-.ad l
     \fB--mergethin\fP
-.ad b
 .br
-.ad l
     \fB--metadataprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP
-.ad b
 .br
-.ad l
  \fB-m\fP|\fB--mirrors\fP [\fB+\fP|\fB-\fP]\fINumber\fP
-.ad b
 .br
-.ad l
  \fB-n\fP|\fB--name\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--nolocking\fP
-.ad b
 .br
-.ad l
     \fB--noudevsync\fP
-.ad b
 .br
-.ad l
     \fB--originname\fP \fILV\fP
-.ad b
 .br
-.ad l
     \fB--poolmetadata\fP \fILV\fP
-.ad b
 .br
-.ad l
     \fB--poolmetadatasize\fP \fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
     \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--profile\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-q\fP|\fB--quiet\fP
-.ad b
 .br
-.ad l
     \fB--raidintegrity\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--raidintegrityblocksize\fP \fINumber\fP
-.ad b
 .br
-.ad l
     \fB--raidintegritymode\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
-.ad b
 .br
-.ad l
  \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
     \fB--repair\fP
-.ad b
 .br
-.ad l
     \fB--replace\fP \fIPV\fP
-.ad b
 .br
-.ad l
  \fB-s\fP|\fB--snapshot\fP
-.ad b
 .br
-.ad l
     \fB--splitcache\fP
-.ad b
 .br
-.ad l
     \fB--splitmirrors\fP \fINumber\fP
-.ad b
 .br
-.ad l
     \fB--splitsnapshot\fP
-.ad b
 .br
-.ad l
     \fB--startpoll\fP
-.ad b
 .br
-.ad l
     \fB--stripes\fP \fINumber\fP
-.ad b
 .br
-.ad l
  \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
-.ad b
 .br
-.ad l
     \fB--swapmetadata\fP
-.ad b
 .br
-.ad l
  \fB-t\fP|\fB--test\fP
-.ad b
 .br
-.ad l
  \fB-T\fP|\fB--thin\fP
-.ad b
 .br
-.ad l
     \fB--thinpool\fP \fILV\fP
-.ad b
 .br
-.ad l
     \fB--trackchanges\fP
-.ad b
 .br
-.ad l
-    \fB--type\fP 
+    \fB--type\fP \c
 .nh
-\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+\%\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
 .hy
-.ad b
 .br
-.ad l
     \fB--uncache\fP
-.ad b
 .br
-.ad l
     \fB--usepolicies\fP
-.ad b
 .br
-.ad l
     \fB--vdopool\fP \fILV\fP
-.ad b
 .br
-.ad l
  \fB-v\fP|\fB--verbose\fP
-.ad b
 .br
-.ad l
     \fB--version\fP
-.ad b
 .br
-.ad l
  \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
  \fB-y\fP|\fB--yes\fP
-.ad b
 .br
-.ad l
  \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .ad b
+.
 .SH DESCRIPTION
+.
 lvconvert changes the LV type and includes utilities for LV data
 maintenance. The LV type controls data layout and redundancy.
 The LV type is also called the segment type or segtype.
-
+.P
 To display the current LV type, run the command:
-
+.P
 .B lvs -o name,segtype
 .I LV
-
+.P
 In some cases, an LV is a single device mapper (dm) layer above physical
 devices.  In other cases, hidden LVs (dm devices) are layered between the
 visible LV and physical devices.  LVs in the middle layers are called sub LVs.
 A command run on a visible LV sometimes operates on a sub LV rather than
 the specified LV.  In other cases, a sub LV must be specified directly on
 the command line.
-
+.P
 Sub LVs can be displayed with the command:
-
+.P
 .B lvs -a
-
+.P
 The
 .B linear
 type is equivalent to the
 .B striped
 type when one stripe exists.
 In that case, the types can sometimes be used interchangably.
-
+.P
 In most cases, the
 .B mirror
 type is deprecated and the
 .B raid1
 type should be used.  They are both implementations of mirroring.
-
+.P
 Striped raid types are
 \fBraid0/raid0_meta\fP,
 \fBraid5\fP (an alias for raid5_ls),
 \fBraid6\fP (an alias for raid6_zr) and
 \fBraid10\fP (an alias for raid10_near).
-
+.P
 As opposed to mirroring, raid5 and raid6 stripe data and calculate parity
 blocks. The parity blocks can be used for data block recovery in case
 devices fail. A maximum number of one device in a raid5 LV may fail, and
@@ -347,45 +212,49 @@ data blocks for performance reasons, thus avoiding contention on a single
 device. Specific arrangements of parity and data blocks (layouts) can be
 used to optimize I/O performance, or to convert between raid levels.  See
 \fBlvmraid\fP(7) for more information.
-
+.P
 Layouts of raid5 rotating parity blocks can be: left-asymmetric
 (raid5_la), left-symmetric (raid5_ls with alias raid5), right-asymmetric
 (raid5_ra), right-symmetric (raid5_rs) and raid5_n, which doesn't rotate
 parity blocks. Layouts of raid6 are: zero-restart (raid6_zr with alias
 raid6), next-restart (raid6_nr), and next-continue (raid6_nc).
-
+.P
 Layouts including _n allow for conversion between raid levels (raid5_n to
 raid6 or raid5_n to striped/raid0/raid0_meta). Additionally, special raid6
 layouts for raid level conversions between raid5 and raid6 are:
 raid6_ls_6, raid6_rs_6, raid6_la_6 and raid6_ra_6. Those correspond to
 their raid5 counterparts (e.g. raid5_rs can be directly converted to
 raid6_rs_6 and vice-versa).
-
+.P
 raid10 (an alias for raid10_near) is currently limited to one data copy
 and even number of sub LVs. This is a mirror group layout, thus a single
 sub LV may fail per mirror group without data loss.
-
+.P
 Striped raid types support converting the layout, their stripesize and
 their number of stripes.
-
+.P
 The striped raid types combined with raid1 allow for conversion from
-linear -> striped/raid0/raid0_meta and vice-versa by e.g. linear <-> raid1
-<-> raid5_n (then adding stripes) <-> striped/raid0/raid0_meta.
+linear \[->] striped/raid0/raid0_meta and vice-versa by e.g. linear \[<>] raid1
+\[<>] raid5_n (then adding stripes) \[<>] striped/raid0/raid0_meta.
+.
 .SH USAGE
+.
 Convert LV to linear.
 .br
 .P
 \fBlvconvert\fP \fB--type\fP \fBlinear\fP \fILV\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Convert LV to striped.
 .br
 .P
@@ -394,28 +263,22 @@ Convert LV to striped.
 .RS 4
 .ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Convert LV to type mirror (also see type raid1),
 .br
 .P
@@ -424,36 +287,26 @@ Convert LV to type mirror (also see type raid1),
 .RS 4
 .ad l
 [ \fB-m\fP|\fB--mirrors\fP [\fB+\fP|\fB-\fP]\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Convert LV to raid or change raid layout 
 .br
 (a specific raid level must be used, e.g. raid1).
@@ -464,32 +317,24 @@ Convert LV to raid or change raid layout
 .RS 4
 .ad l
 [ \fB-m\fP|\fB--mirrors\fP [\fB+\fP|\fB-\fP]\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Convert LV to raid1 or mirror, or change number of mirror images.
 .br
 .P
@@ -498,535 +343,491 @@ Convert LV to raid1 or mirror, or change number of mirror images.
 .RS 4
 .ad l
 [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Convert raid LV to change number of stripe images.
 .br
 .P
-\fBlvconvert\fP \fB--stripes\fP \fINumber\fP \fILV\fP\fI_raid\fP
+\fBlvconvert\fP \fB--stripes\fP \fINumber\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: raid
+.RE
+.P
+\(em
+.P
 Convert raid LV to change the stripe size.
 .br
 .P
-\fBlvconvert\fP \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] \fILV\fP\fI_raid\fP
+\fBlvconvert\fP \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: raid
+.RE
+.P
+\(em
+.P
 Split images from a raid1 or mirror LV and use them to create a new LV.
 .br
 .P
-\fBlvconvert\fP \fB--splitmirrors\fP \fINumber\fP \fB-n\fP|\fB--name\fP \fILV\fP\fI_new\fP \fILV\fP\fI_cache_mirror_raid1\fP
+\fBlvconvert\fP \fB--splitmirrors\fP \fINumber\fP \fB-n\fP|\fB--name\fP \fILV\fP\fI_new\fP \fILV1\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: cache mirror raid1
+.RE
+.P
+\(em
+.P
 Split images from a raid1 LV and track changes to origin for later merge.
 .br
 .P
-\fBlvconvert\fP \fB--splitmirrors\fP \fINumber\fP \fB--trackchanges\fP \fILV\fP\fI_cache_raid1\fP
+\fBlvconvert\fP \fB--splitmirrors\fP \fINumber\fP \fB--trackchanges\fP \fILV1\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: cache raid1
+.RE
+.P
+\(em
+.P
 Merge LV images that were split from a raid1 LV.
 .br
 .P
-\fBlvconvert\fP \fB--mergemirrors\fP \fIVG\fP|\fILV\fP\fI_linear_raid\fP|\fITag\fP ...
+\fBlvconvert\fP \fB--mergemirrors\fP \fIVG\fP|\fILV1\fP|\fITag\fP ...
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear raid
+.RE
+.P
+\(em
+.P
 Convert LV to a thin LV, using the original LV as an external origin.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBthin\fP \fB--thinpool\fP \fILV\fP \fILV\fP\fI_linear_striped_thin_cache_raid_error_zero\fP
+\fBlvconvert\fP \fB--type\fP \fBthin\fP \fB--thinpool\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-T\fP|\fB--thin\fP ]
-.ad b
 .br
-.ad l
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--originname\fP \fILV\fP\fI_new\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadata\fP \fILV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped thin cache raid error zero
+.RE
+.P
+\(em
+.P
 Attach a cache pool to an LV, converts the LV to type cache.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBcache\fP \fB--cachepool\fP \fILV\fP \fILV\fP\fI_linear_striped_thinpool_vdo_vdopool_vdopooldata_raid\fP
+\fBlvconvert\fP \fB--type\fP \fBcache\fP \fB--cachepool\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-H\fP|\fB--cache\fP ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadata\fP \fILV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped thinpool vdo vdopool vdopooldata raid
+.RE
+.P
+\(em
+.P
 Attach a writecache to an LV, converts the LV to type writecache.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBwritecache\fP \fB--cachevol\fP \fILV\fP \fILV\fP\fI_linear_striped_raid\fP
+\fBlvconvert\fP \fB--type\fP \fBwritecache\fP \fB--cachevol\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped raid
+.RE
+.P
+\(em
+.P
 Attach a cache to an LV, converts the LV to type cache.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBcache\fP \fB--cachevol\fP \fILV\fP \fILV\fP\fI_linear_striped_thinpool_raid\fP
+\fBlvconvert\fP \fB--type\fP \fBcache\fP \fB--cachevol\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-H\fP|\fB--cache\fP ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped thinpool raid
+.RE
+.P
+\(em
+.P
 Add a writecache to an LV, using a specified cache device.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBwritecache\fP \fB--cachedevice\fP \fIPV\fP \fILV\fP\fI_linear_striped_raid\fP
+\fBlvconvert\fP \fB--type\fP \fBwritecache\fP \fB--cachedevice\fP \fIPV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [    \fB--cachesize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped raid
+.RE
+.P
+\(em
+.P
 Add a cache to an LV, using a specified cache device.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBcache\fP \fB--cachedevice\fP \fIPV\fP \fILV\fP\fI_linear_striped_thinpool_raid\fP
+\fBlvconvert\fP \fB--type\fP \fBcache\fP \fB--cachedevice\fP \fIPV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--cachesize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped thinpool raid
+.RE
+.P
+\(em
+.P
 Convert LV to type thin-pool.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBthin-pool\fP \fILV\fP\fI_linear_striped_cache_raid_error_zero\fP
+\fBlvconvert\fP \fB--type\fP \fBthin-pool\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
 .br
-.ad l
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadata\fP \fILV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: linear striped cache raid error zero
+.RE
+.P
+\(em
+.P
 Convert LV to type cache-pool.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBcache-pool\fP \fILV\fP\fI_linear_striped_raid\fP
+\fBlvconvert\fP \fB--type\fP \fBcache-pool\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadata\fP \fILV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: linear striped raid
+.RE
+.P
+\(em
+.P
 Convert LV to type vdopool.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBvdo-pool\fP \fILV\fP\fI_linear_striped_cache_raid\fP
+\fBlvconvert\fP \fB--type\fP \fBvdo-pool\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-n\fP|\fB--name\fP \fILV\fP\fI_new\fP ]
-.ad b
 .br
-.ad l
 [ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--compression\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
+.RE
+.P
+.RS 4
+LV1 types: linear striped cache raid
 .RE
-.br
--
-
+.P
+\(em
+.P
 Detach a cache from an LV.
 .br
 .P
-\fBlvconvert\fP \fB--splitcache\fP \fILV\fP\fI_thinpool_cache_cachepool_vdopool_writecache\fP
+\fBlvconvert\fP \fB--splitcache\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: thinpool cache cachepool vdopool writecache
+.RE
+.P
+\(em
+.P
 Merge thin LV into its origin LV.
 .br
 .P
-\fBlvconvert\fP \fB--mergethin\fP \fILV\fP\fI_thin\fP ...
+\fBlvconvert\fP \fB--mergethin\fP \fILV1\fP ...
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: thin
+.RE
+.P
+\(em
+.P
 Merge COW snapshot LV into its origin.
 .br
 .P
-\fBlvconvert\fP \fB--mergesnapshot\fP \fILV\fP\fI_snapshot\fP ...
+\fBlvconvert\fP \fB--mergesnapshot\fP \fILV1\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: snapshot
+.RE
+.P
+\(em
+.P
 Combine a former COW snapshot (second arg) with a former 
 .br
 origin LV (first arg) to reverse a splitsnapshot command.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBsnapshot\fP \fILV\fP \fILV\fP\fI_linear_striped\fP
+\fBlvconvert\fP \fB--type\fP \fBsnapshot\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-s\fP|\fB--snapshot\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped
+.RE
+.P
+\(em
+.P
 Replace failed PVs in a raid or mirror LV. 
 .br
 Repair a thin pool. 
@@ -1034,176 +835,157 @@ Repair a thin pool.
 Repair a cache pool.
 .br
 .P
-\fBlvconvert\fP \fB--repair\fP \fILV\fP\fI_thinpool_cache_cachepool_mirror_raid\fP
+\fBlvconvert\fP \fB--repair\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--usepolicies\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: thinpool cache cachepool mirror raid
+.RE
+.P
+\(em
+.P
 Replace specific PV(s) in a raid LV with another PV.
 .br
 .P
-\fBlvconvert\fP \fB--replace\fP \fIPV\fP \fILV\fP\fI_raid\fP
+\fBlvconvert\fP \fB--replace\fP \fIPV\fP \fILV1\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: raid
+.RE
+.P
+\(em
+.P
 Poll LV to continue conversion.
 .br
 .P
-\fBlvconvert\fP \fB--startpoll\fP \fILV\fP\fI_mirror_raid\fP
+\fBlvconvert\fP \fB--startpoll\fP \fILV1\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: mirror raid
+.RE
+.P
+\(em
+.P
 Add or remove data integrity checksums to raid images.
 .br
 .P
-\fBlvconvert\fP \fB--raidintegrity\fP \fBy\fP|\fBn\fP \fILV\fP\fI_raid\fP
+\fBlvconvert\fP \fB--raidintegrity\fP \fBy\fP|\fBn\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [    \fB--raidintegritymode\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--raidintegrityblocksize\fP \fINumber\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: raid
+.RE
+.P
+\(em
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-b\fP|\fB--background\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
-[    \fB--alloc\fP 
+[    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
 ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
 .ad l
-\fB--alloc\fP 
+\fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.br
 .ad b
+.br
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -1220,39 +1002,34 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
+.
 .HP
-.ad l
 \fB-b\fP|\fB--background\fP
 .br
-.ad b
 If the operation requires polling, this option causes the command to
 return before the operation is complete, and polling is done in the
 background.
+.
 .HP
-.ad l
 \fB-H\fP|\fB--cache\fP
 .br
-.ad b
 Specifies the command is handling a cache LV or cache pool.
 See --type cache and --type cache-pool.
 See \fBlvmcache\fP(7) for more information about LVM caching.
+.
 .HP
-.ad l
 \fB--cachedevice\fP \fIPV\fP
 .br
-.ad b
 The name of a device to use for a cache.
+.
 .HP
-.ad l
 \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP
 .br
-.ad b
 Specifies the cache metadata format used by cache target.
+.
 .HP
-.ad l
 \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
 .br
-.ad b
 Specifies when writes to a cache LV should be considered complete.
 \fBwriteback\fP considers a write complete as soon as it is
 stored in the cache pool.
@@ -1264,24 +1041,21 @@ cache pool LV. With \fBpassthrough\fP, all reads are served
 from the origin LV (all reads miss the cache) and all writes are
 forwarded to the origin LV; additionally, write hits cause cache
 block invalidates. See \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--cachepolicy\fP \fIString\fP
 .br
-.ad b
 Specifies the cache policy for a cache LV.
 See \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--cachepool\fP \fILV\fP
 .br
-.ad b
 The name of a cache pool.
+.
 .HP
-.ad l
 \fB--cachesettings\fP \fIString\fP
 .br
-.ad b
 Specifies tunable values for a cache LV in "Key = Value" form.
 Repeat this option to specify multiple values.
 (The default values should usually be adequate.)
@@ -1289,23 +1063,20 @@ The special string value \fBdefault\fP switches
 settings back to their default kernel values and removes
 them from the list of settings stored in LVM metadata.
 See \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--cachesize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 The size of cache to use.
+.
 .HP
-.ad l
 \fB--cachevol\fP \fILV\fP
 .br
-.ad b
 The name of a cache volume.
+.
 .HP
-.ad l
 \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 The size of chunks in a snapshot, cache pool or thin pool.
 For snapshots, the value must be a power of 2 between 4KiB and 512KiB
 and the default value is 4.
@@ -1316,66 +1087,58 @@ and the default value starts with 64 and scales up to fit the
 pool metadata size within 128MiB, if the pool metadata size is not specified.
 The value must be a multiple of 64KiB.
 See \fBlvmthin\fP(7) and \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--compression\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls whether compression is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--deduplication\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls whether deduplication is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
-.ad b
 Specifies how the device-mapper thin pool layer in the kernel should
 handle discards.
 \fBignore\fP causes the thin pool to ignore discards.
@@ -1384,18 +1147,16 @@ allow reuse of unneeded extents in the thin pool.
 \fBpassdown\fP causes the thin pool to process discards itself
 (like nopassdown) and pass the discards to the underlying device.
 See \fBlvmthin\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies thin pool behavior when data space is exhausted.
 When yes, device-mapper will immediately return an error
 when a thin pool is full and an I/O request requires space.
@@ -1404,57 +1165,49 @@ period of time to allow the thin pool to be extended.
 Errors are returned if no space is available after the timeout.
 (Also see dm-thin-pool kernel module option no_space_timeout.)
 See \fBlvmthin\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-i\fP|\fB--interval\fP \fINumber\fP
 .br
-.ad b
 Report progress at regular intervals.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--merge\fP
 .br
-.ad b
 An alias for --mergethin, --mergemirrors, or --mergesnapshot,
 depending on the type of LV.
+.
 .HP
-.ad l
 \fB--mergemirrors\fP
 .br
-.ad b
 Merge LV images that were split from a raid1 LV.
 See --splitmirrors with --trackchanges.
+.
 .HP
-.ad l
 \fB--mergesnapshot\fP
 .br
-.ad b
 Merge COW snapshot LV into its origin.
 When merging a snapshot, if both the origin and snapshot LVs are not open,
 the merge will start immediately. Otherwise, the merge will start the
@@ -1467,27 +1220,24 @@ reads or writes to the origin appear as being directed to the snapshot
 being merged. When the merge finishes, the merged snapshot is removed.
 Multiple snapshots may be specified on the command line or a @tag may be
 used to specify multiple snapshots be merged to their respective origin.
+.
 .HP
-.ad l
 \fB--mergethin\fP
 .br
-.ad b
 Merge thin LV into its origin LV.
 The origin thin LV takes the content of the thin snapshot,
 and the thin snapshot LV is removed.
 See \fBlvmthin\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
-.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP
 .br
-.ad b
 Specifies the type of mirror log for LVs with the "mirror" type
 (does not apply to the "raid1" type.)
 \fBdisk\fP is a persistent log and requires a small amount of
@@ -1497,11 +1247,10 @@ In this case, the mirror must be synchronized (by copying LV data from
 the first device to others) each time the LV is activated, e.g. after reboot.
 \fBmirrored\fP is a persistent log that is itself mirrored, but
 should be avoided. Instead, use the raid1 type for log redundancy.
+.
 .HP
-.ad l
 \fB-m\fP|\fB--mirrors\fP [\fB+\fP|\fB-\fP]\fINumber\fP
 .br
-.ad b
 Specifies the number of mirror images in addition to the original LV
 image, e.g. --mirrors 1 means there are two images of the data, the
 original and one mirror image.
@@ -1511,100 +1260,88 @@ There are two mirroring implementations: "raid1" and "mirror".
 These are the names of the corresponding LV types, or "segment types".
 Use the --type option to specify which to use (raid1 is default,
 and mirror is legacy)
-Use lvm.conf global/mirror_segtype_default and
+Use \fBlvm.conf\fP(5) \fBglobal/mirror_segtype_default\fP and
 global/raid10_segtype_default to configure the default types.
 The plus prefix \fB+\fP can be used, in which case
 the number is added to the current number of images,
 or the minus prefix \fB-\fP can be used, in which case
 the number is subtracted from the current number of images.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
-.ad b
 Specifies the name of a new LV.
 When unspecified, a default name of "lvol#" is
 generated, where # is a number generated by LVM.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB--originname\fP \fILV\fP
 .br
-.ad b
 Specifies the name to use for the external origin LV when converting an LV
 to a thin LV. The LV being converted becomes a read-only external origin
 with this name.
+.
 .HP
-.ad l
 \fB--poolmetadata\fP \fILV\fP
 .br
-.ad b
 The name of a an LV to use for storing pool metadata.
+.
 .HP
-.ad l
 \fB--poolmetadatasize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Specifies the size of the new pool metadata LV.
+.
 .HP
-.ad l
 \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Enable or disable the automatic creation and management of a
 spare pool metadata LV in the VG. A spare metadata LV is reserved
 space that can be used when repairing a pool.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--raidintegrity\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Enable or disable data integrity checksums for raid images.
+.
 .HP
-.ad l
 \fB--raidintegrityblocksize\fP \fINumber\fP
 .br
-.ad b
 The block size to use for dm-integrity on raid images.
 The integrity block size should usually match the device
 logical block size, or the file system block size.
 It may be less than the file system block size, but not
 less than the device logical block size.
 Possible values: 512, 1024, 2048, 4096.
+.
 .HP
-.ad l
 \fB--raidintegritymode\fP \fIString\fP
 .br
-.ad b
 Use a journal (default) or bitmap for keeping integrity checksums consistent
 in case of a crash. The bitmap areas are recalculated after a crash, so corruption
 in those areas would not be detected. A journal does not have this problem.
@@ -1612,135 +1349,119 @@ The journal mode doubles writes to storage, but can improve performance for
 scattered writes packed into a single journal write.
 bitmap mode can in theory achieve full write throughput of the device,
 but would not benefit from the potential scattered write optimization.
+.
 .HP
-.ad l
 \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
 .br
-.ad b
 Sets read ahead sector count of an LV.
 \fBauto\fP is the default which allows the kernel to choose
 a suitable value automatically.
 \fBnone\fP is equivalent to zero.
+.
 .HP
-.ad l
 \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Size of each raid or mirror synchronization region.
-lvm.conf activation/raid_region_size can be used to
+\fBlvm.conf\fP(5) \fBactivation/raid_region_size\fP can be used to
 configure a default.
+.
 .HP
-.ad l
 \fB--repair\fP
 .br
-.ad b
 Replace failed PVs in a raid or mirror LV, or run a repair
 utility on a thin pool. See \fBlvmraid\fP(7) and \fBlvmthin\fP(7)
 for more information.
+.
 .HP
-.ad l
 \fB--replace\fP \fIPV\fP
 .br
-.ad b
 Replace a specific PV in a raid LV with another PV.
 The new PV to use can be optionally specified after the LV.
 Multiple PVs can be replaced by repeating this option.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-s\fP|\fB--snapshot\fP
 .br
-.ad b
 Combine a former COW snapshot LV with a former origin LV to reverse
 a previous --splitsnapshot command.
+.
 .HP
-.ad l
 \fB--splitcache\fP
 .br
-.ad b
 Separates a cache pool from a cache LV, and keeps the unused cache pool LV.
 Before the separation, the cache is flushed. Also see --uncache.
+.
 .HP
-.ad l
 \fB--splitmirrors\fP \fINumber\fP
 .br
-.ad b
 Splits the specified number of images from a raid1 or mirror LV
 and uses them to create a new LV. If --trackchanges is also specified,
 changes to the raid1 LV are tracked while the split LV remains detached.
 If --name is specified, then the images are permanently split from the
 original LV and changes are not tracked.
+.
 .HP
-.ad l
 \fB--splitsnapshot\fP
 .br
-.ad b
 Separates a COW snapshot from its origin LV. The LV that is split off
 contains the chunks that differ from the origin LV along with metadata
 describing them. This LV can be wiped and then destroyed with lvremove.
+.
 .HP
-.ad l
 \fB--startpoll\fP
 .br
-.ad b
 Start polling an LV to continue processing a conversion.
+.
 .HP
-.ad l
 \fB--stripes\fP \fINumber\fP
 .br
-.ad b
 Specifies the number of stripes in a striped LV. This is the number of
 PVs (devices) that a striped LV is spread across. Data that
 appears sequential in the LV is spread across multiple devices in units of
 the stripe size (see --stripesize). This does not apply to
 existing allocated space, only newly allocated space can be striped.
+.
 .HP
-.ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
+.
 .HP
-.ad l
 \fB--swapmetadata\fP
 .br
-.ad b
 Extracts the metadata LV from a pool and replaces it with another specified LV.
 The extracted LV is preserved and given the name of the LV that replaced it.
 Use for repair only. When the metadata LV is swapped out of the pool, it can
 be activated directly and used with thin provisioning tools:
 \fBcache_dump\fP(8), \fBcache_repair\fP(8), \fBcache_restore\fP(8),
 \fBthin_dump\fP(8), \fBthin_repair\fP(8), \fBthin_restore\fP(8).
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-T\fP|\fB--thin\fP
 .br
-.ad b
 Specifies the command is handling a thin LV or thin pool.
 See --type thin, --type thin-pool, and --virtualsize.
 See \fBlvmthin\fP(7) for more information about LVM thin provisioning.
+.
 .HP
-.ad l
 \fB--thinpool\fP \fILV\fP
 .br
-.ad b
 The name of a thin pool LV.
+.
 .HP
-.ad l
 \fB--trackchanges\fP
 .br
-.ad b
 Can be used with --splitmirrors on a raid1 LV. This causes
 changes to the original raid1 LV to be tracked while the split images
 remain detached. This is a temporary state that allows the read-only
@@ -1749,14 +1470,15 @@ Only the regions with changed data are resynchronized during merge.
 While a raid1 LV is tracking changes, operations on it are limited to
 merging the split image (see --mergemirrors) or permanently splitting
 the image (see --splitmirrors with --name.
+.
 .HP
 .ad l
-\fB--type\fP 
+\fB--type\fP \c
 .nh
-\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+\%\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
 .hy
-.br
 .ad b
+.br
 The LV type, also known as "segment type" or "segtype".
 See usage descriptions for the specific ways to use these types.
 For more information about redundancy and performance (\fBraid\fP<N>, \fBmirror\fP, \fBstriped\fP, \fBlinear\fP) see \fBlvmraid\fP(7).
@@ -1768,50 +1490,44 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
+.
 .HP
-.ad l
 \fB--uncache\fP
 .br
-.ad b
 Separates a cache pool from a cache LV, and deletes the unused cache pool LV.
 Before the separation, the cache is flushed. Also see --splitcache.
+.
 .HP
-.ad l
 \fB--usepolicies\fP
 .br
-.ad b
-Perform an operation according to the policy configured in lvm.conf
+Perform an operation according to the policy configured in \fBlvm.conf\fP(5)
 or a profile.
+.
 .HP
-.ad l
 \fB--vdopool\fP \fILV\fP
 .br
-.ad b
 The name of a VDO pool LV.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 The virtual size of a new thin LV.
 See \fBlvmthin\fP(7) for more information about LVM thin provisioning.
 Using virtual size (-V) and actual size (-L) together creates
 a sparse LV.
-lvm.conf global/sparse_segtype_default determines the
+\fBlvm.conf\fP(5) \fBglobal/sparse_segtype_default\fP determines the
 default segment type used to create a sparse LV.
 Anything written to a sparse LV will be returned when reading from it.
 Reading from other areas of the LV will return blocks of zeros.
@@ -1819,38 +1535,35 @@ When using a snapshot to create a sparse LV, a hidden virtual device
 is created using the zero target, and the LV has the suffix _vorigin.
 Snapshots are less efficient than thin provisioning when creating
 large sparse LVs (GiB).
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .HP
-.ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 For snapshots, this controls zeroing of the first 4KiB of data in the
 snapshot. If the LV is read-only, the snapshot will not be zeroed.
 For thin pools, this controls zeroing of provisioned blocks.
 Provisioning of large zeroed chunks negatively impacts performance.
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fILV\fP
-.br
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-LV followed by _<type> indicates that an LV of the
-given type is required. (raid represents raid<N> type)
-.HP
-\fIPV\fP
-.br
+LV1 indicates the LV must have a specific type, where the
+accepted LV types are listed. (raid represents raid<N> type).
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -1858,278 +1571,261 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
+.
 .SH ADVANCED USAGE
+.
 Alternate command forms, advanced command usage, and listing of all valid syntax for completeness.
 .P
 Change the region size of an LV.
 .br
 .P
-\fBlvconvert\fP \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] \fILV\fP\fI_raid\fP
+\fBlvconvert\fP \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] \fILV1\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: raid
+.RE
+.P
+\(em
+.P
 Change the type of mirror log used by a mirror LV.
 .br
 .P
-\fBlvconvert\fP \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP \fILV\fP\fI_mirror\fP
+\fBlvconvert\fP \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP \fILV1\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: mirror
+.RE
+.P
+\(em
+.P
 Convert LV to a thin LV, using the original LV as an external origin 
 .br
 (infers --type thin).
 .br
 .P
-\fBlvconvert\fP \fB-T\fP|\fB--thin\fP \fB--thinpool\fP \fILV\fP \fILV\fP\fI_linear_striped_thin_cache_raid_error_zero\fP
+\fBlvconvert\fP \fB-T\fP|\fB--thin\fP \fB--thinpool\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--type\fP \fBthin\fP ]
-.ad b
 .br
-.ad l
 [    \fB--originname\fP \fILV\fP\fI_new\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadata\fP \fILV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped thin cache raid error zero
+.RE
+.P
+\(em
+.P
 Attach a cache pool to an LV (infers --type cache).
 .br
 .P
-\fBlvconvert\fP \fB-H\fP|\fB--cache\fP \fB--cachepool\fP \fILV\fP \fILV\fP\fI_linear_striped_thinpool_vdo_vdopool_vdopooldata_raid\fP
+\fBlvconvert\fP \fB-H\fP|\fB--cache\fP \fB--cachepool\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--type\fP \fBcache\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadata\fP \fILV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped thinpool vdo vdopool vdopooldata raid
+.RE
+.P
+\(em
+.P
 Attach a cache to an LV, converts the LV to type cache.
 .br
 .P
-\fBlvconvert\fP \fB-H\fP|\fB--cache\fP \fB--cachevol\fP \fILV\fP \fILV\fP\fI_linear_striped_thinpool_raid\fP
+\fBlvconvert\fP \fB-H\fP|\fB--cache\fP \fB--cachevol\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped thinpool raid
+.RE
+.P
+\(em
+.P
 Convert LV to type vdopool.
 .br
 .P
-\fBlvconvert\fP \fB--vdopool\fP \fILV\fP\fI_linear_striped_cache_raid\fP
+\fBlvconvert\fP \fB--vdopool\fP \fILV\fP
 .br
 .RS 4
 .ad l
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-n\fP|\fB--name\fP \fILV\fP\fI_new\fP ]
-.ad b
 .br
-.ad l
 [ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--type\fP \fBvdo-pool\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--compression\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Detach and delete a cache from an LV.
 .br
 .P
-\fBlvconvert\fP \fB--uncache\fP \fILV\fP\fI_thinpool_cache_vdopool_writecache\fP
+\fBlvconvert\fP \fB--uncache\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: thinpool cache vdopool writecache
+.RE
+.P
+\(em
+.P
 Swap metadata LV in a thin pool or cache pool (for repair only).
 .br
 .P
-\fBlvconvert\fP \fB--swapmetadata\fP \fB--poolmetadata\fP \fILV\fP \fILV\fP\fI_thinpool_cachepool\fP
+\fBlvconvert\fP \fB--swapmetadata\fP \fB--poolmetadata\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: thinpool cachepool
+.RE
+.P
+\(em
+.P
 Merge LV that was split from a mirror (variant, use --mergemirrors). 
 .br
 Merge thin LV into its origin LV (variant, use --mergethin). 
@@ -2137,245 +1833,80 @@ Merge thin LV into its origin LV (variant, use --mergethin).
 Merge COW snapshot LV into its origin (variant, use --mergesnapshot).
 .br
 .P
-\fBlvconvert\fP \fB--merge\fP \fIVG\fP|\fILV\fP\fI_linear_striped_snapshot_thin_raid\fP|\fITag\fP ...
+\fBlvconvert\fP \fB--merge\fP \fIVG\fP|\fILV1\fP|\fITag\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped snapshot thin raid
+.RE
+.P
+\(em
+.P
 Separate a COW snapshot from its origin LV.
 .br
 .P
-\fBlvconvert\fP \fB--splitsnapshot\fP \fILV\fP\fI_snapshot\fP
+\fBlvconvert\fP \fB--splitsnapshot\fP \fILV1\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: snapshot
+.RE
+.P
+\(em
+.P
 Combine a former COW snapshot (second arg) with a former 
 .br
 origin LV (first arg) to reverse a splitsnapshot command.
 .br
 .P
-\fBlvconvert\fP \fB-s\fP|\fB--snapshot\fP \fILV\fP \fILV\fP\fI_linear_striped\fP
+\fBlvconvert\fP \fB-s\fP|\fB--snapshot\fP \fILV\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--type\fP \fBsnapshot\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: linear striped
+.RE
+.P
+\(em
+.P
 Poll LV to continue conversion (also see --startpoll) 
 .br
 or waits till conversion/mirror syncing is finished
 .br
 .P
-\fBlvconvert\fP \fILV\fP\fI_mirror_raid\fP
+\fBlvconvert\fP \fILV1\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
-.SH NOTES
-This previous command syntax would perform two different operations:
-.br
-\fBlvconvert --thinpool\fP \fILV1\fP \fB--poolmetadata\fP \fILV2\fP
-.br
-If LV1 was not a thin pool, the command would convert LV1 to
-a thin pool, optionally using a specified LV for metadata.
-But, if LV1 was already a thin pool, the command would swap
-the current metadata LV with LV2 (for repair purposes.)
-
-In the same way, this previous command syntax would perform two different
-operations:
-.br
-\fBlvconvert --cachepool\fP \fILV1\fP \fB--poolmetadata\fP \fILV2\fP
-.br
-If LV1 was not a cache pool, the command would convert LV1 to
-a cache pool, optionally using a specified LV for metadata.
-But, if LV1 was already a cache pool, the command would swap
-the current metadata LV with LV2 (for repair purposes.)
-.SH EXAMPLES
-Convert a linear LV to a two-way mirror LV.
-.br
-.B lvconvert --type mirror --mirrors 1 vg/lvol1
-
-Convert a linear LV to a two-way RAID1 LV.
-.br
-.B lvconvert --type raid1 --mirrors 1 vg/lvol1
-
-Convert a mirror LV to use an in-memory log.
-.br
-.B lvconvert --mirrorlog core vg/lvol1
-
-Convert a mirror LV to use a disk log.
-.br
-.B lvconvert --mirrorlog disk vg/lvol1
-
-Convert a mirror or raid1 LV to a linear LV.
-.br
-.B lvconvert --type linear vg/lvol1
-
-Convert a mirror LV to a raid1 LV with the same number of images.
-.br
-.B lvconvert --type raid1 vg/lvol1
-
-Convert a linear LV to a two-way mirror LV, allocating new extents from specific
-PV ranges.
-.br
-.B lvconvert --mirrors 1 vg/lvol1 /dev/sda:0-15 /dev/sdb:0-15
-
-Convert a mirror LV to a linear LV, freeing physical extents from a specific PV.
-.br
-.B lvconvert --type linear vg/lvol1 /dev/sda
-
-Split one image from a mirror or raid1 LV, making it a new LV.
-.br
-.B lvconvert --splitmirrors 1 --name lv_split vg/lvol1
-
-Split one image from a raid1 LV, and track changes made to the raid1 LV
-while the split image remains detached.
-.br
-.B lvconvert --splitmirrors 1 --trackchanges vg/lvol1
-
-Merge an image (that was previously created with --splitmirrors and
---trackchanges) back into the original raid1 LV.
-.br
-.B lvconvert --mergemirrors vg/lvol1_rimage_1
-
-Replace PV /dev/sdb1 with PV /dev/sdf1 in a raid1/4/5/6/10 LV.
-.br
-.B lvconvert --replace /dev/sdb1 vg/lvol1 /dev/sdf1
-
-Replace 3 PVs /dev/sd[b-d]1 with PVs /dev/sd[f-h]1 in a raid1 LV.
-.br
-.B lvconvert --replace /dev/sdb1 --replace /dev/sdc1 --replace /dev/sdd1
-.RS
-.B vg/lvol1 /dev/sd[fgh]1
-.RE
-
-Replace the maximum of 2 PVs /dev/sd[bc]1 with PVs /dev/sd[gh]1 in a raid6 LV.
-.br
-.B lvconvert --replace /dev/sdb1 --replace /dev/sdc1 vg/lvol1 /dev/sd[gh]1
-
-Convert an LV into a thin LV in the specified thin pool.  The existing LV
-is used as an external read-only origin for the new thin LV.
-.br
-.B lvconvert --type thin --thinpool vg/tpool1 vg/lvol1
-
-Convert an LV into a thin LV in the specified thin pool.  The existing LV
-is used as an external read-only origin for the new thin LV, and is
-renamed "external".
-.br
-.B lvconvert --type thin --thinpool vg/tpool1
-.RS
-.B --originname external vg/lvol1
-.RE
-
-Convert an LV to a cache pool LV using another specified LV for cache pool
-metadata.
-.br
-.B lvconvert --type cache-pool --poolmetadata vg/poolmeta1 vg/lvol1
-
-Convert an LV to a cache LV using the specified cache pool and chunk size.
-.br
-.B lvconvert --type cache --cachepool vg/cpool1 -c 128 vg/lvol1
-
-Detach and keep the cache pool from a cache LV.
-.br
-.B lvconvert --splitcache vg/lvol1
-
-Detach and remove the cache pool from a cache LV.
-.br
-.B lvconvert --uncache vg/lvol1
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
+.P
+.RS 4
+LV1 types: mirror raid
+.RE
+.P
+\(em
+.P
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index 140344fa8..c73d1bafc 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -1,8 +1,11 @@
 .TH LVCREATE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvcreate - Create a logical volume
+.
+lvcreate \(em Create a logical volume
 .
 .SH SYNOPSIS
+.
 \fBlvcreate\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
@@ -12,349 +15,209 @@ lvcreate - Create a logical volume
 .P
 .ad l
  \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
-.ad b
 .br
-.ad l
     \fB--addtag\fP \fITag\fP
-.ad b
 .br
-.ad l
-    \fB--alloc\fP 
+    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.ad b
 .br
-.ad l
  \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-H\fP|\fB--cache\fP
-.ad b
 .br
-.ad l
     \fB--cachedevice\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP
-.ad b
 .br
-.ad l
     \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
-.ad b
 .br
-.ad l
     \fB--cachepolicy\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--cachepool\fP \fILV\fP
-.ad b
 .br
-.ad l
     \fB--cachesettings\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--cachesize\fP \fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
     \fB--cachevol\fP \fILV\fP
-.ad b
 .br
-.ad l
  \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT]
-.ad b
 .br
-.ad l
     \fB--commandprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--compression\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--config\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-d\fP|\fB--debug\fP
-.ad b
 .br
-.ad l
     \fB--deduplication\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--devices\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--devicesfile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
-.ad b
 .br
-.ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT]
-.ad b
 .br
-.ad l
  \fB-h\fP|\fB--help\fP
-.ad b
 .br
-.ad l
  \fB-K\fP|\fB--ignoreactivationskip\fP
-.ad b
 .br
-.ad l
     \fB--ignoremonitoring\fP
-.ad b
 .br
-.ad l
     \fB--lockopt\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--longhelp\fP
-.ad b
 .br
-.ad l
  \fB-j\fP|\fB--major\fP \fINumber\fP
-.ad b
 .br
-.ad l
-    \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT]
-.ad b
+    \fB--\fP[\fBraid\fP]\fBmaxrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-.ad l
     \fB--metadataprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--minor\fP \fINumber\fP
-.ad b
 .br
-.ad l
-    \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT]
-.ad b
+    \fB--\fP[\fBraid\fP]\fBminrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-.ad l
     \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP
-.ad b
 .br
-.ad l
  \fB-m\fP|\fB--mirrors\fP \fINumber\fP
-.ad b
 .br
-.ad l
     \fB--monitor\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-n\fP|\fB--name\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--nolocking\fP
-.ad b
 .br
-.ad l
     \fB--nosync\fP
-.ad b
 .br
-.ad l
     \fB--noudevsync\fP
-.ad b
 .br
-.ad l
  \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP
-.ad b
 .br
-.ad l
  \fB-M\fP|\fB--persistent\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--poolmetadatasize\fP \fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
     \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--profile\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-q\fP|\fB--quiet\fP
-.ad b
 .br
-.ad l
     \fB--raidintegrity\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--raidintegrityblocksize\fP \fINumber\fP
-.ad b
 .br
-.ad l
     \fB--raidintegritymode\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
-.ad b
 .br
-.ad l
  \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
     \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.ad b
 .br
-.ad l
  \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--setautoactivation\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
  \fB-s\fP|\fB--snapshot\fP
-.ad b
 .br
-.ad l
  \fB-i\fP|\fB--stripes\fP \fINumber\fP
-.ad b
 .br
-.ad l
  \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
-.ad b
 .br
-.ad l
  \fB-t\fP|\fB--test\fP
-.ad b
 .br
-.ad l
  \fB-T\fP|\fB--thin\fP
-.ad b
 .br
-.ad l
     \fB--thinpool\fP \fILV\fP
-.ad b
 .br
-.ad l
-    \fB--type\fP 
+    \fB--type\fP \c
 .nh
-\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+\%\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
 .hy
-.ad b
 .br
-.ad l
     \fB--vdo\fP
-.ad b
 .br
-.ad l
     \fB--vdopool\fP \fILV\fP
-.ad b
 .br
-.ad l
  \fB-v\fP|\fB--verbose\fP
-.ad b
 .br
-.ad l
     \fB--version\fP
-.ad b
 .br
-.ad l
  \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
  \fB-W\fP|\fB--wipesignatures\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-y\fP|\fB--yes\fP
-.ad b
 .br
-.ad l
  \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .ad b
+.
 .SH DESCRIPTION
+.
 lvcreate creates a new LV in a VG. For standard LVs, this requires
 allocating logical extents from the VG's free physical extents. If there
 is not enough free space, the VG can be extended with other PVs
 (\fBvgextend\fP(8)), or existing LVs can be reduced or removed
-(\fBlvremove\fP(8), \fBlvreduce\fP(8).)
-
+(\fBlvremove\fP(8), \fBlvreduce\fP(8)).
+.P
 To control which PVs a new LV will use, specify one or more PVs as
 position args at the end of the command line. lvcreate will allocate
 physical extents only from the specified PVs.
-
+.P
 lvcreate can also create snapshots of existing LVs, e.g. for backup
 purposes. The data in a new snapshot LV represents the content of the
 original LV from the time the snapshot was created.
-
+.P
 RAID LVs can be created by specifying an LV type when creating the LV (see
 \fBlvmraid\fP(7)). Different RAID levels require different numbers of
 unique PVs be available in the VG for allocation.
-
+.P
 Thin pools (for thin provisioning) and cache pools (for caching) are
 represented by special LVs with types thin-pool and cache-pool (see
 \fBlvmthin\fP(7) and \fBlvmcache\fP(7)). The pool LVs are not usable as
 standard block devices, but the LV names act as references to the pools.
-
+.P
 Thin LVs are thinly provisioned from a thin pool, and are created with a
 virtual size rather than a physical size. A cache LV is the combination of
 a standard LV with a cache pool, used to cache active portions of the LV
 to improve performance.
-
+.P
 VDO LVs are also provisioned volumes from a VDO pool, and are created with a
 virtual size rather than a physical size (see \fBlvmvdo\fP(7)).
-
+.P
 .SS Usage notes
 In the usage section below, \fB--size\fP \fISize\fP can be replaced
 with \fB--extents\fP \fINumber\fP. See descriptions in the options section.
-
+.P
 In the usage section below, \fB--name\fP is omitted from the required
 options, even though it is typically used. When the name is not
 specified, a new LV name is generated with the "lvol" prefix and a unique
 numeric suffix.
-
+.P
 In the usage section below, when creating a pool and the name is omitted
 the new LV pool name is generated with the
 "vpool" for vdo-pools  for prefix and a unique numeric suffix.
-
+.P
 Pool name can be specified together with \fIVG\fP name i.e.:
 vg00/mythinpool.
+.
 .SH USAGE
+.
 Create a linear LV.
 .br
 .P
@@ -363,20 +226,18 @@ Create a linear LV.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [    \fB--type\fP \fBlinear\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a striped LV (infers --type striped).
 .br
 .P
@@ -385,20 +246,20 @@ Create a striped LV (infers --type striped).
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
+.br
+[    \fB--type\fP \fBstriped\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a raid1 or mirror LV (infers --type raid1|mirror).
 .br
 .P
@@ -407,32 +268,28 @@ Create a raid1 or mirror LV (infers --type raid1|mirror).
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
+[ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
+.br
+[ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
+.br
 [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP ]
-.ad b
 .br
-.ad l
-[    \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT] ]
-.ad b
+[    \fB--\fP[\fBraid\fP]\fBminrecoveryrate\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
-[    \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT] ]
-.ad b
+[    \fB--\fP[\fBraid\fP]\fBmaxrecoveryrate\fP \fISize\fP[k|UNIT] ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a raid LV (a specific raid level must be used, e.g. raid1).
 .br
 .P
@@ -441,52 +298,34 @@ Create a raid LV (a specific raid level must be used, e.g. raid1).
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-m\fP|\fB--mirrors\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
+[ \fB-m\fP|\fB--mirrors\fP \fINumber\fP ]
+.br
 [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT] ]
-.ad b
+[    \fB--\fP[\fBraid\fP]\fBminrecoveryrate\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
-[    \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT] ]
-.ad b
+[    \fB--\fP[\fBraid\fP]\fBmaxrecoveryrate\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
 [    \fB--raidintegrity\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--raidintegritymode\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--raidintegrityblocksize\fP \fINumber\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a raid10 LV.
 .br
 .P
@@ -498,32 +337,24 @@ Create a raid10 LV.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT] ]
-.ad b
+[    \fB--\fP[\fBraid\fP]\fBminrecoveryrate\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
-[    \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT] ]
-.ad b
+[    \fB--\fP[\fBraid\fP]\fBmaxrecoveryrate\fP \fISize\fP[k|UNIT] ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a COW snapshot LV of an origin LV.
 .br
 .P
@@ -532,32 +363,24 @@ Create a COW snapshot LV of an origin LV.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--type\fP \fBsnapshot\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a thin pool.
 .br
 .P
@@ -566,48 +389,34 @@ Create a thin pool.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--thinpool\fP \fILV\fP\fI_new\fP ]
-.ad b
+[ \fB-T\fP|\fB--thin\fP ]
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[    \fB--thinpool\fP \fILV\fP\fI_new\fP ]
 .br
-.ad l
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
 .br
-.ad l
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a cache pool.
 .br
 .P
@@ -616,135 +425,89 @@ Create a cache pool.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
-[ \fB-H\fP|\fB--cache\fP ]
-.ad b
+[ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
 .br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
+[ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-H\fP|\fB--cache\fP ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a thin LV in a thin pool (infers --type thin).
 .br
 .P
-\fBlvcreate\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fB--thinpool\fP \fILV\fP\fI_thinpool\fP \fIVG\fP
+\fBlvcreate\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fB--thinpool\fP \fILV\fP \fIVG\fP
 .br
 .RS 4
 .ad l
 [ \fB-T\fP|\fB--thin\fP ]
-.ad b
 .br
-.ad l
 [    \fB--type\fP \fBthin\fP ]
-.ad b
-.br
-.ad l
-[    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
-.br
-.ad l
-[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Create a thin LV that is a snapshot of an existing thin LV 
 .br
 (infers --type thin).
 .br
 .P
-\fBlvcreate\fP \fB-s\fP|\fB--snapshot\fP \fILV\fP\fI_thin\fP
+\fBlvcreate\fP \fB-s\fP|\fB--snapshot\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [    \fB--type\fP \fBthin\fP ]
-.ad b
-.br
-.ad l
-[    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
-.br
-.ad l
-[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: thin
+.RE
+.P
+\(em
+.P
 Create a thin LV that is a snapshot of an external origin LV.
 .br
 .P
-\fBlvcreate\fP \fB--type\fP \fBthin\fP \fB--thinpool\fP \fILV\fP\fI_thinpool\fP \fILV\fP
+\fBlvcreate\fP \fB--type\fP \fBthin\fP \fB--thinpool\fP \fILV\fP \fILV\fP
 .br
 .RS 4
 .ad l
 [ \fB-T\fP|\fB--thin\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
-.br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
-.br
-.ad l
-[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Create a LV that returns VDO when used.
 .br
 .P
@@ -753,99 +516,30 @@ Create a LV that returns VDO when used.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
-[ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
-.ad b
-.br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
+[ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
+.br
 [    \fB--vdo\fP ]
-.ad b
 .br
-.ad l
 [    \fB--vdopool\fP \fILV\fP\fI_new\fP ]
-.ad b
 .br
-.ad l
 [    \fB--compression\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
-.RE
-.br
-.RS 4
-[ \fIPV\fP ... ]
-.RE
--
-
-Create a thin LV, first creating a thin pool for it, 
-.br
-where the new thin pool is named by the --thinpool arg.
-.br
-.P
-\fBlvcreate\fP \fB--type\fP \fBthin\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
-.RS 5
- \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fB--thinpool\fP \fILV\fP\fI_new\fP
-.RE
-.br
-.RS 4
-.ad l
-[ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-T\fP|\fB--thin\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-.ad l
-[ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
-.br
-.ad l
-[ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
-.br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .ad b
-.br
-.ad l
-[    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
-.br
-.ad l
-[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a new LV, then attach the specified cachepool 
 .br
 which converts the new LV to type cache.
@@ -853,62 +547,42 @@ which converts the new LV to type cache.
 .P
 \fBlvcreate\fP \fB--type\fP \fBcache\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT]
 .RS 5
- \fB--cachepool\fP \fILV\fP\fI_cachepool\fP \fIVG\fP
+ \fB--cachepool\fP \fILV\fP \fIVG\fP
 .RE
 .br
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
-[ \fB-H\fP|\fB--cache\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-H\fP|\fB--cache\fP ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a new LV, then attach the specified cachevol 
 .br
 which converts the new LV to type cache.
@@ -922,44 +596,30 @@ which converts the new LV to type cache.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
+.br
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a new LV, then attach a cachevol created from 
 .br
 the specified cache device, which converts the 
@@ -975,48 +635,32 @@ new LV to type cache.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
+.br
+[    \fB--cachesize\fP \fISize\fP[m|UNIT] ]
+.br
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
-.br
-.ad l
-[    \fB--cachesize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a new LV, then attach the specified cachevol 
 .br
 which converts the new LV to type writecache.
@@ -1030,28 +674,22 @@ which converts the new LV to type writecache.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a new LV, then attach a cachevol created from 
 .br
 the specified cache device, which converts the 
@@ -1067,201 +705,122 @@ new LV to type writecache.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--cachesize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP ]
-.ad b
 .br
-.ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-K\fP|\fB--ignoreactivationskip\fP ]
-.ad b
 .br
-.ad l
 [ \fB-j\fP|\fB--major\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-n\fP|\fB--name\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP ]
-.ad b
 .br
-.ad l
 [ \fB-M\fP|\fB--persistent\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-W\fP|\fB--wipesignatures\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--addtag\fP \fITag\fP ]
-.ad b
 .br
-.ad l
-[    \fB--alloc\fP 
+[    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
 ]
-.ad b
 .br
-.ad l
 [    \fB--ignoremonitoring\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--minor\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--monitor\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nosync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--setautoactivation\fP \fBy\fP|\fBn\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
-.ad b
 Controls the active state of the new LV.
 \fBy\fP makes the LV active, or available.
 New LVs are made active by default.
@@ -1271,24 +830,24 @@ For example, COW snapshots of an active origin LV can only
 be created in the active state (this does not apply to thin snapshots).
 The --zero option normally requires the LV to be active.
 If autoactivation \fBay\fP is used, the LV is only activated
-if it matches an item in lvm.conf activation/auto_activation_volume_list.
+if it matches an item in \fBlvm.conf\fP(5) \fBactivation/auto_activation_volume_list\fP.
 \fBay\fP implies --zero n and --wipesignatures n.
 See \fBlvmlockd\fP(8) for more information about activation options for shared VGs.
+.
 .HP
-.ad l
 \fB--addtag\fP \fITag\fP
 .br
-.ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
+.
 .HP
 .ad l
-\fB--alloc\fP 
+\fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.br
 .ad b
+.br
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -1305,38 +864,33 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB-H\fP|\fB--cache\fP
 .br
-.ad b
 Specifies the command is handling a cache LV or cache pool.
 See --type cache and --type cache-pool.
 See \fBlvmcache\fP(7) for more information about LVM caching.
+.
 .HP
-.ad l
 \fB--cachedevice\fP \fIPV\fP
 .br
-.ad b
 The name of a device to use for a cache.
+.
 .HP
-.ad l
 \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP
 .br
-.ad b
 Specifies the cache metadata format used by cache target.
+.
 .HP
-.ad l
 \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
 .br
-.ad b
 Specifies when writes to a cache LV should be considered complete.
 \fBwriteback\fP considers a write complete as soon as it is
 stored in the cache pool.
@@ -1348,24 +902,21 @@ cache pool LV. With \fBpassthrough\fP, all reads are served
 from the origin LV (all reads miss the cache) and all writes are
 forwarded to the origin LV; additionally, write hits cause cache
 block invalidates. See \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--cachepolicy\fP \fIString\fP
 .br
-.ad b
 Specifies the cache policy for a cache LV.
 See \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--cachepool\fP \fILV\fP
 .br
-.ad b
 The name of a cache pool.
+.
 .HP
-.ad l
 \fB--cachesettings\fP \fIString\fP
 .br
-.ad b
 Specifies tunable values for a cache LV in "Key = Value" form.
 Repeat this option to specify multiple values.
 (The default values should usually be adequate.)
@@ -1373,23 +924,20 @@ The special string value \fBdefault\fP switches
 settings back to their default kernel values and removes
 them from the list of settings stored in LVM metadata.
 See \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--cachesize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 The size of cache to use.
+.
 .HP
-.ad l
 \fB--cachevol\fP \fILV\fP
 .br
-.ad b
 The name of a cache volume.
+.
 .HP
-.ad l
 \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 The size of chunks in a snapshot, cache pool or thin pool.
 For snapshots, the value must be a power of 2 between 4KiB and 512KiB
 and the default value is 4.
@@ -1400,76 +948,67 @@ and the default value starts with 64 and scales up to fit the
 pool metadata size within 128MiB, if the pool metadata size is not specified.
 The value must be a multiple of 64KiB.
 See \fBlvmthin\fP(7) and \fBlvmcache\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--compression\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls whether compression is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Sets or resets the contiguous allocation policy for LVs.
 Default is no contiguous allocation based on a next free principle.
 It is only possible to change a non-contiguous allocation policy
 to contiguous if all of the allocated physical extents in the LV
 are already contiguous.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--deduplication\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls whether deduplication is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
-.ad b
 Specifies how the device-mapper thin pool layer in the kernel should
 handle discards.
 \fBignore\fP causes the thin pool to ignore discards.
@@ -1478,18 +1017,16 @@ allow reuse of unneeded extents in the thin pool.
 \fBpassdown\fP causes the thin pool to process discards itself
 (like nopassdown) and pass the discards to the underlying device.
 See \fBlvmthin\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies thin pool behavior when data space is exhausted.
 When yes, device-mapper will immediately return an error
 when a thin pool is full and an I/O request requires space.
@@ -1498,11 +1035,10 @@ period of time to allow the thin pool to be extended.
 Errors are returned if no space is available after the timeout.
 (Also see dm-thin-pool kernel module option no_space_timeout.)
 See \fBlvmthin\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT]
 .br
-.ad b
 Specifies the size of the new LV in logical extents.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -1518,81 +1054,70 @@ the whole origin).
 When expressed as a percentage, the size defines an upper limit for the
 number of logical extents in the new LV. The precise number of logical
 extents in the new LV is not determined until the command has completed.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-K\fP|\fB--ignoreactivationskip\fP
 .br
-.ad b
 Ignore the "activation skip" LV flag during activation
 to allow LVs with the flag set to be activated.
+.
 .HP
-.ad l
 \fB--ignoremonitoring\fP
 .br
-.ad b
 Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-j\fP|\fB--major\fP \fINumber\fP
 .br
-.ad b
 Sets the major number of an LV block device.
+.
 .HP
-.ad l
-\fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT]
+\fB--\fP[\fBraid\fP]\fBmaxrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 Sets the maximum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
-.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--minor\fP \fINumber\fP
 .br
-.ad b
 Sets the minor number of an LV block device.
+.
 .HP
-.ad l
-\fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT]
+\fB--\fP[\fBraid\fP]\fBminrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 Sets the minimum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP
 .br
-.ad b
 Specifies the type of mirror log for LVs with the "mirror" type
 (does not apply to the "raid1" type.)
 \fBdisk\fP is a persistent log and requires a small amount of
@@ -1602,11 +1127,10 @@ In this case, the mirror must be synchronized (by copying LV data from
 the first device to others) each time the LV is activated, e.g. after reboot.
 \fBmirrored\fP is a persistent log that is itself mirrored, but
 should be avoided. Instead, use the raid1 type for log redundancy.
+.
 .HP
-.ad l
 \fB-m\fP|\fB--mirrors\fP \fINumber\fP
 .br
-.ad b
 Specifies the number of mirror images in addition to the original LV
 image, e.g. --mirrors 1 means there are two images of the data, the
 original and one mirror image.
@@ -1616,38 +1140,34 @@ There are two mirroring implementations: "raid1" and "mirror".
 These are the names of the corresponding LV types, or "segment types".
 Use the --type option to specify which to use (raid1 is default,
 and mirror is legacy)
-Use lvm.conf global/mirror_segtype_default and
+Use \fBlvm.conf\fP(5) \fBglobal/mirror_segtype_default\fP and
 global/raid10_segtype_default to configure the default types.
 See the --nosync option for avoiding initial image synchronization.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--monitor\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Start (yes) or stop (no) monitoring an LV with dmeventd.
 dmeventd monitors kernel events for an LV, and performs
 automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
-.ad b
 Specifies the name of a new LV.
 When unspecified, a default name of "lvol#" is
 generated, where # is a number generated by LVM.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--nosync\fP
 .br
-.ad b
 Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
 initial synchronization. In case of mirror, raid1 and raid10, any data
 written afterwards will be mirrored, but the original contents will not be
@@ -1660,77 +1180,67 @@ This option is not valid for raid6, because raid6 relies on proper parity
 to reconstruct proper user date in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP
 .br
-.ad b
 Set access permission to read only \fBr\fP or read and write \fBrw\fP.
+.
 .HP
-.ad l
 \fB-M\fP|\fB--persistent\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 When yes, makes the specified minor number persistent.
+.
 .HP
-.ad l
 \fB--poolmetadatasize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Specifies the size of the new pool metadata LV.
+.
 .HP
-.ad l
 \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Enable or disable the automatic creation and management of a
 spare pool metadata LV in the VG. A spare metadata LV is reserved
 space that can be used when repairing a pool.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--raidintegrity\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Enable or disable data integrity checksums for raid images.
+.
 .HP
-.ad l
 \fB--raidintegrityblocksize\fP \fINumber\fP
 .br
-.ad b
 The block size to use for dm-integrity on raid images.
 The integrity block size should usually match the device
 logical block size, or the file system block size.
 It may be less than the file system block size, but not
 less than the device logical block size.
 Possible values: 512, 1024, 2048, 4096.
+.
 .HP
-.ad l
 \fB--raidintegritymode\fP \fIString\fP
 .br
-.ad b
 Use a journal (default) or bitmap for keeping integrity checksums consistent
 in case of a crash. The bitmap areas are recalculated after a crash, so corruption
 in those areas would not be detected. A journal does not have this problem.
@@ -1738,50 +1248,45 @@ The journal mode doubles writes to storage, but can improve performance for
 scattered writes packed into a single journal write.
 bitmap mode can in theory achieve full write throughput of the device,
 but would not benefit from the potential scattered write optimization.
+.
 .HP
-.ad l
 \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
 .br
-.ad b
 Sets read ahead sector count of an LV.
 \fBauto\fP is the default which allows the kernel to choose
 a suitable value automatically.
 \fBnone\fP is equivalent to zero.
+.
 .HP
-.ad l
 \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Size of each raid or mirror synchronization region.
-lvm.conf activation/raid_region_size can be used to
+\fBlvm.conf\fP(5) \fBactivation/raid_region_size\fP can be used to
 configure a default.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Persistently sets (yes) or clears (no) the "activation skip" flag on an LV.
 An LV with this flag set is not activated unless the
 --ignoreactivationskip option is used by the activation command.
 This flag is set by default on new thin snapshot LVs.
 The flag is not applied to deactivation.
 The current value of the flag is indicated in the lvs lv_attr bits.
+.
 .HP
-.ad l
 \fB--setautoactivation\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Set the autoactivation property on a VG or LV.
 Display the property with vgs or lvs "-o autoactivation".
 When the autoactivation property is disabled, the VG or LV
@@ -1791,20 +1296,18 @@ If autoactivation is disabled on a VG, no LVs will be autoactivated
 in that VG, and the LV autoactivation property has no effect.
 If autoactivation is enabled on a VG, autoactivation can be disabled
 for individual LVs.
+.
 .HP
-.ad l
 \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Specifies the size of the new LV.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
 greater when redundant data is needed for RAID levels.
+.
 .HP
-.ad l
 \fB-s\fP|\fB--snapshot\fP
 .br
-.ad b
 Create a snapshot. Snapshots provide a "frozen image" of an origin LV.
 The snapshot LV can be used, e.g. for backups, while the origin LV
 continues to be used.
@@ -1830,11 +1333,10 @@ A small amount of the COW snapshot LV size is used to track COW block
 locations, so the full size is not available for COW data blocks.
 Use lvs to check how much space is used, and see --monitor to
 to automatically extend the size to avoid running out of space.
+.
 .HP
-.ad l
 \fB-i\fP|\fB--stripes\fP \fINumber\fP
 .br
-.ad b
 Specifies the number of stripes in a striped LV. This is the number of
 PVs (devices) that a striped LV is spread across. Data that
 appears sequential in the LV is spread across multiple devices in units of
@@ -1846,46 +1348,43 @@ the RAID type (raid0: 64, raid10: 32, raid4/5: 63, raid6: 62), and
 when unspecified, the default depends on the RAID type
 (raid0: 2, raid10: 2, raid4/5: 3, raid6: 5.)
 To stripe a new raid LV across all PVs by default,
-see lvm.conf allocation/raid_stripe_all_devices.
+see \fBlvm.conf\fP(5) \fBallocation/raid_stripe_all_devices\fP.
+.
 .HP
-.ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-T\fP|\fB--thin\fP
 .br
-.ad b
 Specifies the command is handling a thin LV or thin pool.
 See --type thin, --type thin-pool, and --virtualsize.
 See \fBlvmthin\fP(7) for more information about LVM thin provisioning.
+.
 .HP
-.ad l
 \fB--thinpool\fP \fILV\fP
 .br
-.ad b
 The name of a thin pool LV.
+.
 .HP
 .ad l
-\fB--type\fP 
+\fB--type\fP \c
 .nh
-\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+\%\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
 .hy
-.br
 .ad b
+.br
 The LV type, also known as "segment type" or "segtype".
 See usage descriptions for the specific ways to use these types.
 For more information about redundancy and performance (\fBraid\fP<N>, \fBmirror\fP, \fBstriped\fP, \fBlinear\fP) see \fBlvmraid\fP(7).
@@ -1897,44 +1396,39 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
+.
 .HP
-.ad l
 \fB--vdo\fP
 .br
-.ad b
 Specifies the command is handling VDO LV.
 See --type vdo.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
+.
 .HP
-.ad l
 \fB--vdopool\fP \fILV\fP
 .br
-.ad b
 The name of a VDO pool LV.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 The virtual size of a new thin LV.
 See \fBlvmthin\fP(7) for more information about LVM thin provisioning.
 Using virtual size (-V) and actual size (-L) together creates
 a sparse LV.
-lvm.conf global/sparse_segtype_default determines the
+\fBlvm.conf\fP(5) \fBglobal/sparse_segtype_default\fP determines the
 default segment type used to create a sparse LV.
 Anything written to a sparse LV will be returned when reading from it.
 Reading from other areas of the LV will return blocks of zeros.
@@ -1942,61 +1436,57 @@ When using a snapshot to create a sparse LV, a hidden virtual device
 is created using the zero target, and the LV has the suffix _vorigin.
 Snapshots are less efficient than thin provisioning when creating
 large sparse LVs (GiB).
+.
 .HP
-.ad l
 \fB-W\fP|\fB--wipesignatures\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls detection and subsequent wiping of signatures on new LVs.
 There is a prompt for each signature detected to confirm its wiping
 (unless --yes is used to override confirmations.)
 When not specified, signatures are wiped whenever zeroing is done
 (see --zero). This behaviour can be configured with
-lvm.conf allocation/wipe_signatures_when_zeroing_new_lvs.
-If blkid wiping is used (lvm.conf allocation/use_blkid_wiping)
+\fBlvm.conf\fP(5) \fBallocation/wipe_signatures_when_zeroing_new_lvs\fP.
+If blkid wiping is used (\fBlvm.conf\fP(5) \fBallocation/use_blkid_wiping\fP)
 and LVM is compiled with blkid wiping support, then the blkid(8)
 library is used to detect the signatures (use blkid -k to list the
 signatures that are recognized).
 Otherwise, native LVM code is used to detect signatures
 (only MD RAID, swap and LUKS signatures are detected in this case.)
 The LV is not wiped if the read only flag is set.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .HP
-.ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls zeroing of the first 4KiB of data in the new LV.
 Default is \fBy\fP.
 Snapshot COW volumes are always zeroed.
 For thin pools, this controls zeroing of provisioned blocks.
 LV is not zeroed if the read only flag is set.
 Warning: trying to mount an unzeroed LV can cause the system to hang.
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
 For lvcreate, the required VG positional arg may be
 omitted when the VG name is included in another option,
 e.g. --name VG/LV.
-.HP
-\fILV\fP
-.br
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-LV followed by _<type> indicates that an LV of the
-given type is required. (raid represents raid<N> type)
-.HP
-\fIPV\fP
-.br
+LV1 indicates the LV must have a specific type, where the
+accepted LV types are listed. (raid represents raid<N> type).
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -2004,26 +1494,42 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
+.
 .SH ADVANCED USAGE
+.
 Alternate command forms, advanced command usage, and listing of all valid syntax for completeness.
 .P
 Create an LV that returns errors when used.
@@ -2034,13 +1540,13 @@ Create an LV that returns errors when used.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Create an LV that returns zeros when read.
 .br
 .P
@@ -2049,13 +1555,13 @@ Create an LV that returns zeros when read.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Create a linear LV.
 .br
 .P
@@ -2064,16 +1570,16 @@ Create a linear LV.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a striped LV (also see lvcreate --stripes).
 .br
 .P
@@ -2082,24 +1588,20 @@ Create a striped LV (also see lvcreate --stripes).
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a mirror LV (also see --type raid1).
 .br
 .P
@@ -2108,36 +1610,26 @@ Create a mirror LV (also see --type raid1).
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
-[ \fB-m\fP|\fB--mirrors\fP \fINumber\fP ]
-.ad b
-.br
-.ad l
-[ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-.ad b
-.br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
+[ \fB-m\fP|\fB--mirrors\fP \fINumber\fP ]
+.br
+[ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
+.br
 [    \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a COW snapshot LV of an origin LV 
 .br
 (also see --snapshot).
@@ -2148,32 +1640,24 @@ Create a COW snapshot LV of an origin LV
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-s\fP|\fB--snapshot\fP ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a sparse COW snapshot LV of a virtual origin LV 
 .br
 (also see --snapshot).
@@ -2187,53 +1671,20 @@ Create a sparse COW snapshot LV of a virtual origin LV
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-s\fP|\fB--snapshot\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
-.RE
-.br
-.RS 4
-[ \fIPV\fP ... ]
-.RE
--
-
-Create a sparse COW snapshot LV of a virtual origin LV.
-.br
-.P
-\fBlvcreate\fP \fB-s\fP|\fB--snapshot\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT]
-.RS 5
- \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fIVG\fP
-.RE
-.br
-.RS 4
-.ad l
-[ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-.ad l
-[    \fB--type\fP \fBsnapshot\fP ]
 .ad b
-.br
-[ COMMON_OPTIONS ]
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a thin pool (infers --type thin-pool).
 .br
 .P
@@ -2242,48 +1693,32 @@ Create a thin pool (infers --type thin-pool).
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-.ad l
-[    \fB--type\fP \fBthin-pool\fP ]
-.ad b
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[    \fB--type\fP \fBthin-pool\fP ]
 .br
-.ad l
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
 .br
-.ad l
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a thin pool named by the --thinpool arg 
 .br
 (infers --type thin-pool).
@@ -2294,52 +1729,34 @@ Create a thin pool named by the --thinpool arg
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-T\fP|\fB--thin\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--type\fP \fBthin-pool\fP ]
-.ad b
+[ \fB-T\fP|\fB--thin\fP ]
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[    \fB--type\fP \fBthin-pool\fP ]
 .br
-.ad l
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
 .br
-.ad l
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a cache pool named by the --cachepool arg 
 .br
 (variant, uses --cachepool in place of --name).
@@ -2353,111 +1770,75 @@ Create a cache pool named by the --cachepool arg
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
-[ \fB-H\fP|\fB--cache\fP ]
-.ad b
+[ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
 .br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
+[ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-H\fP|\fB--cache\fP ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a thin LV in a thin pool.
 .br
 .P
 \fBlvcreate\fP \fB--type\fP \fBthin\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
 .RS 5
- \fB--thinpool\fP \fILV\fP\fI_thinpool\fP \fIVG\fP
+ \fB--thinpool\fP \fILV\fP \fIVG\fP
 .RE
 .br
 .RS 4
 .ad l
 [ \fB-T\fP|\fB--thin\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
-.br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
-.br
-.ad l
-[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Create a thin LV in a thin pool named in the first arg 
 .br
 (variant, also see --thinpool for naming pool).
 .br
 .P
-\fBlvcreate\fP \fB--type\fP \fBthin\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fILV\fP\fI_thinpool\fP
+\fBlvcreate\fP \fB--type\fP \fBthin\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-T\fP|\fB--thin\fP ]
-.ad b
-.br
-.ad l
-[    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
-.br
-.ad l
-[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: thinpool
+.RE
+.P
+\(em
+.P
 Create a thin LV in the thin pool named in the first arg 
 .br
 (variant, infers --type thin, also see --thinpool for 
@@ -2465,103 +1846,81 @@ Create a thin LV in the thin pool named in the first arg
 naming pool.)
 .br
 .P
-\fBlvcreate\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fILV\fP\fI_thinpool\fP
+\fBlvcreate\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-T\fP|\fB--thin\fP ]
-.ad b
 .br
-.ad l
 [    \fB--type\fP \fBthin\fP ]
-.ad b
-.br
-.ad l
-[    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
-.br
-.ad l
-[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: thinpool
+.RE
+.P
+\(em
+.P
 Create a thin LV that is a snapshot of an existing thin LV.
 .br
 .P
-\fBlvcreate\fP \fB--type\fP \fBthin\fP \fILV\fP\fI_thin\fP
+\fBlvcreate\fP \fB--type\fP \fBthin\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-T\fP|\fB--thin\fP ]
-.ad b
-.br
-.ad l
-[    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
-.br
-.ad l
-[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: thin
+.RE
+.P
+\(em
+.P
 Create a thin LV that is a snapshot of an existing thin LV 
 .br
 (infers --type thin).
 .br
 .P
-\fBlvcreate\fP \fB-T\fP|\fB--thin\fP \fILV\fP\fI_thin\fP
+\fBlvcreate\fP \fB-T\fP|\fB--thin\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [    \fB--type\fP \fBthin\fP ]
-.ad b
-.br
-.ad l
-[    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
-.br
-.ad l
-[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+.RS 4
+LV1 types: thin
+.RE
+.P
+\(em
+.P
 Create a thin LV that is a snapshot of an external origin LV 
 .br
 (infers --type thin).
 .br
 .P
-\fBlvcreate\fP \fB-s\fP|\fB--snapshot\fP \fB--thinpool\fP \fILV\fP\fI_thinpool\fP \fILV\fP
+\fBlvcreate\fP \fB-s\fP|\fB--snapshot\fP \fB--thinpool\fP \fILV\fP \fILV\fP
 .br
 .RS 4
 .ad l
 [    \fB--type\fP \fBthin\fP ]
-.ad b
-.br
-.ad l
-[    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
-.br
-.ad l
-[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Create a VDO LV with VDO pool.
 .br
 .P
@@ -2570,40 +1929,30 @@ Create a VDO LV with VDO pool.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
+[ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--type\fP \fBvdo\fP ]
+.br
 [    \fB--vdopool\fP \fILV\fP\fI_new\fP ]
-.ad b
 .br
-.ad l
 [    \fB--compression\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a VDO LV with VDO pool.
 .br
 .P
@@ -2612,101 +1961,69 @@ Create a VDO LV with VDO pool.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
+[ \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] ]
+.br
 [    \fB--vdo\fP ]
-.ad b
 .br
-.ad l
 [    \fB--type\fP \fBvdo\fP ]
-.ad b
 .br
-.ad l
 [    \fB--compression\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--deduplication\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a thin LV, first creating a thin pool for it, 
 .br
-where the new thin pool is named by the --thinpool arg 
-.br
-(variant, infers --type thin).
+where the new thin pool is named by the --thinpool arg.
 .br
 .P
-\fBlvcreate\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT] \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT]
+\fBlvcreate\fP \fB--type\fP \fBthin\fP \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
 .RS 5
- \fB--thinpool\fP \fILV\fP\fI_new\fP
+ \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fB--thinpool\fP \fILV\fP\fI_new\fP \fIVG\fP
 .RE
 .br
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-T\fP|\fB--thin\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-T\fP|\fB--thin\fP ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
 .br
-.ad l
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a thin LV, first creating a thin pool for it, 
 .br
 where the new thin pool is named by the --thinpool arg 
@@ -2722,48 +2039,34 @@ where the new thin pool is named by the --thinpool arg
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-T\fP|\fB--thin\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-T\fP|\fB--thin\fP ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
+.br
+[    \fB--type\fP \fBthin\fP ]
 .br
-.ad l
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
 .br
-.ad l
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a thin LV, first creating a thin pool for it, 
 .br
 where the new thin pool is named in the first arg, 
@@ -2781,48 +2084,32 @@ arg is a VG name.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-T\fP|\fB--thin\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-T\fP|\fB--thin\fP ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
 .br
-.ad l
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a thin LV, first creating a thin pool for it, 
 .br
 where the new thin pool is named in the first arg, 
@@ -2840,44 +2127,32 @@ arg is a VG name (variant, infers --type thin).
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[    \fB--type\fP \fBthin\fP ]
 .br
-.ad l
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
 .br
-.ad l
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a thin LV, first creating a thin pool for it 
 .br
 (infers --type thin). 
@@ -2896,52 +2171,36 @@ config setting sparse_segtype_default.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-s\fP|\fB--snapshot\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--type\fP \fBsnapshot\fP ]
-.ad b
+[ \fB-s\fP|\fB--snapshot\fP ]
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-T\fP|\fB--thin\fP ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
+.br
+[    \fB--type\fP \fIString\fP ]
 .br
-.ad l
 [    \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP ]
-.ad b
 .br
-.ad l
 [    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a new LV, then attach the specified cachepool 
 .br
 which converts the new LV to type cache 
@@ -2949,57 +2208,39 @@ which converts the new LV to type cache
 (variant, infers --type cache.)
 .br
 .P
-\fBlvcreate\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fB--cachepool\fP \fILV\fP\fI_cachepool\fP \fIVG\fP
+\fBlvcreate\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fB--cachepool\fP \fILV\fP \fIVG\fP
 .br
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-H\fP|\fB--cache\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
+[ \fB-H\fP|\fB--cache\fP ]
+.br
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
+.br
 [    \fB--type\fP \fBcache\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Create a new LV, then attach the specified cachepool 
 .br
 which converts the new LV to type cache. 
@@ -3007,61 +2248,45 @@ which converts the new LV to type cache.
 (variant, also use --cachepool).
 .br
 .P
-\fBlvcreate\fP \fB--type\fP \fBcache\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fILV\fP\fI_cachepool\fP
+\fBlvcreate\fP \fB--type\fP \fBcache\fP \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT] \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-H\fP|\fB--cache\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
+[ \fB-H\fP|\fB--cache\fP ]
 .br
-.ad l
-[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
 .br
-.ad l
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
+.br
+[    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
+.br
+[    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: cachepool
+.RE
+.P
+\(em
+.P
 When the LV arg is a cachepool, then create a new LV and 
 .br
 attach the cachepool arg to it. 
@@ -3078,223 +2303,33 @@ and attach it to the LV arg (alternative, use lvconvert.)
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
+[    \fB--type\fP \fBcache\fP ]
+.br
 [    \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachepolicy\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachesettings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
-.SH EXAMPLES
-
-Create a striped LV with 3 stripes, a stripe size of 8KiB and a size of 100MiB.
-The LV name is chosen by lvcreate.
-.br
-.B lvcreate -i 3 -I 8 -L 100m vg00
-
-Create a raid1 LV with two images, and a useable size of 500 MiB. This
-operation requires two devices, one for each mirror image. RAID metadata
-(superblock and bitmap) is also included on the two devices.
-.br
-.B lvcreate --type raid1 -m1 -L 500m -n mylv vg00
-
-Create a mirror LV with two images, and a useable size of 500 MiB.
-This operation requires three devices: two for mirror images and
-one for a disk log.
-.br
-.B lvcreate --type mirror -m1 -L 500m -n mylv vg00
-
-Create a mirror LV with 2 images, and a useable size of 500 MiB.
-This operation requires 2 devices because the log is in memory.
-.br
-.B lvcreate --type mirror -m1 --mirrorlog core -L 500m -n mylv vg00
-
-Create a copy-on-write snapshot of an LV:
-.br
-.B lvcreate --snapshot --size 100m --name mysnap vg00/mylv
-
-Create a copy-on-write snapshot with a size sufficient
-for overwriting 20% of the size of the original LV.
-.br
-.B lvcreate -s -l 20%ORIGIN -n mysnap vg00/mylv
-
-Create a sparse LV with 1TiB of virtual space, and actual space just under
-100MiB.
-.br
-.B lvcreate --snapshot --virtualsize 1t --size 100m --name mylv vg00
-
-Create a linear LV with a usable size of 64MiB on specific physical extents.
-.br
-.B lvcreate -L 64m -n mylv vg00 /dev/sda:0-7 /dev/sdb:0-7
-
-Create a RAID5 LV with a usable size of 5GiB, 3 stripes, a stripe size of
-64KiB, using a total of 4 devices (including one for parity).
-.br
-.B lvcreate --type raid5 -L 5G -i 3 -I 64 -n mylv vg00
-
-Create a RAID5 LV using all of the free space in the VG and spanning all the
-PVs in the VG (note that the command will fail if there are more than 8 PVs in
-the VG, in which case \fB-i 7\fP must be used to get to the current maximum of
-8 devices including parity for RaidLVs).
-.br
-.B lvcreate --config allocation/raid_stripe_all_devices=1
-.RS
-.B --type raid5 -l 100%FREE -n mylv vg00
-.RE
-
-Create RAID10 LV with a usable size of 5GiB, using 2 stripes, each on
-a two-image mirror. (Note that the \fB-i\fP and \fB-m\fP arguments behave
-differently:
-\fB-i\fP specifies the total number of stripes,
-but \fB-m\fP specifies the number of images in addition
-to the first image).
-.br
-.B lvcreate --type raid10 -L 5G -i 2 -m 1 -n mylv vg00
-
-Create a 1TiB thin LV mythin, with 256GiB thinpool tpool0 in vg00.
-.br
-.B lvcreate --T --size 256G --name mythin vg00/tpool0
-
-Create a 1TiB thin LV, first creating a new thin pool for it, where
-the thin pool has 100MiB of space, uses 2 stripes, has a 64KiB stripe
-size, and 256KiB chunk size.
-.br
-.B lvcreate --type thin --name mylv --thinpool mypool
-.RS
-.B -V 1t -L 100m -i 2 -I 64 -c 256 vg00
-.RE
-
-Create a thin snapshot of a thin LV (the size option must not be
-used, otherwise a copy-on-write snapshot would be created).
-.br
-.B lvcreate --snapshot --name mysnap vg00/thinvol
-
-Create a thin snapshot of the read-only inactive LV named "origin"
-which becomes an external origin for the thin snapshot LV.
-.br
-.B lvcreate --snapshot --name mysnap --thinpool mypool vg00/origin
-
-Create a cache pool from a fast physical device. The cache pool can
-then be used to cache an LV.
-.br
-.B lvcreate --type cache-pool -L 1G -n my_cpool vg00 /dev/fast1
-
-Create a cache LV, first creating a new origin LV on a slow physical device,
-then combining the new origin LV with an existing cache pool.
-.br
-.B lvcreate --type cache --cachepool my_cpool
-.RS
-.B -L 100G -n mylv vg00 /dev/slow1
-.RE
-
-Create a VDO LV vdo0 with VDOPoolLV size of 10GiB and name vpool1.
-.br
-.B lvcreate --vdo --size 10G --name vdo0 vg00/vpool1
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
+.P
+\(em
+.P
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index be1c8b73e..8ff34bc08 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -1,363 +1,277 @@
 .TH LVDISPLAY 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvdisplay - Display information about a logical volume
+.
+lvdisplay \(em Display information about a logical volume
 .
 .SH SYNOPSIS
+.
 \fBlvdisplay\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 lvdisplay shows the attributes of LVs, like size, read/write status,
 snapshot information, etc.
-
+.P
 \fBlvs\fP(8) is a preferred alternative that shows the same information
 and more, using a more compact and configurable output format.
+.
 .SH USAGE
+.
 \fBlvdisplay\fP
 .br
 .RS 4
 .ad l
 [ \fB-a\fP|\fB--all\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--colon\fP ]
-.ad b
 .br
-.ad l
 [ \fB-C\fP|\fB--columns\fP ]
-.ad b
 .br
-.ad l
 [ \fB-H\fP|\fB--history\fP ]
-.ad b
 .br
-.ad l
 [ \fB-m\fP|\fB--maps\fP ]
-.ad b
 .br
-.ad l
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--aligned\fP ]
-.ad b
 .br
-.ad l
 [    \fB--binary\fP ]
-.ad b
 .br
-.ad l
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
-.ad b
 .br
-.ad l
 [    \fB--foreign\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--logonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noheadings\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nosuffix\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--segments\fP ]
-.ad b
 .br
-.ad l
 [    \fB--separator\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--shared\fP ]
-.ad b
 .br
-.ad l
 [    \fB--unbuffered\fP ]
-.ad b
 .br
-.ad l
-[    \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP ]
-.ad b
+[    \fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
+]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fILV\fP|\fITag\fP ... ]
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--aligned\fP
 .br
-.ad b
 Use with --separator to align the output columns
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
 Show information about internal LVs.
 These are components of normal LVs, such as mirrors,
 which are not independently accessible, e.g. not mountable.
+.
 .HP
-.ad l
 \fB--binary\fP
 .br
-.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
+.
 .HP
-.ad l
 \fB-c\fP|\fB--colon\fP
 .br
-.ad b
 Generate colon separated output for easier parsing in scripts or programs.
 Also see \fBvgs\fP(8) which provides considerably more control over the output.
+.
 .HP
-.ad l
 \fB-C\fP|\fB--columns\fP
 .br
-.ad b
 Display output in columns, the equivalent of \fBvgs\fP(8).
 Options listed are the same as options given in \fBvgs\fP(8).
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-.ad b
 See \fBlvmreport\fP(7).
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--foreign\fP
 .br
-.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-H\fP|\fB--history\fP
 .br
-.ad b
 Include historical LVs in the output.
 (This has no effect unless LVs were removed while
-lvm.conf metadata/record_lvs_history was enabled.
+\fBlvm.conf\fP(5) \fBmetadata/record_lvs_history\fP was enabled.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--logonly\fP
 .br
-.ad b
 Suppress command report and display only log report.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-m\fP|\fB--maps\fP
 .br
-.ad b
 Display the mapping of logical extents to PVs and physical extents.
 To map physical extents to logical extents use:
 pvs --segments -o+lv_name,seg_start_pe,segtype
+.
 .HP
-.ad l
 \fB--noheadings\fP
 .br
-.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--nosuffix\fP
 .br
-.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
+.
 .HP
-.ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
-.ad b
 Comma-separated, ordered list of fields to display in columns.
-String arg syntax is: [+|-|#]Field1[,Field2 ...]
+String arg syntax is: [\fB+\fP|\fB-\fP|\fB#\fP]\fIField1\fP[\fB,\fP\fIField2\fP ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
 \fB-\fP will remove the specified fields from the default fields, and
 \fB#\fP will compact specified fields (removing them when empty for all rows.)
@@ -371,54 +285,48 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment fields,
 \fBseg_all\fP all LV segment fields, and
 \fBpvseg_all\fP all PV segment columns.
-See the lvm.conf report section for more config options.
+See the \fBlvm.conf\fP(5) report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--segments\fP
 .br
-.ad b
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -427,175 +335,115 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB--separator\fP \fIString\fP
 .br
-.ad b
 String to use to separate each column. Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--shared\fP
 .br
-.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
+.
 .HP
-.ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
-.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB--unbuffered\fP
 .br
-.ad b
 Produce output immediately without sorting or aligning the columns properly.
+.
 .HP
 .ad l
-\fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
-.br
+\fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
 .ad b
+.br
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fILV\fP
-.br
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index 83216b972..fc4d55233 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -1,8 +1,11 @@
 .TH LVEXTEND 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvextend - Add space to a logical volume
+.
+lvextend \(em Add space to a logical volume
 .
 .SH SYNOPSIS
+.
 \fBlvextend\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
@@ -11,152 +14,94 @@ lvextend - Add space to a logical volume
 .br
 .P
 .ad l
-    \fB--alloc\fP 
+    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.ad b
 .br
-.ad l
  \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--commandprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--config\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-d\fP|\fB--debug\fP
-.ad b
 .br
-.ad l
     \fB--devices\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--devicesfile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-l\fP|\fB--extents\fP [\fB+\fP]\fINumber\fP[PERCENT]
-.ad b
 .br
-.ad l
  \fB-f\fP|\fB--force\fP
-.ad b
 .br
-.ad l
  \fB-h\fP|\fB--help\fP
-.ad b
 .br
-.ad l
     \fB--lockopt\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--longhelp\fP
-.ad b
 .br
-.ad l
  \fB-m\fP|\fB--mirrors\fP \fINumber\fP
-.ad b
 .br
-.ad l
  \fB-n\fP|\fB--nofsck\fP
-.ad b
 .br
-.ad l
     \fB--nolocking\fP
-.ad b
 .br
-.ad l
     \fB--nosync\fP
-.ad b
 .br
-.ad l
     \fB--noudevsync\fP
-.ad b
 .br
-.ad l
     \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
     \fB--profile\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-q\fP|\fB--quiet\fP
-.ad b
 .br
-.ad l
     \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.ad b
 .br
-.ad l
  \fB-r\fP|\fB--resizefs\fP
-.ad b
 .br
-.ad l
  \fB-L\fP|\fB--size\fP [\fB+\fP]\fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
  \fB-i\fP|\fB--stripes\fP \fINumber\fP
-.ad b
 .br
-.ad l
  \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
-.ad b
 .br
-.ad l
  \fB-t\fP|\fB--test\fP
-.ad b
 .br
-.ad l
-    \fB--type\fP 
+    \fB--type\fP \c
 .nh
-\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+\%\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
 .hy
-.ad b
 .br
-.ad l
     \fB--usepolicies\fP
-.ad b
 .br
-.ad l
  \fB-v\fP|\fB--verbose\fP
-.ad b
 .br
-.ad l
     \fB--version\fP
-.ad b
 .br
-.ad l
  \fB-y\fP|\fB--yes\fP
 .ad b
+.
 .SH DESCRIPTION
+.
 lvextend extends the size of an LV. This requires allocating logical
 extents from the VG's free physical extents. If the extension adds a new
 LV segment, the new segment will use the existing segment type of the LV.
-
+.P
 Extending a copy-on-write snapshot LV adds space for COW blocks.
-
+.P
 Use \fBlvconvert\fP(8) to change the number of data images in a RAID or
 mirrored LV.
-
+.P
 In the usage section below, \fB--size\fP \fISize\fP can be replaced
 with \fB--extents\fP \fINumber\fP.  See both descriptions
 the options section.
+.
 .SH USAGE
+.
 Extend an LV by a specified size.
 .br
 .P
@@ -165,32 +110,24 @@ Extend an LV by a specified size.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP [\fB+\fP]\fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-r\fP|\fB--resizefs\fP ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Extend an LV by specified PV extents.
 .br
 .P
@@ -199,185 +136,144 @@ Extend an LV by specified PV extents.
 .RS 4
 .ad l
 [ \fB-r\fP|\fB--resizefs\fP ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Extend a pool metadata SubLV by a specified size.
 .br
 .P
-\fBlvextend\fP \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT] \fILV\fP\fI_thinpool\fP
+\fBlvextend\fP \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT] \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: thinpool
+.RE
+.P
+\(em
+.P
 Extend an LV according to a predefined policy.
 .br
 .P
-\fBlvextend\fP \fB--usepolicies\fP \fILV\fP\fI_snapshot_thinpool\fP
+\fBlvextend\fP \fB--usepolicies\fP \fILV1\fP
 .br
 .RS 4
 .ad l
 [ \fB-r\fP|\fB--resizefs\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: snapshot thinpool
+.RE
+.P
+\(em
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-m\fP|\fB--mirrors\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-n\fP|\fB--nofsck\fP ]
-.ad b
 .br
-.ad l
-[    \fB--alloc\fP 
+[    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
 ]
-.ad b
 .br
-.ad l
 [    \fB--nosync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
-[    \fB--type\fP 
+[    \fB--type\fP \c
 .nh
-\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+\%\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
 .hy
 ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
 .ad l
-\fB--alloc\fP 
+\fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.br
 .ad b
+.br
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -394,66 +290,58 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--extents\fP [\fB+\fP]\fINumber\fP[PERCENT]
 .br
-.ad b
 Specifies the new size of the LV in logical extents.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -472,57 +360,49 @@ extents in the new LV is not determined until the command has completed.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-m\fP|\fB--mirrors\fP \fINumber\fP
 .br
-.ad b
 Not used.
+.
 .HP
-.ad l
 \fB-n\fP|\fB--nofsck\fP
 .br
-.ad b
 Do not perform fsck before resizing filesystem when filesystem
 requires it. You may need to use --force to proceed with
 this option.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--nosync\fP
 .br
-.ad b
 Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
 initial synchronization. In case of mirror, raid1 and raid10, any data
 written afterwards will be mirrored, but the original contents will not be
@@ -535,59 +415,52 @@ This option is not valid for raid6, because raid6 relies on proper parity
 to reconstruct proper user date in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT]
 .br
-.ad b
 Specifies the new size of the pool metadata LV.
 The plus prefix \fB+\fP can be used, in which case
 the value is added to the current size.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-r\fP|\fB--resizefs\fP
 .br
-.ad b
 Resize underlying filesystem together with the LV using fsadm(8).
+.
 .HP
-.ad l
 \fB-L\fP|\fB--size\fP [\fB+\fP]\fISize\fP[m|UNIT]
 .br
-.ad b
 Specifies the new size of the LV.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -595,11 +468,10 @@ greater when redundant data is needed for RAID levels.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
+.
 .HP
-.ad l
 \fB-i\fP|\fB--stripes\fP \fINumber\fP
 .br
-.ad b
 Specifies the number of stripes in a striped LV. This is the number of
 PVs (devices) that a striped LV is spread across. Data that
 appears sequential in the LV is spread across multiple devices in units of
@@ -611,32 +483,31 @@ the RAID type (raid0: 64, raid10: 32, raid4/5: 63, raid6: 62), and
 when unspecified, the default depends on the RAID type
 (raid0: 2, raid10: 2, raid4/5: 3, raid6: 5.)
 To stripe a new raid LV across all PVs by default,
-see lvm.conf allocation/raid_stripe_all_devices.
+see \fBlvm.conf\fP(5) \fBallocation/raid_stripe_all_devices\fP.
+.
 .HP
-.ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
 .ad l
-\fB--type\fP 
+\fB--type\fP \c
 .nh
-\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+\%\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
 .hy
-.br
 .ad b
+.br
 The LV type, also known as "segment type" or "segtype".
 See usage descriptions for the specific ways to use these types.
 For more information about redundancy and performance (\fBraid\fP<N>, \fBmirror\fP, \fBstriped\fP, \fBlinear\fP) see \fBlvmraid\fP(7).
@@ -648,45 +519,41 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
+.
 .HP
-.ad l
 \fB--usepolicies\fP
 .br
-.ad b
-Perform an operation according to the policy configured in lvm.conf
+Perform an operation according to the policy configured in \fBlvm.conf\fP(5)
 or a profile.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fILV\fP
-.br
+.
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-LV followed by _<type> indicates that an LV of the
-given type is required. (raid represents raid<N> type)
-.HP
-\fIPV\fP
-.br
+LV1 indicates the LV must have a specific type, where the
+accepted LV types are listed. (raid represents raid<N> type).
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -694,105 +561,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-Extend the size of an LV by 54MiB, using a specific PV.
-.br
-.B lvextend -L +54 vg01/lvol10 /dev/sdk3
-
-Extend the size of an LV by the amount of free
-space on PV /dev/sdk3. This is equivalent to specifying
-"-l +100%PVS" on the command line.
-.br
-.B lvextend vg01/lvol01 /dev/sdk3
-
-Extend an LV by 16MiB using specific physical extents.
-.br
-.B lvextend -L+16m vg01/lvol01 /dev/sda:8-9 /dev/sdb:8-9
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 33e2dfaad..399d4ff9a 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -1,330 +1,251 @@
 .TH LVM FULLREPORT 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvm fullreport - Display full report
+.
+lvm fullreport \(em Display full report
 .
 .SH SYNOPSIS
+.
 \fBlvm fullreport\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 lvm fullreport produces formatted output about PVs, PV segments, VGs, LVs
 and LV segments. The information is all gathered together for each VG
 (under a per-VG lock) so it is consistent. Information gathered from
 separate calls to \fBvgs\fP, \fBpvs\fP, and \fBlvs\fP can be inconsistent
 if information changes between commands.
+.
 .SH USAGE
+.
 \fBlvm fullreport\fP
 .br
 .RS 4
 .ad l
 [ \fB-a\fP|\fB--all\fP ]
-.ad b
 .br
-.ad l
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--aligned\fP ]
-.ad b
 .br
-.ad l
 [    \fB--binary\fP ]
-.ad b
 .br
-.ad l
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
-.ad b
 .br
-.ad l
 [    \fB--foreign\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--logonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nameprefixes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noheadings\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nosuffix\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--rows\fP ]
-.ad b
 .br
-.ad l
 [    \fB--separator\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--shared\fP ]
-.ad b
 .br
-.ad l
 [    \fB--unbuffered\fP ]
-.ad b
 .br
-.ad l
-[    \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP ]
-.ad b
+[    \fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
+]
 .br
-.ad l
 [    \fB--unquoted\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP ... ]
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--aligned\fP
 .br
-.ad b
 Use with --separator to align the output columns
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
+.
 .HP
-.ad l
 \fB--binary\fP
 .br
-.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-.ad b
 See \fBlvmreport\fP(7).
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--foreign\fP
 .br
-.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--logonly\fP
 .br
-.ad b
 Suppress command report and display only log report.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nameprefixes\fP
 .br
-.ad b
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
+.
 .HP
-.ad l
 \fB--noheadings\fP
 .br
-.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--nosuffix\fP
 .br
-.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
+.
 .HP
-.ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
-.ad b
 Comma-separated, ordered list of fields to display in columns.
-String arg syntax is: [+|-|#]Field1[,Field2 ...]
+String arg syntax is: [\fB+\fP|\fB-\fP|\fB#\fP]\fIField1\fP[\fB,\fP\fIField2\fP ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
 \fB-\fP will remove the specified fields from the default fields, and
 \fB#\fP will compact specified fields (removing them when empty for all rows.)
@@ -338,55 +259,49 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment fields,
 \fBseg_all\fP all LV segment fields, and
 \fBpvseg_all\fP all PV segment columns.
-See the lvm.conf report section for more config options.
+See the \fBlvm.conf\fP(5) report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--rows\fP
 .br
-.ad b
 Output columns as rows.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -395,172 +310,113 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB--separator\fP \fIString\fP
 .br
-.ad b
 String to use to separate each column. Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--shared\fP
 .br
-.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
+.
 .HP
-.ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
-.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB--unbuffered\fP
 .br
-.ad b
 Produce output immediately without sorting or aligning the columns properly.
+.
 .HP
 .ad l
-\fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
-.br
+\fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
 .ad b
+.br
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
+.
 .HP
-.ad l
 \fB--unquoted\fP
 .br
-.ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen
index 3aff67d19..cf18ebeec 100644
--- a/man/lvm-lvpoll.8_pregen
+++ b/man/lvm-lvpoll.8_pregen
@@ -1,381 +1,247 @@
 .TH LVM LVPOLL 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvm lvpoll - Continue already initiated poll operation on a logical volume
+.
+lvm lvpoll \(em Continue already initiated poll operation on a logical volume
 .
 .SH SYNOPSIS
+.
 \fBlvm lvpoll\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 lvm lvpoll is an internal command used by \fBlvmpolld\fP(8) to monitor and
 complete \fBlvconvert\fP(8) and \fBpvmove\fP(8) operations. lvpoll itself
 does not initiate these operations and should not normally need to be run
 directly.
+.
 .SH USAGE
+.
 \fBlvm lvpoll\fP \fB--polloperation\fP \fBpvmove\fP|\fBconvert\fP|\fBmerge\fP|\fBmerge_thin\fP \fILV\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--abort\fP ]
-.ad b
 .br
-.ad l
 [    \fB--handlemissingpvs\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--abort\fP
 .br
-.ad b
 Stop processing a poll operation in lvmpolld.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--handlemissingpvs\fP
 .br
-.ad b
 Allows a polling operation to continue when PVs are missing,
 e.g. for repairs due to faulty devices.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-i\fP|\fB--interval\fP \fINumber\fP
 .br
-.ad b
 Report progress at regular intervals.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--polloperation\fP \fBpvmove\fP|\fBconvert\fP|\fBmerge\fP|\fBmerge_thin\fP
 .br
-.ad b
 The command to perform from lvmpolld.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fILV\fP
-.br
+.
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH NOTES
-
-To find the name of the pvmove LV that was created by an original
-\fBpvmove /dev/name\fP command, use the command:
-.br
-\fBlvs -a -S move_pv=/dev/name\fP.
-.SH EXAMPLES
-
-Continue polling a pvmove operation.
-.br
-.B lvm lvpoll --polloperation pvmove vg00/pvmove0
-
-Abort a pvmove operation.
-.br
-.B lvm lvpoll --polloperation pvmove --abort vg00/pvmove0
-
-Continue polling a mirror conversion.
-.br
-.B lvm lvpoll --polloperation convert vg00/lvmirror
-
-Continue mirror repair.
-.br
-.B lvm lvpoll --polloperation convert vg/damaged_mirror --handlemissingpvs
-
-Continue snapshot merge.
-.br
-.B lvm lvpoll --polloperation merge vg/snapshot_old
-
-Continue thin snapshot merge.
-.br
-.B lvm lvpoll --polloperation merge_thin vg/thin_snapshot
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen
index 469a6b9e8..6cdb577c1 100644
--- a/man/lvmconfig.8_pregen
+++ b/man/lvmconfig.8_pregen
@@ -1,187 +1,126 @@
 .TH LVMCONFIG 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvmconfig - Display and manipulate configuration information
+.
+lvmconfig \(em Display and manipulate configuration information
 .
 .SH SYNOPSIS
+.
 \fBlvmconfig\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 lvmconfig, lvm config, lvm dumpconfig (for compatibility reasons, to be phased out) produce
 formatted output from the LVM configuration tree. The
 sources of the configuration data include \fBlvm.conf\fP(5) and command
 line settings from --config.
+.
 .SH USAGE
+.
 \fBlvmconfig\fP
 .br
 .RS 4
 .ad l
 [ \fB-f\fP|\fB--file\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-l\fP|\fB--list\fP ]
-.ad b
 .br
-.ad l
 [    \fB--atversion\fP \fIString\fP ]
-.ad b
 .br
-.ad l
-[    \fB--typeconfig\fP 
+[    \fB--typeconfig\fP \c
 .nh
-\fBcurrent\fP|\:\fBdefault\fP|\:\fBdiff\fP|\:\fBfull\fP|\:\fBlist\fP|\:\fBmissing\fP|\:\fBnew\fP|\:\fBprofilable\fP|\:\fBprofilable-command\fP|\:\fBprofilable-metadata\fP
+\%\fBcurrent\fP|\:\fBdefault\fP|\:\fBdiff\fP|\:\fBfull\fP|\:\fBlist\fP|\:\fBmissing\fP|\:\fBnew\fP|\:\fBprofilable\fP|\:\fBprofilable-command\fP|\:\fBprofilable-metadata\fP
 .hy
 ]
-.ad b
 .br
-.ad l
 [    \fB--ignoreadvanced\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignoreunsupported\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelocal\fP ]
-.ad b
 .br
-.ad l
 [    \fB--mergedconfig\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--sinceversion\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--showdeprecated\fP ]
-.ad b
 .br
-.ad l
 [    \fB--showunsupported\fP ]
-.ad b
 .br
-.ad l
 [    \fB--validate\fP ]
-.ad b
 .br
-.ad l
 [    \fB--withsummary\fP ]
-.ad b
 .br
-.ad l
 [    \fB--withcomments\fP ]
-.ad b
 .br
-.ad l
 [    \fB--withgeneralpreamble\fP ]
-.ad b
 .br
-.ad l
 [    \fB--withlocalpreamble\fP ]
-.ad b
 .br
-.ad l
 [    \fB--withspaces\fP ]
-.ad b
 .br
-.ad l
 [    \fB--unconfigured\fP ]
-.ad b
 .br
-.ad l
 [    \fB--withversions\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIString\fP ... ]
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--atversion\fP \fIString\fP
 .br
-.ad b
 Specify an LVM version in x.y.z format where x is the major version,
 the y is the minor version and z is the patchlevel (e.g. 2.2.106).
 When configuration is displayed, the configuration settings recognized
@@ -189,116 +128,101 @@ at this LVM version will be considered only. This can be used
 to display a configuration that a certain LVM version understands and
 which does not contain any newer settings for which LVM would
 issue a warning message when checking the configuration.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
-.ad b
 Write output to the named file.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignoreadvanced\fP
 .br
-.ad b
 Exclude advanced configuration settings from the output.
+.
 .HP
-.ad l
 \fB--ignorelocal\fP
 .br
-.ad b
 Ignore the local section. The local section should be defined in
 the lvmlocal.conf file, and should contain config settings
 specific to the local host which should not be copied to
 other hosts.
+.
 .HP
-.ad l
 \fB--ignoreunsupported\fP
 .br
-.ad b
 Exclude unsupported configuration settings from the output. These settings are
 either used for debugging and development purposes only or their support is not
 yet complete and they are not meant to be used in production. The \fBcurrent\fP
 and \fBdiff\fP types include unsupported settings in their output by default,
 all the other types ignore unsupported settings.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--list\fP
 .br
-.ad b
 List config settings with summarizing comment. This is the same as using
 options --typeconfig list --withsummary.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--mergedconfig\fP
 .br
-.ad b
 When the command is run with --config
 and/or --commandprofile (or using LVM_COMMAND_PROFILE
 environment variable), --profile, or --metadataprofile,
@@ -306,81 +230,74 @@ merge all the contents of the "config cascade" before displaying it.
 Without merging, only the configuration at the front of the
 cascade is displayed.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
-.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--showdeprecated\fP
 .br
-.ad b
 Include deprecated configuration settings in the output. These settings
 are deprecated after a certain version. If a concrete version is specified
 with --atversion, deprecated settings are automatically included
 if the specified version is lower than the version in which the settings were
 deprecated. The current and diff types include deprecated settings
 in their output by default, all the other types ignore deprecated settings.
+.
 .HP
-.ad l
 \fB--showunsupported\fP
 .br
-.ad b
 Include unsupported configuration settings in the output. These settings
 are either used for debugging or development purposes only, or their support
 is not yet complete and they are not meant to be used in production. The
 current and diff types include unsupported settings in their
 output by default, all the other types ignore unsupported settings.
+.
 .HP
-.ad l
 \fB--sinceversion\fP \fIString\fP
 .br
-.ad b
 Specify an LVM version in x.y.z format where x is the major version,
 the y is the minor version and z is the patchlevel (e.g. 2.2.106).
 This option is currently applicable only with --typeconfig new
 to display all configuration settings introduced since given version.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
 .ad l
-\fB--typeconfig\fP 
+\fB--typeconfig\fP \c
 .nh
-\fBcurrent\fP|\:\fBdefault\fP|\:\fBdiff\fP|\:\fBfull\fP|\:\fBlist\fP|\:\fBmissing\fP|\:\fBnew\fP|\:\fBprofilable\fP|\:\fBprofilable-command\fP|\:\fBprofilable-metadata\fP
+\%\fBcurrent\fP|\:\fBdefault\fP|\:\fBdiff\fP|\:\fBfull\fP|\:\fBlist\fP|\:\fBmissing\fP|\:\fBnew\fP|\:\fBprofilable\fP|\:\fBprofilable-command\fP|\:\fBprofilable-metadata\fP
 .hy
-.br
 .ad b
+.br
 \fBcurrent\fP prints the config settings that would be applied
 to an lvm command (assuming the command does not override them
 on the command line.) This includes:
@@ -413,168 +330,104 @@ with their default values.
 \fBprofilable-command\fP prints settings with their default values that can be set from a command profile.
 \fBprofilable-metadata\fP prints settings with their default values that can be set from a metadata profile.
 Also see \fBlvm.conf\fP(5).
+.
 .HP
-.ad l
 \fB--unconfigured\fP
 .br
-.ad b
 Internal option used for generating config file during build.
+.
 .HP
-.ad l
 \fB--validate\fP
 .br
-.ad b
 Validate current configuration used and exit with appropriate
 return code. The validation is done only for the configuration
 at the front of the "config cascade". To validate the whole
 merged configuration tree, also use --mergedconfig.
-The validation is done even if lvm.conf config/checks is disabled.
+The validation is done even if \fBlvm.conf\fP(5) \fBconfig/checks\fP is disabled.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB--withcomments\fP
 .br
-.ad b
 Display a full comment for each configuration node. For deprecated
 settings, also display comments about deprecation.
+.
 .HP
-.ad l
 \fB--withgeneralpreamble\fP
 .br
-.ad b
 Include general config file preamble.
+.
 .HP
-.ad l
 \fB--withlocalpreamble\fP
 .br
-.ad b
 Include local config file preamble.
+.
 .HP
-.ad l
 \fB--withspaces\fP
 .br
-.ad b
 Where appropriate, add more spaces in output for better readability.
+.
 .HP
-.ad l
 \fB--withsummary\fP
 .br
-.ad b
 Display a one line comment for each configuration node.
+.
 .HP
-.ad l
 \fB--withversions\fP
 .br
-.ad b
 Also display a comment containing the version of introduction for
 each configuration node. If the setting is deprecated, also display
 the version since which it is deprecated.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIString\fP
-.br
+.
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
index 6bdb5ff26..267ce965f 100644
--- a/man/lvmdevices.8_pregen
+++ b/man/lvmdevices.8_pregen
@@ -1,8 +1,11 @@
 .TH LVMDEVICES 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvmdevices - Manage the devices file
+.
+lvmdevices \(em Manage the devices file
 .
 .SH SYNOPSIS
+.
 \fBlvmdevices\fP \fIoption_args\fP
 .br
     [ \fIoption_args\fP ]
@@ -10,108 +13,68 @@ lvmdevices - Manage the devices file
 .P
 .ad l
     \fB--adddev\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--addpvid\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--check\fP
-.ad b
 .br
-.ad l
     \fB--commandprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--config\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-d\fP|\fB--debug\fP
-.ad b
 .br
-.ad l
     \fB--deldev\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--delpvid\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--devices\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--devicesfile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-h\fP|\fB--help\fP
-.ad b
 .br
-.ad l
     \fB--lockopt\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--longhelp\fP
-.ad b
 .br
-.ad l
     \fB--nolocking\fP
-.ad b
 .br
-.ad l
     \fB--profile\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-q\fP|\fB--quiet\fP
-.ad b
 .br
-.ad l
  \fB-t\fP|\fB--test\fP
-.ad b
 .br
-.ad l
     \fB--update\fP
-.ad b
 .br
-.ad l
  \fB-v\fP|\fB--verbose\fP
-.ad b
 .br
-.ad l
     \fB--version\fP
-.ad b
 .br
-.ad l
  \fB-y\fP|\fB--yes\fP
 .ad b
+.
 .SH DESCRIPTION
+.
 The LVM devices file lists devices that lvm can use.  The default file is
-/etc/lvm/devices/system.devices, and the lvmdevices(8) command is used to
+\fI#DEFAULT_SYS_DIR#/devices/system.devices\fP, and the \fBlvmdevices\fP(8) command is used to
 add or remove device entries.  If the file does not exist, or if lvm.conf
 includes use_devicesfile=0, then lvm will not use a devices file.
-
+.P
 To use a device with lvm, add it to the devices file with the command
 lvmdevices --adddev, and to prevent lvm from seeing or using a device,
 remove it from the devices file with lvmdevices --deldev.  The
 vgimportdevices(8) command adds all PVs from a VG to the devices file,
 and updates the VG metadata to include device IDs of the PVs.
-
+.P
 Commands adding new devices to the devices file necessarily look outside
 the existing devices file to find the devices to add.  pvcreate, vgcreate,
 and vgextend also look outside the devices file to create new PVs and add
 them to the devices file.
-
+.P
 LVM records devices in the devices file using hardware-specific IDs, such
 as the WWID, and attempts to use subsystem-specific IDs for virtual device
 types (which also aim to be as unique and stable as possible.)
@@ -119,436 +82,350 @@ These device IDs are also written in the VG metadata.  When no hardware or
 virtual ID is available, lvm falls back using the unstable device name as
 the device ID.  When devnames are used, lvm performs extra scanning to
 find devices if their devname changes, e.g. after reboot.
-
+.P
 When proper device IDs are used, an lvm command will not look@devices
 outside the devices file, but when devnames are used as a fallback, lvm
 will scan devices outside the devices file to locate PVs on renamed
 devices.  A config setting search_for_devnames can be used to control the
 scanning for renamed devname entries.
-
+.P
 Related to the devices file, the new command option --devices <devnames>
 allows a list of devices to be specified for the command to use,
 overriding the devices file.  The listed devices act as a sort of devices
 file in terms of limiting which devices lvm will see and use.  Devices
 that are not listed will appear to be missing to the lvm command.
-    
-Multiple devices files can be kept in /etc/lvm/devices, which allows lvm
+.P
+Multiple devices files can be kept in \fI#DEFAULT_SYS_DIR#/devices\fP, which allows lvm
 to be used with different sets of devices, e.g. system devices do not need
 to be exposed to a specific application, and the application can use lvm on
 its own devices that are not exposed to the system.  The option
 --devicesfile <filename> is used to select the devices file to use with the
 command.  Without the option set, the default system devices file is used.
-
+.P
 Setting --devicesfile "" causes lvm to not use a devices file.
-
+.P
 With no devices file, lvm will use any device on the system, and applies
 the filter to limit the full set of system devices.  With a devices file,
 the regex filter is not used, and the filter settings in lvm.conf or the
 command line are ignored.  The vgimportdevices command is one exception
 which does apply the regex filter when looking for a VG to import.
-
+.P
 If a devices file exists, lvm will use it, even if it's empty.  An empty
 devices file means lvm will see no devices.
-
+.P
 If the system devices file does not yet exist, the pvcreate or vgcreate
 commands will create it if they see no existing VGs on the system.
 lvmdevices --addev and vgimportdevices will always create a new devices file
 if it does not yet exist.
-
+.P
 It is recommended to use lvm commands to make changes to the devices file to
 ensure proper updates.
-
+.
 .SH USAGE
+.
 Print devices in the devices file.
 .br
 .P
 \fBlvmdevices\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Check the devices file and report incorrect values.
 .br
 .P
 \fBlvmdevices\fP \fB--check\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Update the devices file to fix incorrect values.
 .br
 .P
 \fBlvmdevices\fP \fB--update\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Add a device to the devices file.
 .br
 .P
 \fBlvmdevices\fP \fB--adddev\fP \fIPV\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Remove a device from the devices file.
 .br
 .P
 \fBlvmdevices\fP \fB--deldev\fP \fIPV\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Find the device with the given PVID and add it to the devices file.
 .br
 .P
 \fBlvmdevices\fP \fB--addpvid\fP \fIString\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Remove the devices file entry for the given PVID.
 .br
 .P
 \fBlvmdevices\fP \fB--delpvid\fP \fIString\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Common options for command:
 .
 .RS 4
+.ad l
+.ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--adddev\fP \fIPV\fP
 .br
-.ad b
 Add a device to the devices file.
+.
 .HP
-.ad l
 \fB--addpvid\fP \fIString\fP
 .br
-.ad b
 Find a device with the PVID and add the device to the devices file.
+.
 .HP
-.ad l
 \fB--check\fP
 .br
-.ad b
 Check the content of the devices file.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--deldev\fP \fIPV\fP
 .br
-.ad b
 Remove a device from the devices file.
+.
 .HP
-.ad l
 \fB--delpvid\fP \fIString\fP
 .br
-.ad b
 Remove a device with the PVID from the devices file.
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB--update\fP
 .br
-.ad b
 Update the content of the devices file.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIString\fP
-.br
+.
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen
index f6cc0e2e2..5f31e8115 100644
--- a/man/lvmdiskscan.8_pregen
+++ b/man/lvmdiskscan.8_pregen
@@ -1,325 +1,229 @@
 .TH LVMDISKSCAN 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvmdiskscan - List devices that may be used as physical volumes
+.
+lvmdiskscan \(em List devices that may be used as physical volumes
 .
 .SH SYNOPSIS
+.
 \fBlvmdiskscan\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 lvmdiskscan scans all SCSI, (E)IDE disks, multiple devices and a bunch of
 other block devices in the system looking for LVM PVs. The size reported
 is the real device size. Define a filter in \fBlvm.conf\fP(5) to restrict
 the scan to avoid a CD ROM, for example.
-
+.P
 This command is deprecated, use \fBpvs\fP instead.
-
+.
 .SH USAGE
+.
 \fBlvmdiskscan\fP
 .br
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--lvmpartition\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--lvmpartition\fP
 .br
-.ad b
 Only report PVs.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIString\fP
-.br
+.
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index 49c9465d9..13522bb70 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -1,195 +1,153 @@
 .TH LVREDUCE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvreduce - Reduce the size of a logical volume
+.
+lvreduce \(em Reduce the size of a logical volume
 .
 .SH SYNOPSIS
+.
 \fBlvreduce\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 lvreduce reduces the size of an LV. The freed logical extents are returned
 to the VG to be used by other LVs. A copy-on-write snapshot LV can also
 be reduced if less space is needed to hold COW blocks. Use
 \fBlvconvert\fP(8) to change the number of data images in a RAID or
 mirrored LV.
-
+.P
 Be careful when reducing an LV's size, because data in the reduced area is
 lost. Ensure that any file system on the LV is resized \fBbefore\fP
 running lvreduce so that the removed extents are not in use by the file
 system.
-
+.P
 Sizes will be rounded if necessary. For example, the LV size must be an
 exact number of extents, and the size of a striped segment must be a
 multiple of the number of stripes.
-
+.P
 In the usage section below, \fB--size\fP \fISize\fP can be replaced
 with \fB--extents\fP \fINumber\fP.  See both descriptions
 the options section.
+.
 .SH USAGE
+.
 \fBlvreduce\fP \fB-L\fP|\fB--size\fP [\fB-\fP]\fISize\fP[m|UNIT] \fILV\fP
 .br
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP [\fB-\fP]\fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-n\fP|\fB--nofsck\fP ]
-.ad b
 .br
-.ad l
 [ \fB-r\fP|\fB--resizefs\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--extents\fP [\fB-\fP]\fINumber\fP[PERCENT]
 .br
-.ad b
 Specifies the new size of the LV in logical extents.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -208,91 +166,79 @@ extents in the new LV is not determined until the command has completed.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-n\fP|\fB--nofsck\fP
 .br
-.ad b
 Do not perform fsck before resizing filesystem when filesystem
 requires it. You may need to use --force to proceed with
 this option.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-r\fP|\fB--resizefs\fP
 .br
-.ad b
 Resize underlying filesystem together with the LV using fsadm(8).
+.
 .HP
-.ad l
 \fB-L\fP|\fB--size\fP [\fB-\fP]\fISize\fP[m|UNIT]
 .br
-.ad b
 Specifies the new size of the LV.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -300,133 +246,70 @@ greater when redundant data is needed for RAID levels.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fILV\fP
-.br
+.
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-Reduce the size of an LV by 3 logical extents:
-.br
-.B lvreduce -l -3 vg00/lvol1
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index 53ba71e0b..a5ed82666 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -1,28 +1,33 @@
 .TH LVREMOVE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvremove - Remove logical volume(s) from the system
+.
+lvremove \(em Remove logical volume(s) from the system
 .
 .SH SYNOPSIS
+.
 \fBlvremove\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 lvremove removes one or more LVs. For standard LVs, this returns the
 logical extents that were used by the LV to the VG for use by other LVs.
-
+.P
 Confirmation will be requested before deactivating any active LV prior to
 removal.  LVs cannot be deactivated or removed while they are open (e.g.
 if they contain a mounted filesystem). Removing an origin LV will also
 remove all dependent snapshots.
-
+.P
 When a single force option is used, LVs are removed without confirmation,
 and the command will try to deactivate unused LVs.
-
+.P
 To remove damaged LVs, two force options may be required (\fB-ff\fP).
-
+.P
 \fBHistorical LVs\fP
-
+.P
 If the configuration setting \fBmetadata/record_lvs_history\fP is enabled
 and the LV being removed forms part of the history of at least one LV that
 is still present, then a simplified representation of the LV will be
@@ -34,240 +39,185 @@ some intermediate LVs have been removed. The names of such historical LVs
 acquire a hyphen as a prefix (e.g. '-lvol1') and cannot be reactivated.
 Use lvremove a second time, with the hyphen, to remove the record of the
 former LV completely.
+.
 .SH USAGE
+.
 \fBlvremove\fP \fIVG\fP|\fILV\fP|\fITag\fP|\fISelect\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nohistory\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nohistory\fP
 .br
-.ad b
 Do not record history of LVs being removed.
 This has no effect unless the configuration setting
 metadata/record_lvs_history is enabled.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -276,151 +226,82 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fILV\fP
-.br
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fISelect\fP
-.br
+.TP
+.I Select
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-Remove an active LV without asking for confirmation.
-.br
-.B lvremove -f vg00/lvol1
-
-Remove all LVs the specified VG.
-.br
-.B lvremove vg00
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index 024da1821..5b5975fa3 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -1,363 +1,257 @@
 .TH LVRENAME 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvrename - Rename a logical volume
+.
+lvrename \(em Rename a logical volume
 .
 .SH SYNOPSIS
+.
 \fBlvrename\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 lvrename renames an existing LV or a historical LV (see \fBlvremove\fP for
 historical LV information.)
+.
 .SH USAGE
+.
 \fBlvrename\fP \fIVG\fP \fILV\fP \fILV\fP\fI_new\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 \fBlvrename\fP \fILV\fP \fILV\fP\fI_new\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fILV\fP
-.br
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-Rename "lvold" to "lvnew":
-.br
-.B lvrename /dev/vg02/lvold vg02/lvnew
-
-An alternate syntax to rename "lvold" to "lvnew":
-.br
-.B lvrename vg02 lvold lvnew
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index f3535ce7f..4e27cf4ee 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -1,8 +1,11 @@
 .TH LVRESIZE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvresize - Resize a logical volume
+.
+lvresize \(em Resize a logical volume
 .
 .SH SYNOPSIS
+.
 \fBlvresize\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
@@ -11,138 +14,84 @@ lvresize - Resize a logical volume
 .br
 .P
 .ad l
-    \fB--alloc\fP 
+    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.ad b
 .br
-.ad l
  \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--commandprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--config\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-d\fP|\fB--debug\fP
-.ad b
 .br
-.ad l
     \fB--devices\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--devicesfile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-l\fP|\fB--extents\fP [\fB+\fP|\fB-\fP]\fINumber\fP[PERCENT]
-.ad b
 .br
-.ad l
  \fB-f\fP|\fB--force\fP
-.ad b
 .br
-.ad l
  \fB-h\fP|\fB--help\fP
-.ad b
 .br
-.ad l
     \fB--lockopt\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--longhelp\fP
-.ad b
 .br
-.ad l
  \fB-n\fP|\fB--nofsck\fP
-.ad b
 .br
-.ad l
     \fB--nolocking\fP
-.ad b
 .br
-.ad l
     \fB--nosync\fP
-.ad b
 .br
-.ad l
     \fB--noudevsync\fP
-.ad b
 .br
-.ad l
     \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
     \fB--profile\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-q\fP|\fB--quiet\fP
-.ad b
 .br
-.ad l
     \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.ad b
 .br
-.ad l
  \fB-r\fP|\fB--resizefs\fP
-.ad b
 .br
-.ad l
  \fB-L\fP|\fB--size\fP [\fB+\fP|\fB-\fP]\fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
  \fB-i\fP|\fB--stripes\fP \fINumber\fP
-.ad b
 .br
-.ad l
  \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
-.ad b
 .br
-.ad l
  \fB-t\fP|\fB--test\fP
-.ad b
 .br
-.ad l
-    \fB--type\fP 
+    \fB--type\fP \c
 .nh
-\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+\%\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
 .hy
-.ad b
 .br
-.ad l
  \fB-v\fP|\fB--verbose\fP
-.ad b
 .br
-.ad l
     \fB--version\fP
-.ad b
 .br
-.ad l
  \fB-y\fP|\fB--yes\fP
 .ad b
+.
 .SH DESCRIPTION
+.
 lvresize resizes an LV in the same way as lvextend and lvreduce. See
 \fBlvextend\fP(8) and \fBlvreduce\fP(8) for more information.
-
+.P
 In the usage section below, \fB--size\fP \fISize\fP can be replaced
 with \fB--extents\fP \fINumber\fP.  See both descriptions
 the options section.
+.
 .SH USAGE
+.
 Resize an LV by a specified size.
 .br
 .P
@@ -151,24 +100,20 @@ Resize an LV by a specified size.
 .RS 4
 .ad l
 [ \fB-l\fP|\fB--extents\fP [\fB+\fP|\fB-\fP]\fINumber\fP[PERCENT] ]
-.ad b
 .br
-.ad l
 [ \fB-r\fP|\fB--resizefs\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT] ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Resize an LV by specified PV extents.
 .br
 .P
@@ -177,155 +122,116 @@ Resize an LV by specified PV extents.
 .RS 4
 .ad l
 [ \fB-r\fP|\fB--resizefs\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Resize a pool metadata SubLV by a specified size.
 .br
 .P
-\fBlvresize\fP \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT] \fILV\fP\fI_thinpool\fP
+\fBlvresize\fP \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT] \fILV1\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
--
-
+.P
+.RS 4
+LV1 types: thinpool
+.RE
+.P
+\(em
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-n\fP|\fB--nofsck\fP ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
-[    \fB--alloc\fP 
+[    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
 ]
-.ad b
 .br
-.ad l
 [    \fB--nosync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
-[    \fB--type\fP 
+[    \fB--type\fP \c
 .nh
-\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+\%\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
 .hy
 ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
 .ad l
-\fB--alloc\fP 
+\fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.br
 .ad b
+.br
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -342,66 +248,58 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--extents\fP [\fB+\fP|\fB-\fP]\fINumber\fP[PERCENT]
 .br
-.ad b
 Specifies the new size of the LV in logical extents.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -420,51 +318,44 @@ extents in the new LV is not determined until the command has completed.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-n\fP|\fB--nofsck\fP
 .br
-.ad b
 Do not perform fsck before resizing filesystem when filesystem
 requires it. You may need to use --force to proceed with
 this option.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--nosync\fP
 .br
-.ad b
 Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
 initial synchronization. In case of mirror, raid1 and raid10, any data
 written afterwards will be mirrored, but the original contents will not be
@@ -477,59 +368,52 @@ This option is not valid for raid6, because raid6 relies on proper parity
 to reconstruct proper user date in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT]
 .br
-.ad b
 Specifies the new size of the pool metadata LV.
 The plus prefix \fB+\fP can be used, in which case
 the value is added to the current size.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-r\fP|\fB--resizefs\fP
 .br
-.ad b
 Resize underlying filesystem together with the LV using fsadm(8).
+.
 .HP
-.ad l
 \fB-L\fP|\fB--size\fP [\fB+\fP|\fB-\fP]\fISize\fP[m|UNIT]
 .br
-.ad b
 Specifies the new size of the LV.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -537,11 +421,10 @@ greater when redundant data is needed for RAID levels.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
+.
 .HP
-.ad l
 \fB-i\fP|\fB--stripes\fP \fINumber\fP
 .br
-.ad b
 Specifies the number of stripes in a striped LV. This is the number of
 PVs (devices) that a striped LV is spread across. Data that
 appears sequential in the LV is spread across multiple devices in units of
@@ -553,32 +436,31 @@ the RAID type (raid0: 64, raid10: 32, raid4/5: 63, raid6: 62), and
 when unspecified, the default depends on the RAID type
 (raid0: 2, raid10: 2, raid4/5: 3, raid6: 5.)
 To stripe a new raid LV across all PVs by default,
-see lvm.conf allocation/raid_stripe_all_devices.
+see \fBlvm.conf\fP(5) \fBallocation/raid_stripe_all_devices\fP.
+.
 .HP
-.ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
 .ad l
-\fB--type\fP 
+\fB--type\fP \c
 .nh
-\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+\%\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
 .hy
-.br
 .ad b
+.br
 The LV type, also known as "segment type" or "segtype".
 See usage descriptions for the specific ways to use these types.
 For more information about redundancy and performance (\fBraid\fP<N>, \fBmirror\fP, \fBstriped\fP, \fBlinear\fP) see \fBlvmraid\fP(7).
@@ -590,38 +472,35 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fILV\fP
-.br
+.
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-LV followed by _<type> indicates that an LV of the
-given type is required. (raid represents raid<N> type)
-.HP
-\fIPV\fP
-.br
+LV1 indicates the LV must have a specific type, where the
+accepted LV types are listed. (raid represents raid<N> type).
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -629,96 +508,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-Extend an LV by 16MB using specific physical extents:
-.br
-.B lvresize -L+16M vg1/lv1 /dev/sda:0-1 /dev/sdb:0-1
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index 76ea404c7..d822347a1 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -1,345 +1,261 @@
 .TH LVS 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvs - Display information about logical volumes
+.
+lvs \(em Display information about logical volumes
 .
 .SH SYNOPSIS
+.
 \fBlvs\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 lvs produces formatted output about LVs.
+.
 .SH USAGE
+.
 \fBlvs\fP
 .br
 .RS 4
 .ad l
 [ \fB-H\fP|\fB--history\fP ]
-.ad b
 .br
-.ad l
 [ \fB-a\fP|\fB--all\fP ]
-.ad b
 .br
-.ad l
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--segments\fP ]
-.ad b
 .br
-.ad l
 [    \fB--aligned\fP ]
-.ad b
 .br
-.ad l
 [    \fB--binary\fP ]
-.ad b
 .br
-.ad l
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
-.ad b
 .br
-.ad l
 [    \fB--foreign\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--logonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nameprefixes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noheadings\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nosuffix\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--rows\fP ]
-.ad b
 .br
-.ad l
 [    \fB--separator\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--shared\fP ]
-.ad b
 .br
-.ad l
 [    \fB--unbuffered\fP ]
-.ad b
 .br
-.ad l
-[    \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP ]
-.ad b
+[    \fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
+]
 .br
-.ad l
 [    \fB--unquoted\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fILV\fP|\fITag\fP ... ]
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--aligned\fP
 .br
-.ad b
 Use with --separator to align the output columns
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
 Show information about internal LVs.
 These are components of normal LVs, such as mirrors,
 which are not independently accessible, e.g. not mountable.
+.
 .HP
-.ad l
 \fB--binary\fP
 .br
-.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-.ad b
 See \fBlvmreport\fP(7).
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--foreign\fP
 .br
-.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-H\fP|\fB--history\fP
 .br
-.ad b
 Include historical LVs in the output.
 (This has no effect unless LVs were removed while
-lvm.conf metadata/record_lvs_history was enabled.
+\fBlvm.conf\fP(5) \fBmetadata/record_lvs_history\fP was enabled.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--logonly\fP
 .br
-.ad b
 Suppress command report and display only log report.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nameprefixes\fP
 .br
-.ad b
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
+.
 .HP
-.ad l
 \fB--noheadings\fP
 .br
-.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--nosuffix\fP
 .br
-.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
+.
 .HP
-.ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
-.ad b
 Comma-separated, ordered list of fields to display in columns.
-String arg syntax is: [+|-|#]Field1[,Field2 ...]
+String arg syntax is: [\fB+\fP|\fB-\fP|\fB#\fP]\fIField1\fP[\fB,\fP\fIField2\fP ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
 \fB-\fP will remove the specified fields from the default fields, and
 \fB#\fP will compact specified fields (removing them when empty for all rows.)
@@ -353,61 +269,54 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment fields,
 \fBseg_all\fP all LV segment fields, and
 \fBpvseg_all\fP all PV segment columns.
-See the lvm.conf report section for more config options.
+See the \fBlvm.conf\fP(5) report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--rows\fP
 .br
-.ad b
 Output columns as rows.
+.
 .HP
-.ad l
 \fB--segments\fP
 .br
-.ad b
 Use default columns that emphasize segment information.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -416,264 +325,121 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB--separator\fP \fIString\fP
 .br
-.ad b
 String to use to separate each column. Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--shared\fP
 .br
-.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
+.
 .HP
-.ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
-.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB--unbuffered\fP
 .br
-.ad b
 Produce output immediately without sorting or aligning the columns properly.
+.
 .HP
 .ad l
-\fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
-.br
+\fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
 .ad b
+.br
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
+.
 .HP
-.ad l
 \fB--unquoted\fP
 .br
-.ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fILV\fP
-.br
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH NOTES
-.
-The lv_attr bits are:
-.IP 1 3
-Volume type: (C)ache, (m)irrored, (M)irrored without initial sync, (o)rigin,
-(O)rigin with merging snapshot, (r)aid, (R)aid without initial sync,
-(s)napshot, merging (S)napshot, (p)vmove, (v)irtual,
-mirror or raid (i)mage, mirror or raid (I)mage out-of-sync, mirror (l)og device,
-under (c)onversion, thin (V)olume, (t)hin pool, (T)hin pool data,
-v(d)o pool, v(D)o pool data,
-raid or pool m(e)tadata or pool metadata spare.
-.IP 2 3
-Permissions: (w)riteable, (r)ead-only, (R)ead-only activation of non-read-only
-volume
-.IP 3 3
-Allocation policy:  (a)nywhere, (c)ontiguous, (i)nherited, c(l)ing, (n)ormal
-This is capitalised if the volume is currently locked against allocation
-changes, for example during
-.BR pvmove (8).
-.IP 4 3
-fixed (m)inor
-.IP 5 3
-State: @ctive, (h)istorical, (s)uspended, (I)nvalid snapshot,
-invalid (S)uspended snapshot, snapshot (m)erge failed,
-suspended snapshot (M)erge failed, mapped (d)evice present without tables,
-mapped device present with (i)nactive table, thin-pool (c)heck needed,
-suspended thin-pool (C)heck needed, (X) unknown
-.IP 6 3
-device (o)pen, (X) unknown
-.IP 7 3
-Target type: (C)ache, (m)irror, (r)aid, (s)napshot, (t)hin, (u)nknown, (v)irtual.
-This groups logical volumes related to the same kernel target together.  So,
-for example, mirror images, mirror logs as well as mirrors themselves appear as
-(m) if they use the original device-mapper mirror kernel driver; whereas the raid
-equivalents using the md raid kernel driver all appear as (r).
-Snapshots using the original device-mapper driver appear as (s); whereas
-snapshots of thin volumes using the new thin provisioning driver appear as (t).
-.IP 8 3
-Newly-allocated data blocks are overwritten with blocks of (z)eroes before use.
-.IP 9 3
-Volume Health, where there are currently three groups of attributes identified:
-.IP
-Common ones for all Logical Volumes: (p)artial, (X) unknown.
-.br
-(p)artial signifies that one or more of the Physical Volumes this Logical
-Volume uses is missing from the system. (X) unknown signifies the status
-is unknown.
-.IP
-Related to RAID Logical Volumes: (r)efresh needed, (m)ismatches exist, (w)ritemostly.
-.br
-(r)efresh signifies that one or more of the Physical Volumes this RAID Logical
-Volume uses had suffered a write error. The write error could be due to a
-temporary failure of that Physical Volume or an indication that it is failing.
-The device should be refreshed or replaced. (m)ismatches signifies that the
-RAID logical volume has portions of the array that are not coherent.
-Inconsistencies are detected by initiating a "check" on a RAID logical volume.
-(The scrubbing operations, "check" and "repair", can be performed on a RAID
-logical volume via the 'lvchange' command.)  (w)ritemostly signifies the
-devices in a RAID 1 logical volume that have been marked write-mostly.
-Re(s)haping signifies a RAID Logical Volume is either undergoing a stripe
-addition/removal, a stripe size or RAID algorithm change.
-(R)emove after reshape signifies freed striped raid images to be removed.
-.IP
-Related to Thin pool Logical Volumes: (F)ailed, out of (D)ata space,
-(M)etadata read only.
-.br
-(F)ailed is set if thin pool encounters serious failures and hence no further I/O
-is permitted at all. The out of (D)ata space is set if thin pool has run out of
-data space. (M)etadata read only signifies that thin pool encounters certain
-types of failures but it's still possible to do reads at least,
-but no metadata changes are allowed.
-.IP
-Related to Thin Logical Volumes: (F)ailed.
-.br
-(F)ailed is set when related thin pool enters Failed state and no further I/O
-is permitted at all.
-.IP
-Related to writecache logical volumes: (E)rror.
-.br
-(E)rror is set dm-writecache reports an error.
-.IP 10 3
-s(k)ip activation: this volume is flagged to be skipped during activation.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index 264d9607e..40438a7d2 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -1,361 +1,257 @@
 .TH LVSCAN 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-lvscan - List all logical volumes in all volume groups
+.
+lvscan \(em List all logical volumes in all volume groups
 .
 .SH SYNOPSIS
+.
 \fBlvscan\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 lvscan scans all VGs or all supported LVM block devices in the system for
 LVs. The output consists of one line for each LV indicating whether or not
 it is active, a snapshot or origin, the size of the device and its
 allocation policy. Use \fBlvs\fP(8) or \fBlvdisplay\fP(8) to obtain more
 comprehensive information about LVs.
+.
 .SH USAGE
+.
 \fBlvscan\fP
 .br
 .RS 4
 .ad l
 [ \fB-a\fP|\fB--all\fP ]
-.ad b
 .br
-.ad l
 [ \fB-b\fP|\fB--blockdevice\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
 Show information about internal LVs.
 These are components of normal LVs, such as mirrors,
 which are not independently accessible, e.g. not mountable.
+.
 .HP
-.ad l
 \fB-b\fP|\fB--blockdevice\fP
 .br
-.ad b
 No longer used.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIString\fP
-.br
+.
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index 33778ee6c..577352d2a 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -1,18 +1,25 @@
 .TH PVCHANGE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-pvchange - Change attributes of physical volume(s)
+.
+pvchange \(em Change attributes of physical volume(s)
 .
 .SH SYNOPSIS
+.
 \fBpvchange\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 pvchange changes PV attributes in the VG.
-
+.P
 For options listed in parentheses, any one is required, after which the
 others are optional.
+.
 .SH USAGE
+.
 Change properties of all PVs.
 .br
 .P
@@ -30,10 +37,11 @@ Change properties of all PVs.
 .RE
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Change properties of specified PVs.
 .br
 .P
@@ -56,252 +64,196 @@ Change properties of specified PVs.
 .RS 4
 .ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-u\fP|\fB--uuid\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--addtag\fP \fITag\fP
 .br
-.ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
 Change all visible PVs.
+.
 .HP
-.ad l
 \fB-x\fP|\fB--allocatable\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Enable or disable allocation of physical extents on this PV.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--deltag\fP \fITag\fP
 .br
-.ad b
 Deletes a tag from a PV, VG or LV. This option can be repeated to delete
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--metadataignore\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies the metadataignore property of a PV.
 If yes, metadata areas on the PV are ignored, and lvm will
 not store metadata in the metadata areas of the PV.
 If no, lvm will store metadata on the PV.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -310,47 +262,43 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-u\fP|\fB--uuid\fP
 .br
-.ad b
 Generate new random UUID for specified PVs.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIPV\fP
-.br
+.
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -358,103 +306,41 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fISelect\fP
-.br
+.TP
+.I Select
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-Disallow the allocation of physical extents on a PV (e.g. because of
-disk errors, or because it will be removed after freeing it).
-.br
-.B pvchange -x n /dev/sdk1
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen
index 22e6f6eff..6e55916a3 100644
--- a/man/pvck.8_pregen
+++ b/man/pvck.8_pregen
@@ -1,8 +1,11 @@
 .TH PVCK 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-pvck - Check metadata on physical volumes
+.
+pvck \(em Check metadata on physical volumes
 .
 .SH SYNOPSIS
+.
 \fBpvck\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
@@ -10,103 +13,61 @@ pvck - Check metadata on physical volumes
 .P
 .ad l
     \fB--commandprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--config\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-d\fP|\fB--debug\fP
-.ad b
 .br
-.ad l
     \fB--devices\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--devicesfile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
-    \fB--dump\fP 
+    \fB--dump\fP \c
 .nh
-\fBheaders\fP|\:\fBmetadata\fP|\:\fBmetadata_all\fP|\:\fBmetadata_search\fP
+\%\fBheaders\fP|\:\fBmetadata\fP|\:\fBmetadata_all\fP|\:\fBmetadata_search\fP
 .hy
-.ad b
 .br
-.ad l
  \fB-f\fP|\fB--file\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-h\fP|\fB--help\fP
-.ad b
 .br
-.ad l
     \fB--labelsector\fP \fINumber\fP
-.ad b
 .br
-.ad l
     \fB--lockopt\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--longhelp\fP
-.ad b
 .br
-.ad l
     \fB--nolocking\fP
-.ad b
 .br
-.ad l
     \fB--profile\fP \fIString\fP
-.ad b
 .br
-.ad l
-    \fB--[pv]metadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
-.ad b
+    \fB--\fP[\fBpv\fP]\fBmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
-.ad l
  \fB-q\fP|\fB--quiet\fP
-.ad b
 .br
-.ad l
     \fB--repair\fP
-.ad b
 .br
-.ad l
     \fB--repairtype\fP \fBpv_header\fP|\fBmetadata\fP|\fBlabel_header\fP
-.ad b
 .br
-.ad l
     \fB--settings\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-t\fP|\fB--test\fP
-.ad b
 .br
-.ad l
  \fB-v\fP|\fB--verbose\fP
-.ad b
 .br
-.ad l
     \fB--version\fP
-.ad b
 .br
-.ad l
  \fB-y\fP|\fB--yes\fP
 .ad b
+.
 .SH DESCRIPTION
+.
 pvck checks and repairs LVM metadata on PVs.
-
+.P
 .SS Dump options 
-
+.P
 .B headers
 .br
 Print LVM on-disk headers and structures: label_header, pv_header,
@@ -117,7 +78,7 @@ a 512 byte sector at offset 4096 bytes.  A second mda_header can
 optionally exist near the end of the device.  The metadata text exists in
 an area (about 1MiB by default) immediately following the mda_header
 sector.  The metadata text is checked but not printed (see other options).
-
+.P
 .B metadata
 .br
 Print the current LVM VG metadata text (or save to a file), using headers
@@ -125,7 +86,7 @@ to locate the latest copy of metadata.  If headers are damaged, metadata
 may not be found (see metadata_search).  Use --settings "mda_num=2" to
 look in mda2 (the second mda@the end of the device, if used).  The
 metadata text is printed to stdout or saved to a file with --file.
-
+.P
 .B metadata_all
 .br
 List all versions of VG metadata found in the metadata area, using headers
@@ -133,7 +94,7 @@ to locate metadata.  Full copies of all metadata are saved to a file with
 the --file option.  If headers are damaged, metadata may not be found (see
 metadata_search).  Use --settings "mda_num=2" as above.  Use -v to include
 descriptions and dates when listing metadata versions.
-
+.P
 .B metadata_search
 .br
 List all versions of VG metadata found in the metadata area, searching
@@ -143,20 +104,20 @@ save one specific version of metadata, use --settings
 "metadata_offset=<offset>", where the offset is taken from the list of
 versions found.  Use -v to include descriptions and dates when listing
 metadata versions.
-
+.P
 .B metadata_area
 .br
 Save the entire text metadata area to a file without processing.
-
+.P
 .SS Repair options
-
+.P
 .B --repair
 .br
 Repair headers and metadata on a PV.  This uses a metadata input file that
-was extracted by --dump, or a backup file (from /etc/lvm/backup).  When
+was extracted by --dump, or a backup file (from \fI#DEFAULT_BACKUP_DIR#\fP).  When
 possible, use metadata saved by --dump from another PV in the same VG (or
 from a second metadata area on the PV).
-
+.P
 There are cases where the PV UUID needs to be specified for the PV being
 repaired.  It is specified using --settings "pv_uuid=<UUID>".  In
 particular, if the device name for the PV being repaired does not match
@@ -165,52 +126,52 @@ the correct PV UUID.  When headers are damaged on more than one PV in a
 VG, it is important for the user to determine the correct PV UUID and
 specify it in --settings.  Otherwise, the wrong PV UUID could be used if
 device names have been swapped since the metadata was last written.
-
+.P
 If a PV has no metadata areas and the pv_header is damaged, then the
 repair will not know to create no metadata areas during repair.  It will
 by default repair metadata in mda1.  To repair with no metadata areas, use
 --settings "mda_offset=0 mda_size=0".
-
+.P
 There are cases where repair should be run on all PVs in the VG (using the
 same metadata file):  if all PVs in the VG are damaged, if using an old
 metadata version, or if a backup file is used instead of raw metadata
 (taken from pvck dump.)
-
+.P
 Using --repair is equivalent to running --repairtype pv_header followed by
 --repairtype metadata.
-
+.P
 .B --repairtype pv_header
 .br
 Repairs the header sector, containing the pv_header and label_header.
-
+.P
 .B --repairtype metadata
 .br
 Repairs the mda_header and metadata text.  It requires the headers to be
 correct (having been undamaged or already repaired).
-
+.P
 .B --repairtype label_header
 .br
 Repairs label_header fields, leaving the pv_header (in the same sector)
 unchanged.  (repairtype pv_header should usually be used instead.)
-
+.P
 .SS Settings
-
+.P
 The --settings option controls or overrides certain dump or repair
 behaviors.  All offset and size values in settings are in bytes (units are
 not recognized.)  These settings are subject to change.
-
+.P
 .B mda_num=1|2
 .br
 Select which metadata area should be used.  By default the first metadata
 area (1) is used.  mda1 is always located at offset 4096.  mda2, at the
 end of the device, often does not exist (it's not created by default.) If
 mda1 is erased, mda2, if it exists, will often still have metadata.
-
+.P
 \fBmetadata_offset=\fP\fIbytes\fP
 .br
 Select metadata text at this offset.  Use with metadata_search to
 print/save one instance of metadata text.
-
+.P
 \fBmda_offset=\fP\fIbytes\fP \fBmda_size=\fP\fIbytes\fP
 .br
 Refers to a metadata area (mda) location and size.  An mda includes an
@@ -218,18 +179,18 @@ mda_header and circular metadata text buffer.  Setting this forces
 metadata_search look for metadata in the given area instead of the
 standard locations.  When set to zero with repair, it indicates no
 metadata areas should exist.
-
+.P
 \fBmda2_offset=\fP\fIbytes\fP \fBmda2_size=\fP\fIbytes\fP
 .br
 When repairing a pv_header, this forces a specific offset and size for
 mda2 that should be recorded in the pv_header.
-
+.P
 \fBpv_uuid=\fP\fIuuid\fP
 .br
 Specify the PV UUID of the device being repaired.  When not specified,
 repair will attempt to determine the correct PV UUID by matching a device
 name in the metadata.
-
+.P
 \fBdevice_size=\fP\fIbytes\fP
 .br
 \fBdata_offset=\fP\fIbytes\fP
@@ -239,46 +200,45 @@ be specified directly, in which case these values are not taken from a
 metadata file (where they usually come from), and the metadata file can be
 omitted.  data_offset is the starting location of the first physical
 extent (data), which follows the first metadata area.
-
+.
 .SH USAGE
+.
 Check for metadata on a device
 .br
 .P
 \fBpvck\fP \fIPV\fP ...
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Check and print LVM headers and metadata on a device
 .br
 .P
-\fBpvck\fP \fB--dump\fP 
+\fBpvck\fP \fB--dump\fP \c
 .nh
-\fBheaders\fP|\:\fBmetadata\fP|\:\fBmetadata_all\fP|\:\fBmetadata_search\fP
+\%\fBheaders\fP|\:\fBmetadata\fP|\:\fBmetadata_all\fP|\:\fBmetadata_search\fP
 .hy 
 \fIPV\fP
 .br
 .RS 4
 .ad l
 [ \fB-f\fP|\fB--file\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--settings\fP \fIString\fP ]
-.ad b
 .br
-.ad l
-[    \fB--[pv]metadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP ]
-.ad b
+[    \fB--\fP[\fBpv\fP]\fBmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP ]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Repair LVM headers or metadata on a device
 .br
 .P
@@ -287,17 +247,15 @@ Repair LVM headers or metadata on a device
 .RS 4
 .ad l
 [ \fB-f\fP|\fB--file\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--settings\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Repair LVM headers and metadata on a device
 .br
 .P
@@ -306,13 +264,13 @@ Repair LVM headers and metadata on a device
 .RS 4
 .ad l
 [    \fB--settings\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Common options for command:
 .
 .RS 4
@@ -320,131 +278,98 @@ Common options for command:
 [    \fB--labelsector\fP \fINumber\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
 .ad l
-\fB--dump\fP 
+\fB--dump\fP \c
 .nh
-\fBheaders\fP|\:\fBmetadata\fP|\:\fBmetadata_all\fP|\:\fBmetadata_search\fP
+\%\fBheaders\fP|\:\fBmetadata\fP|\:\fBmetadata_all\fP|\:\fBmetadata_search\fP
 .hy
-.br
 .ad b
+.br
 Dump headers and metadata from a PV for debugging and repair.
 Option values include: \fBheaders\fP to print and check LVM headers,
 \fBmetadata\fP to print or save the current text metadata,
@@ -452,58 +377,50 @@ Option values include: \fBheaders\fP to print and check LVM headers,
 \fBmetadata_search\fP to list or save all versions of metadata,
 searching standard locations in case of damaged headers,
 \fBmetadata_area\fP to save an entire text metadata area to a file.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
-.ad b
 Metadata file to read or write.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--labelsector\fP \fINumber\fP
 .br
-.ad b
 By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
-\fB--[pv]metadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
+\fB--\fP[\fBpv\fP]\fBmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
-.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -511,68 +428,61 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--repair\fP
 .br
-.ad b
 Repair headers and metadata on a PV.
+.
 .HP
-.ad l
 \fB--repairtype\fP \fBpv_header\fP|\fBmetadata\fP|\fBlabel_header\fP
 .br
-.ad b
 Repair headers and metadata on a PV. See command description.
+.
 .HP
-.ad l
 \fB--settings\fP \fIString\fP
 .br
-.ad b
 Specifies command specific settings in "Key = Value" form.
 Combine multiple settings in quotes, or repeat the settings
 option for each.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIPV\fP
-.br
+.
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -580,99 +490,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-If the partition table is corrupted or lost on /dev/sda, and you suspect
-there was an LVM partition at approximately 100 MiB, then this
-area of the disk can be scanned using the \fB--labelsector\fP
-parameter with a value of 204800 (100 * 1024 * 1024 / 512 = 204800).
-.br
-.B pvck --labelsector 204800 /dev/sda
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index f56022b2e..26e5141fe 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -1,36 +1,41 @@
 .TH PVCREATE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-pvcreate - Initialize physical volume(s) for use by LVM
+.
+pvcreate \(em Initialize physical volume(s) for use by LVM
 .
 .SH SYNOPSIS
+.
 \fBpvcreate\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 pvcreate initializes a Physical Volume (PV) on a device so the device is
 recognized as belonging to LVM.  This allows the PV to be used in a Volume
 Group (VG).  An LVM disk label is written to the device, and LVM metadata
 areas are initialized.  A PV can be placed on a whole device or partition.
-
+.P
 Use \fBvgcreate\fP(8) to create a new VG on the PV, or \fBvgextend\fP(8)
 to add the PV to an existing VG.  Use \fBpvremove\fP(8) to remove the LVM
 disk label from the device.
-
+.P
 The force option will create a PV without confirmation.  Repeating the
 force option (\fB-ff\fP) will forcibly create a PV, overriding checks that
 normally prevent it, e.g. if the PV is already in a VG.
-
+.P
 .B Metadata location, size, and alignment
-
+.P
 The LVM disk label begins 512 bytes from the start of the device, and is
 512 bytes in size.
-
+.P
 The LVM metadata area begins at an offset (from the start of the device)
 equal to the page size of the machine creating the PV (often 4 KiB.) The
 metadata area contains a 512 byte header and a multi-KiB circular buffer
 that holds text copies of the VG metadata.
-
+.P
 With default settings, the first physical extent (PE), which contains LV
 data, is 1 MiB from the start of the device.  This location is controlled
 by \fBdefault_data_alignment\fP in lvm.conf, which is set to 1 (MiB) by
@@ -39,7 +44,7 @@ can be checked with:
 .br
 .B pvs -o pe_start
 .I PV
-
+.P
 The size of the LVM metadata area is the space between the the start of
 the metadata area and the first PE.  When metadata begins at 4 KiB and the
 first PE is at 1024 KiB, the metadata area size is 1020 KiB.  This can be
@@ -47,7 +52,7 @@ checked with:
 .br
 .B pvs -o mda_size
 .I PV
-
+.P
 The mda_size cannot be increased after pvcreate, so if larger metadata is
 needed, it must be set during pvcreate.  Two copies of the VG metadata
 must always fit within the metadata area, so the maximum VG metadata size
@@ -55,7 +60,7 @@ is around half the mda_size.  This can be checked with:
 .br
 .B vgs -o mda_free
 .I VG
-
+.P
 A larger metadata area can be set with --metadatasize.  The resulting
 mda_size may be larger than specified due to default_data_alignment
 placing pe_start on a MiB boundary, and the fact that the metadata area
@@ -63,12 +68,12 @@ extends to the first PE.  With metadata starting at 4 KiB and
 default_data_alignment 1 (MiB), setting --metadatasize 2048k results in
 pe_start of 3 MiB and mda_size of 3068 KiB.  Alternatively, --metadatasize
 2044k results in pe_start at 2 MiB and mda_size of 2044 KiB.
-
+.P
 The alignment of pe_start described above may be automatically overridden
 based on md device properties or device i/o properties reported in sysfs.
 These automatic adjustments can be enabled/disabled using lvm.conf
 settings md_chunk_alignment and data_alignment_offset_detection.
-
+.P
 To use a different pe_start alignment, use the --dataalignment option.
 The --metadatasize option would also typically be used in this case
 because the metadata area size also determines the location of pe_start.
@@ -81,152 +86,96 @@ The pe_start of 2176 KiB is the nearest even multiple of 128 KiB that
 provides at least 2048 KiB of metadata space.
 Always check the resulting alignment and metadata size when using
 these options.
-
+.P
 To shift an aligned pe_start value, use the --dataalignmentoffset option.
 The pe_start alignment is calculated as described above, and then the
 value specified with --dataalignmentoffset is added to produce the final
 pe_start value.
+.
 .SH USAGE
+.
 \fBpvcreate\fP \fIPV\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP ]
-.ad b
 .br
-.ad l
 [ \fB-u\fP|\fB--uuid\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--dataalignment\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--bootloaderareasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--labelsector\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
-[    \fB--[pv]metadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP ]
-.ad b
+[    \fB--\fP[\fBpv\fP]\fBmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP ]
 .br
-.ad l
 [    \fB--metadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--metadataignore\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--norestorefile\fP ]
-.ad b
 .br
-.ad l
 [    \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--restorefile\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--bootloaderareasize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Reserve space for the bootloader between the LVM metadata area and the first PE.
 The bootloader area is reserved for bootloaders to embed their own data or
 metadata; LVM will not use it.
@@ -238,154 +187,134 @@ and --dataalignmentoffset. The bootloader area may be larger than requested
 due to the alignment, but it's never less than the requested size.
 To see the bootloader area start and size of
 an existing PV use pvs -o +pv_ba_start,pv_ba_size.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--dataalignment\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 Align the start of a PV data area with a multiple of this number.
 To see the location of the first Physical Extent (PE) of an existing PV,
 use pvs -o +pe_start. In addition, it may be shifted by an alignment offset,
 see --dataalignmentoffset.
 Also specify an appropriate PE size when creating a VG.
+.
 .HP
-.ad l
 \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 Shift the start of the PV data area by this additional offset.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--labelsector\fP \fINumber\fP
 .br
-.ad b
 By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--metadataignore\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies the metadataignore property of a PV.
 If yes, metadata areas on the PV are ignored, and lvm will
 not store metadata in the metadata areas of the PV.
 If no, lvm will store metadata on the PV.
+.
 .HP
-.ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
+.
 .HP
-.ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
-.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--norestorefile\fP
 .br
-.ad b
 In conjunction with --uuid, this allows a uuid to be specified
 without also requiring that a backup of the metadata be provided.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
-\fB--[pv]metadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
+\fB--\fP[\fBpv\fP]\fBmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
-.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -393,29 +322,26 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--restorefile\fP \fIString\fP
 .br
-.ad b
 In conjunction with --uuid, this reads the file (produced by
 vgcfgbackup), extracts the location and size of the data on the PV,
 and ensures that the metadata produced by the program is consistent
@@ -423,28 +349,25 @@ with the contents of the file, i.e. the physical extents will be in
 the same place and not be overwritten by new metadata. This provides
 a mechanism to upgrade the metadata format or to add/remove metadata
 areas. Use with care.
+.
 .HP
-.ad l
 \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Overrides the automatically detected size of the PV.
 Use with care, or prior to reducing the physical size of the device.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-u\fP|\fB--uuid\fP \fIString\fP
 .br
-.ad b
 Specify a UUID for the device.
 Without this option, a random UUID is generated.
 This option is needed before restoring a backup of LVM metadata
@@ -453,39 +376,36 @@ onto a replacement device; see \fBvgcfgrestore\fP(8). As such, use of
 All PVs must have unique UUIDs, and LVM will prevent certain operations
 if multiple devices are seen with the same UUID.
 See \fBvgimportclone\fP(8) for more information.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .HP
-.ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls if the first 4 sectors (2048 bytes) of the device are wiped.
 The default is to wipe these sectors unless either or both of
 --restorefile or --uuid are specified.
+.
 .SH VARIABLES
-.HP
-\fIPV\fP
-.br
+.
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -493,103 +413,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-Initialize a partition and a full device.
-.br
-.B pvcreate /dev/sdc4 /dev/sde
-
-If a device is a 4KiB sector drive that compensates for windows
-partitioning (sector 7 is the lowest aligned logical block, the 4KiB
-sectors start at LBA -1, and consequently sector 63 is aligned on a 4KiB
-boundary) manually account for this when initializing for use by LVM.
-.br
-.B pvcreate --dataalignmentoffset 7s /dev/sdb
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index 9a7e4ed56..ff5d9f50a 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -1,348 +1,265 @@
 .TH PVDISPLAY 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-pvdisplay - Display various attributes of physical volume(s)
+.
+pvdisplay \(em Display various attributes of physical volume(s)
 .
 .SH SYNOPSIS
+.
 \fBpvdisplay\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 pvdisplay shows the attributes of PVs, like size, physical extent size,
 space used for the VG descriptor area, etc.
-
+.P
 \fBpvs\fP(8) is a preferred alternative that shows the same information
 and more, using a more compact and configurable output format.
+.
 .SH USAGE
+.
 \fBpvdisplay\fP
 .br
 .RS 4
 .ad l
 [ \fB-a\fP|\fB--all\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--colon\fP ]
-.ad b
 .br
-.ad l
 [ \fB-C\fP|\fB--columns\fP ]
-.ad b
 .br
-.ad l
 [ \fB-m\fP|\fB--maps\fP ]
-.ad b
 .br
-.ad l
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-s\fP|\fB--short\fP ]
-.ad b
 .br
-.ad l
 [ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--aligned\fP ]
-.ad b
 .br
-.ad l
 [    \fB--binary\fP ]
-.ad b
 .br
-.ad l
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
-.ad b
 .br
-.ad l
 [    \fB--foreign\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--logonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noheadings\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nosuffix\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--separator\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--shared\fP ]
-.ad b
 .br
-.ad l
 [    \fB--unbuffered\fP ]
-.ad b
 .br
-.ad l
-[    \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP ]
-.ad b
+[    \fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
+]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP|\fITag\fP ... ]
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--aligned\fP
 .br
-.ad b
 Use with --separator to align the output columns
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
 Show information about devices that have not been initialized
 by LVM, i.e. they are not PVs.
+.
 .HP
-.ad l
 \fB--binary\fP
 .br
-.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
+.
 .HP
-.ad l
 \fB-c\fP|\fB--colon\fP
 .br
-.ad b
 Generate colon separated output for easier parsing in scripts or programs.
 Also see \fBvgs\fP(8) which provides considerably more control over the output.
+.
 .HP
-.ad l
 \fB-C\fP|\fB--columns\fP
 .br
-.ad b
 Display output in columns, the equivalent of \fBvgs\fP(8).
 Options listed are the same as options given in \fBvgs\fP(8).
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-.ad b
 See \fBlvmreport\fP(7).
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--foreign\fP
 .br
-.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--logonly\fP
 .br
-.ad b
 Suppress command report and display only log report.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-m\fP|\fB--maps\fP
 .br
-.ad b
 Display the mapping of physical extents to LVs and logical extents.
+.
 .HP
-.ad l
 \fB--noheadings\fP
 .br
-.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--nosuffix\fP
 .br
-.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
+.
 .HP
-.ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
-.ad b
 Comma-separated, ordered list of fields to display in columns.
-String arg syntax is: [+|-|#]Field1[,Field2 ...]
+String arg syntax is: [\fB+\fP|\fB-\fP|\fB#\fP]\fIField1\fP[\fB,\fP\fIField2\fP ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
 \fB-\fP will remove the specified fields from the default fields, and
 \fB#\fP will compact specified fields (removing them when empty for all rows.)
@@ -356,49 +273,44 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment fields,
 \fBseg_all\fP all LV segment fields, and
 \fBpvseg_all\fP all PV segment columns.
-See the lvm.conf report section for more config options.
+See the \fBlvm.conf\fP(5) report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -407,85 +319,81 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB--separator\fP \fIString\fP
 .br
-.ad b
 String to use to separate each column. Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--shared\fP
 .br
-.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
+.
 .HP
-.ad l
 \fB-s\fP|\fB--short\fP
 .br
-.ad b
 Only display the size of the given PVs.
+.
 .HP
-.ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
-.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB--unbuffered\fP
 .br
-.ad b
 Produce output immediately without sorting or aligning the columns properly.
+.
 .HP
 .ad l
-\fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
-.br
+\fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
 .ad b
+.br
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIPV\fP
-.br
+.
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -493,96 +401,40 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index 791e2834f..a764ed9ca 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -1,31 +1,38 @@
 .TH PVMOVE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-pvmove - Move extents from one physical volume to another
+.
+pvmove \(em Move extents from one physical volume to another
 .
 .SH SYNOPSIS
+.
 \fBpvmove\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 pvmove moves the allocated physical extents (PEs) on a source PV to one or
 more destination PVs.  You can optionally specify a source LV in which
 case only extents used by that LV will be moved to free (or specified)
 extents on the destination PV. If no destination PV is specified, the
 normal allocation rules for the VG are used.
-
+.P
 If pvmove is interrupted for any reason (e.g. the machine crashes) then
 run pvmove again without any PV arguments to restart any operations that
 were in progress from the last checkpoint. Alternatively, use the abort
 option at any time to abort the operation. The resulting location of LVs
 after an abort depends on whether the atomic option was used.
-
+.P
 More than one pvmove can run concurrently if they are moving data from
 different source PVs, but additional pvmoves will ignore any LVs already
 in the process of being changed, so some data might not get moved.
+.
 .SH USAGE
+.
 Move PV extents.
 .br
 .P
@@ -34,150 +41,108 @@ Move PV extents.
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-n\fP|\fB--name\fP \fILV\fP ]
-.ad b
 .br
-.ad l
-[    \fB--alloc\fP 
+[    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
 ]
-.ad b
 .br
-.ad l
 [    \fB--atomic\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP ... ]
 .RE
-
+.P
 Continue or abort existing pvmove operations.
 .br
 .P
 \fBpvmove\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-b\fP|\fB--background\fP ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--abort\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--abort\fP
 .br
-.ad b
 Abort any pvmove operations in progress. If a pvmove was started
 with the --atomic option, then all LVs will remain on the source PV.
 Otherwise, segments that have been moved will remain on the
 destination PV, while unmoved segments will remain on the source PV.
+.
 .HP
 .ad l
-\fB--alloc\fP 
+\fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.br
 .ad b
+.br
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -194,182 +159,160 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
+.
 .HP
-.ad l
 \fB--atomic\fP
 .br
-.ad b
 Makes a pvmove operation atomic, ensuring that all affected LVs are
 moved to the destination PV, or none are if the operation is aborted.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB-b\fP|\fB--background\fP
 .br
-.ad b
 If the operation requires polling, this option causes the command to
 return before the operation is complete, and polling is done in the
 background.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-i\fP|\fB--interval\fP \fINumber\fP
 .br
-.ad b
 Report progress at regular intervals.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
-.ad b
 Move only the extents belonging to the named LV.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIPV\fP
-.br
+.
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -377,182 +320,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH NOTES
-pvmove works as follows:
-
-1. A temporary 'pvmove' LV is created to store details of all the data
-movements required.
-
-2. Every LV in the VG is searched for contiguous data that need moving
-according to the command line arguments.
-For each piece of data found, a new segment is added to the end of the
-pvmove LV.
-This segment takes the form of a temporary mirror to copy the data
-from the original location to a newly allocated location.
-The original LV is updated to use the new temporary mirror segment
-in the pvmove LV instead of accessing the data directly.
-
-3. The VG metadata is updated on disk.
-
-4. The first segment of the pvmove LV is activated and starts to mirror
-the first part of the data.  Only one segment is mirrored at once as this
-is usually more efficient.
-
-5. A daemon repeatedly checks progress at the specified time interval.
-When it detects that the first temporary mirror is in sync, it breaks that
-mirror so that only the new location for that data gets used and writes a
-checkpoint into the VG metadata on disk.  Then it activates the mirror for
-the next segment of the pvmove LV.
-
-6. When there are no more segments left to be mirrored, the temporary LV
-is removed and the VG metadata is updated so that the LVs reflect the new
-data locations.
-
-Note that this new process cannot support the original LVM1
-type of on-disk metadata.  Metadata can be converted using
-\fBvgconvert\fP(8).
-
-If the \fB--atomic\fP option is used, a slightly different approach is
-used for the move.  Again, a temporary 'pvmove' LV is created to store the
-details of all the data movements required.  This temporary LV contains
-all the segments of the various LVs that need to be moved.  However, in
-this case, an identical LV is allocated that contains the same number of
-segments and a mirror is created to copy the contents from the first
-temporary LV to the second.  After a complete copy is made, the temporary
-LVs are removed, leaving behind the segments on the destination PV.  If an
-abort is issued during the move, all LVs being moved will remain on the
-source PV.
-
-.SH EXAMPLES
-
-Move all physical extents that are used by simple LVs on the specified PV to
-free physical extents elsewhere in the VG.
-.br
-.B pvmove /dev/sdb1
-
-Use a specific destination PV when moving physical extents.
-.br
-.B pvmove /dev/sdb1 /dev/sdc1
-
-Move extents belonging to a single LV.
-.br
-.B pvmove -n lvol1 /dev/sdb1 /dev/sdc1
-
-Rather than moving the contents of an entire device, it is possible to
-move a range of physical extents, for example numbers 1000 to 1999
-inclusive on the specified PV.
-.br
-.B pvmove /dev/sdb1:1000-1999
-
-A range of physical extents to move can be specified as start+length. For
-example, starting from PE 1000. (Counting starts from 0, so this refers to the
-1001st to the 2000th PE inclusive.)
-.br
-.B pvmove /dev/sdb1:1000+1000
-
-Move a range of physical extents to a specific PV (which must have
-sufficient free extents).
-.br
-.B pvmove /dev/sdb1:1000-1999 /dev/sdc1
-
-Move a range of physical extents to specific new extents on a new PV.
-.br
-.B pvmove /dev/sdb1:1000-1999 /dev/sdc1:0-999
-
-If the source and destination are on the same disk, the
-\fBanywhere\fP allocation policy is needed.
-.br
-.B pvmove --alloc anywhere /dev/sdb1:1000-1999 /dev/sdb1:0-999
-
-The part of a specific LV present within in a range of physical
-extents can also be picked out and moved.
-.br
-.B pvmove -n lvol1 /dev/sdb1:1000-1999 /dev/sdc1
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index 3015b70d1..b34f2a042 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -1,244 +1,203 @@
 .TH PVREMOVE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-pvremove - Remove LVM label(s) from physical volume(s)
+.
+pvremove \(em Remove LVM label(s) from physical volume(s)
 .
 .SH SYNOPSIS
+.
 \fBpvremove\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 pvremove wipes the label on a device so that LVM will no longer recognise
 it as a PV.
-
+.P
 A PV cannot be removed from a VG while it is used by an active LV.
-
+.P
 Repeat the force option (\fB-ff\fP) to forcibly remove a PV belonging to
 an existing VG. Normally, \fBvgreduce\fP(8) should be used instead.
+.
 .SH USAGE
+.
 \fBpvremove\fP \fIPV\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIPV\fP
-.br
+.
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -246,91 +205,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index fcc85885b..ea309b311 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -1,239 +1,198 @@
 .TH PVRESIZE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-pvresize - Resize physical volume(s)
+.
+pvresize \(em Resize physical volume(s)
 .
 .SH SYNOPSIS
+.
 \fBpvresize\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 pvresize resizes a PV. The PV may already be in a VG and may have active
 LVs allocated on it.
+.
 .SH USAGE
+.
 \fBpvresize\fP \fIPV\fP ...
 .br
 .RS 4
 .ad l
 [    \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Overrides the automatically detected size of the PV.
 Use with care, or prior to reducing the physical size of the device.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIPV\fP
-.br
+.
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -241,103 +200,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH NOTES
-pvresize will refuse to shrink a PV if it has allocated extents beyond the
-new end.
-.SH EXAMPLES
-Expand a PV after enlarging the partition.
-.br
-.B pvresize /dev/sda1
-
-Shrink a PV prior to shrinking the partition (ensure that the PV size is
-appropriate for the intended new partition size).
-.br
-.B pvresize --setphysicalvolumesize 40G /dev/sda1
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index f00e0328a..08b5600f5 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -1,332 +1,251 @@
 .TH PVS 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-pvs - Display information about physical volumes
+.
+pvs \(em Display information about physical volumes
 .
 .SH SYNOPSIS
+.
 \fBpvs\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 pvs produces formatted output about PVs.
+.
 .SH USAGE
+.
 \fBpvs\fP
 .br
 .RS 4
 .ad l
 [ \fB-a\fP|\fB--all\fP ]
-.ad b
 .br
-.ad l
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--segments\fP ]
-.ad b
 .br
-.ad l
 [    \fB--aligned\fP ]
-.ad b
 .br
-.ad l
 [    \fB--binary\fP ]
-.ad b
 .br
-.ad l
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
-.ad b
 .br
-.ad l
 [    \fB--foreign\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--logonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nameprefixes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noheadings\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nosuffix\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--rows\fP ]
-.ad b
 .br
-.ad l
 [    \fB--separator\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--shared\fP ]
-.ad b
 .br
-.ad l
 [    \fB--unbuffered\fP ]
-.ad b
 .br
-.ad l
-[    \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP ]
-.ad b
+[    \fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
+]
 .br
-.ad l
 [    \fB--unquoted\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIPV\fP|\fITag\fP ... ]
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--aligned\fP
 .br
-.ad b
 Use with --separator to align the output columns
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
 Show information about devices that have not been initialized
 by LVM, i.e. they are not PVs.
+.
 .HP
-.ad l
 \fB--binary\fP
 .br
-.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-.ad b
 See \fBlvmreport\fP(7).
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--foreign\fP
 .br
-.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--logonly\fP
 .br
-.ad b
 Suppress command report and display only log report.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nameprefixes\fP
 .br
-.ad b
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
+.
 .HP
-.ad l
 \fB--noheadings\fP
 .br
-.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--nosuffix\fP
 .br
-.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
+.
 .HP
-.ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
-.ad b
 Comma-separated, ordered list of fields to display in columns.
-String arg syntax is: [+|-|#]Field1[,Field2 ...]
+String arg syntax is: [\fB+\fP|\fB-\fP|\fB#\fP]\fIField1\fP[\fB,\fP\fIField2\fP ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
 \fB-\fP will remove the specified fields from the default fields, and
 \fB#\fP will compact specified fields (removing them when empty for all rows.)
@@ -340,63 +259,56 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment fields,
 \fBseg_all\fP all LV segment fields, and
 \fBpvseg_all\fP all PV segment columns.
-See the lvm.conf report section for more config options.
+See the \fBlvm.conf\fP(5) report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--rows\fP
 .br
-.ad b
 Output columns as rows.
+.
 .HP
-.ad l
 \fB--segments\fP
 .br
-.ad b
 Produces one line of output for each contiguous allocation of space on each
 PV, showing the start (pvseg_start) and length (pvseg_size) in units of
 physical extents.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -405,86 +317,82 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB--separator\fP \fIString\fP
 .br
-.ad b
 String to use to separate each column. Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--shared\fP
 .br
-.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
+.
 .HP
-.ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
-.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB--unbuffered\fP
 .br
-.ad b
 Produce output immediately without sorting or aligning the columns properly.
+.
 .HP
 .ad l
-\fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
-.br
+\fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
 .ad b
+.br
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
+.
 .HP
-.ad l
 \fB--unquoted\fP
 .br
-.ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIPV\fP
-.br
+.
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -492,105 +400,40 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH NOTES
-.
-The pv_attr bits are:
-.IP 1 3
-(d)uplicate, (a)llocatable, (u)sed
-.IP 2 3
-e(x)ported
-.IP 3 3
-(m)issing
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index 1b0d3d925..8025d6c34 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -1,52 +1,57 @@
 .TH PVSCAN 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-pvscan - List all physical volumes
+.
+pvscan \(em List all physical volumes
 .
 .SH SYNOPSIS
+.
 \fBpvscan\fP \fIoption_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 When called without the --cache option, pvscan lists PVs on the system,
 like
 .BR pvs (8)
 or
 .BR pvdisplay (8).
-
+.P
 When the --cache and -aay options are used, pvscan records which PVs are
 available on the system, and activates LVs in completed VGs.  A VG is
 complete when pvscan sees that the final PV in the VG has appeared.  This
 is used by event-based system startup (systemd, udev) to activate LVs.
-
+.P
 The four main variations of this are:
-
+.P
 .B pvscan --cache
-.IR device
-
+.I device
+.P
 If device is present, lvm adds a record that the PV on device is online.
 If device is not present, lvm removes the online record for the PV.
 In most cases, the pvscan will only read the named devices.
-
+.P
 .B pvscan --cache -aay
 .IR device ...
-
+.P
 This begins by performing the same steps as above.  Afterward, if the VG
 for the specified PV is complete, then pvscan will activate LVs in the VG
 (the same as vgchange -aay vgname would do.)
-
+.P
 .B pvscan --cache
-
+.P
 This first clears all existing PV online records, then scans all devices
 on the system, adding PV online records for any PVs that are found.
-
+.P
 .B pvscan --cache -aay
-
+.P
 This begins by performing the same steps as pvscan --cache.  Afterward, it
 activates LVs in any complete VGs.
-
+.P
 To prevent devices from being scanned by pvscan --cache, add them
 to
 .BR lvm.conf (5)
@@ -54,23 +59,24 @@ to
 For more information, see:
 .br
 .B lvmconfig --withcomments devices/global_filter
-
+.P
 Auto-activation of VGs or LVs can be enabled/disabled using:
 .br
 .BR lvm.conf (5)
 .B activation/auto_activation_volume_list
-
+.P
 For more information, see:
 .br
 .B lvmconfig --withcomments activation/auto_activation_volume_list
-
+.P
 To disable auto-activation, explicitly set this list to an empty list,
 i.e. auto_activation_volume_list = [ ].
-
+.P
 When this setting is undefined (e.g. commented), then all LVs are
 auto-activated.
-
+.
 .SH USAGE
+.
 Display PV information.
 .br
 .P
@@ -79,24 +85,17 @@ Display PV information.
 .RS 4
 .ad l
 [ \fB-e\fP|\fB--exported\fP ]
-.ad b
 .br
-.ad l
 [ \fB-n\fP|\fB--novolumegroup\fP ]
-.ad b
 .br
-.ad l
 [ \fB-s\fP|\fB--short\fP ]
-.ad b
 .br
-.ad l
 [ \fB-u\fP|\fB--uuid\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Autoactivate a VG when all PVs are online.
 .br
 .P
@@ -105,305 +104,242 @@ Autoactivate a VG when all PVs are online.
 .RS 4
 .ad l
 [ \fB-a\fP|\fB--activate\fP \fBay\fP ]
-.ad b
 .br
-.ad l
 [ \fB-j\fP|\fB--major\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--minor\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIString\fP|\fIPV\fP ... ]
 .RE
-
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
-.ad b
 Auto-activate LVs in a VG when the PVs scanned have completed the VG.
 (Only \fBay\fP is applicable.)
+.
 .HP
-.ad l
 \fB--cache\fP
 .br
-.ad b
 Scan one or more devices and record that they are online.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-e\fP|\fB--exported\fP
 .br
-.ad b
 Only show PVs belonging to exported VGs.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-j\fP|\fB--major\fP \fINumber\fP
 .br
-.ad b
 The major number of a device.
+.
 .HP
-.ad l
 \fB--minor\fP \fINumber\fP
 .br
-.ad b
 The minor number of a device.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB-n\fP|\fB--novolumegroup\fP
 .br
-.ad b
 Only show PVs not belonging to any VG.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-s\fP|\fB--short\fP
 .br
-.ad b
 Short listing format.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-u\fP|\fB--uuid\fP
 .br
-.ad b
 Show UUIDs in addition to device names.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIPV\fP
-.br
+.
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -411,91 +347,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index 1ef11ffb0..ce7102595 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -1,382 +1,277 @@
 .TH VGCFGBACKUP 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgcfgbackup - Backup volume group configuration(s)
+.
+vgcfgbackup \(em Backup volume group configuration(s)
 .
 .SH SYNOPSIS
+.
 \fBvgcfgbackup\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgcfgbackup creates back up files containing metadata of VGs.
 If no VGs are named, back up files are created for all VGs.
 See \fBvgcfgrestore\fP for information on using the back up
 files.
-
+.P
 In a default installation, each VG is backed up into a separate file
 bearing the name of the VG in the directory \fI#DEFAULT_BACKUP_DIR#\fP.
-
+.P
 To use an alternative back up file, use \fB-f\fP. In this case, when
 backing up multiple VGs, the file name is treated as a template, with %s
 replaced by the VG name.
-
+.P
 NB. This DOES NOT back up the data content of LVs.
-
+.P
 It may also be useful to regularly back up the files in
 \fI#DEFAULT_SYS_DIR#\fP.
+.
 .SH USAGE
+.
 \fBvgcfgbackup\fP
 .br
 .RS 4
 .ad l
 [ \fB-f\fP|\fB--file\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--foreign\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP ... ]
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
-.ad b
 Write the backup to the named file.
 When backing up more than one VG, the file name is
 treated as a template, and %s is replaced by the VG name.
+.
 .HP
-.ad l
 \fB--foreign\fP
 .br
-.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen
index 151aa2505..841626728 100644
--- a/man/vgcfgrestore.8_pregen
+++ b/man/vgcfgrestore.8_pregen
@@ -1,8 +1,11 @@
 .TH VGCFGRESTORE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgcfgrestore - Restore volume group configuration
+.
+vgcfgrestore \(em Restore volume group configuration
 .
 .SH SYNOPSIS
+.
 \fBvgcfgrestore\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
@@ -12,472 +15,333 @@ vgcfgrestore - Restore volume group configuration
 .P
 .ad l
     \fB--commandprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--config\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-d\fP|\fB--debug\fP
-.ad b
 .br
-.ad l
     \fB--devices\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--devicesfile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-f\fP|\fB--file\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--force\fP
-.ad b
 .br
-.ad l
  \fB-h\fP|\fB--help\fP
-.ad b
 .br
-.ad l
  \fB-l\fP|\fB--list\fP
-.ad b
 .br
-.ad l
     \fB--lockopt\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--longhelp\fP
-.ad b
 .br
-.ad l
  \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
-.ad b
 .br
-.ad l
     \fB--nolocking\fP
-.ad b
 .br
-.ad l
     \fB--profile\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-q\fP|\fB--quiet\fP
-.ad b
 .br
-.ad l
  \fB-t\fP|\fB--test\fP
-.ad b
 .br
-.ad l
  \fB-v\fP|\fB--verbose\fP
-.ad b
 .br
-.ad l
     \fB--version\fP
-.ad b
 .br
-.ad l
  \fB-y\fP|\fB--yes\fP
 .ad b
+.
 .SH DESCRIPTION
+.
 vgcfgrestore restores the metadata of a VG from a text back up file
 produced by \fBvgcfgbackup\fP. This writes VG metadata onto the devices
 specifed in back up file.
-
+.P
 A back up file can be specified with \fB--file\fP.  If no backup file is
 specified, the most recent one is used. Use \fB--list\fP for a list of
 the available back up and archive files of a VG.
-
+.P
 WARNING: When a VG contains thin pools, changes to thin metadata cannot be
 reverted, and data loss may occur if thin metadata has changed. The force
 option is required to restore in this case.
+.
 .SH USAGE
+.
 Restore VG metadata from last backup.
 .br
 .P
 \fBvgcfgrestore\fP \fIVG\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Restore VG metadata from specified file.
 .br
 .P
 \fBvgcfgrestore\fP \fB-f\fP|\fB--file\fP \fIString\fP \fIVG\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 List all VG metadata backups.
 .br
 .P
 \fBvgcfgrestore\fP \fB-l\fP|\fB--list\fP \fIVG\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 List one VG metadata backup file.
 .br
 .P
 \fBvgcfgrestore\fP \fB-l\fP|\fB--list\fP \fB-f\fP|\fB--file\fP \fIString\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP ]
 .RE
--
-
+.P
+\(em
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--force\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
-.ad b
 Read metadata backup from the named file.
 Usually this file was created by vgcfgbackup.
+.
 .HP
-.ad l
 \fB--force\fP ...
 .br
-.ad b
 Force metadata restore even with thin pool LVs.
 Use with extreme caution. Most changes to thin metadata
 cannot be reverted.
 You may lose data if you restore metadata that does not match the
 thin pool kernel metadata precisely.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--list\fP
 .br
-.ad b
 List metadata backup and archive files pertaining to the VG.
 May be used with --file. Does not restore the VG.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
-.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH NOTES
-
-To replace PVs, \fBvgdisplay --partial --verbose\fP will show the
-UUIDs and sizes of any PVs that are no longer present. If a PV in the VG
-is lost and you wish to substitute another of the same size, use
-\fBpvcreate --restorefile filename --uuid uuid\fP (plus additional
-arguments as appropriate) to initialise it with the same UUID as the
-missing PV. Repeat for all other missing PVs in the VG.  Then use
-\fBvgcfgrestore --file filename\fP to restore the VG's metadata.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 025113627..857dabf04 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -1,8 +1,11 @@
 .TH VGCHANGE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgchange - Change volume group attributes
+.
+vgchange \(em Change volume group attributes
 .
 .SH SYNOPSIS
+.
 \fBvgchange\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
@@ -12,206 +15,114 @@ vgchange - Change volume group attributes
 .P
 .ad l
  \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
-.ad b
 .br
-.ad l
     \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP
-.ad b
 .br
-.ad l
     \fB--addtag\fP \fITag\fP
-.ad b
 .br
-.ad l
-    \fB--alloc\fP 
+    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.ad b
 .br
-.ad l
  \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--commandprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--config\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-d\fP|\fB--debug\fP
-.ad b
 .br
-.ad l
     \fB--deltag\fP \fITag\fP
-.ad b
 .br
-.ad l
     \fB--detachprofile\fP
-.ad b
 .br
-.ad l
     \fB--devices\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--devicesfile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-f\fP|\fB--force\fP
-.ad b
 .br
-.ad l
  \fB-h\fP|\fB--help\fP
-.ad b
 .br
-.ad l
  \fB-K\fP|\fB--ignoreactivationskip\fP
-.ad b
 .br
-.ad l
     \fB--ignorelockingfailure\fP
-.ad b
 .br
-.ad l
     \fB--ignoremonitoring\fP
-.ad b
 .br
-.ad l
     \fB--lockopt\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--lockstart\fP
-.ad b
 .br
-.ad l
     \fB--lockstop\fP
-.ad b
 .br
-.ad l
     \fB--locktype\fP \fBsanlock\fP|\fBdlm\fP|\fBnone\fP
-.ad b
 .br
-.ad l
  \fB-l\fP|\fB--logicalvolume\fP \fINumber\fP
-.ad b
 .br
-.ad l
     \fB--longhelp\fP
-.ad b
 .br
-.ad l
  \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
-.ad b
 .br
-.ad l
     \fB--metadataprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--monitor\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--nolocking\fP
-.ad b
 .br
-.ad l
     \fB--noudevsync\fP
-.ad b
 .br
-.ad l
  \fB-P\fP|\fB--partial\fP
-.ad b
 .br
-.ad l
  \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT]
-.ad b
 .br
-.ad l
     \fB--poll\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--profile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
-.ad b
 .br
-.ad l
  \fB-q\fP|\fB--quiet\fP
-.ad b
 .br
-.ad l
     \fB--readonly\fP
-.ad b
 .br
-.ad l
     \fB--refresh\fP
-.ad b
 .br
-.ad l
     \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.ad b
 .br
-.ad l
  \fB-x\fP|\fB--resizeable\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-S\fP|\fB--select\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--setautoactivation\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--sysinit\fP
-.ad b
 .br
-.ad l
     \fB--systemid\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-t\fP|\fB--test\fP
-.ad b
 .br
-.ad l
  \fB-u\fP|\fB--uuid\fP
-.ad b
 .br
-.ad l
  \fB-v\fP|\fB--verbose\fP
-.ad b
 .br
-.ad l
     \fB--version\fP
-.ad b
 .br
-.ad l
-    \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
-.ad b
+    \fB--\fP[\fBvg\fP]\fBmetadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
-.ad l
  \fB-y\fP|\fB--yes\fP
 .ad b
+.
 .SH DESCRIPTION
+.
 vgchange changes VG attributes, changes LV activation in the kernel, and
 includes other utilities for VG maintenance.
+.
 .SH USAGE
+.
 Change a general VG attribute. 
 .br
 For options listed in parentheses, any one is 
@@ -235,14 +146,14 @@ required, after which the others are optional.
 .br
      \fB--deltag\fP \fITag\fP
 .br
-     \fB--alloc\fP 
+     \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
 .br
      \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
-     \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
+     \fB--\fP[\fBvg\fP]\fBmetadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
      \fB--profile\fP \fIString\fP
 .br
@@ -256,40 +167,28 @@ required, after which the others are optional.
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poll\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignoremonitoring\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fITag\fP|\fISelect\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Start or stop monitoring LVs from dmeventd.
 .br
 .P
@@ -298,48 +197,32 @@ Start or stop monitoring LVs from dmeventd.
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [    \fB--sysinit\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poll\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignoremonitoring\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fITag\fP|\fISelect\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Start or stop processing LV conversions.
 .br
 .P
@@ -348,40 +231,28 @@ Start or stop processing LV conversions.
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignoremonitoring\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fITag\fP|\fISelect\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Activate or deactivate LVs.
 .br
 .P
@@ -390,68 +261,42 @@ Activate or deactivate LVs.
 .RS 4
 .ad l
 [ \fB-K\fP|\fB--ignoreactivationskip\fP ]
-.ad b
 .br
-.ad l
 [ \fB-P\fP|\fB--partial\fP ]
-.ad b
 .br
-.ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [    \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP ]
-.ad b
 .br
-.ad l
 [    \fB--sysinit\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--monitor\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poll\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignoremonitoring\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fITag\fP|\fISelect\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Reactivate LVs using the latest metadata.
 .br
 .P
@@ -460,59 +305,45 @@ Reactivate LVs using the latest metadata.
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [    \fB--sysinit\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--poll\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignoremonitoring\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fITag\fP|\fISelect\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Change the system ID of a VG.
 .br
 .P
 \fBvgchange\fP \fB--systemid\fP \fIString\fP \fIVG\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Start the lockspace of a shared VG in lvmlockd.
 .br
 .P
@@ -521,16 +352,16 @@ Start the lockspace of a shared VG in lvmlockd.
 .RS 4
 .ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fITag\fP|\fISelect\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Stop the lockspace of a shared VG in lvmlockd.
 .br
 .P
@@ -539,105 +370,80 @@ Stop the lockspace of a shared VG in lvmlockd.
 .RS 4
 .ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fITag\fP|\fISelect\fP ... ]
 .RE
--
-
+.P
+\(em
+.P
 Change the lock type for a shared VG.
 .br
 .P
 \fBvgchange\fP \fB--locktype\fP \fBsanlock\fP|\fBdlm\fP|\fBnone\fP \fIVG\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Common options for command:
 .
 .RS 4
+.ad l
+.ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
-.ad b
 Change the active state of LVs.
 An active LV can be used through a block device,
 allowing data on the LV to be accessed.
@@ -655,18 +461,17 @@ activation commands.  By default, LVs are autoactivated.
 An autoactivation property can be set on a VG or LV to disable autoactivation,
 see --setautoactivation y|n in vgchange, lvchange, vgcreate, and lvcreate.
 Display the property with vgs or lvs "-o autoactivation".
-The lvm.conf auto_activation_volume_list includes names of VGs or LVs
+The \fBlvm.conf\fP(5) auto_activation_volume_list includes names of VGs or LVs
 that should be autoactivated, and anything not listed is not autoactivated.
 When auto_activation_volume_list is undefined (the default), it has no effect.
 If auto_activation_volume_list is defined and empty, no LVs are autoactivated.
 Items included by auto_activation_volume_list will not be autoactivated if
 the autoactivation property has been disabled.
 See \fBlvmlockd\fP(8) for more information about activation options \fBey\fP and \fBsy\fP for shared VGs.
+.
 .HP
-.ad l
 \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP
 .br
-.ad b
 Determines if LV activation is allowed when PVs are missing,
 e.g. because of a device failure.
 \fBcomplete\fP only allows LVs with no missing PVs to be activated,
@@ -675,23 +480,23 @@ and is the most restrictive mode.
 (This does not include the "mirror" type, see "raid1" instead.)
 \fBpartial\fP allows any LV with missing PVs to be activated, and
 should only be used for recovery or repair.
-For default, see lvm.conf/activation_mode.
+For default, see \fBlvm.conf\fP(5) activation_mode.
 See \fBlvmraid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--addtag\fP \fITag\fP
 .br
-.ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
+.
 .HP
 .ad l
-\fB--alloc\fP 
+\fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.br
 .ad b
+.br
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -708,205 +513,178 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--deltag\fP \fITag\fP
 .br
-.ad b
 Deletes a tag from a PV, VG or LV. This option can be repeated to delete
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
+.
 .HP
-.ad l
 \fB--detachprofile\fP
 .br
-.ad b
 Detaches a metadata profile from a VG or LV.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-K\fP|\fB--ignoreactivationskip\fP
 .br
-.ad b
 Ignore the "activation skip" LV flag during activation
 to allow LVs with the flag set to be activated.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--ignoremonitoring\fP
 .br
-.ad b
 Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--lockstart\fP
 .br
-.ad b
 Start the lockspace of a shared VG in lvmlockd.
 lvmlockd locks becomes available for the VG, allowing LVM to use the VG.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--lockstop\fP
 .br
-.ad b
 Stop the lockspace of a shared VG in lvmlockd.
 lvmlockd locks become unavailable for the VG, preventing LVM from using the VG.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--locktype\fP \fBsanlock\fP|\fBdlm\fP|\fBnone\fP
 .br
-.ad b
 Change the VG lock type to or from a shared lock type used with lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--logicalvolume\fP \fINumber\fP
 .br
-.ad b
 Sets the maximum number of LVs allowed in a VG.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
-.ad b
 Sets the maximum number of PVs that can belong to the VG.
 The value 0 removes any limitation.
 For large numbers of PVs, also see options --pvmetadatacopies,
 and --vgmetadatacopies for improving performance.
+.
 .HP
-.ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
-.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--monitor\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Start (yes) or stop (no) monitoring an LV with dmeventd.
 dmeventd monitors kernel events for an LV, and performs
 automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB-P\fP|\fB--partial\fP
 .br
-.ad b
 Commands will do their best to activate LVs with missing PV extents.
 Missing extents may be replaced with error or zero segments
-according to the lvm.conf missing_stripe_filler setting.
+according to the  missing_stripe_filler setting.
 Metadata may not be changed with this option.
+.
 .HP
-.ad l
 \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Sets the physical extent size of PVs in the VG.
 The value must be either a power of 2 of at least 1 sector
 (where the sector size is the largest sector size of the PVs
@@ -916,11 +694,10 @@ without recreating the VG, unless no extents need moving.
 Before increasing the physical extent size, you might need to use lvresize,
 pvresize and/or pvmove so that everything fits. For example, every
 contiguous range of extents used in a LV must start and end on an extent boundary.
+.
 .HP
-.ad l
 \fB--poll\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 When yes, start the background transformation of an LV.
 An incomplete transformation, e.g. pvmove or lvconvert interrupted
 by reboot or crash, can be restarted from the last checkpoint with --poll y.
@@ -928,18 +705,16 @@ When no, background transformation of an LV will not occur, and the
 transformation will not complete. It may not be appropriate to immediately
 poll an LV after activation, in which case --poll n can be used to defer
 polling until a later --poll y command.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
-.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -947,56 +722,50 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--refresh\fP
 .br
-.ad b
 If the LV is active, reload its metadata.
 This is not necessary in normal operation, but may be useful
 if something has gone wrong, or if some form of manual LV
 sharing is being used.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-x\fP|\fB--resizeable\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Enables or disables the addition or removal of PVs to/from a VG
 (by vgextend/vgreduce).
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -1005,11 +774,10 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB--setautoactivation\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Set the autoactivation property on a VG or LV.
 Display the property with vgs or lvs "-o autoactivation".
 When the autoactivation property is disabled, the VG or LV
@@ -1019,11 +787,10 @@ If autoactivation is disabled on a VG, no LVs will be autoactivated
 in that VG, and the LV autoactivation property has no effect.
 If autoactivation is enabled on a VG, autoactivation can be disabled
 for individual LVs.
+.
 .HP
-.ad l
 \fB--sysinit\fP
 .br
-.ad b
 Indicates that vgchange/lvchange is being invoked from early system initialisation
 scripts (e.g. rc.sysinit or an initrd), before writable filesystems are
 available. As such, some functionality needs to be disabled and this option
@@ -1031,49 +798,43 @@ acts as a shortcut which selects an appropriate set of options. Currently,
 this is equivalent to using --ignorelockingfailure, --ignoremonitoring,
 --poll n, and setting env var LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES.
 vgchange/lvchange skip autoactivation, and defer to pvscan autoactivation.
+.
 .HP
-.ad l
 \fB--systemid\fP \fIString\fP
 .br
-.ad b
 Changes the system ID of the VG.  Using this option requires caution
 because the VG may become foreign to the host running the command,
 leaving the host unable to access it.
 See \fBlvmsystemid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-u\fP|\fB--uuid\fP
 .br
-.ad b
 Generate new random UUID for specified VGs.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
-\fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
+\fB--\fP[\fBvg\fP]\fBmetadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
-.ad b
 Number of copies of the VG metadata that are kept.
 VG metadata is kept in VG metadata areas on PVs in the VG,
 i.e. reserved space at the start and/or end of the PVs.
@@ -1087,127 +848,58 @@ The number can also be replaced with special string values:
 metadataignore flags.
 \fBall\fP causes LVM to first clear the metadataignore flags on
 all PVs, and then to become unmanaged.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fISelect\fP
-.br
+.TP
+.I Select
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH NOTES
-If vgchange recognizes COW snapshot LVs that were dropped because they ran
-out of space, it displays a message informing the administrator that the
-snapshots should be removed.
-.SH EXAMPLES
-Activate all LVs in all VGs on all existing devices.
-.br
-.B vgchange -a y
-
-Change the maximum number of LVs for an inactive VG.
-.br
-.B vgchange -l 128 vg00
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index aef35f3b2..f177dfbdd 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -1,17 +1,24 @@
 .TH VGCK 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgck - Check the consistency of volume group(s)
+.
+vgck \(em Check the consistency of volume group(s)
 .
 .SH SYNOPSIS
+.
 \fBvgck\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgck checks LVM metadata for consistency.
+.
 .SH USAGE
+.
 Read and display information about a VG.
 .br
 .P
@@ -20,211 +27,170 @@ Read and display information about a VG.
 .RS 4
 .ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fITag\fP ... ]
 .RE
-
+.P
 Rewrite VG metadata to correct problems.
 .br
 .P
 \fBvgck\fP \fB--updatemetadata\fP \fIVG\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for command:
 .
 .RS 4
+.ad l
+.ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB--updatemetadata\fP
 .br
-.ad b
 Update VG metadata to correct problems.
 If VG metadata was updated while a PV was missing, and the PV
 reappears with an old version of metadata, then this option
@@ -235,122 +201,64 @@ this option will clear the outdated metadata from the previously
 missing PV. If metadata text is damaged on one PV, using this
 option will replace the damaged metadata text. For more severe
 damage, e.g. with headers, see \fBpvck\fP(8).
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index 093512ab0..d18e7af08 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -1,125 +1,90 @@
 .TH VGCONVERT 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgconvert - Change volume group metadata format
+.
+vgconvert \(em Change volume group metadata format
 .
 .SH SYNOPSIS
+.
 \fBvgconvert\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgconvert is no longer a part of LVM.  It was removed along with
 support for the LVM1 format.  Use an older version of LVM to
 convert VGs from the LVM1 format to LVM2.
+.
 .SH USAGE
+.
 \fBvgconvert\fP \fIVG\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--labelsector\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--bootloaderareasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
-
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--bootloaderareasize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Reserve space for the bootloader between the LVM metadata area and the first PE.
 The bootloader area is reserved for bootloaders to embed their own data or
 metadata; LVM will not use it.
@@ -131,122 +96,106 @@ and --dataalignmentoffset. The bootloader area may be larger than requested
 due to the alignment, but it's never less than the requested size.
 To see the bootloader area start and size of
 an existing PV use pvs -o +pv_ba_start,pv_ba_size.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--labelsector\fP \fINumber\fP
 .br
-.ad b
 By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
+.
 .HP
-.ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
-.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
-.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -254,146 +203,85 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index 3a3c35a08..7e357a548 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -1,206 +1,141 @@
 .TH VGCREATE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgcreate - Create a volume group
+.
+vgcreate \(em Create a volume group
 .
 .SH SYNOPSIS
+.
 \fBvgcreate\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgcreate creates a new VG on block devices. If the devices were not
 previously initialized as PVs with \fBpvcreate\fP(8), vgcreate will
 inititialize them, making them PVs. The pvcreate options for initializing
 devices are also available with vgcreate.
-
+.P
 When vgcreate uses an existing PV, that PV's existing values for metadata
 size, PE start, etc, are used, even if different values are specified in
 the vgcreate command.  To change these values, first use pvremove on the
 device.
-
+.
 .SH USAGE
+.
 \fBvgcreate\fP \fIVG\fP\fI_new\fP \fIPV\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-l\fP|\fB--maxlogicalvolumes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP ]
-.ad b
 .br
-.ad l
 [ \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--addtag\fP \fITag\fP ]
-.ad b
 .br
-.ad l
-[    \fB--alloc\fP 
+[    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
 ]
-.ad b
 .br
-.ad l
 [    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--labelsector\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
-.ad l
-[    \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP ]
-.ad b
+[    \fB--\fP[\fBvg\fP]\fBmetadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP ]
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--dataalignment\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--shared\fP ]
-.ad b
 .br
-.ad l
 [    \fB--systemid\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--locktype\fP \fBsanlock\fP|\fBdlm\fP|\fBnone\fP ]
-.ad b
 .br
-.ad l
 [    \fB--setautoactivation\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--addtag\fP \fITag\fP
 .br
-.ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
+.
 .HP
 .ad l
-\fB--alloc\fP 
+\fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.br
 .ad b
+.br
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -217,192 +152,167 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 This option was specific to clvm and is now replaced by
 the --shared option with \fBlvmlockd\fP(8).
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--dataalignment\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 Align the start of a PV data area with a multiple of this number.
 To see the location of the first Physical Extent (PE) of an existing PV,
 use pvs -o +pe_start. In addition, it may be shifted by an alignment offset,
 see --dataalignmentoffset.
 Also specify an appropriate PE size when creating a VG.
+.
 .HP
-.ad l
 \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 Shift the start of the PV data area by this additional offset.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--labelsector\fP \fINumber\fP
 .br
-.ad b
 By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--locktype\fP \fBsanlock\fP|\fBdlm\fP|\fBnone\fP
 .br
-.ad b
 Specify the VG lock type directly in place of using --shared.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--maxlogicalvolumes\fP \fINumber\fP
 .br
-.ad b
 Sets the maximum number of LVs allowed in a VG.
+.
 .HP
-.ad l
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
-.ad b
 Sets the maximum number of PVs that can belong to the VG.
 The value 0 removes any limitation.
 For large numbers of PVs, also see options --pvmetadatacopies,
 and --vgmetadatacopies for improving performance.
+.
 .HP
-.ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
-.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
+.
 .HP
-.ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
-.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 Sets the physical extent size of PVs in the VG.
 The value must be either a power of 2 of at least 1 sector
 (where the sector size is the largest sector size of the PVs
 currently used in the VG), or at least 128KiB.
 Once this value has been set, it is difficult to change
 without recreating the VG, unless no extents need moving.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
-.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -410,29 +320,26 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--setautoactivation\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Set the autoactivation property on a VG or LV.
 Display the property with vgs or lvs "-o autoactivation".
 When the autoactivation property is disabled, the VG or LV
@@ -442,21 +349,19 @@ If autoactivation is disabled on a VG, no LVs will be autoactivated
 in that VG, and the LV autoactivation property has no effect.
 If autoactivation is enabled on a VG, autoactivation can be disabled
 for individual LVs.
+.
 .HP
-.ad l
 \fB--shared\fP
 .br
-.ad b
 Create a shared VG using lvmlockd if LVM is compiled with lockd support.
 lvmlockd will select lock type sanlock or dlm depending on which lock
 manager is running. This allows multiple hosts to share a VG on shared
 devices. lvmlockd and a lock manager must be configured and running.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
+.
 .HP
-.ad l
 \fB--systemid\fP \fIString\fP
 .br
-.ad b
 Specifies the system ID that will be given to the new VG, overriding the
 system ID of the host running the command. A VG is normally created
 without this option, in which case the new VG is given the system ID of
@@ -464,34 +369,30 @@ the host creating it. Using this option requires caution because the
 system ID of the new VG may not match the system ID of the host running
 the command, leaving the VG inaccessible to the host.
 See \fBlvmsystemid\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
-\fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
+\fB--\fP[\fBvg\fP]\fBmetadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
-.ad b
 Number of copies of the VG metadata that are kept.
 VG metadata is kept in VG metadata areas on PVs in the VG,
 i.e. reserved space at the start and/or end of the PVs.
@@ -505,30 +406,28 @@ The number can also be replaced with special string values:
 metadataignore flags.
 \fBall\fP causes LVM to first clear the metadataignore flags on
 all PVs, and then to become unmanaged.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .HP
-.ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls if the first 4 sectors (2048 bytes) of the device are wiped.
 The default is to wipe these sectors unless either or both of
 --restorefile or --uuid are specified.
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIPV\fP
-.br
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -536,96 +435,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-Create a VG with two PVs, using the default physical extent size.
-.br
-.B vgcreate myvg /dev/sdk1 /dev/sdl1
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index a6f8106f2..467f74506 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -1,337 +1,257 @@
 .TH VGDISPLAY 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgdisplay - Display volume group information
+.
+vgdisplay \(em Display volume group information
 .
 .SH SYNOPSIS
+.
 \fBvgdisplay\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgdisplay shows the attributes of VGs, and the associated PVs and LVs.
-
+.P
 \fBvgs\fP(8) is a preferred alternative that shows the same information
 and more, using a more compact and configurable output format.
+.
 .SH USAGE
+.
 \fBvgdisplay\fP
 .br
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--activevolumegroups\fP ]
-.ad b
 .br
-.ad l
 [ \fB-c\fP|\fB--colon\fP ]
-.ad b
 .br
-.ad l
 [ \fB-C\fP|\fB--columns\fP ]
-.ad b
 .br
-.ad l
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-s\fP|\fB--short\fP ]
-.ad b
 .br
-.ad l
 [ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--aligned\fP ]
-.ad b
 .br
-.ad l
 [    \fB--binary\fP ]
-.ad b
 .br
-.ad l
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
-.ad b
 .br
-.ad l
 [    \fB--foreign\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--logonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noheadings\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nosuffix\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--shared\fP ]
-.ad b
 .br
-.ad l
 [    \fB--separator\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--unbuffered\fP ]
-.ad b
 .br
-.ad l
-[    \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP ]
-.ad b
+[    \fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
+]
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fITag\fP ... ]
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--activevolumegroups\fP
 .br
-.ad b
 Only select active VGs. The VG is considered active
 if at least one of its LVs is active.
+.
 .HP
-.ad l
 \fB--aligned\fP
 .br
-.ad b
 Use with --separator to align the output columns
+.
 .HP
-.ad l
 \fB--binary\fP
 .br
-.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
+.
 .HP
-.ad l
 \fB-c\fP|\fB--colon\fP
 .br
-.ad b
 Generate colon separated output for easier parsing in scripts or programs.
 Also see \fBvgs\fP(8) which provides considerably more control over the output.
+.
 .HP
-.ad l
 \fB-C\fP|\fB--columns\fP
 .br
-.ad b
 Display output in columns, the equivalent of \fBvgs\fP(8).
 Options listed are the same as options given in \fBvgs\fP(8).
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-.ad b
 See \fBlvmreport\fP(7).
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--foreign\fP
 .br
-.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--logonly\fP
 .br
-.ad b
 Suppress command report and display only log report.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--noheadings\fP
 .br
-.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--nosuffix\fP
 .br
-.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
+.
 .HP
-.ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
-.ad b
 Comma-separated, ordered list of fields to display in columns.
-String arg syntax is: [+|-|#]Field1[,Field2 ...]
+String arg syntax is: [\fB+\fP|\fB-\fP|\fB#\fP]\fIField1\fP[\fB,\fP\fIField2\fP ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
 \fB-\fP will remove the specified fields from the default fields, and
 \fB#\fP will compact specified fields (removing them when empty for all rows.)
@@ -345,49 +265,44 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment fields,
 \fBseg_all\fP all LV segment fields, and
 \fBpvseg_all\fP all PV segment columns.
-See the lvm.conf report section for more config options.
+See the \fBlvm.conf\fP(5) report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -396,176 +311,116 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB--separator\fP \fIString\fP
 .br
-.ad b
 String to use to separate each column. Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--shared\fP
 .br
-.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
+.
 .HP
-.ad l
 \fB-s\fP|\fB--short\fP
 .br
-.ad b
 Give a short listing showing the existence of VGs.
+.
 .HP
-.ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
-.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB--unbuffered\fP
 .br
-.ad b
 Produce output immediately without sorting or aligning the columns properly.
+.
 .HP
 .ad l
-\fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
-.br
+\fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
 .ad b
+.br
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index 89a25af07..0e6e0b164 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -1,33 +1,40 @@
 .TH VGEXPORT 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgexport - Unregister volume group(s) from the system
+.
+vgexport \(em Unregister volume group(s) from the system
 .
 .SH SYNOPSIS
+.
 \fBvgexport\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgexport changes a VG into the exported state, which ensures that the VG
 and its disks are not being used, and cannot be used until the VG is
 imported by \fBvgimport\fP(8).  Putting a VG into an unusable, offline
 state can be useful when doing things like moving a VG's disks to another
 system.  Exporting a VG provides some protection from its LVs being
 accidentally used, or being used by an automated system before it's ready.
-
+.P
 A VG cannot be exported until all of its LVs are inactive.
-
+.P
 LVM commands will ignore an exported VG or report an error if a command
 tries to use it.
-
+.P
 For an exported VG, the vgs command will display \"x\" in the third VG
 attribute, and the pvs command will display \"x\" in the second PV
 attribute.  Both vgs and pvs will display \"exported\" from the export
 report field.
-
+.P
 vgexport clears the VG system ID, and vgimport sets the VG system ID to
 match the host running vgimport (if the host has a system ID).
+.
 .SH USAGE
+.
 Export specified VGs.
 .br
 .P
@@ -36,22 +43,22 @@ Export specified VGs.
 .RS 4
 .ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Export all VGs.
 .br
 .P
 \fBvgexport\fP \fB-a\fP|\fB--all\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for command:
 .
 .RS 4
@@ -59,183 +66,140 @@ Common options for command:
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -244,138 +208,78 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fISelect\fP
-.br
+.TP
+.I Select
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index c4c0b130a..e5e01c4c5 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -1,296 +1,232 @@
 .TH VGEXTEND 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgextend - Add physical volumes to a volume group
+.
+vgextend \(em Add physical volumes to a volume group
 .
 .SH SYNOPSIS
+.
 \fBvgextend\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgextend adds one or more PVs to a VG. This increases the space available
 for LVs in the VG.
-
+.P
 Also, PVs that have gone missing and then returned, e.g. due to a
 transient device failure, can be added back to the VG without
 re-initializing them (see --restoremissing).
-
+.P
 If the specified PVs have not yet been initialized with pvcreate, vgextend
 will initialize them. In this case pvcreate options can be used, e.g.
 --labelsector, --metadatasize, --metadataignore,
 --pvmetadatacopies, --dataalignment, --dataalignmentoffset.
+.
 .SH USAGE
+.
 \fBvgextend\fP \fIVG\fP \fIPV\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--labelsector\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadatasize\fP \fISize\fP[m|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP ]
-.ad b
 .br
-.ad l
 [    \fB--metadataignore\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--dataalignment\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT] ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--restoremissing\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--dataalignment\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 Align the start of a PV data area with a multiple of this number.
 To see the location of the first Physical Extent (PE) of an existing PV,
 use pvs -o +pe_start. In addition, it may be shifted by an alignment offset,
 see --dataalignmentoffset.
 Also specify an appropriate PE size when creating a VG.
+.
 .HP
-.ad l
 \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT]
 .br
-.ad b
 Shift the start of the PV data area by this additional offset.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--labelsector\fP \fINumber\fP
 .br
-.ad b
 By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--metadataignore\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies the metadataignore property of a PV.
 If yes, metadata areas on the PV are ignored, and lvm will
 not store metadata in the metadata areas of the PV.
 If no, lvm will store metadata on the PV.
+.
 .HP
-.ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
-.ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
+.
 .HP
-.ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
-.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
-.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -298,78 +234,70 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--restoremissing\fP
 .br
-.ad b
 Add a PV back into a VG after the PV was missing and then returned,
 e.g. due to a transient failure. The PV is not reinitialized.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .HP
-.ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Controls if the first 4 sectors (2048 bytes) of the device are wiped.
 The default is to wipe these sectors unless either or both of
 --restorefile or --uuid are specified.
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIPV\fP
-.br
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -377,96 +305,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-Add two PVs to a VG.
-.br
-.B vgextend vg00 /dev/sda4 /dev/sdn1
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index 993a52e21..c0b815b65 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -1,19 +1,26 @@
 .TH VGIMPORT 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgimport - Register exported volume group with system
+.
+vgimport \(em Register exported volume group with system
 .
 .SH SYNOPSIS
+.
 \fBvgimport\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgimport makes exported VGs known to the system again, perhaps after
 moving the PVs from a different system.
-
+.P
 vgexport clears the VG system ID, and vgimport sets the VG system ID to
 match the host running vgimport (if the host has a system ID).
+.
 .SH USAGE
+.
 Import specified VGs.
 .br
 .P
@@ -22,218 +29,172 @@ Import specified VGs.
 .RS 4
 .ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Import all VGs.
 .br
 .P
 \fBvgimport\fP \fB-a\fP|\fB--all\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
 Import all visible VGs.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -242,138 +203,78 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fISelect\fP
-.br
+.TP
+.I Select
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen
index 2fe7ed60f..ee9bbe66c 100644
--- a/man/vgimportclone.8_pregen
+++ b/man/vgimportclone.8_pregen
@@ -1,252 +1,208 @@
 .TH VGIMPORTCLONE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgimportclone - Import a VG from cloned PVs
+.
+vgimportclone \(em Import a VG from cloned PVs
 .
 .SH SYNOPSIS
+.
 \fBvgimportclone\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgimportclone imports a VG from duplicated PVs, e.g. created by a hardware
 snapshot of existing PVs.
-
+.P
 A duplicated VG cannot used until it is made to coexist with the original
 VG. vgimportclone renames the VG associated with the specified PVs and
 changes the associated VG and PV UUIDs.
+.
 .SH USAGE
+.
 \fBvgimportclone\fP \fIPV\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-n\fP|\fB--basevgname\fP \fIVG\fP ]
-.ad b
 .br
-.ad l
 [ \fB-i\fP|\fB--import\fP ]
-.ad b
 .br
-.ad l
 [    \fB--importdevices\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-n\fP|\fB--basevgname\fP \fIString\fP
 .br
-.ad b
 By default the snapshot VG will be renamed to the original name plus a
 numeric suffix to avoid duplicate naming (e.g. 'test_vg' would be renamed
 to 'test_vg1'). This option will override the base VG name that is
 used for all VG renames. If a VG already exists with the specified name
 a numeric suffix will be added (like the previous example) to make it unique.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-i\fP|\fB--import\fP
 .br
-.ad b
 Import exported VGs. Otherwise VGs that have been exported
 will not be changed (nor will their associated PVs).
+.
 .HP
-.ad l
 \fB--importdevices\fP
 .br
-.ad b
 Add devices to the devices file.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIPV\fP
-.br
+.
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -254,99 +210,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-An original VG "vg00" has PVs "/dev/sda" and "/dev/sdb".
-The corresponding PVs from a hardware snapshot are "/dev/sdc" and "/dev/sdd".
-Rename the VG associated with "/dev/sdc" and "/dev/sdd" from "vg00" to "vg00_snap"
-(and change associated UUIDs).
-.br
-.B vgimportclone --basevgname vg00_snap /dev/sdc /dev/sdd
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgimportdevices.8_pregen b/man/vgimportdevices.8_pregen
index 18beabdfa..364ef52a4 100644
--- a/man/vgimportdevices.8_pregen
+++ b/man/vgimportdevices.8_pregen
@@ -1,25 +1,31 @@
 .TH VGIMPORTDEVICES 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgimportdevices - Add devices for a VG to the devices file.
+.
+vgimportdevices \(em Add devices for a VG to the devices file.
 .
 .SH SYNOPSIS
+.
 \fBvgimportdevices\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgimportdevices adds PVs from a VG to the devices file.  This is similar
 to using using lvmdevices --adddev to add each PV to the devices file
 individually.  vgimportdevices will also update the VG metadata to include
 the device IDs of each PV.  vgimportdevices will create a new devices file
 if none exists.
-
+.P
 When a devices file is used, the regex filter is ignored, except in the case
 of vgimportdevices which will apply the regex filter when looking for the VGs
 to import to the devices file.  Use vgimportdevices -a to import all VGs on a
 system to the devices file.
-
+.
 .SH USAGE
+.
 Add devices from specific VGs to the devices file.
 .br
 .P
@@ -28,217 +34,171 @@ Add devices from specific VGs to the devices file.
 .RS 4
 .ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Add devices from all accessible VGs to the devices file.
 .br
 .P
 \fBvgimportdevices\fP \fB-a\fP|\fB--all\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [    \fB--foreign\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--foreign\fP
 .br
-.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -247,138 +207,78 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fISelect\fP
-.br
+.TP
+.I Select
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen
index cca10b528..1264bb565 100644
--- a/man/vgmerge.8_pregen
+++ b/man/vgmerge.8_pregen
@@ -1,327 +1,225 @@
 .TH VGMERGE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgmerge - Merge volume groups
+.
+vgmerge \(em Merge volume groups
 .
 .SH SYNOPSIS
+.
 \fBvgmerge\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgmerge merges two existing VGs. The inactive source VG is merged into the
 destination VG if physical extent sizes are equal and PV and LV summaries
 of both VGs fit into the destination VG's limits.
+.
 .SH USAGE
+.
 \fBvgmerge\fP \fIVG\fP \fIVG\fP
 .br
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-l\fP|\fB--list\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--list\fP
 .br
-.ad b
 Display merged destination VG like vgdisplay -v.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-Merge an inactive VG named "vg00" into the active or inactive VG named
-"databases", giving verbose runtime information.
-.br
-.B vgmerge -v databases vg00
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index 34213ef8e..10f235949 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -1,356 +1,255 @@
 .TH VGMKNODES 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgmknodes - Create the special files for volume group devices in /dev
+.
+vgmknodes \(em Create the special files for volume group devices in /dev
 .
 .SH SYNOPSIS
+.
 \fBvgmknodes\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgmknodes checks the LVM device nodes in /dev that are needed for active
 LVs and creates any that are missing and removes unused ones.
-
+.P
 This command should not usually be needed if all the system components are
 interoperating correctly.
+.
 .SH USAGE
+.
 \fBvgmknodes\fP
 .br
 .RS 4
 .ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--refresh\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fILV\fP|\fITag\fP ... ]
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--refresh\fP
 .br
-.ad b
 If the LV is active, reload its metadata.
 This is not necessary in normal operation, but may be useful
 if something has gone wrong, or if some form of manual LV
 sharing is being used.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fILV\fP
-.br
+.TP
+.I LV
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index f0d22121b..1509e4bd0 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -1,8 +1,11 @@
 .TH VGREDUCE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgreduce - Remove physical volume(s) from a volume group
+.
+vgreduce \(em Remove physical volume(s) from a volume group
 .
 .SH SYNOPSIS
+.
 \fBvgreduce\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
@@ -10,116 +13,82 @@ vgreduce - Remove physical volume(s) from a volume group
 .P
 .ad l
  \fB-a\fP|\fB--all\fP
-.ad b
 .br
-.ad l
  \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
     \fB--commandprofile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--config\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-d\fP|\fB--debug\fP
-.ad b
 .br
-.ad l
     \fB--devices\fP \fIPV\fP
-.ad b
 .br
-.ad l
     \fB--devicesfile\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
 .br
-.ad l
  \fB-f\fP|\fB--force\fP
-.ad b
 .br
-.ad l
  \fB-h\fP|\fB--help\fP
-.ad b
 .br
-.ad l
     \fB--lockopt\fP \fIString\fP
-.ad b
 .br
-.ad l
     \fB--longhelp\fP
-.ad b
 .br
-.ad l
     \fB--mirrorsonly\fP
-.ad b
 .br
-.ad l
     \fB--nolocking\fP
-.ad b
 .br
-.ad l
     \fB--profile\fP \fIString\fP
-.ad b
 .br
-.ad l
  \fB-q\fP|\fB--quiet\fP
-.ad b
 .br
-.ad l
     \fB--removemissing\fP
-.ad b
 .br
-.ad l
     \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.ad b
 .br
-.ad l
  \fB-t\fP|\fB--test\fP
-.ad b
 .br
-.ad l
  \fB-v\fP|\fB--verbose\fP
-.ad b
 .br
-.ad l
     \fB--version\fP
-.ad b
 .br
-.ad l
  \fB-y\fP|\fB--yes\fP
 .ad b
+.
 .SH DESCRIPTION
+.
 vgreduce removes one or more unused PVs from a VG.
+.
 .SH USAGE
+.
 Remove a PV from a VG.
 .br
 .P
 \fBvgreduce\fP \fIVG\fP \fIPV\fP ...
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Remove all unused PVs from a VG.
 .br
 .P
 \fBvgreduce\fP \fB-a\fP|\fB--all\fP \fIVG\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Remove all missing PVs from a VG.
 .br
 .P
@@ -128,215 +97,166 @@ Remove all missing PVs from a VG.
 .RS 4
 .ad l
 [    \fB--mirrorsonly\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
--
-
+.P
+\(em
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
 Removes all empty PVs if none are named on the command line.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--mirrorsonly\fP
 .br
-.ad b
 Only remove missing PVs from mirror LVs.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--removemissing\fP
 .br
-.ad b
 Removes all missing PVs from the VG, if there are no LVs allocated
 on them. This resumes normal operation of the VG (new LVs may again
 be created, changed and so on).
@@ -347,56 +267,51 @@ were partly on the missing disks are removed completely, including
 those parts on disks that are still present.
 If LVs spanned several disks, including ones that are lost, salvaging
 some data first may be possible by activating LVs in partial mode.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIPV\fP
-.br
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -404,91 +319,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index 73d6dbd4a..cf5c48ce4 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -1,233 +1,189 @@
 .TH VGREMOVE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgremove - Remove volume group(s)
+.
+vgremove \(em Remove volume group(s)
 .
 .SH SYNOPSIS
+.
 \fBvgremove\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgremove removes one or more VGs. If LVs exist in the VG, a prompt is used
 to confirm LV removal.
-
+.P
 If one or more PVs in the VG are lost, consider
 \fBvgreduce --removemissing\fP to make the VG
 metadata consistent again.
-
+.P
 Repeat the force option (\fB-ff\fP) to forcibly remove LVs in the VG
 without confirmation.
+.
 .SH USAGE
+.
 \fBvgremove\fP \fIVG\fP|\fITag\fP|\fISelect\fP ...
 .br
 .RS 4
 .ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noudevsync\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--noudevsync\fP
 .br
-.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -236,138 +192,78 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fISelect\fP
-.br
+.TP
+.I Select
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index ba5adca31..24ff24744 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -1,15 +1,20 @@
 .TH VGRENAME 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgrename - Rename a volume group
+.
+vgrename \(em Rename a volume group
 .
 .SH SYNOPSIS
+.
 \fBvgrename\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgrename renames a VG.
-
+.P
 All VGs visible to a system need to have different names, otherwise many
 LVM commands will refuse to run or give warning messages. VGs with the
 same name can occur when disks are moved between machines, or filters are
@@ -17,353 +22,243 @@ changed. If a newly connected disk has a VG with the same name as the VG
 containing the root filesystem, the machine may not boot correctly. When
 two VGs have the same name, the VG UUID can be used in place of the source
 VG name.
+.
 .SH USAGE
+.
 Rename a VG.
 .br
 .P
 \fBvgrename\fP \fIVG\fP \fIVG\fP\fI_new\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Rename a VG by specifying the VG UUID.
 .br
 .P
 \fBvgrename\fP \fIString\fP \fIVG\fP\fI_new\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-f\fP|\fB--force\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
-.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-
-Rename VG "vg02" to "myvg":
-.br
-.B vgrename "vg02" "myvg"
-
-Rename the VG with the specified UUID to "myvg".
-.br
-.B vgrename Zvlifi-Ep3t-e0Ng-U42h-o0ye-KHu1-nl7Ns4 myvg
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index 2cf23764e..ffb4ddc41 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -1,327 +1,248 @@
 .TH VGS 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgs - Display information about volume groups
+.
+vgs \(em Display information about volume groups
 .
 .SH SYNOPSIS
+.
 \fBvgs\fP
 .br
     [ \fIoption_args\fP ]
 .br
     [ \fIposition_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgs produces formatted output about VGs.
+.
 .SH USAGE
+.
 \fBvgs\fP
 .br
 .RS 4
 .ad l
 [ \fB-a\fP|\fB--all\fP ]
-.ad b
 .br
-.ad l
 [ \fB-o\fP|\fB--options\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--aligned\fP ]
-.ad b
 .br
-.ad l
 [    \fB--binary\fP ]
-.ad b
 .br
-.ad l
 [    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
-.ad b
 .br
-.ad l
 [    \fB--foreign\fP ]
-.ad b
 .br
-.ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--logonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nameprefixes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--noheadings\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nosuffix\fP ]
-.ad b
 .br
-.ad l
 [    \fB--readonly\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
-.ad l
 [    \fB--rows\fP ]
-.ad b
 .br
-.ad l
 [    \fB--separator\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--shared\fP ]
-.ad b
 .br
-.ad l
 [    \fB--unbuffered\fP ]
-.ad b
 .br
-.ad l
-[    \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP ]
-.ad b
+[    \fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
+]
 .br
-.ad l
 [    \fB--unquoted\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
 .RS 4
 [ \fIVG\fP|\fITag\fP ... ]
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--aligned\fP
 .br
-.ad b
 Use with --separator to align the output columns
+.
 .HP
-.ad l
 \fB-a\fP|\fB--all\fP
 .br
-.ad b
 List all VGs. Equivalent to not specifying any VGs.
+.
 .HP
-.ad l
 \fB--binary\fP
 .br
-.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-.ad b
 See \fBlvmreport\fP(7).
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB--foreign\fP
 .br
-.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--logonly\fP
 .br
-.ad b
 Suppress command report and display only log report.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--nameprefixes\fP
 .br
-.ad b
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
+.
 .HP
-.ad l
 \fB--noheadings\fP
 .br
-.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--nosuffix\fP
 .br
-.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
+.
 .HP
-.ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
-.ad b
 Comma-separated, ordered list of fields to display in columns.
-String arg syntax is: [+|-|#]Field1[,Field2 ...]
+String arg syntax is: [\fB+\fP|\fB-\fP|\fB#\fP]\fIField1\fP[\fB,\fP\fIField2\fP ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
 \fB-\fP will remove the specified fields from the default fields, and
 \fB#\fP will compact specified fields (removing them when empty for all rows.)
@@ -335,55 +256,49 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment fields,
 \fBseg_all\fP all LV segment fields, and
 \fBpvseg_all\fP all PV segment columns.
-See the lvm.conf report section for more config options.
+See the \fBlvm.conf\fP(5) report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--readonly\fP
 .br
-.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB--rows\fP
 .br
-.ad b
 Output columns as rows.
+.
 .HP
-.ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
-.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -392,193 +307,117 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.
 .HP
-.ad l
 \fB--separator\fP \fIString\fP
 .br
-.ad b
 String to use to separate each column. Useful if grepping the output.
+.
 .HP
-.ad l
 \fB--shared\fP
 .br
-.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
+.
 .HP
-.ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
-.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB--unbuffered\fP
 .br
-.ad b
 Produce output immediately without sorting or aligning the columns properly.
+.
 .HP
 .ad l
-\fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
-.br
+\fB--units\fP \c
+.nh
+\%[\fINumber\fP]\fBr\fP|\:\fBR\fP|\:\fBh\fP|\:\fBH\fP|\:\fBb\fP|\:\fBB\fP|\:\fBs\fP|\:\fBS\fP|\:\fBk\fP|\:\fBK\fP|\:\fBm\fP|\:\fBM\fP|\:\fBg\fP|\:\fBG\fP|\:\fBt\fP|\:\fBT\fP|\:\fBp\fP|\:\fBP\fP|\:\fBe\fP|\:\fBE\fP
+.hy
 .ad b
+.br
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
+.
 .HP
-.ad l
 \fB--unquoted\fP
 .br
-.ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fITag\fP
-.br
+.TP
+.I Tag
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH NOTES
-.
-The vg_attr bits are:
-.IP 1 3
-Permissions: (w)riteable, (r)ead-only
-.IP 2 3
-Resi(z)eable
-.IP 3 3
-E(x)ported
-.IP 4 3
-(p)artial: one or more physical volumes belonging to the volume group
-are missing from the system
-.IP 5 3
-Allocation policy: (c)ontiguous, c(l)ing, (n)ormal, @nywhere
-.IP 6 3
-(c)lustered, (s)hared
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index 40145b078..959e16190 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -1,343 +1,242 @@
 .TH VGSCAN 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgscan - Search for all volume groups
+.
+vgscan \(em Search for all volume groups
 .
 .SH SYNOPSIS
+.
 \fBvgscan\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgscan scans all supported LVM block devices in the system for VGs.
+.
 .SH USAGE
+.
 \fBvgscan\fP
 .br
 .RS 4
 .ad l
 [    \fB--ignorelockingfailure\fP ]
-.ad b
 .br
-.ad l
 [    \fB--mknodes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--notifydbus\fP ]
-.ad b
 .br
-.ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
 .br
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--ignorelockingfailure\fP
 .br
-.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB--mknodes\fP
 .br
-.ad b
 Also checks the LVM special files in /dev that are needed for active
 LVs and creates any missing ones and removes unused ones.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--notifydbus\fP
 .br
-.ad b
 Send a notification to D-Bus. The command will exit with an error
 if LVM is not built with support for D-Bus notification, or if the
 notify_dbus config setting is disabled.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
-.ad b
 Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
+the report/output_format setting in \fBlvm.conf\fP(5).
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIString\fP
-.br
+.
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)
diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen
index c4721b9ba..331c6e491 100644
--- a/man/vgsplit.8_pregen
+++ b/man/vgsplit.8_pregen
@@ -1,156 +1,128 @@
 .TH VGSPLIT 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.
 .SH NAME
-vgsplit - Move physical volumes into a new or existing volume group
+.
+vgsplit \(em Move physical volumes into a new or existing volume group
 .
 .SH SYNOPSIS
+.
 \fBvgsplit\fP \fIoption_args\fP \fIposition_args\fP
 .br
     [ \fIoption_args\fP ]
 .br
+.
 .SH DESCRIPTION
+.
 vgsplit moves one or more PVs from a source VG (the first VG arg) to a
 destination VG (the second VG arg).  The PV(s) to move are named after the
 source and destination VGs, or an LV is named, in which case the PVs
 underlying the LV are moved.
-
+.P
 If the destination VG does not exist, a new VG is created (command options
 can be used to specify properties of the new VG, also see
-\fBvgcreate\fP(8).)
-
+\fBvgcreate\fP(8)).
+.P
 LVs cannot be split between VGs; each LV must be entirely on the PVs in
 the source or destination VG.
-
+.P
 vgsplit can only move complete PVs. (See \fBpvmove\fP(8) for moving part
 of a PV.)
+.
 .SH USAGE
+.
 Split a VG by specified PVs.
 .br
 .P
 \fBvgsplit\fP \fIVG\fP \fIVG\fP \fIPV\fP ...
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Split a VG by PVs in a specified LV.
 .br
 .P
 \fBvgsplit\fP \fB-n\fP|\fB--name\fP \fILV\fP \fIVG\fP \fIVG\fP
 .br
 .RS 4
+.ad l
 [ COMMON_OPTIONS ]
+.ad b
 .RE
-.br
-
+.P
 Common options for command:
 .
 .RS 4
 .ad l
 [ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [ \fB-l\fP|\fB--maxlogicalvolumes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP ]
-.ad b
 .br
-.ad l
 [ \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP ]
-.ad b
 .br
-.ad l
-[    \fB--alloc\fP 
+[    \fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
 ]
-.ad b
 .br
-.ad l
-[    \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP ]
+[    \fB--\fP[\fBvg\fP]\fBmetadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP ]
 .ad b
 .RE
-
+.P
 Common options for lvm:
 .
 .RS 4
 .ad l
 [ \fB-d\fP|\fB--debug\fP ]
-.ad b
 .br
-.ad l
 [ \fB-h\fP|\fB--help\fP ]
-.ad b
 .br
-.ad l
 [ \fB-q\fP|\fB--quiet\fP ]
-.ad b
 .br
-.ad l
 [ \fB-t\fP|\fB--test\fP ]
-.ad b
 .br
-.ad l
 [ \fB-v\fP|\fB--verbose\fP ]
-.ad b
 .br
-.ad l
 [ \fB-y\fP|\fB--yes\fP ]
-.ad b
 .br
-.ad l
 [    \fB--commandprofile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--config\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devices\fP \fIPV\fP ]
-.ad b
 .br
-.ad l
 [    \fB--devicesfile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
 .br
-.ad l
 [    \fB--lockopt\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--longhelp\fP ]
-.ad b
 .br
-.ad l
 [    \fB--nolocking\fP ]
-.ad b
 .br
-.ad l
 [    \fB--profile\fP \fIString\fP ]
-.ad b
 .br
-.ad l
 [    \fB--version\fP ]
 .ad b
 .RE
+.
 .SH OPTIONS
+.
+.
 .HP
 .ad l
-\fB--alloc\fP 
+\fB--alloc\fP \c
 .nh
-\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+\%\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
 .hy
-.br
 .ad b
+.br
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -167,157 +139,136 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
+.
 .HP
-.ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--commandprofile\fP \fIString\fP
 .br
-.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
+.
 .HP
-.ad l
 \fB--config\fP \fIString\fP
 .br
-.ad b
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
+Config settings for the command. These override \fBlvm.conf\fP(5) settings.
+The String arg uses the same format as \fBlvm.conf\fP(5),
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
+.
 .HP
-.ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
-.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
+.
 .HP
-.ad l
 \fB--devices\fP \fIPV\fP
 .br
-.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
+.
 .HP
-.ad l
 \fB--devicesfile\fP \fIString\fP
 .br
-.ad b
 A file listing devices that LVM should use.
-The file must exist in /etc/lvm/devices/ and is managed
-with the lvmdevices(8) command.
-This overrides the lvm.conf devices/devicesfile and
-devices/use_devicesfile settings.
+The file must exist in \fI#DEFAULT_SYS_DIR#/devices/\fP and is managed
+with the \fBlvmdevices\fP(8) command.
+This overrides the \fBlvm.conf\fP(5) \fBdevices/devicesfile\fP and
+\fBdevices/use_devicesfile\fP settings.
+.
 .HP
-.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
-.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
+.
 .HP
-.ad l
 \fB-h\fP|\fB--help\fP
 .br
-.ad b
 Display help text.
+.
 .HP
-.ad l
 \fB--lockopt\fP \fIString\fP
 .br
-.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
+.
 .HP
-.ad l
 \fB--longhelp\fP
 .br
-.ad b
 Display long help text.
+.
 .HP
-.ad l
 \fB-l\fP|\fB--maxlogicalvolumes\fP \fINumber\fP
 .br
-.ad b
 Sets the maximum number of LVs allowed in a VG.
+.
 .HP
-.ad l
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
-.ad b
 Sets the maximum number of PVs that can belong to the VG.
 The value 0 removes any limitation.
 For large numbers of PVs, also see options --pvmetadatacopies,
 and --vgmetadatacopies for improving performance.
+.
 .HP
-.ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
-.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
+.
 .HP
-.ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
-.ad b
 Move only PVs used by the named LV.
+.
 .HP
-.ad l
 \fB--nolocking\fP
 .br
-.ad b
 Disable locking.
+.
 .HP
-.ad l
 \fB--profile\fP \fIString\fP
 .br
-.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
+.
 .HP
-.ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
-.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
+.
 .HP
-.ad l
 \fB-t\fP|\fB--test\fP
 .br
-.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
+.
 .HP
-.ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
-.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
+.
 .HP
-.ad l
 \fB--version\fP
 .br
-.ad b
 Display version information.
+.
 .HP
-.ad l
-\fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
+\fB--\fP[\fBvg\fP]\fBmetadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
-.ad b
 Number of copies of the VG metadata that are kept.
 VG metadata is kept in VG metadata areas on PVs in the VG,
 i.e. reserved space@the start and/or end of the PVs.
@@ -331,22 +282,21 @@ The number can also be replaced with special string values:
 metadataignore flags.
 \fBall\fP causes LVM to first clear the metadataignore flags on
 all PVs, and then to become unmanaged.
+.
 .HP
-.ad l
 \fB-y\fP|\fB--yes\fP
 .br
-.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
+.
 .SH VARIABLES
-.HP
-\fIVG\fP
-.br
+.
+.TP
+.I VG
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIPV\fP
-.br
+.TP
+.I PV
 Physical Volume name, a device path under /dev.
 For commands managing physical extents, a PV positional arg
 generally accepts a suffix indicating a range (or multiple ranges)
@@ -354,91 +304,36 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
+.TP
+.I String
 See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
+.TP
+.IR Size [UNIT]
 Size is an input number that accepts an optional unit.
 Input units are always treated as base two values, regardless of
 capitalization, e.g. 'k' and 'K' both refer to 1024.
 The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
-m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+UNIT represents other possible input units:
+.BR b | B
+is bytes,
+.BR s | S
+is sectors of 512 bytes,
+.BR k | K
+is KiB,
+.BR m | M
+is MiB,
+.BR g | G
+is GiB,
+.BR t | T
+is TiB,
+.BR p | P
+is PiB,
+.BR e | E
+is EiB.
 (This should not be confused with the output control --units, where
 capital letters mean multiple of 1000.)
+.
 .SH ENVIRONMENT VARIABLES
+.
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-.nh
-.ad l
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmconfig (8),
-.BR lvmdevices (8),
-
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvresize (8),
-.BR pvs (8),
-.BR pvscan (8),
-
-.BR vgcfgbackup (8),
-.BR vgcfgrestore (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgcreate (8),
-.BR vgconvert (8),
-.BR vgdisplay (8),
-.BR vgexport (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgimportdevices (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
-
-.BR lvcreate (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-
-.BR lvm-fullreport (8),
-.BR lvm-lvpoll (8),
-.BR lvm2-activation-generator (8),
-.BR blkdeactivate (8),
-.BR lvmdump (8),
-
-.BR dmeventd (8),
-.BR lvmpolld (8),
-.BR lvmlockd (8),
-.BR lvmlockctl (8),
-.BR cmirrord (8),
-.BR lvmdbusd (8),
-
-.BR lvmsystemid (7),
-.BR lvmreport (7),
-.BR lvmraid (7),
-.BR lvmthin (7),
-.BR lvmcache (7)



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-04-12  9:13 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2021-04-12  9:13 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9eca1312569f89884ca4c0a767d6c603ab7613db
Commit:        9eca1312569f89884ca4c0a767d6c603ab7613db
Parent:        396d93937db940736675db13609640ac6856b912
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Mon Apr 12 11:11:51 2021 +0200
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Apr 12 11:12:40 2021 +0200

make: generate

Oops, previous generate was not correct.
---
 man/lvchange.8_pregen        | 132 ++++++++++++++++++------------------
 man/lvconvert.8_pregen       | 154 +++++++++++++++++++++---------------------
 man/lvcreate.8_pregen        | 156 +++++++++++++++++++++----------------------
 man/lvdisplay.8_pregen       |  88 ++++++++++++------------
 man/lvextend.8_pregen        |  72 ++++++++++----------
 man/lvm-fullreport.8_pregen  |  80 +++++++++++-----------
 man/lvm-lvpoll.8_pregen      |  48 ++++++-------
 man/lvmconfig.8_pregen       |  76 ++++++++++-----------
 man/lvmdevices.8_pregen      |  48 ++++++-------
 man/lvmdiskscan.8_pregen     |  40 +++++------
 man/lvreduce.8_pregen        |  54 +++++++--------
 man/lvremove.8_pregen        |  56 ++++++++--------
 man/lvrename.8_pregen        |  46 ++++++-------
 man/lvresize.8_pregen        |  68 +++++++++----------
 man/lvs.8_pregen             |  88 ++++++++++++------------
 man/lvscan.8_pregen          |  46 ++++++-------
 man/pvchange.8_pregen        |  60 ++++++++---------
 man/pvck.8_pregen            |  52 +++++++--------
 man/pvcreate.8_pregen        |  68 +++++++++----------
 man/pvdisplay.8_pregen       |  84 +++++++++++------------
 man/pvmove.8_pregen          |  56 ++++++++--------
 man/pvremove.8_pregen        |  42 ++++++------
 man/pvresize.8_pregen        |  42 ++++++------
 man/pvs.8_pregen             |  84 +++++++++++------------
 man/pvscan.8_pregen          |  60 ++++++++---------
 man/vgcfgbackup.8_pregen     |  48 ++++++-------
 man/vgcfgrestore.8_pregen    |  46 ++++++-------
 man/vgchange.8_pregen        | 108 +++++++++++++++---------------
 man/vgck.8_pregen            |  44 ++++++------
 man/vgconvert.8_pregen       |  52 +++++++--------
 man/vgcreate.8_pregen        |  84 +++++++++++------------
 man/vgdisplay.8_pregen       |  82 +++++++++++------------
 man/vgexport.8_pregen        |  48 ++++++-------
 man/vgextend.8_pregen        |  64 +++++++++---------
 man/vgimport.8_pregen        |  50 +++++++-------
 man/vgimportclone.8_pregen   |  44 ++++++------
 man/vgimportdevices.8_pregen |  50 +++++++-------
 man/vgmerge.8_pregen         |  42 ++++++------
 man/vgmknodes.8_pregen       |  48 ++++++-------
 man/vgreduce.8_pregen        |  52 +++++++--------
 man/vgremove.8_pregen        |  50 +++++++-------
 man/vgrename.8_pregen        |  44 ++++++------
 man/vgs.8_pregen             |  82 +++++++++++------------
 man/vgscan.8_pregen          |  44 ++++++------
 man/vgsplit.8_pregen         |  54 +++++++--------
 45 files changed, 1468 insertions(+), 1468 deletions(-)

diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index 3d376996f..93c7311b5 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -594,7 +594,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
@@ -623,7 +623,7 @@ If auto_activation_volume_list is defined and empty, no LVs are autoactivated.
 Items included by auto_activation_volume_list will not be autoactivated if
 the autoactivation property has been disabled.
 See \fBlvmlockd\fP(8) for more information about activation options \fBey\fP and \fBsy\fP for shared VGs.
-.TP
+.HP
 .ad l
 \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP
 .br
@@ -638,14 +638,14 @@ and is the most restrictive mode.
 should only be used for recovery or repair.
 For default, see lvm.conf/activation_mode.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--addtag\fP \fITag\fP
 .br
 .ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.TP
+.HP
 .ad l
 \fB--alloc\fP 
 .nh
@@ -669,14 +669,14 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
 .br
@@ -692,14 +692,14 @@ cache pool LV. With \fBpassthrough\fP, all reads are served
 from the origin LV (all reads miss the cache) and all writes are
 forwarded to the origin LV; additionally, write hits cause cache
 block invalidates. See \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--cachepolicy\fP \fIString\fP
 .br
 .ad b
 Specifies the cache policy for a cache LV.
 See \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--cachesettings\fP \fIString\fP
 .br
@@ -711,21 +711,21 @@ The special string value \fBdefault\fP switches
 settings back to their default kernel values and removes
 them from the list of settings stored in LVM metadata.
 See \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--compression\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Controls whether compression is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -734,7 +734,7 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP
 .br
@@ -744,35 +744,35 @@ Default is no contiguous allocation based on a next free principle.
 It is only possible to change a non-contiguous allocation policy
 to contiguous if all of the allocated physical extents in the LV
 are already contiguous.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--deduplication\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Controls whether deduplication is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.TP
+.HP
 .ad l
 \fB--deltag\fP \fITag\fP
 .br
 .ad b
 Deletes a tag from a PV, VG or LV. This option can be repeated to delete
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.TP
+.HP
 .ad l
 \fB--detachprofile\fP
 .br
 .ad b
 Detaches a metadata profile from a VG or LV.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -780,7 +780,7 @@ See \fBlvm.conf\fP(5) for more information about profiles.
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -790,7 +790,7 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
@@ -803,14 +803,14 @@ allow reuse of unneeded extents in the thin pool.
 \fBpassdown\fP causes the thin pool to process discards itself
 (like nopassdown) and pass the discards to the underlying device.
 See \fBlvmthin\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
 .br
@@ -823,60 +823,60 @@ period of time to allow the thin pool to be extended.
 Errors are returned if no space is available after the timeout.
 (Also see dm-thin-pool kernel module option no_space_timeout.)
 See \fBlvmthin\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-K\fP|\fB--ignoreactivationskip\fP
 .br
 .ad b
 Ignore the "activation skip" LV flag during activation
 to allow LVs with the flag set to be activated.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--ignoremonitoring\fP
 .br
 .ad b
 Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-j\fP|\fB--major\fP \fINumber\fP
 .br
 .ad b
 Sets the major number of an LV block device.
-.TP
+.HP
 .ad l
 \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
@@ -885,20 +885,20 @@ Sets the maximum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
 .ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--minor\fP \fINumber\fP
 .br
 .ad b
 Sets the minor number of an LV block device.
-.TP
+.HP
 .ad l
 \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
@@ -907,7 +907,7 @@ Sets the minimum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--monitor\fP \fBy\fP|\fBn\fP
 .br
@@ -916,13 +916,13 @@ Start (yes) or stop (no) monitoring an LV with dmeventd.
 dmeventd monitors kernel events for an LV, and performs
 automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -931,7 +931,7 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB-P\fP|\fB--partial\fP
 .br
@@ -940,19 +940,19 @@ Commands will do their best to activate LVs with missing PV extents.
 Missing extents may be replaced with error or zero segments
 according to the lvm.conf missing_stripe_filler setting.
 Metadata may not be changed with this option.
-.TP
+.HP
 .ad l
 \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP
 .br
 .ad b
 Set access permission to read only \fBr\fP or read and write \fBrw\fP.
-.TP
+.HP
 .ad l
 \fB-M\fP|\fB--persistent\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 When yes, makes the specified minor number persistent.
-.TP
+.HP
 .ad l
 \fB--poll\fP \fBy\fP|\fBn\fP
 .br
@@ -964,21 +964,21 @@ When no, background transformation of an LV will not occur, and the
 transformation will not complete. It may not be appropriate to immediately
 poll an LV after activation, in which case --poll n can be used to defer
 polling until a later --poll y command.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
 .br
@@ -987,7 +987,7 @@ Sets read ahead sector count of an LV.
 \fBauto\fP is the default which allows the kernel to choose
 a suitable value automatically.
 \fBnone\fP is equivalent to zero.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -998,7 +998,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--rebuild\fP \fIPV\fP
 .br
@@ -1009,7 +1009,7 @@ Use this option in place of --resync or --syncaction repair when the
 PVs with corrupted data are known, and their data should be reconstructed
 rather than reconstructing default (rotating) data.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--refresh\fP
 .br
@@ -1018,7 +1018,7 @@ If the LV is active, reload its metadata.
 This is not necessary in normal operation, but may be useful
 if something has gone wrong, or if some form of manual LV
 sharing is being used.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -1029,7 +1029,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--resync\fP
 .br
@@ -1041,7 +1041,7 @@ During synchronization, data is read from the primary mirror device
 and copied to the others. This can take considerable time, during
 which the LV is without a complete redundant copy of the data.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -1054,7 +1054,7 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
 .br
@@ -1065,7 +1065,7 @@ An LV with this flag set is not activated unless the
 This flag is set by default on new thin snapshot LVs.
 The flag is not applied to deactivation.
 The current value of the flag is indicated in the lvs lv_attr bits.
-.TP
+.HP
 .ad l
 \fB--setautoactivation\fP \fBy\fP|\fBn\fP
 .br
@@ -1079,7 +1079,7 @@ If autoactivation is disabled on a VG, no LVs will be autoactivated
 in that VG, and the LV autoactivation property has no effect.
 If autoactivation is enabled on a VG, autoactivation can be disabled
 for individual LVs.
-.TP
+.HP
 .ad l
 \fB--[raid]syncaction\fP \fBcheck\fP|\fBrepair\fP
 .br
@@ -1091,7 +1091,7 @@ blocks in the array and check for discrepancies
 \fBcheck\fP will count but not correct discrepancies.
 \fBrepair\fP will correct discrepancies.
 See lvs for reporting discrepancies found or repaired.
-.TP
+.HP
 .ad l
 \fB--sysinit\fP
 .br
@@ -1103,7 +1103,7 @@ acts as a shortcut which selects an appropriate set of options. Currently,
 this is equivalent to using --ignorelockingfailure, --ignoremonitoring,
 --poll n, and setting env var LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES.
 vgchange/lvchange skip autoactivation, and defer to pvscan autoactivation.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -1113,20 +1113,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB--[raid]writebehind\fP \fINumber\fP
 .br
@@ -1137,7 +1137,7 @@ Once this value is exceeded, writes become synchronous (i.e. all writes
 to the constituent devices must complete before the array signals the
 write has completed). Setting the value to zero clears the preference
 and allows the system to choose the value arbitrarily.
-.TP
+.HP
 .ad l
 \fB--[raid]writemostly\fP \fIPV\fP[\fB:t\fP|\fBn\fP|\fBy\fP]
 .br
@@ -1150,7 +1150,7 @@ It is also possible to remove the write-mostly flag by adding the
 suffix \fB:n\fP at the end of the PV name, or to toggle the value with
 the suffix \fB:t\fP. Repeat this option to change the attribute on
 multiple PVs.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -1158,7 +1158,7 @@ multiple PVs.
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.TP
+.HP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
@@ -1166,33 +1166,33 @@ answer yes. Use with extreme caution.
 Set zeroing mode for thin pool. Note: already provisioned blocks from pool
 in non-zero mode are not cleared in unwritten parts when setting --zero y.
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
 LV followed by _<type> indicates that an LV of the
 given type is required. (raid represents raid<N> type)
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index cfe3a56ff..03e6d62dd 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -1196,7 +1196,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--alloc\fP 
 .nh
@@ -1220,7 +1220,7 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.TP
+.HP
 .ad l
 \fB-b\fP|\fB--background\fP
 .br
@@ -1228,7 +1228,7 @@ See \fBlvm\fP(8) for more information about allocation.
 If the operation requires polling, this option causes the command to
 return before the operation is complete, and polling is done in the
 background.
-.TP
+.HP
 .ad l
 \fB-H\fP|\fB--cache\fP
 .br
@@ -1236,19 +1236,19 @@ background.
 Specifies the command is handling a cache LV or cache pool.
 See --type cache and --type cache-pool.
 See \fBlvmcache\fP(7) for more information about LVM caching.
-.TP
+.HP
 .ad l
 \fB--cachedevice\fP \fIPV\fP
 .br
 .ad b
 The name of a device to use for a cache.
-.TP
+.HP
 .ad l
 \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP
 .br
 .ad b
 Specifies the cache metadata format used by cache target.
-.TP
+.HP
 .ad l
 \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
 .br
@@ -1264,20 +1264,20 @@ cache pool LV. With \fBpassthrough\fP, all reads are served
 from the origin LV (all reads miss the cache) and all writes are
 forwarded to the origin LV; additionally, write hits cause cache
 block invalidates. See \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--cachepolicy\fP \fIString\fP
 .br
 .ad b
 Specifies the cache policy for a cache LV.
 See \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--cachepool\fP \fILV\fP
 .br
 .ad b
 The name of a cache pool.
-.TP
+.HP
 .ad l
 \fB--cachesettings\fP \fIString\fP
 .br
@@ -1289,19 +1289,19 @@ The special string value \fBdefault\fP switches
 settings back to their default kernel values and removes
 them from the list of settings stored in LVM metadata.
 See \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--cachesize\fP \fISize\fP[m|UNIT]
 .br
 .ad b
 The size of cache to use.
-.TP
+.HP
 .ad l
 \fB--cachevol\fP \fILV\fP
 .br
 .ad b
 The name of a cache volume.
-.TP
+.HP
 .ad l
 \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT]
 .br
@@ -1316,21 +1316,21 @@ and the default value starts with 64 and scales up to fit the
 pool metadata size within 128MiB, if the pool metadata size is not specified.
 The value must be a multiple of 64KiB.
 See \fBlvmthin\fP(7) and \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--compression\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Controls whether compression is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -1339,21 +1339,21 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--deduplication\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Controls whether deduplication is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -1361,7 +1361,7 @@ See \fBlvmvdo\fP(7) for more information about VDO usage.
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -1371,7 +1371,7 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
@@ -1384,14 +1384,14 @@ allow reuse of unneeded extents in the thin pool.
 \fBpassdown\fP causes the thin pool to process discards itself
 (like nopassdown) and pass the discards to the underlying device.
 See \fBlvmthin\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
 .br
@@ -1404,53 +1404,53 @@ period of time to allow the thin pool to be extended.
 Errors are returned if no space is available after the timeout.
 (Also see dm-thin-pool kernel module option no_space_timeout.)
 See \fBlvmthin\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-i\fP|\fB--interval\fP \fINumber\fP
 .br
 .ad b
 Report progress at regular intervals.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--merge\fP
 .br
 .ad b
 An alias for --mergethin, --mergemirrors, or --mergesnapshot,
 depending on the type of LV.
-.TP
+.HP
 .ad l
 \fB--mergemirrors\fP
 .br
 .ad b
 Merge LV images that were split from a raid1 LV.
 See --splitmirrors with --trackchanges.
-.TP
+.HP
 .ad l
 \fB--mergesnapshot\fP
 .br
@@ -1467,7 +1467,7 @@ reads or writes to the origin appear as being directed to the snapshot
 being merged. When the merge finishes, the merged snapshot is removed.
 Multiple snapshots may be specified on the command line or a @tag may be
 used to specify multiple snapshots be merged to their respective origin.
-.TP
+.HP
 .ad l
 \fB--mergethin\fP
 .br
@@ -1476,14 +1476,14 @@ Merge thin LV into its origin LV.
 The origin thin LV takes the content of the thin snapshot,
 and the thin snapshot LV is removed.
 See \fBlvmthin\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
 .ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP
 .br
@@ -1497,7 +1497,7 @@ In this case, the mirror must be synchronized (by copying LV data from
 the first device to others) each time the LV is activated, e.g. after reboot.
 \fBmirrored\fP is a persistent log that is itself mirrored, but
 should be avoided. Instead, use the raid1 type for log redundancy.
-.TP
+.HP
 .ad l
 \fB-m\fP|\fB--mirrors\fP [\fB+\fP|\fB-\fP]\fINumber\fP
 .br
@@ -1518,7 +1518,7 @@ the number is added to the current number of images,
 or the minus prefix \fB-\fP can be used, in which case
 the number is subtracted from the current number of images.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
@@ -1526,13 +1526,13 @@ See \fBlvmraid\fP(7) for more information.
 Specifies the name of a new LV.
 When unspecified, a default name of "lvol#" is
 generated, where # is a number generated by LVM.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -1541,7 +1541,7 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB--originname\fP \fILV\fP
 .br
@@ -1549,19 +1549,19 @@ ignore the devices LVM creates.
 Specifies the name to use for the external origin LV when converting an LV
 to a thin LV. The LV being converted becomes a read-only external origin
 with this name.
-.TP
+.HP
 .ad l
 \fB--poolmetadata\fP \fILV\fP
 .br
 .ad b
 The name of a an LV to use for storing pool metadata.
-.TP
+.HP
 .ad l
 \fB--poolmetadatasize\fP \fISize\fP[m|UNIT]
 .br
 .ad b
 Specifies the size of the new pool metadata LV.
-.TP
+.HP
 .ad l
 \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP
 .br
@@ -1569,27 +1569,27 @@ Specifies the size of the new pool metadata LV.
 Enable or disable the automatic creation and management of a
 spare pool metadata LV in the VG. A spare metadata LV is reserved
 space that can be used when repairing a pool.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--raidintegrity\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Enable or disable data integrity checksums for raid images.
-.TP
+.HP
 .ad l
 \fB--raidintegrityblocksize\fP \fINumber\fP
 .br
@@ -1600,7 +1600,7 @@ logical block size, or the file system block size.
 It may be less than the file system block size, but not
 less than the device logical block size.
 Possible values: 512, 1024, 2048, 4096.
-.TP
+.HP
 .ad l
 \fB--raidintegritymode\fP \fIString\fP
 .br
@@ -1612,7 +1612,7 @@ The journal mode doubles writes to storage, but can improve performance for
 scattered writes packed into a single journal write.
 bitmap mode can in theory achieve full write throughput of the device,
 but would not benefit from the potential scattered write optimization.
-.TP
+.HP
 .ad l
 \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
 .br
@@ -1621,7 +1621,7 @@ Sets read ahead sector count of an LV.
 \fBauto\fP is the default which allows the kernel to choose
 a suitable value automatically.
 \fBnone\fP is equivalent to zero.
-.TP
+.HP
 .ad l
 \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT]
 .br
@@ -1629,7 +1629,7 @@ a suitable value automatically.
 Size of each raid or mirror synchronization region.
 lvm.conf activation/raid_region_size can be used to
 configure a default.
-.TP
+.HP
 .ad l
 \fB--repair\fP
 .br
@@ -1637,7 +1637,7 @@ configure a default.
 Replace failed PVs in a raid or mirror LV, or run a repair
 utility on a thin pool. See \fBlvmraid\fP(7) and \fBlvmthin\fP(7)
 for more information.
-.TP
+.HP
 .ad l
 \fB--replace\fP \fIPV\fP
 .br
@@ -1646,21 +1646,21 @@ Replace a specific PV in a raid LV with another PV.
 The new PV to use can be optionally specified after the LV.
 Multiple PVs can be replaced by repeating this option.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-s\fP|\fB--snapshot\fP
 .br
 .ad b
 Combine a former COW snapshot LV with a former origin LV to reverse
 a previous --splitsnapshot command.
-.TP
+.HP
 .ad l
 \fB--splitcache\fP
 .br
 .ad b
 Separates a cache pool from a cache LV, and keeps the unused cache pool LV.
 Before the separation, the cache is flushed. Also see --uncache.
-.TP
+.HP
 .ad l
 \fB--splitmirrors\fP \fINumber\fP
 .br
@@ -1670,7 +1670,7 @@ and uses them to create a new LV. If --trackchanges is also specified,
 changes to the raid1 LV are tracked while the split LV remains detached.
 If --name is specified, then the images are permanently split from the
 original LV and changes are not tracked.
-.TP
+.HP
 .ad l
 \fB--splitsnapshot\fP
 .br
@@ -1678,13 +1678,13 @@ original LV and changes are not tracked.
 Separates a COW snapshot from its origin LV. The LV that is split off
 contains the chunks that differ from the origin LV along with metadata
 describing them. This LV can be wiped and then destroyed with lvremove.
-.TP
+.HP
 .ad l
 \fB--startpoll\fP
 .br
 .ad b
 Start polling an LV to continue processing a conversion.
-.TP
+.HP
 .ad l
 \fB--stripes\fP \fINumber\fP
 .br
@@ -1694,14 +1694,14 @@ PVs (devices) that a striped LV is spread across. Data that
 appears sequential in the LV is spread across multiple devices in units of
 the stripe size (see --stripesize). This does not apply to
 existing allocated space, only newly allocated space can be striped.
-.TP
+.HP
 .ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
 .ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
-.TP
+.HP
 .ad l
 \fB--swapmetadata\fP
 .br
@@ -1712,7 +1712,7 @@ Use for repair only. When the metadata LV is swapped out of the pool, it can
 be activated directly and used with thin provisioning tools:
 \fBcache_dump\fP(8), \fBcache_repair\fP(8), \fBcache_restore\fP(8),
 \fBthin_dump\fP(8), \fBthin_repair\fP(8), \fBthin_restore\fP(8).
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -1722,7 +1722,7 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-T\fP|\fB--thin\fP
 .br
@@ -1730,13 +1730,13 @@ back metadata it believes has changed but hasn't.
 Specifies the command is handling a thin LV or thin pool.
 See --type thin, --type thin-pool, and --virtualsize.
 See \fBlvmthin\fP(7) for more information about LVM thin provisioning.
-.TP
+.HP
 .ad l
 \fB--thinpool\fP \fILV\fP
 .br
 .ad b
 The name of a thin pool LV.
-.TP
+.HP
 .ad l
 \fB--trackchanges\fP
 .br
@@ -1749,7 +1749,7 @@ Only the regions with changed data are resynchronized during merge.
 While a raid1 LV is tracking changes, operations on it are limited to
 merging the split image (see --mergemirrors) or permanently splitting
 the image (see --splitmirrors with --name.
-.TP
+.HP
 .ad l
 \fB--type\fP 
 .nh
@@ -1768,41 +1768,41 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
-.TP
+.HP
 .ad l
 \fB--uncache\fP
 .br
 .ad b
 Separates a cache pool from a cache LV, and deletes the unused cache pool LV.
 Before the separation, the cache is flushed. Also see --splitcache.
-.TP
+.HP
 .ad l
 \fB--usepolicies\fP
 .br
 .ad b
 Perform an operation according to the policy configured in lvm.conf
 or a profile.
-.TP
+.HP
 .ad l
 \fB--vdopool\fP \fILV\fP
 .br
 .ad b
 The name of a VDO pool LV.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
 .br
@@ -1819,7 +1819,7 @@ When using a snapshot to create a sparse LV, a hidden virtual device
 is created using the zero target, and the LV has the suffix _vorigin.
 Snapshots are less efficient than thin provisioning when creating
 large sparse LVs (GiB).
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -1827,7 +1827,7 @@ large sparse LVs (GiB).
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.TP
+.HP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
@@ -1837,18 +1837,18 @@ snapshot. If the LV is read-only, the snapshot will not be zeroed.
 For thin pools, this controls zeroing of provisioned blocks.
 Provisioning of large zeroed chunks negatively impacts performance.
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
 LV followed by _<type> indicates that an LV of the
 given type is required. (raid represents raid<N> type)
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -1858,16 +1858,16 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index e804f9ce0..140344fa8 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -1257,7 +1257,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
@@ -1274,14 +1274,14 @@ If autoactivation \fBay\fP is used, the LV is only activated
 if it matches an item in lvm.conf activation/auto_activation_volume_list.
 \fBay\fP implies --zero n and --wipesignatures n.
 See \fBlvmlockd\fP(8) for more information about activation options for shared VGs.
-.TP
+.HP
 .ad l
 \fB--addtag\fP \fITag\fP
 .br
 .ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.TP
+.HP
 .ad l
 \fB--alloc\fP 
 .nh
@@ -1305,14 +1305,14 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB-H\fP|\fB--cache\fP
 .br
@@ -1320,19 +1320,19 @@ Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information
 Specifies the command is handling a cache LV or cache pool.
 See --type cache and --type cache-pool.
 See \fBlvmcache\fP(7) for more information about LVM caching.
-.TP
+.HP
 .ad l
 \fB--cachedevice\fP \fIPV\fP
 .br
 .ad b
 The name of a device to use for a cache.
-.TP
+.HP
 .ad l
 \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP
 .br
 .ad b
 Specifies the cache metadata format used by cache target.
-.TP
+.HP
 .ad l
 \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
 .br
@@ -1348,20 +1348,20 @@ cache pool LV. With \fBpassthrough\fP, all reads are served
 from the origin LV (all reads miss the cache) and all writes are
 forwarded to the origin LV; additionally, write hits cause cache
 block invalidates. See \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--cachepolicy\fP \fIString\fP
 .br
 .ad b
 Specifies the cache policy for a cache LV.
 See \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--cachepool\fP \fILV\fP
 .br
 .ad b
 The name of a cache pool.
-.TP
+.HP
 .ad l
 \fB--cachesettings\fP \fIString\fP
 .br
@@ -1373,19 +1373,19 @@ The special string value \fBdefault\fP switches
 settings back to their default kernel values and removes
 them from the list of settings stored in LVM metadata.
 See \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--cachesize\fP \fISize\fP[m|UNIT]
 .br
 .ad b
 The size of cache to use.
-.TP
+.HP
 .ad l
 \fB--cachevol\fP \fILV\fP
 .br
 .ad b
 The name of a cache volume.
-.TP
+.HP
 .ad l
 \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT]
 .br
@@ -1400,21 +1400,21 @@ and the default value starts with 64 and scales up to fit the
 pool metadata size within 128MiB, if the pool metadata size is not specified.
 The value must be a multiple of 64KiB.
 See \fBlvmthin\fP(7) and \fBlvmcache\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--compression\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Controls whether compression is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -1423,7 +1423,7 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP
 .br
@@ -1433,21 +1433,21 @@ Default is no contiguous allocation based on a next free principle.
 It is only possible to change a non-contiguous allocation policy
 to contiguous if all of the allocated physical extents in the LV
 are already contiguous.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--deduplication\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Controls whether deduplication is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -1455,7 +1455,7 @@ See \fBlvmvdo\fP(7) for more information about VDO usage.
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -1465,7 +1465,7 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
@@ -1478,14 +1478,14 @@ allow reuse of unneeded extents in the thin pool.
 \fBpassdown\fP causes the thin pool to process discards itself
 (like nopassdown) and pass the discards to the underlying device.
 See \fBlvmthin\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
 .br
@@ -1498,7 +1498,7 @@ period of time to allow the thin pool to be extended.
 Errors are returned if no space is available after the timeout.
 (Also see dm-thin-pool kernel module option no_space_timeout.)
 See \fBlvmthin\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT]
 .br
@@ -1518,46 +1518,46 @@ the whole origin).
 When expressed as a percentage, the size defines an upper limit for the
 number of logical extents in the new LV. The precise number of logical
 extents in the new LV is not determined until the command has completed.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-K\fP|\fB--ignoreactivationskip\fP
 .br
 .ad b
 Ignore the "activation skip" LV flag during activation
 to allow LVs with the flag set to be activated.
-.TP
+.HP
 .ad l
 \fB--ignoremonitoring\fP
 .br
 .ad b
 Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-j\fP|\fB--major\fP \fINumber\fP
 .br
 .ad b
 Sets the major number of an LV block device.
-.TP
+.HP
 .ad l
 \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
@@ -1566,20 +1566,20 @@ Sets the maximum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
 .ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--minor\fP \fINumber\fP
 .br
 .ad b
 Sets the minor number of an LV block device.
-.TP
+.HP
 .ad l
 \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
@@ -1588,7 +1588,7 @@ Sets the minimum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP
 .br
@@ -1602,7 +1602,7 @@ In this case, the mirror must be synchronized (by copying LV data from
 the first device to others) each time the LV is activated, e.g. after reboot.
 \fBmirrored\fP is a persistent log that is itself mirrored, but
 should be avoided. Instead, use the raid1 type for log redundancy.
-.TP
+.HP
 .ad l
 \fB-m\fP|\fB--mirrors\fP \fINumber\fP
 .br
@@ -1620,7 +1620,7 @@ Use lvm.conf global/mirror_segtype_default and
 global/raid10_segtype_default to configure the default types.
 See the --nosync option for avoiding initial image synchronization.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--monitor\fP \fBy\fP|\fBn\fP
 .br
@@ -1629,7 +1629,7 @@ Start (yes) or stop (no) monitoring an LV with dmeventd.
 dmeventd monitors kernel events for an LV, and performs
 automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
@@ -1637,13 +1637,13 @@ See \fBdmeventd\fP(8) for more information.
 Specifies the name of a new LV.
 When unspecified, a default name of "lvol#" is
 generated, where # is a number generated by LVM.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--nosync\fP
 .br
@@ -1660,7 +1660,7 @@ This option is not valid for raid6, because raid6 relies on proper parity
 to reconstruct proper user date in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -1669,25 +1669,25 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP
 .br
 .ad b
 Set access permission to read only \fBr\fP or read and write \fBrw\fP.
-.TP
+.HP
 .ad l
 \fB-M\fP|\fB--persistent\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 When yes, makes the specified minor number persistent.
-.TP
+.HP
 .ad l
 \fB--poolmetadatasize\fP \fISize\fP[m|UNIT]
 .br
 .ad b
 Specifies the size of the new pool metadata LV.
-.TP
+.HP
 .ad l
 \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP
 .br
@@ -1695,27 +1695,27 @@ Specifies the size of the new pool metadata LV.
 Enable or disable the automatic creation and management of a
 spare pool metadata LV in the VG. A spare metadata LV is reserved
 space that can be used when repairing a pool.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--raidintegrity\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Enable or disable data integrity checksums for raid images.
-.TP
+.HP
 .ad l
 \fB--raidintegrityblocksize\fP \fINumber\fP
 .br
@@ -1726,7 +1726,7 @@ logical block size, or the file system block size.
 It may be less than the file system block size, but not
 less than the device logical block size.
 Possible values: 512, 1024, 2048, 4096.
-.TP
+.HP
 .ad l
 \fB--raidintegritymode\fP \fIString\fP
 .br
@@ -1738,7 +1738,7 @@ The journal mode doubles writes to storage, but can improve performance for
 scattered writes packed into a single journal write.
 bitmap mode can in theory achieve full write throughput of the device,
 but would not benefit from the potential scattered write optimization.
-.TP
+.HP
 .ad l
 \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
 .br
@@ -1747,7 +1747,7 @@ Sets read ahead sector count of an LV.
 \fBauto\fP is the default which allows the kernel to choose
 a suitable value automatically.
 \fBnone\fP is equivalent to zero.
-.TP
+.HP
 .ad l
 \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT]
 .br
@@ -1755,7 +1755,7 @@ a suitable value automatically.
 Size of each raid or mirror synchronization region.
 lvm.conf activation/raid_region_size can be used to
 configure a default.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -1766,7 +1766,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
 .br
@@ -1777,7 +1777,7 @@ An LV with this flag set is not activated unless the
 This flag is set by default on new thin snapshot LVs.
 The flag is not applied to deactivation.
 The current value of the flag is indicated in the lvs lv_attr bits.
-.TP
+.HP
 .ad l
 \fB--setautoactivation\fP \fBy\fP|\fBn\fP
 .br
@@ -1791,7 +1791,7 @@ If autoactivation is disabled on a VG, no LVs will be autoactivated
 in that VG, and the LV autoactivation property has no effect.
 If autoactivation is enabled on a VG, autoactivation can be disabled
 for individual LVs.
-.TP
+.HP
 .ad l
 \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT]
 .br
@@ -1800,7 +1800,7 @@ Specifies the size of the new LV.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
 greater when redundant data is needed for RAID levels.
-.TP
+.HP
 .ad l
 \fB-s\fP|\fB--snapshot\fP
 .br
@@ -1830,7 +1830,7 @@ A small amount of the COW snapshot LV size is used to track COW block
 locations, so the full size is not available for COW data blocks.
 Use lvs to check how much space is used, and see --monitor to
 to automatically extend the size to avoid running out of space.
-.TP
+.HP
 .ad l
 \fB-i\fP|\fB--stripes\fP \fINumber\fP
 .br
@@ -1847,14 +1847,14 @@ when unspecified, the default depends on the RAID type
 (raid0: 2, raid10: 2, raid4/5: 3, raid6: 5.)
 To stripe a new raid LV across all PVs by default,
 see lvm.conf allocation/raid_stripe_all_devices.
-.TP
+.HP
 .ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
 .ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -1864,7 +1864,7 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-T\fP|\fB--thin\fP
 .br
@@ -1872,13 +1872,13 @@ back metadata it believes has changed but hasn't.
 Specifies the command is handling a thin LV or thin pool.
 See --type thin, --type thin-pool, and --virtualsize.
 See \fBlvmthin\fP(7) for more information about LVM thin provisioning.
-.TP
+.HP
 .ad l
 \fB--thinpool\fP \fILV\fP
 .br
 .ad b
 The name of a thin pool LV.
-.TP
+.HP
 .ad l
 \fB--type\fP 
 .nh
@@ -1897,7 +1897,7 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
-.TP
+.HP
 .ad l
 \fB--vdo\fP
 .br
@@ -1905,27 +1905,27 @@ Use inferred types with care because it can lead to unexpected results.
 Specifies the command is handling VDO LV.
 See --type vdo.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.TP
+.HP
 .ad l
 \fB--vdopool\fP \fILV\fP
 .br
 .ad b
 The name of a VDO pool LV.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
 .br
@@ -1942,7 +1942,7 @@ When using a snapshot to create a sparse LV, a hidden virtual device
 is created using the zero target, and the LV has the suffix _vorigin.
 Snapshots are less efficient than thin provisioning when creating
 large sparse LVs (GiB).
-.TP
+.HP
 .ad l
 \fB-W\fP|\fB--wipesignatures\fP \fBy\fP|\fBn\fP
 .br
@@ -1960,7 +1960,7 @@ signatures that are recognized).
 Otherwise, native LVM code is used to detect signatures
 (only MD RAID, swap and LUKS signatures are detected in this case.)
 The LV is not wiped if the read only flag is set.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -1968,7 +1968,7 @@ The LV is not wiped if the read only flag is set.
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.TP
+.HP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
@@ -1980,21 +1980,21 @@ For thin pools, this controls zeroing of provisioned blocks.
 LV is not zeroed if the read only flag is set.
 Warning: trying to mount an unzeroed LV can cause the system to hang.
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
 For lvcreate, the required VG positional arg may be
 omitted when the VG name is included in another option,
 e.g. --name VG/LV.
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
 LV followed by _<type> indicates that an LV of the
 given type is required. (raid represents raid<N> type)
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -2004,11 +2004,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index d1370d616..be1c8b73e 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -186,13 +186,13 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--aligned\fP
 .br
 .ad b
 Use with --separator to align the output columns
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
@@ -200,7 +200,7 @@ Use with --separator to align the output columns
 Show information about internal LVs.
 These are components of normal LVs, such as mirrors,
 which are not independently accessible, e.g. not mountable.
-.TP
+.HP
 .ad l
 \fB--binary\fP
 .br
@@ -208,28 +208,28 @@ which are not independently accessible, e.g. not mountable.
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.TP
+.HP
 .ad l
 \fB-c\fP|\fB--colon\fP
 .br
 .ad b
 Generate colon separated output for easier parsing in scripts or programs.
 Also see \fBvgs\fP(8) which provides considerably more control over the output.
-.TP
+.HP
 .ad l
 \fB-C\fP|\fB--columns\fP
 .br
 .ad b
 Display output in columns, the equivalent of \fBvgs\fP(8).
 Options listed are the same as options given in \fBvgs\fP(8).
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -238,20 +238,20 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
 .ad b
 See \fBlvmreport\fP(7).
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -259,7 +259,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -269,27 +269,27 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--foreign\fP
 .br
 .ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-H\fP|\fB--history\fP
 .br
@@ -297,33 +297,33 @@ Display help text.
 Include historical LVs in the output.
 (This has no effect unless LVs were removed while
 lvm.conf metadata/record_lvs_history was enabled.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--logonly\fP
 .br
 .ad b
 Suppress command report and display only log report.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-m\fP|\fB--maps\fP
 .br
@@ -331,27 +331,27 @@ Display long help text.
 Display the mapping of logical extents to PVs and physical extents.
 To map physical extents to logical extents use:
 pvs --segments -o+lv_name,seg_start_pe,segtype
-.TP
+.HP
 .ad l
 \fB--noheadings\fP
 .br
 .ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--nosuffix\fP
 .br
 .ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.TP
+.HP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
@@ -373,21 +373,21 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -398,7 +398,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -409,12 +409,12 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--segments\fP
 .br
 .ad b
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -427,13 +427,13 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
 .ad b
 String to use to separate each column. Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--shared\fP
 .br
@@ -441,14 +441,14 @@ String to use to separate each column. Useful if grepping the output.
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.TP
+.HP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
 .ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -458,13 +458,13 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--unbuffered\fP
 .br
 .ad b
 Produce output immediately without sorting or aligning the columns properly.
-.TP
+.HP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
@@ -475,20 +475,20 @@ human-(r)eadable with '<' rounding indicator,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -497,25 +497,25 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index a4a90994d..83216b972 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -370,7 +370,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--alloc\fP 
 .nh
@@ -394,21 +394,21 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -417,14 +417,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -432,7 +432,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -442,14 +442,14 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--extents\fP [\fB+\fP]\fINumber\fP[PERCENT]
 .br
@@ -472,39 +472,39 @@ extents in the new LV is not determined until the command has completed.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-m\fP|\fB--mirrors\fP \fINumber\fP
 .br
 .ad b
 Not used.
-.TP
+.HP
 .ad l
 \fB-n\fP|\fB--nofsck\fP
 .br
@@ -512,13 +512,13 @@ Not used.
 Do not perform fsck before resizing filesystem when filesystem
 requires it. You may need to use --force to proceed with
 this option.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--nosync\fP
 .br
@@ -535,7 +535,7 @@ This option is not valid for raid6, because raid6 relies on proper parity
 to reconstruct proper user date in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -544,7 +544,7 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT]
 .br
@@ -552,21 +552,21 @@ ignore the devices LVM creates.
 Specifies the new size of the pool metadata LV.
 The plus prefix \fB+\fP can be used, in which case
 the value is added to the current size.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -577,13 +577,13 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-r\fP|\fB--resizefs\fP
 .br
 .ad b
 Resize underlying filesystem together with the LV using fsadm(8).
-.TP
+.HP
 .ad l
 \fB-L\fP|\fB--size\fP [\fB+\fP]\fISize\fP[m|UNIT]
 .br
@@ -595,7 +595,7 @@ greater when redundant data is needed for RAID levels.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.TP
+.HP
 .ad l
 \fB-i\fP|\fB--stripes\fP \fINumber\fP
 .br
@@ -612,14 +612,14 @@ when unspecified, the default depends on the RAID type
 (raid0: 2, raid10: 2, raid4/5: 3, raid6: 5.)
 To stripe a new raid LV across all PVs by default,
 see lvm.conf allocation/raid_stripe_all_devices.
-.TP
+.HP
 .ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
 .ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -629,7 +629,7 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--type\fP 
 .nh
@@ -648,27 +648,27 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
-.TP
+.HP
 .ad l
 \fB--usepolicies\fP
 .br
 .ad b
 Perform an operation according to the policy configured in lvm.conf
 or a profile.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -677,14 +677,14 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
 LV followed by _<type> indicates that an LV of the
 given type is required. (raid represents raid<N> type)
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -694,11 +694,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 7a63dc4ad..33e2dfaad 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -178,18 +178,18 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--aligned\fP
 .br
 .ad b
 Use with --separator to align the output columns
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
-.TP
+.HP
 .ad l
 \fB--binary\fP
 .br
@@ -197,14 +197,14 @@ Use with --separator to align the output columns
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -213,20 +213,20 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
 .ad b
 See \fBlvmreport\fP(7).
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -234,7 +234,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -244,53 +244,53 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--foreign\fP
 .br
 .ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--logonly\fP
 .br
 .ad b
 Suppress command report and display only log report.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nameprefixes\fP
 .br
@@ -298,27 +298,27 @@ Display long help text.
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
-.TP
+.HP
 .ad l
 \fB--noheadings\fP
 .br
 .ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--nosuffix\fP
 .br
 .ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.TP
+.HP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
@@ -340,21 +340,21 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -365,7 +365,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -376,13 +376,13 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--rows\fP
 .br
 .ad b
 Output columns as rows.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -395,13 +395,13 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
 .ad b
 String to use to separate each column. Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--shared\fP
 .br
@@ -409,14 +409,14 @@ String to use to separate each column. Useful if grepping the output.
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.TP
+.HP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
 .ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -426,13 +426,13 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--unbuffered\fP
 .br
 .ad b
 Produce output immediately without sorting or aligning the columns properly.
-.TP
+.HP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
@@ -443,27 +443,27 @@ human-(r)eadable with '<' rounding indicator,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.TP
+.HP
 .ad l
 \fB--unquoted\fP
 .br
 .ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -472,15 +472,15 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen
index 328e980c0..3aff67d19 100644
--- a/man/lvm-lvpoll.8_pregen
+++ b/man/lvm-lvpoll.8_pregen
@@ -104,27 +104,27 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--abort\fP
 .br
 .ad b
 Stop processing a poll operation in lvmpolld.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -133,14 +133,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -148,7 +148,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -158,72 +158,72 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--handlemissingpvs\fP
 .br
 .ad b
 Allows a polling operation to continue when PVs are missing,
 e.g. for repairs due to faulty devices.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-i\fP|\fB--interval\fP \fINumber\fP
 .br
 .ad b
 Report progress at regular intervals.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--polloperation\fP \fBpvmove\fP|\fBconvert\fP|\fBmerge\fP|\fBmerge_thin\fP
 .br
 .ad b
 The command to perform from lvmpolld.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -233,20 +233,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -255,16 +255,16 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen
index 8ddee04a7..469a6b9e8 100644
--- a/man/lvmconfig.8_pregen
+++ b/man/lvmconfig.8_pregen
@@ -177,7 +177,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--atversion\fP \fIString\fP
 .br
@@ -189,14 +189,14 @@ at this LVM version will be considered only. This can be used
 to display a configuration that a certain LVM version understands and
 which does not contain any newer settings for which LVM would
 issue a warning message when checking the configuration.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -205,14 +205,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -220,7 +220,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -230,32 +230,32 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
 .ad b
 Write output to the named file.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignoreadvanced\fP
 .br
 .ad b
 Exclude advanced configuration settings from the output.
-.TP
+.HP
 .ad l
 \fB--ignorelocal\fP
 .br
@@ -264,7 +264,7 @@ Ignore the local section. The local section should be defined in
 the lvmlocal.conf file, and should contain config settings
 specific to the local host which should not be copied to
 other hosts.
-.TP
+.HP
 .ad l
 \fB--ignoreunsupported\fP
 .br
@@ -274,27 +274,27 @@ either used for debugging and development purposes only or their support is not
 yet complete and they are not meant to be used in production. The \fBcurrent\fP
 and \fBdiff\fP types include unsupported settings in their output by default,
 all the other types ignore unsupported settings.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--list\fP
 .br
 .ad b
 List config settings with summarizing comment. This is the same as using
 options --typeconfig list --withsummary.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--mergedconfig\fP
 .br
@@ -306,34 +306,34 @@ merge all the contents of the "config cascade" before displaying it.
 Without merging, only the configuration at the front of the
 cascade is displayed.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
 .ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--showdeprecated\fP
 .br
@@ -344,7 +344,7 @@ with --atversion, deprecated settings are automatically included
 if the specified version is lower than the version in which the settings were
 deprecated. The current and diff types include deprecated settings
 in their output by default, all the other types ignore deprecated settings.
-.TP
+.HP
 .ad l
 \fB--showunsupported\fP
 .br
@@ -354,7 +354,7 @@ are either used for debugging or development purposes only, or their support
 is not yet complete and they are not meant to be used in production. The
 current and diff types include unsupported settings in their
 output by default, all the other types ignore unsupported settings.
-.TP
+.HP
 .ad l
 \fB--sinceversion\fP \fIString\fP
 .br
@@ -363,7 +363,7 @@ Specify an LVM version in x.y.z format where x is the major version,
 the y is the minor version and z is the patchlevel (e.g. 2.2.106).
 This option is currently applicable only with --typeconfig new
 to display all configuration settings introduced since given version.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -373,7 +373,7 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--typeconfig\fP 
 .nh
@@ -413,13 +413,13 @@ with their default values.
 \fBprofilable-command\fP prints settings with their default values that can be set from a command profile.
 \fBprofilable-metadata\fP prints settings with their default values that can be set from a metadata profile.
 Also see \fBlvm.conf\fP(5).
-.TP
+.HP
 .ad l
 \fB--unconfigured\fP
 .br
 .ad b
 Internal option used for generating config file during build.
-.TP
+.HP
 .ad l
 \fB--validate\fP
 .br
@@ -429,51 +429,51 @@ return code. The validation is done only for the configuration
@the front of the "config cascade". To validate the whole
 merged configuration tree, also use --mergedconfig.
 The validation is done even if lvm.conf config/checks is disabled.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB--withcomments\fP
 .br
 .ad b
 Display a full comment for each configuration node. For deprecated
 settings, also display comments about deprecation.
-.TP
+.HP
 .ad l
 \fB--withgeneralpreamble\fP
 .br
 .ad b
 Include general config file preamble.
-.TP
+.HP
 .ad l
 \fB--withlocalpreamble\fP
 .br
 .ad b
 Include local config file preamble.
-.TP
+.HP
 .ad l
 \fB--withspaces\fP
 .br
 .ad b
 Where appropriate, add more spaces in output for better readability.
-.TP
+.HP
 .ad l
 \fB--withsummary\fP
 .br
 .ad b
 Display a one line comment for each configuration node.
-.TP
+.HP
 .ad l
 \fB--withversions\fP
 .br
@@ -481,7 +481,7 @@ Display a one line comment for each configuration node.
 Also display a comment containing the version of introduction for
 each configuration node. If the setting is deprecated, also display
 the version since which it is deprecated.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -490,11 +490,11 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
index f576bdea4..6bdb5ff26 100644
--- a/man/lvmdevices.8_pregen
+++ b/man/lvmdevices.8_pregen
@@ -309,32 +309,32 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--adddev\fP \fIPV\fP
 .br
 .ad b
 Add a device to the devices file.
-.TP
+.HP
 .ad l
 \fB--addpvid\fP \fIString\fP
 .br
 .ad b
 Find a device with the PVID and add the device to the devices file.
-.TP
+.HP
 .ad l
 \fB--check\fP
 .br
 .ad b
 Check the content of the devices file.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -343,26 +343,26 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--deldev\fP \fIPV\fP
 .br
 .ad b
 Remove a device from the devices file.
-.TP
+.HP
 .ad l
 \fB--delpvid\fP \fIString\fP
 .br
 .ad b
 Remove a device with the PVID from the devices file.
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -370,7 +370,7 @@ Remove a device with the PVID from the devices file.
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -380,53 +380,53 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -436,26 +436,26 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--update\fP
 .br
 .ad b
 Update the content of the devices file.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -464,11 +464,11 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen
index 0fb64dbe3..f6cc0e2e2 100644
--- a/man/lvmdiskscan.8_pregen
+++ b/man/lvmdiskscan.8_pregen
@@ -99,14 +99,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -115,14 +115,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -130,7 +130,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -140,59 +140,59 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--lvmpartition\fP
 .br
 .ad b
 Only report PVs.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -203,7 +203,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -213,20 +213,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -235,11 +235,11 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index 50c9ae453..49c9465d9 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -130,21 +130,21 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -153,14 +153,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -168,7 +168,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -178,14 +178,14 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--extents\fP [\fB-\fP]\fINumber\fP[PERCENT]
 .br
@@ -208,33 +208,33 @@ extents in the new LV is not determined until the command has completed.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-n\fP|\fB--nofsck\fP
 .br
@@ -242,13 +242,13 @@ Display long help text.
 Do not perform fsck before resizing filesystem when filesystem
 requires it. You may need to use --force to proceed with
 this option.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -257,21 +257,21 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -282,13 +282,13 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-r\fP|\fB--resizefs\fP
 .br
 .ad b
 Resize underlying filesystem together with the LV using fsadm(8).
-.TP
+.HP
 .ad l
 \fB-L\fP|\fB--size\fP [\fB-\fP]\fISize\fP[m|UNIT]
 .br
@@ -300,7 +300,7 @@ greater when redundant data is needed for RAID levels.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -310,20 +310,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -332,16 +332,16 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index ca62d5d65..53ba71e0b 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -134,21 +134,21 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -157,14 +157,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -172,7 +172,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -182,40 +182,40 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nohistory\fP
 .br
@@ -223,13 +223,13 @@ Display long help text.
 Do not record history of LVs being removed.
 This has no effect unless the configuration setting
 metadata/record_lvs_history is enabled.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -238,21 +238,21 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -263,7 +263,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -276,7 +276,7 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -286,20 +286,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -308,31 +308,31 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index 7a3d78996..024da1821 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -109,21 +109,21 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -132,14 +132,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -147,7 +147,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -157,39 +157,39 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -198,21 +198,21 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -223,7 +223,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -233,20 +233,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -255,20 +255,20 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index dfe30ca56..f3535ce7f 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -318,7 +318,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--alloc\fP 
 .nh
@@ -342,21 +342,21 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -365,14 +365,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -380,7 +380,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -390,14 +390,14 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--extents\fP [\fB+\fP|\fB-\fP]\fINumber\fP[PERCENT]
 .br
@@ -420,33 +420,33 @@ extents in the new LV is not determined until the command has completed.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-n\fP|\fB--nofsck\fP
 .br
@@ -454,13 +454,13 @@ Display long help text.
 Do not perform fsck before resizing filesystem when filesystem
 requires it. You may need to use --force to proceed with
 this option.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--nosync\fP
 .br
@@ -477,7 +477,7 @@ This option is not valid for raid6, because raid6 relies on proper parity
 to reconstruct proper user date in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -486,7 +486,7 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT]
 .br
@@ -494,21 +494,21 @@ ignore the devices LVM creates.
 Specifies the new size of the pool metadata LV.
 The plus prefix \fB+\fP can be used, in which case
 the value is added to the current size.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -519,13 +519,13 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-r\fP|\fB--resizefs\fP
 .br
 .ad b
 Resize underlying filesystem together with the LV using fsadm(8).
-.TP
+.HP
 .ad l
 \fB-L\fP|\fB--size\fP [\fB+\fP|\fB-\fP]\fISize\fP[m|UNIT]
 .br
@@ -537,7 +537,7 @@ greater when redundant data is needed for RAID levels.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.TP
+.HP
 .ad l
 \fB-i\fP|\fB--stripes\fP \fINumber\fP
 .br
@@ -554,14 +554,14 @@ when unspecified, the default depends on the RAID type
 (raid0: 2, raid10: 2, raid4/5: 3, raid6: 5.)
 To stripe a new raid LV across all PVs by default,
 see lvm.conf allocation/raid_stripe_all_devices.
-.TP
+.HP
 .ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
 .ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -571,7 +571,7 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--type\fP 
 .nh
@@ -590,20 +590,20 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -612,14 +612,14 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
 LV followed by _<type> indicates that an LV of the
 given type is required. (raid represents raid<N> type)
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -629,11 +629,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index c45aacc61..76ea404c7 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -182,13 +182,13 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--aligned\fP
 .br
 .ad b
 Use with --separator to align the output columns
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
@@ -196,7 +196,7 @@ Use with --separator to align the output columns
 Show information about internal LVs.
 These are components of normal LVs, such as mirrors,
 which are not independently accessible, e.g. not mountable.
-.TP
+.HP
 .ad l
 \fB--binary\fP
 .br
@@ -204,14 +204,14 @@ which are not independently accessible, e.g. not mountable.
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -220,20 +220,20 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
 .ad b
 See \fBlvmreport\fP(7).
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -241,7 +241,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -251,27 +251,27 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--foreign\fP
 .br
 .ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-H\fP|\fB--history\fP
 .br
@@ -279,33 +279,33 @@ Display help text.
 Include historical LVs in the output.
 (This has no effect unless LVs were removed while
 lvm.conf metadata/record_lvs_history was enabled.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--logonly\fP
 .br
 .ad b
 Suppress command report and display only log report.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nameprefixes\fP
 .br
@@ -313,27 +313,27 @@ Display long help text.
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
-.TP
+.HP
 .ad l
 \fB--noheadings\fP
 .br
 .ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--nosuffix\fP
 .br
 .ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.TP
+.HP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
@@ -355,21 +355,21 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -380,7 +380,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -391,19 +391,19 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--rows\fP
 .br
 .ad b
 Output columns as rows.
-.TP
+.HP
 .ad l
 \fB--segments\fP
 .br
 .ad b
 Use default columns that emphasize segment information.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -416,13 +416,13 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
 .ad b
 String to use to separate each column. Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--shared\fP
 .br
@@ -430,14 +430,14 @@ String to use to separate each column. Useful if grepping the output.
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.TP
+.HP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
 .ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -447,13 +447,13 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--unbuffered\fP
 .br
 .ad b
 Produce output immediately without sorting or aligning the columns properly.
-.TP
+.HP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
@@ -464,27 +464,27 @@ human-(r)eadable with '<' rounding indicator,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.TP
+.HP
 .ad l
 \fB--unquoted\fP
 .br
 .ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -493,25 +493,25 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index ab3ed3670..264d9607e 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -109,7 +109,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
@@ -117,20 +117,20 @@ Common options for lvm:
 Show information about internal LVs.
 These are components of normal LVs, such as mirrors,
 which are not independently accessible, e.g. not mountable.
-.TP
+.HP
 .ad l
 \fB-b\fP|\fB--blockdevice\fP
 .br
 .ad b
 No longer used.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -139,14 +139,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -154,7 +154,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -164,60 +164,60 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -228,7 +228,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -239,7 +239,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -249,20 +249,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -271,11 +271,11 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index 84b4e13e0..33778ee6c 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -150,40 +150,40 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--addtag\fP \fITag\fP
 .br
 .ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
 Change all visible PVs.
-.TP
+.HP
 .ad l
 \fB-x\fP|\fB--allocatable\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Enable or disable allocation of physical extents on this PV.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -192,21 +192,21 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--deltag\fP \fITag\fP
 .br
 .ad b
 Deletes a tag from a PV, VG or LV. This option can be repeated to delete
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -214,7 +214,7 @@ multiple tags at once. See \fBlvm\fP(8) for information about tags.
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -224,40 +224,40 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--metadataignore\fP \fBy\fP|\fBn\fP
 .br
@@ -266,27 +266,27 @@ Specifies the metadataignore property of a PV.
 If yes, metadata areas on the PV are ignored, and lvm will
 not store metadata in the metadata areas of the PV.
 If no, lvm will store metadata on the PV.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -297,7 +297,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -310,7 +310,7 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -320,26 +320,26 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-u\fP|\fB--uuid\fP
 .br
 .ad b
 Generate new random UUID for specified PVs.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -348,7 +348,7 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -358,17 +358,17 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen
index 8b1493b10..22e6f6eff 100644
--- a/man/pvck.8_pregen
+++ b/man/pvck.8_pregen
@@ -389,14 +389,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -405,14 +405,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -420,7 +420,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -430,14 +430,14 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--dump\fP 
 .nh
@@ -452,19 +452,19 @@ Option values include: \fBheaders\fP to print and check LVM headers,
 \fBmetadata_search\fP to list or save all versions of metadata,
 searching standard locations in case of damaged headers,
 \fBmetadata_area\fP to save an entire text metadata area to a file.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
 .ad b
 Metadata file to read or write.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--labelsector\fP \fINumber\fP
 .br
@@ -473,33 +473,33 @@ By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB--[pv]metadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
@@ -511,26 +511,26 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--repair\fP
 .br
 .ad b
 Repair headers and metadata on a PV.
-.TP
+.HP
 .ad l
 \fB--repairtype\fP \fBpv_header\fP|\fBmetadata\fP|\fBlabel_header\fP
 .br
 .ad b
 Repair headers and metadata on a PV. See command description.
-.TP
+.HP
 .ad l
 \fB--settings\fP \fIString\fP
 .br
@@ -538,7 +538,7 @@ Repair headers and metadata on a PV. See command description.
 Specifies command specific settings in "Key = Value" form.
 Combine multiple settings in quotes, or repeat the settings
 option for each.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -548,20 +548,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -570,7 +570,7 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -580,11 +580,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index 52ad1d5ee..f56022b2e 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -222,7 +222,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--bootloaderareasize\fP \fISize\fP[m|UNIT]
 .br
@@ -238,14 +238,14 @@ and --dataalignmentoffset. The bootloader area may be larger than requested
 due to the alignment, but it's never less than the requested size.
 To see the bootloader area start and size of
 an existing PV use pvs -o +pv_ba_start,pv_ba_size.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -254,7 +254,7 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--dataalignment\fP \fISize\fP[k|UNIT]
 .br
@@ -264,20 +264,20 @@ To see the location of the first Physical Extent (PE) of an existing PV,
 use pvs -o +pe_start. In addition, it may be shifted by an alignment offset,
 see --dataalignmentoffset.
 Also specify an appropriate PE size when creating a VG.
-.TP
+.HP
 .ad l
 \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT]
 .br
 .ad b
 Shift the start of the PV data area by this additional offset.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -285,7 +285,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -295,27 +295,27 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--labelsector\fP \fINumber\fP
 .br
@@ -324,20 +324,20 @@ By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--metadataignore\fP \fBy\fP|\fBn\fP
 .br
@@ -346,14 +346,14 @@ Specifies the metadataignore property of a PV.
 If yes, metadata areas on the PV are ignored, and lvm will
 not store metadata in the metadata areas of the PV.
 If no, lvm will store metadata on the PV.
-.TP
+.HP
 .ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
 .ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
-.TP
+.HP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
@@ -361,27 +361,27 @@ The size may be rounded.
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--norestorefile\fP
 .br
 .ad b
 In conjunction with --uuid, this allows a uuid to be specified
 without also requiring that a backup of the metadata be provided.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB--[pv]metadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
@@ -393,14 +393,14 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -411,7 +411,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--restorefile\fP \fIString\fP
 .br
@@ -423,14 +423,14 @@ with the contents of the file, i.e. the physical extents will be in
 the same place and not be overwritten by new metadata. This provides
 a mechanism to upgrade the metadata format or to add/remove metadata
 areas. Use with care.
-.TP
+.HP
 .ad l
 \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT]
 .br
 .ad b
 Overrides the automatically detected size of the PV.
 Use with care, or prior to reducing the physical size of the device.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -440,7 +440,7 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-u\fP|\fB--uuid\fP \fIString\fP
 .br
@@ -453,20 +453,20 @@ onto a replacement device; see \fBvgcfgrestore\fP(8). As such, use of
 All PVs must have unique UUIDs, and LVM will prevent certain operations
 if multiple devices are seen with the same UUID.
 See \fBvgimportclone\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -474,7 +474,7 @@ Display version information.
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.TP
+.HP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
@@ -483,7 +483,7 @@ Controls if the first 4 sectors (2048 bytes) of the device are wiped.
 The default is to wipe these sectors unless either or both of
 --restorefile or --uuid are specified.
 .SH VARIABLES
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -493,11 +493,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index 1aebef484..9a7e4ed56 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -182,20 +182,20 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--aligned\fP
 .br
 .ad b
 Use with --separator to align the output columns
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
 Show information about devices that have not been initialized
 by LVM, i.e. they are not PVs.
-.TP
+.HP
 .ad l
 \fB--binary\fP
 .br
@@ -203,28 +203,28 @@ by LVM, i.e. they are not PVs.
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.TP
+.HP
 .ad l
 \fB-c\fP|\fB--colon\fP
 .br
 .ad b
 Generate colon separated output for easier parsing in scripts or programs.
 Also see \fBvgs\fP(8) which provides considerably more control over the output.
-.TP
+.HP
 .ad l
 \fB-C\fP|\fB--columns\fP
 .br
 .ad b
 Display output in columns, the equivalent of \fBvgs\fP(8).
 Options listed are the same as options given in \fBvgs\fP(8).
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -233,20 +233,20 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
 .ad b
 See \fBlvmreport\fP(7).
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -254,7 +254,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -264,79 +264,79 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--foreign\fP
 .br
 .ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--logonly\fP
 .br
 .ad b
 Suppress command report and display only log report.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-m\fP|\fB--maps\fP
 .br
 .ad b
 Display the mapping of physical extents to LVs and logical extents.
-.TP
+.HP
 .ad l
 \fB--noheadings\fP
 .br
 .ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--nosuffix\fP
 .br
 .ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.TP
+.HP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
@@ -358,21 +358,21 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -383,7 +383,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -394,7 +394,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -407,13 +407,13 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
 .ad b
 String to use to separate each column. Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--shared\fP
 .br
@@ -421,20 +421,20 @@ String to use to separate each column. Useful if grepping the output.
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.TP
+.HP
 .ad l
 \fB-s\fP|\fB--short\fP
 .br
 .ad b
 Only display the size of the given PVs.
-.TP
+.HP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
 .ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -444,13 +444,13 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--unbuffered\fP
 .br
 .ad b
 Produce output immediately without sorting or aligning the columns properly.
-.TP
+.HP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
@@ -461,20 +461,20 @@ human-(r)eadable with '<' rounding indicator,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -483,7 +483,7 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -493,16 +493,16 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index a9fab6eac..791e2834f 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -161,7 +161,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--abort\fP
 .br
@@ -170,7 +170,7 @@ Abort any pvmove operations in progress. If a pvmove was started
 with the --atomic option, then all LVs will remain on the source PV.
 Otherwise, segments that have been moved will remain on the
 destination PV, while unmoved segments will remain on the source PV.
-.TP
+.HP
 .ad l
 \fB--alloc\fP 
 .nh
@@ -194,21 +194,21 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.TP
+.HP
 .ad l
 \fB--atomic\fP
 .br
 .ad b
 Makes a pvmove operation atomic, ensuring that all affected LVs are
 moved to the destination PV, or none are if the operation is aborted.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB-b\fP|\fB--background\fP
 .br
@@ -216,14 +216,14 @@ Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information
 If the operation requires polling, this option causes the command to
 return before the operation is complete, and polling is done in the
 background.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -232,14 +232,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -247,7 +247,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -257,51 +257,51 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-i\fP|\fB--interval\fP \fINumber\fP
 .br
 .ad b
 Report progress at regular intervals.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
 .ad b
 Move only the extents belonging to the named LV.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -310,21 +310,21 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -335,7 +335,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -345,20 +345,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -367,7 +367,7 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -377,11 +377,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index 36577aff2..3015b70d1 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -99,14 +99,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -115,14 +115,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -130,7 +130,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -140,60 +140,60 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -204,7 +204,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -214,20 +214,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -236,7 +236,7 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -246,11 +246,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index bb3ab4cb2..fcc85885b 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -94,14 +94,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -110,14 +110,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -125,7 +125,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -135,53 +135,53 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -192,14 +192,14 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT]
 .br
 .ad b
 Overrides the automatically detected size of the PV.
 Use with care, or prior to reducing the physical size of the device.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -209,20 +209,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -231,7 +231,7 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -241,11 +241,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index 12160af0d..f00e0328a 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -178,20 +178,20 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--aligned\fP
 .br
 .ad b
 Use with --separator to align the output columns
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
 Show information about devices that have not been initialized
 by LVM, i.e. they are not PVs.
-.TP
+.HP
 .ad l
 \fB--binary\fP
 .br
@@ -199,14 +199,14 @@ by LVM, i.e. they are not PVs.
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -215,20 +215,20 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
 .ad b
 See \fBlvmreport\fP(7).
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -236,7 +236,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -246,53 +246,53 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--foreign\fP
 .br
 .ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--logonly\fP
 .br
 .ad b
 Suppress command report and display only log report.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nameprefixes\fP
 .br
@@ -300,27 +300,27 @@ Display long help text.
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
-.TP
+.HP
 .ad l
 \fB--noheadings\fP
 .br
 .ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--nosuffix\fP
 .br
 .ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.TP
+.HP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
@@ -342,21 +342,21 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -367,7 +367,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -378,13 +378,13 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--rows\fP
 .br
 .ad b
 Output columns as rows.
-.TP
+.HP
 .ad l
 \fB--segments\fP
 .br
@@ -392,7 +392,7 @@ Output columns as rows.
 Produces one line of output for each contiguous allocation of space on each
 PV, showing the start (pvseg_start) and length (pvseg_size) in units of
 physical extents.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -405,13 +405,13 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
 .ad b
 String to use to separate each column. Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--shared\fP
 .br
@@ -419,14 +419,14 @@ String to use to separate each column. Useful if grepping the output.
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.TP
+.HP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
 .ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -436,13 +436,13 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--unbuffered\fP
 .br
 .ad b
 Produce output immediately without sorting or aligning the columns properly.
-.TP
+.HP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
@@ -453,27 +453,27 @@ human-(r)eadable with '<' rounding indicator,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.TP
+.HP
 .ad l
 \fB--unquoted\fP
 .br
 .ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -482,7 +482,7 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -492,16 +492,16 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index 644c6a2fc..1b0d3d925 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -206,27 +206,27 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
 .ad b
 Auto-activate LVs in a VG when the PVs scanned have completed the VG.
 (Only \fBay\fP is applicable.)
-.TP
+.HP
 .ad l
 \fB--cache\fP
 .br
 .ad b
 Scan one or more devices and record that they are online.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -235,14 +235,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -250,7 +250,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -260,64 +260,64 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-e\fP|\fB--exported\fP
 .br
 .ad b
 Only show PVs belonging to exported VGs.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-j\fP|\fB--major\fP \fINumber\fP
 .br
 .ad b
 The major number of a device.
-.TP
+.HP
 .ad l
 \fB--minor\fP \fINumber\fP
 .br
 .ad b
 The minor number of a device.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -326,27 +326,27 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB-n\fP|\fB--novolumegroup\fP
 .br
 .ad b
 Only show PVs not belonging to any VG.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -357,13 +357,13 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-s\fP|\fB--short\fP
 .br
 .ad b
 Short listing format.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -373,26 +373,26 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-u\fP|\fB--uuid\fP
 .br
 .ad b
 Show UUIDs in addition to device names.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -401,7 +401,7 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -411,11 +411,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index 5d359146a..1ef11ffb0 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -125,14 +125,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -141,14 +141,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -156,7 +156,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -166,14 +166,14 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
@@ -181,60 +181,60 @@ For testing and debugging.
 Write the backup to the named file.
 When backing up more than one VG, the file name is
 treated as a template, and %s is replaced by the VG name.
-.TP
+.HP
 .ad l
 \fB--foreign\fP
 .br
 .ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -245,7 +245,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -256,7 +256,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -266,20 +266,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -288,15 +288,15 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen
index eb1564f70..151aa2505 100644
--- a/man/vgcfgrestore.8_pregen
+++ b/man/vgcfgrestore.8_pregen
@@ -229,14 +229,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -245,14 +245,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -260,7 +260,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -270,21 +270,21 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
 .ad b
 Read metadata backup from the named file.
 Usually this file was created by vgcfgbackup.
-.TP
+.HP
 .ad l
 \fB--force\fP ...
 .br
@@ -294,33 +294,33 @@ Use with extreme caution. Most changes to thin metadata
 cannot be reverted.
 You may lose data if you restore metadata that does not match the
 thin pool kernel metadata precisely.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--list\fP
 .br
 .ad b
 List metadata backup and archive files pertaining to the VG.
 May be used with --file. Does not restore the VG.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
@@ -328,27 +328,27 @@ Display long help text.
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -358,20 +358,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -380,15 +380,15 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index c5af0de36..025113627 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -633,7 +633,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
@@ -662,7 +662,7 @@ If auto_activation_volume_list is defined and empty, no LVs are autoactivated.
 Items included by auto_activation_volume_list will not be autoactivated if
 the autoactivation property has been disabled.
 See \fBlvmlockd\fP(8) for more information about activation options \fBey\fP and \fBsy\fP for shared VGs.
-.TP
+.HP
 .ad l
 \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP
 .br
@@ -677,14 +677,14 @@ and is the most restrictive mode.
 should only be used for recovery or repair.
 For default, see lvm.conf/activation_mode.
 See \fBlvmraid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--addtag\fP \fITag\fP
 .br
 .ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.TP
+.HP
 .ad l
 \fB--alloc\fP 
 .nh
@@ -708,21 +708,21 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -731,28 +731,28 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--deltag\fP \fITag\fP
 .br
 .ad b
 Deletes a tag from a PV, VG or LV. This option can be repeated to delete
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.TP
+.HP
 .ad l
 \fB--detachprofile\fP
 .br
 .ad b
 Detaches a metadata profile from a VG or LV.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -760,7 +760,7 @@ See \fBlvm.conf\fP(5) for more information about profiles.
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -770,55 +770,55 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-K\fP|\fB--ignoreactivationskip\fP
 .br
 .ad b
 Ignore the "activation skip" LV flag during activation
 to allow LVs with the flag set to be activated.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--ignoremonitoring\fP
 .br
 .ad b
 Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--lockstart\fP
 .br
@@ -826,7 +826,7 @@ See \fBlvmlockd\fP(8) for more information.
 Start the lockspace of a shared VG in lvmlockd.
 lvmlockd locks becomes available for the VG, allowing LVM to use the VG.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--lockstop\fP
 .br
@@ -834,26 +834,26 @@ See \fBlvmlockd\fP(8) for more information.
 Stop the lockspace of a shared VG in lvmlockd.
 lvmlockd locks become unavailable for the VG, preventing LVM from using the VG.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--locktype\fP \fBsanlock\fP|\fBdlm\fP|\fBnone\fP
 .br
 .ad b
 Change the VG lock type to or from a shared lock type used with lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--logicalvolume\fP \fINumber\fP
 .br
 .ad b
 Sets the maximum number of LVs allowed in a VG.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
@@ -862,14 +862,14 @@ Sets the maximum number of PVs that can belong to the VG.
 The value 0 removes any limitation.
 For large numbers of PVs, also see options --pvmetadatacopies,
 and --vgmetadatacopies for improving performance.
-.TP
+.HP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
 .ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--monitor\fP \fBy\fP|\fBn\fP
 .br
@@ -878,13 +878,13 @@ Start (yes) or stop (no) monitoring an LV with dmeventd.
 dmeventd monitors kernel events for an LV, and performs
 automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -893,7 +893,7 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB-P\fP|\fB--partial\fP
 .br
@@ -902,7 +902,7 @@ Commands will do their best to activate LVs with missing PV extents.
 Missing extents may be replaced with error or zero segments
 according to the lvm.conf missing_stripe_filler setting.
 Metadata may not be changed with this option.
-.TP
+.HP
 .ad l
 \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT]
 .br
@@ -916,7 +916,7 @@ without recreating the VG, unless no extents need moving.
 Before increasing the physical extent size, you might need to use lvresize,
 pvresize and/or pvmove so that everything fits. For example, every
 contiguous range of extents used in a LV must start and end on an extent boundary.
-.TP
+.HP
 .ad l
 \fB--poll\fP \fBy\fP|\fBn\fP
 .br
@@ -928,14 +928,14 @@ When no, background transformation of an LV will not occur, and the
 transformation will not complete. It may not be appropriate to immediately
 poll an LV after activation, in which case --poll n can be used to defer
 polling until a later --poll y command.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
@@ -947,14 +947,14 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -965,7 +965,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--refresh\fP
 .br
@@ -974,7 +974,7 @@ If the LV is active, reload its metadata.
 This is not necessary in normal operation, but may be useful
 if something has gone wrong, or if some form of manual LV
 sharing is being used.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -985,14 +985,14 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-x\fP|\fB--resizeable\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Enables or disables the addition or removal of PVs to/from a VG
 (by vgextend/vgreduce).
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -1005,7 +1005,7 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB--setautoactivation\fP \fBy\fP|\fBn\fP
 .br
@@ -1019,7 +1019,7 @@ If autoactivation is disabled on a VG, no LVs will be autoactivated
 in that VG, and the LV autoactivation property has no effect.
 If autoactivation is enabled on a VG, autoactivation can be disabled
 for individual LVs.
-.TP
+.HP
 .ad l
 \fB--sysinit\fP
 .br
@@ -1031,7 +1031,7 @@ acts as a shortcut which selects an appropriate set of options. Currently,
 this is equivalent to using --ignorelockingfailure, --ignoremonitoring,
 --poll n, and setting env var LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES.
 vgchange/lvchange skip autoactivation, and defer to pvscan autoactivation.
-.TP
+.HP
 .ad l
 \fB--systemid\fP \fIString\fP
 .br
@@ -1040,7 +1040,7 @@ Changes the system ID of the VG.  Using this option requires caution
 because the VG may become foreign to the host running the command,
 leaving the host unable to access it.
 See \fBlvmsystemid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -1050,26 +1050,26 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-u\fP|\fB--uuid\fP
 .br
 .ad b
 Generate new random UUID for specified VGs.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
@@ -1087,7 +1087,7 @@ The number can also be replaced with special string values:
 metadataignore flags.
 \fBall\fP causes LVM to first clear the metadataignore flags on
 all PVs, and then to become unmanaged.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -1096,26 +1096,26 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index 7682431ff..aef35f3b2 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -112,14 +112,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -128,14 +128,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -143,7 +143,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -153,53 +153,53 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -210,7 +210,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -220,7 +220,7 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--updatemetadata\fP
 .br
@@ -235,20 +235,20 @@ this option will clear the outdated metadata from the previously
 missing PV. If metadata text is damaged on one PV, using this
 option will replace the damaged metadata text. For more severe
 damage, e.g. with headers, see \fBpvck\fP(8).
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -257,20 +257,20 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index 2f2ba8b75..093512ab0 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -115,7 +115,7 @@ Common options for lvm:
 .RE
 
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--bootloaderareasize\fP \fISize\fP[m|UNIT]
 .br
@@ -131,14 +131,14 @@ and --dataalignmentoffset. The bootloader area may be larger than requested
 due to the alignment, but it's never less than the requested size.
 To see the bootloader area start and size of
 an existing PV use pvs -o +pv_ba_start,pv_ba_size.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -147,14 +147,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -162,7 +162,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -172,27 +172,27 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--labelsector\fP \fINumber\fP
 .br
@@ -201,27 +201,27 @@ By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
 .ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
-.TP
+.HP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
@@ -229,20 +229,20 @@ The size may be rounded.
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
@@ -254,14 +254,14 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -272,7 +272,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -282,20 +282,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -304,15 +304,15 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index 61823d579..3a3c35a08 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -186,14 +186,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--addtag\fP \fITag\fP
 .br
 .ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.TP
+.HP
 .ad l
 \fB--alloc\fP 
 .nh
@@ -217,28 +217,28 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 This option was specific to clvm and is now replaced by
 the --shared option with \fBlvmlockd\fP(8).
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -247,7 +247,7 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--dataalignment\fP \fISize\fP[k|UNIT]
 .br
@@ -257,20 +257,20 @@ To see the location of the first Physical Extent (PE) of an existing PV,
 use pvs -o +pe_start. In addition, it may be shifted by an alignment offset,
 see --dataalignmentoffset.
 Also specify an appropriate PE size when creating a VG.
-.TP
+.HP
 .ad l
 \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT]
 .br
 .ad b
 Shift the start of the PV data area by this additional offset.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -278,7 +278,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -288,27 +288,27 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--labelsector\fP \fINumber\fP
 .br
@@ -317,33 +317,33 @@ By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--locktype\fP \fBsanlock\fP|\fBdlm\fP|\fBnone\fP
 .br
 .ad b
 Specify the VG lock type directly in place of using --shared.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--maxlogicalvolumes\fP \fINumber\fP
 .br
 .ad b
 Sets the maximum number of LVs allowed in a VG.
-.TP
+.HP
 .ad l
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
@@ -352,21 +352,21 @@ Sets the maximum number of PVs that can belong to the VG.
 The value 0 removes any limitation.
 For large numbers of PVs, also see options --pvmetadatacopies,
 and --vgmetadatacopies for improving performance.
-.TP
+.HP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
 .ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
 .ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
-.TP
+.HP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
@@ -374,13 +374,13 @@ The size may be rounded.
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT]
 .br
@@ -391,14 +391,14 @@ The value must be either a power of 2 of at least 1 sector
 currently used in the VG), or at least 128KiB.
 Once this value has been set, it is difficult to change
 without recreating the VG, unless no extents need moving.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
@@ -410,14 +410,14 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -428,7 +428,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--setautoactivation\fP \fBy\fP|\fBn\fP
 .br
@@ -442,7 +442,7 @@ If autoactivation is disabled on a VG, no LVs will be autoactivated
 in that VG, and the LV autoactivation property has no effect.
 If autoactivation is enabled on a VG, autoactivation can be disabled
 for individual LVs.
-.TP
+.HP
 .ad l
 \fB--shared\fP
 .br
@@ -452,7 +452,7 @@ lvmlockd will select lock type sanlock or dlm depending on which lock
 manager is running. This allows multiple hosts to share a VG on shared
 devices. lvmlockd and a lock manager must be configured and running.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.TP
+.HP
 .ad l
 \fB--systemid\fP \fIString\fP
 .br
@@ -464,7 +464,7 @@ the host creating it. Using this option requires caution because the
 system ID of the new VG may not match the system ID of the host running
 the command, leaving the VG inaccessible to the host.
 See \fBlvmsystemid\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -474,20 +474,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
@@ -505,7 +505,7 @@ The number can also be replaced with special string values:
 metadataignore flags.
 \fBall\fP causes LVM to first clear the metadataignore flags on
 all PVs, and then to become unmanaged.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -513,7 +513,7 @@ all PVs, and then to become unmanaged.
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.TP
+.HP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
@@ -522,11 +522,11 @@ Controls if the first 4 sectors (2048 bytes) of the device are wiped.
 The default is to wipe these sectors unless either or both of
 --restorefile or --uuid are specified.
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -536,11 +536,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index 1684a68ba..a6f8106f2 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -177,20 +177,20 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--activevolumegroups\fP
 .br
 .ad b
 Only select active VGs. The VG is considered active
 if at least one of its LVs is active.
-.TP
+.HP
 .ad l
 \fB--aligned\fP
 .br
 .ad b
 Use with --separator to align the output columns
-.TP
+.HP
 .ad l
 \fB--binary\fP
 .br
@@ -198,28 +198,28 @@ Use with --separator to align the output columns
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.TP
+.HP
 .ad l
 \fB-c\fP|\fB--colon\fP
 .br
 .ad b
 Generate colon separated output for easier parsing in scripts or programs.
 Also see \fBvgs\fP(8) which provides considerably more control over the output.
-.TP
+.HP
 .ad l
 \fB-C\fP|\fB--columns\fP
 .br
 .ad b
 Display output in columns, the equivalent of \fBvgs\fP(8).
 Options listed are the same as options given in \fBvgs\fP(8).
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -228,20 +228,20 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
 .ad b
 See \fBlvmreport\fP(7).
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -249,7 +249,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -259,73 +259,73 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--foreign\fP
 .br
 .ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--logonly\fP
 .br
 .ad b
 Suppress command report and display only log report.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--noheadings\fP
 .br
 .ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--nosuffix\fP
 .br
 .ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.TP
+.HP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
@@ -347,21 +347,21 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -372,7 +372,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -383,7 +383,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -396,13 +396,13 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
 .ad b
 String to use to separate each column. Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--shared\fP
 .br
@@ -410,20 +410,20 @@ String to use to separate each column. Useful if grepping the output.
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.TP
+.HP
 .ad l
 \fB-s\fP|\fB--short\fP
 .br
 .ad b
 Give a short listing showing the existence of VGs.
-.TP
+.HP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
 .ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -433,13 +433,13 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--unbuffered\fP
 .br
 .ad b
 Produce output immediately without sorting or aligning the columns properly.
-.TP
+.HP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
@@ -450,20 +450,20 @@ human-(r)eadable with '<' rounding indicator,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -472,20 +472,20 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index eb10961ce..89a25af07 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -128,19 +128,19 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -149,14 +149,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -164,7 +164,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -174,53 +174,53 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -231,7 +231,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -244,7 +244,7 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -254,20 +254,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -276,26 +276,26 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index e82cdb4e8..c4c0b130a 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -143,21 +143,21 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -166,7 +166,7 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--dataalignment\fP \fISize\fP[k|UNIT]
 .br
@@ -176,20 +176,20 @@ To see the location of the first Physical Extent (PE) of an existing PV,
 use pvs -o +pe_start. In addition, it may be shifted by an alignment offset,
 see --dataalignmentoffset.
 Also specify an appropriate PE size when creating a VG.
-.TP
+.HP
 .ad l
 \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT]
 .br
 .ad b
 Shift the start of the PV data area by this additional offset.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -197,7 +197,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -207,27 +207,27 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--labelsector\fP \fINumber\fP
 .br
@@ -236,20 +236,20 @@ By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--metadataignore\fP \fBy\fP|\fBn\fP
 .br
@@ -258,14 +258,14 @@ Specifies the metadataignore property of a PV.
 If yes, metadata areas on the PV are ignored, and lvm will
 not store metadata in the metadata areas of the PV.
 If no, lvm will store metadata on the PV.
-.TP
+.HP
 .ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
 .ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
-.TP
+.HP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
@@ -273,20 +273,20 @@ The size may be rounded.
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
@@ -298,14 +298,14 @@ When 1, one copy of the VG metadata is stored@the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -316,14 +316,14 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--restoremissing\fP
 .br
 .ad b
 Add a PV back into a VG after the PV was missing and then returned,
 e.g. due to a transient failure. The PV is not reinitialized.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -333,20 +333,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -354,7 +354,7 @@ Display version information.
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.TP
+.HP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
@@ -363,11 +363,11 @@ Controls if the first 4 sectors (2048 bytes) of the device are wiped.
 The default is to wipe these sectors unless either or both of
 --restorefile or --uuid are specified.
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -377,11 +377,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index b119a4e15..993a52e21 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -118,20 +118,20 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
 Import all visible VGs.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -140,14 +140,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -155,7 +155,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -165,60 +165,60 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -229,7 +229,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -242,7 +242,7 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -252,20 +252,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -274,26 +274,26 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen
index 42dfa3487..2fe7ed60f 100644
--- a/man/vgimportclone.8_pregen
+++ b/man/vgimportclone.8_pregen
@@ -102,7 +102,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-n\fP|\fB--basevgname\fP \fIString\fP
 .br
@@ -112,14 +112,14 @@ numeric suffix to avoid duplicate naming (e.g. 'test_vg' would be renamed
 to 'test_vg1'). This option will override the base VG name that is
 used for all VG renames. If a VG already exists with the specified name
 a numeric suffix will be added (like the previous example) to make it unique.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -128,14 +128,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -143,7 +143,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -153,66 +153,66 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-i\fP|\fB--import\fP
 .br
 .ad b
 Import exported VGs. Otherwise VGs that have been exported
 will not be changed (nor will their associated PVs).
-.TP
+.HP
 .ad l
 \fB--importdevices\fP
 .br
 .ad b
 Add devices to the devices file.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -222,20 +222,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -244,7 +244,7 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -254,11 +254,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgimportdevices.8_pregen b/man/vgimportdevices.8_pregen
index 1472de265..18beabdfa 100644
--- a/man/vgimportdevices.8_pregen
+++ b/man/vgimportdevices.8_pregen
@@ -124,19 +124,19 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -145,14 +145,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -160,7 +160,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -170,60 +170,60 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--foreign\fP
 .br
 .ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -234,7 +234,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -247,7 +247,7 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -257,20 +257,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -279,26 +279,26 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen
index f0ef43ddc..cca10b528 100644
--- a/man/vgmerge.8_pregen
+++ b/man/vgmerge.8_pregen
@@ -95,21 +95,21 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -118,14 +118,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -133,7 +133,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -143,59 +143,59 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--list\fP
 .br
 .ad b
 Display merged destination VG like vgdisplay -v.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -205,20 +205,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -227,15 +227,15 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index 476b76ed5..34213ef8e 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -106,14 +106,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -122,14 +122,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -137,7 +137,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -147,60 +147,60 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--refresh\fP
 .br
@@ -209,7 +209,7 @@ If the LV is active, reload its metadata.
 This is not necessary in normal operation, but may be useful
 if something has gone wrong, or if some form of manual LV
 sharing is being used.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -220,7 +220,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -230,20 +230,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -252,25 +252,25 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index 72937ce67..f0d22121b 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -219,27 +219,27 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
 Removes all empty PVs if none are named on the command line.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -248,14 +248,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -263,7 +263,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -273,66 +273,66 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--mirrorsonly\fP
 .br
 .ad b
 Only remove missing PVs from mirror LVs.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--removemissing\fP
 .br
@@ -347,7 +347,7 @@ were partly on the missing disks are removed completely, including
 those parts on disks that are still present.
 If LVs spanned several disks, including ones that are lost, salvaging
 some data first may be possible by activating LVs in partial mode.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -358,7 +358,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -368,20 +368,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -390,11 +390,11 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -404,11 +404,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index b80dc09ba..73d6dbd4a 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -109,14 +109,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -125,14 +125,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -140,7 +140,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -150,46 +150,46 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--noudevsync\fP
 .br
@@ -198,21 +198,21 @@ Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -223,7 +223,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -236,7 +236,7 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -246,20 +246,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -268,26 +268,26 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index e22bca88c..ba5adca31 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -122,21 +122,21 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -145,14 +145,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -160,7 +160,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -170,60 +170,60 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 .ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -234,7 +234,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -244,20 +244,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -266,15 +266,15 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index ae18b1c10..2cf23764e 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -174,19 +174,19 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--aligned\fP
 .br
 .ad b
 Use with --separator to align the output columns
-.TP
+.HP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
 List all VGs. Equivalent to not specifying any VGs.
-.TP
+.HP
 .ad l
 \fB--binary\fP
 .br
@@ -194,14 +194,14 @@ List all VGs. Equivalent to not specifying any VGs.
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -210,20 +210,20 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
 .ad b
 See \fBlvmreport\fP(7).
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -231,7 +231,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -241,53 +241,53 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB--foreign\fP
 .br
 .ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--logonly\fP
 .br
 .ad b
 Suppress command report and display only log report.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--nameprefixes\fP
 .br
@@ -295,27 +295,27 @@ Display long help text.
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
-.TP
+.HP
 .ad l
 \fB--noheadings\fP
 .br
 .ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--nosuffix\fP
 .br
 .ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.TP
+.HP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
@@ -337,21 +337,21 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--readonly\fP
 .br
@@ -362,7 +362,7 @@ inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -373,13 +373,13 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB--rows\fP
 .br
 .ad b
 Output columns as rows.
-.TP
+.HP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
@@ -392,13 +392,13 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.TP
+.HP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
 .ad b
 String to use to separate each column. Useful if grepping the output.
-.TP
+.HP
 .ad l
 \fB--shared\fP
 .br
@@ -406,14 +406,14 @@ String to use to separate each column. Useful if grepping the output.
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.TP
+.HP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
 .ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -423,13 +423,13 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB--unbuffered\fP
 .br
 .ad b
 Produce output immediately without sorting or aligning the columns properly.
-.TP
+.HP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
@@ -440,27 +440,27 @@ human-(r)eadable with '<' rounding indicator,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.TP
+.HP
 .ad l
 \fB--unquoted\fP
 .br
 .ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -469,20 +469,20 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index 4cbf08d91..40145b078 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -101,14 +101,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -117,14 +117,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -132,7 +132,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -142,53 +142,53 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
 .ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB--mknodes\fP
 .br
 .ad b
 Also checks the LVM special files in /dev that are needed for active
 LVs and creates any missing ones and removes unused ones.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--notifydbus\fP
 .br
@@ -196,21 +196,21 @@ Disable locking.
 Send a notification to D-Bus. The command will exit with an error
 if LVM is not built with support for D-Bus notification, or if the
 notify_dbus config setting is disabled.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
@@ -221,7 +221,7 @@ the report/output_format setting in lvm.conf.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -231,20 +231,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -253,11 +253,11 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen
index 9a1a6083e..c4721b9ba 100644
--- a/man/vgsplit.8_pregen
+++ b/man/vgsplit.8_pregen
@@ -143,7 +143,7 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.TP
+.HP
 .ad l
 \fB--alloc\fP 
 .nh
@@ -167,21 +167,21 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.TP
+.HP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
 .ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.TP
+.HP
 .ad l
 \fB--config\fP \fIString\fP
 .br
@@ -190,14 +190,14 @@ Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.TP
+.HP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
 .ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.TP
+.HP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
@@ -205,7 +205,7 @@ messages sent to the log file and/or syslog (if configured).
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.TP
+.HP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
@@ -215,39 +215,39 @@ The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.TP
+.HP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 .ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.TP
+.HP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
 .ad b
 Display help text.
-.TP
+.HP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
 .ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.TP
+.HP
 .ad l
 \fB--longhelp\fP
 .br
 .ad b
 Display long help text.
-.TP
+.HP
 .ad l
 \fB-l\fP|\fB--maxlogicalvolumes\fP \fINumber\fP
 .br
 .ad b
 Sets the maximum number of LVs allowed in a VG.
-.TP
+.HP
 .ad l
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
@@ -256,7 +256,7 @@ Sets the maximum number of PVs that can belong to the VG.
 The value 0 removes any limitation.
 For large numbers of PVs, also see options --pvmetadatacopies,
 and --vgmetadatacopies for improving performance.
-.TP
+.HP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
@@ -264,33 +264,33 @@ and --vgmetadatacopies for improving performance.
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.TP
+.HP
 .ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
 .ad b
 Move only PVs used by the named LV.
-.TP
+.HP
 .ad l
 \fB--nolocking\fP
 .br
 .ad b
 Disable locking.
-.TP
+.HP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
 .ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.TP
+.HP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
 .ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.TP
+.HP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
@@ -300,20 +300,20 @@ This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.TP
+.HP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
 .ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.TP
+.HP
 .ad l
 \fB--version\fP
 .br
 .ad b
 Display version information.
-.TP
+.HP
 .ad l
 \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
@@ -331,7 +331,7 @@ The number can also be replaced with special string values:
 metadataignore flags.
 \fBall\fP causes LVM to first clear the metadataignore flags on
 all PVs, and then to become unmanaged.
-.TP
+.HP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
@@ -340,11 +340,11 @@ Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
 .SH VARIABLES
-.TP
+.HP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.TP
+.HP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -354,11 +354,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.TP
+.HP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.TP
+.HP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-04-12  7:55 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2021-04-12  7:55 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=151377dd50b7ba84894f799d9e0957898748f882
Commit:        151377dd50b7ba84894f799d9e0957898748f882
Parent:        19ff0d983ee013711b88b66acc625a532f31b22b
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Thu Apr 8 21:08:48 2021 +0200
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Apr 12 09:54:16 2021 +0200

make: generate

---
 conf/example.conf.in         |  38 ++--
 man/lvchange.8_pregen        | 505 +++++++++++++++++++++----------------------
 man/lvconvert.8_pregen       | 455 +++++++++++++++++++-------------------
 man/lvcreate.8_pregen        | 477 +++++++++++++++++++++-------------------
 man/lvdisplay.8_pregen       | 285 ++++++++++++------------
 man/lvextend.8_pregen        | 289 +++++++++++++------------
 man/lvm-fullreport.8_pregen  | 273 +++++++++++------------
 man/lvm-lvpoll.8_pregen      | 211 +++++++++---------
 man/lvmconfig.8_pregen       | 280 ++++++++++++------------
 man/lvmdevices.8_pregen      | 213 +++++++++---------
 man/lvmdiskscan.8_pregen     | 197 ++++++++---------
 man/lvreduce.8_pregen        | 223 +++++++++----------
 man/lvremove.8_pregen        | 221 +++++++++----------
 man/lvrename.8_pregen        | 205 +++++++++---------
 man/lvresize.8_pregen        | 281 +++++++++++++-----------
 man/lvs.8_pregen             | 287 ++++++++++++------------
 man/lvscan.8_pregen          | 209 +++++++++---------
 man/pvchange.8_pregen        | 265 +++++++++++------------
 man/pvck.8_pregen            | 247 +++++++++++----------
 man/pvcreate.8_pregen        | 251 ++++++++++-----------
 man/pvdisplay.8_pregen       | 281 ++++++++++++------------
 man/pvmove.8_pregen          | 238 ++++++++++----------
 man/pvremove.8_pregen        | 199 ++++++++---------
 man/pvresize.8_pregen        | 199 ++++++++---------
 man/pvs.8_pregen             | 281 ++++++++++++------------
 man/pvscan.8_pregen          | 235 ++++++++++----------
 man/vgcfgbackup.8_pregen     | 211 +++++++++---------
 man/vgcfgrestore.8_pregen    | 207 +++++++++---------
 man/vgchange.8_pregen        | 421 ++++++++++++++++++------------------
 man/vgck.8_pregen            | 201 ++++++++---------
 man/vgconvert.8_pregen       | 219 +++++++++----------
 man/vgcreate.8_pregen        | 304 ++++++++++++++------------
 man/vgdisplay.8_pregen       | 277 ++++++++++++------------
 man/vgexport.8_pregen        | 205 +++++++++---------
 man/vgextend.8_pregen        | 241 +++++++++++----------
 man/vgimport.8_pregen        | 211 +++++++++---------
 man/vgimportclone.8_pregen   | 203 ++++++++---------
 man/vgimportdevices.8_pregen | 209 +++++++++---------
 man/vgmerge.8_pregen         | 199 ++++++++---------
 man/vgmknodes.8_pregen       | 207 +++++++++---------
 man/vgreduce.8_pregen        | 217 ++++++++++---------
 man/vgremove.8_pregen        | 211 +++++++++---------
 man/vgrename.8_pregen        | 203 ++++++++---------
 man/vgs.8_pregen             | 277 ++++++++++++------------
 man/vgscan.8_pregen          | 205 +++++++++---------
 man/vgsplit.8_pregen         | 232 ++++++++++----------
 46 files changed, 5843 insertions(+), 5662 deletions(-)

diff --git a/conf/example.conf.in b/conf/example.conf.in
index 5275e76c5..19efe6b6d 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -1086,10 +1086,12 @@ global {
 	# Activate LVs based on system-generated device events.
 	# When a device appears on the system, a system-generated event runs
 	# the pvscan command to activate LVs if the new PV completes the VG.
-	# Use auto_activation_volume_list to select which LVs should be
-	# activated from these events (the default is all.)
 	# When event_activation is disabled, the system will generally run
 	# a direct activation command to activate LVs in complete VGs.
+	# Activation commands that are run by the system, either from events
+	# or at fixed points during startup, use autoactivation (-aay).  See
+	# the --setautoactivation option or the auto_activation_volume_list
+	# setting to configure autoactivation for specific VGs or LVs.
 	# This configuration option has an automatic default value.
 	# event_activation = 1
 
@@ -1430,22 +1432,22 @@ activation {
 	# This configuration option does not have a default value defined.
 
 	# Configuration option activation/auto_activation_volume_list.
-	# Only LVs selected by this list are auto-activated.
-	# This list works like volume_list, but it is used only by
-	# auto-activation commands. It does not apply to direct activation
-	# commands. If this list is defined, an LV is only auto-activated
-	# if it matches an entry in this list. If this list is undefined, it
-	# imposes no limits on LV auto-activation (all are allowed.) If this
-	# list is defined and empty, i.e. "[]", then no LVs are selected for
-	# auto-activation. An LV that is selected by this list for
-	# auto-activation, must also be selected by volume_list (if defined)
-	# before it is activated. Auto-activation is an activation command that
-	# includes the 'a' argument: --activate ay or -a ay. The 'a' (auto)
-	# argument for auto-activation is meant to be used by activation
-	# commands that are run automatically by the system, as opposed to LVM
-	# commands run directly by a user. A user may also use the 'a' flag
-	# directly to perform auto-activation. Also see pvscan(8) for more
-	# information about auto-activation.
+	# A list of VGs or LVs that should be autoactivated.
+	# Autoactivation is an activation command run with -aay,
+	# i.e. vgchange -aay, lvchange -aay, or pvscan --cache -aay.
+	# When this list is defined, an autoactivation command will only
+	# activate LVs included in the list. If this list is undefined,
+	# it has no effect. If this list is defined but empty, then no
+	# LVs will be autoactivated. LVs can be included in the list by
+	# LV name, VG name (applies to all LVs in the VG), or tag name.
+	# VGs and LVs can also have an autoactivation property set in
+	# metadata, see --setautoactivation. LVs included in this list
+	# will not be autoactivated if the VG or LV autoactivation
+	# property is disabled (see vgs or lvs "-o autoactivation").
+	# The volume_list setting and the "activation skip" property
+	# also apply to autoactivation.
+	# The -aay option is meant to be used by activation commands that
+	# are run automatically by the system, e.g. from systemd services.
 	#
 	# Accepted values:
 	#   vgname
diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index fa7bdada0..3d376996f 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -21,7 +21,10 @@ lvchange - Change the attributes of logical volume(s)
 .ad b
 .br
 .ad l
-    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .ad b
 .br
 .ad l
@@ -208,6 +211,10 @@ lvchange - Change the attributes of logical volume(s)
  \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
 .ad b
 .br
+.ad l
+    \fB--setautoactivation\fP \fBy\fP|\fBn\fP
+.ad b
+.br
 .ad l
     \fB--[raid]syncaction\fP \fBcheck\fP|\fBrepair\fP
 .ad b
@@ -256,94 +263,55 @@ required, after which the others are optional.
 .P
 \fBlvchange\fP
 .RS 4
-( \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP,
-.ad b
+( \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP
 .br
-.ad l
-  \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP,
-.ad b
+  \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP
 .br
-.ad l
-  \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP,
-.ad b
+  \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
 .br
-.ad l
-  \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP,
-.ad b
+  \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
 .br
-.ad l
-  \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP,
-.ad b
+  \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
-.ad l
-  \fB-M\fP|\fB--persistent\fP \fBn\fP,
-.ad b
+  \fB-M\fP|\fB--persistent\fP \fBn\fP
 .br
-.ad l
-     \fB--addtag\fP \fITag\fP,
-.ad b
+     \fB--addtag\fP \fITag\fP
 .br
-.ad l
-     \fB--deltag\fP \fITag\fP,
-.ad b
+     \fB--deltag\fP \fITag\fP
 .br
-.ad l
-     \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP,
-.ad b
+     \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
-.ad l
-     \fB--compression\fP \fBy\fP|\fBn\fP,
-.ad b
+     \fB--compression\fP \fBy\fP|\fBn\fP
 .br
-.ad l
-     \fB--deduplication\fP \fBy\fP|\fBn\fP,
-.ad b
+     \fB--deduplication\fP \fBy\fP|\fBn\fP
 .br
-.ad l
-     \fB--detachprofile\fP,
-.ad b
+     \fB--detachprofile\fP
 .br
-.ad l
-     \fB--metadataprofile\fP \fIString\fP,
-.ad b
+     \fB--metadataprofile\fP \fIString\fP
 .br
-.ad l
-     \fB--profile\fP \fIString\fP,
-.ad b
+     \fB--profile\fP \fIString\fP
 .br
-.ad l
-     \fB--errorwhenfull\fP \fBy\fP|\fBn\fP,
-.ad b
+     \fB--setautoactivation\fP \fBy\fP|\fBn\fP
 .br
-.ad l
-     \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP,
-.ad b
+     \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
 .br
-.ad l
-     \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP,
-.ad b
+     \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
-.ad l
-     \fB--cachepolicy\fP \fIString\fP,
-.ad b
+     \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
 .br
-.ad l
-     \fB--cachesettings\fP \fIString\fP,
-.ad b
+     \fB--cachepolicy\fP \fIString\fP
 .br
-.ad l
-     \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT],
-.ad b
+     \fB--cachesettings\fP \fIString\fP
 .br
-.ad l
-     \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT],
-.ad b
+     \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
-.ad l
-     \fB--[raid]writebehind\fP \fINumber\fP,
-.ad b
+     \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT]
+.br
+     \fB--[raid]writebehind\fP \fINumber\fP
 .br
-.ad l
      \fB--[raid]writemostly\fP \fIPV\fP[\fB:t\fP|\fBn\fP|\fBy\fP] )
 .RE
 .RS 4
@@ -626,10 +594,11 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
+.ad b
 Change the active state of LVs.
 An active LV can be used through a block device,
 allowing data on the LV to be accessed.
@@ -642,18 +611,23 @@ All software and scripts should access the device through the symbolic
 link and present this as the name of the device.
 The location and name of the underlying device node may depend on
 the distribution, configuration (e.g. udev), or release version.
-\fBay\fP specifies autoactivation, in which case an LV is activated
-only if it matches an item in lvm.conf activation/auto_activation_volume_list.
-If the list is not set, all LVs are considered to match, and if
-if the list is set but empty, no LVs match.
-Autoactivation should be used during system boot to make it possible
-to select which LVs should be automatically activated by the system.
+\fBay\fP specifies autoactivation, which is used by system-generated
+activation commands.  By default, LVs are autoactivated.
+An autoactivation property can be set on a VG or LV to disable autoactivation,
+see --setautoactivation y|n in vgchange, lvchange, vgcreate, and lvcreate.
+Display the property with vgs or lvs "-o autoactivation".
+The lvm.conf auto_activation_volume_list includes names of VGs or LVs
+that should be autoactivated, and anything not listed is not autoactivated.
+When auto_activation_volume_list is undefined (the default), it has no effect.
+If auto_activation_volume_list is defined and empty, no LVs are autoactivated.
+Items included by auto_activation_volume_list will not be autoactivated if
+the autoactivation property has been disabled.
 See \fBlvmlockd\fP(8) for more information about activation options \fBey\fP and \fBsy\fP for shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP
 .br
+.ad b
 Determines if LV activation is allowed when PVs are missing,
 e.g. because of a device failure.
 \fBcomplete\fP only allows LVs with no missing PVs to be activated,
@@ -664,18 +638,21 @@ and is the most restrictive mode.
 should only be used for recovery or repair.
 For default, see lvm.conf/activation_mode.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--addtag\fP \fITag\fP
 .br
+.ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.ad b
-.HP
+.TP
 .ad l
-\fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+\fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
+.ad b
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -692,18 +669,18 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.ad b
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
 .br
+.ad b
 Specifies when writes to a cache LV should be considered complete.
 \fBwriteback\fP considers a write complete as soon as it is
 stored in the cache pool.
@@ -715,18 +692,18 @@ cache pool LV. With \fBpassthrough\fP, all reads are served
 from the origin LV (all reads miss the cache) and all writes are
 forwarded to the origin LV; additionally, write hits cause cache
 block invalidates. See \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachepolicy\fP \fIString\fP
 .br
+.ad b
 Specifies the cache policy for a cache LV.
 See \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachesettings\fP \fIString\fP
 .br
+.ad b
 Specifies tunable values for a cache LV in "Key = Value" form.
 Repeat this option to specify multiple values.
 (The default values should usually be adequate.)
@@ -734,90 +711,90 @@ The special string value \fBdefault\fP switches
 settings back to their default kernel values and removes
 them from the list of settings stored in LVM metadata.
 See \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--compression\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls whether compression is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Sets or resets the contiguous allocation policy for LVs.
 Default is no contiguous allocation based on a next free principle.
 It is only possible to change a non-contiguous allocation policy
 to contiguous if all of the allocated physical extents in the LV
 are already contiguous.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--deduplication\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls whether deduplication is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.ad b
-.HP
+.TP
 .ad l
 \fB--deltag\fP \fITag\fP
 .br
+.ad b
 Deletes a tag from a PV, VG or LV. This option can be repeated to delete
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.ad b
-.HP
+.TP
 .ad l
 \fB--detachprofile\fP
 .br
+.ad b
 Detaches a metadata profile from a VG or LV.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
+.ad b
 Specifies how the device-mapper thin pool layer in the kernel should
 handle discards.
 \fBignore\fP causes the thin pool to ignore discards.
@@ -826,18 +803,18 @@ allow reuse of unneeded extents in the thin pool.
 \fBpassdown\fP causes the thin pool to process discards itself
 (like nopassdown) and pass the discards to the underlying device.
 See \fBlvmthin\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies thin pool behavior when data space is exhausted.
 When yes, device-mapper will immediately return an error
 when a thin pool is full and an I/O request requires space.
@@ -846,140 +823,140 @@ period of time to allow the thin pool to be extended.
 Errors are returned if no space is available after the timeout.
 (Also see dm-thin-pool kernel module option no_space_timeout.)
 See \fBlvmthin\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-K\fP|\fB--ignoreactivationskip\fP
 .br
+.ad b
 Ignore the "activation skip" LV flag during activation
 to allow LVs with the flag set to be activated.
-.ad b
-.HP
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--ignoremonitoring\fP
 .br
+.ad b
 Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-j\fP|\fB--major\fP \fINumber\fP
 .br
-Sets the major number of an LV block device.
 .ad b
-.HP
+Sets the major number of an LV block device.
+.TP
 .ad l
 \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 Sets the maximum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
+.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--minor\fP \fINumber\fP
 .br
-Sets the minor number of an LV block device.
 .ad b
-.HP
+Sets the minor number of an LV block device.
+.TP
 .ad l
 \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 Sets the minimum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--monitor\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Start (yes) or stop (no) monitoring an LV with dmeventd.
 dmeventd monitors kernel events for an LV, and performs
 automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB-P\fP|\fB--partial\fP
 .br
+.ad b
 Commands will do their best to activate LVs with missing PV extents.
 Missing extents may be replaced with error or zero segments
 according to the lvm.conf missing_stripe_filler setting.
 Metadata may not be changed with this option.
-.ad b
-.HP
+.TP
 .ad l
 \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP
 .br
-Set access permission to read only \fBr\fP or read and write \fBrw\fP.
 .ad b
-.HP
+Set access permission to read only \fBr\fP or read and write \fBrw\fP.
+.TP
 .ad l
 \fB-M\fP|\fB--persistent\fP \fBy\fP|\fBn\fP
 .br
-When yes, makes the specified minor number persistent.
 .ad b
-.HP
+When yes, makes the specified minor number persistent.
+.TP
 .ad l
 \fB--poll\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 When yes, start the background transformation of an LV.
 An incomplete transformation, e.g. pvmove or lvconvert interrupted
 by reboot or crash, can be restarted from the last checkpoint with --poll y.
@@ -987,76 +964,76 @@ When no, background transformation of an LV will not occur, and the
 transformation will not complete. It may not be appropriate to immediately
 poll an LV after activation, in which case --poll n can be used to defer
 polling until a later --poll y command.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
 .br
+.ad b
 Sets read ahead sector count of an LV.
 \fBauto\fP is the default which allows the kernel to choose
 a suitable value automatically.
 \fBnone\fP is equivalent to zero.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--rebuild\fP \fIPV\fP
 .br
+.ad b
 Selects a PV to rebuild in a raid LV. Multiple PVs can be rebuilt by
 repeating this option.
 Use this option in place of --resync or --syncaction repair when the
 PVs with corrupted data are known, and their data should be reconstructed
 rather than reconstructing default (rotating) data.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--refresh\fP
 .br
+.ad b
 If the LV is active, reload its metadata.
 This is not necessary in normal operation, but may be useful
 if something has gone wrong, or if some form of manual LV
 sharing is being used.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--resync\fP
 .br
+.ad b
 Initiates mirror synchronization. Synchronization generally happens
 automatically, but this option forces it to run.
 Also see --rebuild to synchronize a specific PV.
@@ -1064,11 +1041,11 @@ During synchronization, data is read from the primary mirror device
 and copied to the others. This can take considerable time, during
 which the LV is without a complete redundant copy of the data.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -1077,22 +1054,36 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Persistently sets (yes) or clears (no) the "activation skip" flag on an LV.
 An LV with this flag set is not activated unless the
 --ignoreactivationskip option is used by the activation command.
 This flag is set by default on new thin snapshot LVs.
 The flag is not applied to deactivation.
 The current value of the flag is indicated in the lvs lv_attr bits.
+.TP
+.ad l
+\fB--setautoactivation\fP \fBy\fP|\fBn\fP
+.br
 .ad b
-.HP
+Set the autoactivation property on a VG or LV.
+Display the property with vgs or lvs "-o autoactivation".
+When the autoactivation property is disabled, the VG or LV
+will not be activated by a command doing autoactivation
+(vgchange, lvchange, or pvscan using -aay.)
+If autoactivation is disabled on a VG, no LVs will be autoactivated
+in that VG, and the LV autoactivation property has no effect.
+If autoactivation is enabled on a VG, autoactivation can be disabled
+for individual LVs.
+.TP
 .ad l
 \fB--[raid]syncaction\fP \fBcheck\fP|\fBrepair\fP
 .br
+.ad b
 Initiate different types of RAID synchronization.
 This causes the RAID LV to read all data and parity
 blocks in the array and check for discrepancies
@@ -1100,11 +1091,11 @@ blocks in the array and check for discrepancies
 \fBcheck\fP will count but not correct discrepancies.
 \fBrepair\fP will correct discrepancies.
 See lvs for reporting discrepancies found or repaired.
-.ad b
-.HP
+.TP
 .ad l
 \fB--sysinit\fP
 .br
+.ad b
 Indicates that vgchange/lvchange is being invoked from early system initialisation
 scripts (e.g. rc.sysinit or an initrd), before writable filesystems are
 available. As such, some functionality needs to be disabled and this option
@@ -1112,45 +1103,45 @@ acts as a shortcut which selects an appropriate set of options. Currently,
 this is equivalent to using --ignorelockingfailure, --ignoremonitoring,
 --poll n, and setting env var LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES.
 vgchange/lvchange skip autoactivation, and defer to pvscan autoactivation.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB--[raid]writebehind\fP \fINumber\fP
 .br
+.ad b
 The maximum number of outstanding writes that are allowed to
 devices in a RAID1 LV that is marked write-mostly.
 Once this value is exceeded, writes become synchronous (i.e. all writes
 to the constituent devices must complete before the array signals the
 write has completed). Setting the value to zero clears the preference
 and allows the system to choose the value arbitrarily.
-.ad b
-.HP
+.TP
 .ad l
 \fB--[raid]writemostly\fP \fIPV\fP[\fB:t\fP|\fBn\fP|\fBy\fP]
 .br
+.ad b
 Mark a device in a RAID1 LV as write-mostly.  All reads
 to these drives will be avoided unless absolutely necessary. This keeps
 the number of I/Os to the drive to a minimum. The default behavior is to
@@ -1159,50 +1150,49 @@ It is also possible to remove the write-mostly flag by adding the
 suffix \fB:n\fP at the end of the PV name, or to toggle the value with
 the suffix \fB:t\fP. Repeat this option to change the attribute on
 multiple PVs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Set zeroing mode for thin pool. Note: already provisioned blocks from pool
 in non-zero mode are not cleared in unwritten parts when setting --zero y.
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
 LV followed by _<type> indicates that an LV of the
 given type is required. (raid represents raid<N> type)
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -1222,70 +1212,71 @@ Change LV permission to read-only:
 .sp
 .B lvchange -pr vg00/lvol1
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index f6b364611..cfe3a56ff 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -11,7 +11,10 @@ lvconvert - Change logical volume layout
 .br
 .P
 .ad l
-    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .ad b
 .br
 .ad l
@@ -259,7 +262,10 @@ lvconvert - Change logical volume layout
 .ad b
 .br
 .ad l
-    \fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBraid\fP|\fBmirror\fP|\fBthin\fP|\fBthin-pool\fP|\fBvdo\fP|\fBvdo-pool\fP|\fBcache\fP|\fBcache-pool\fP|\fBwritecache\fP
+    \fB--type\fP 
+.nh
+\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+.hy
 .ad b
 .br
 .ad l
@@ -1110,7 +1116,11 @@ Common options for command:
 .ad b
 .br
 .ad l
-[    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP ]
+[    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
+]
 .ad b
 .br
 .ad l
@@ -1186,10 +1196,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
-\fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+\fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
+.ad b
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -1206,39 +1220,39 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.ad b
-.HP
+.TP
 .ad l
 \fB-b\fP|\fB--background\fP
 .br
+.ad b
 If the operation requires polling, this option causes the command to
 return before the operation is complete, and polling is done in the
 background.
-.ad b
-.HP
+.TP
 .ad l
 \fB-H\fP|\fB--cache\fP
 .br
+.ad b
 Specifies the command is handling a cache LV or cache pool.
 See --type cache and --type cache-pool.
 See \fBlvmcache\fP(7) for more information about LVM caching.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachedevice\fP \fIPV\fP
 .br
-The name of a device to use for a cache.
 .ad b
-.HP
+The name of a device to use for a cache.
+.TP
 .ad l
 \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP
 .br
-Specifies the cache metadata format used by cache target.
 .ad b
-.HP
+Specifies the cache metadata format used by cache target.
+.TP
 .ad l
 \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
 .br
+.ad b
 Specifies when writes to a cache LV should be considered complete.
 \fBwriteback\fP considers a write complete as soon as it is
 stored in the cache pool.
@@ -1250,24 +1264,24 @@ cache pool LV. With \fBpassthrough\fP, all reads are served
 from the origin LV (all reads miss the cache) and all writes are
 forwarded to the origin LV; additionally, write hits cause cache
 block invalidates. See \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachepolicy\fP \fIString\fP
 .br
+.ad b
 Specifies the cache policy for a cache LV.
 See \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachepool\fP \fILV\fP
 .br
-The name of a cache pool.
 .ad b
-.HP
+The name of a cache pool.
+.TP
 .ad l
 \fB--cachesettings\fP \fIString\fP
 .br
+.ad b
 Specifies tunable values for a cache LV in "Key = Value" form.
 Repeat this option to specify multiple values.
 (The default values should usually be adequate.)
@@ -1275,23 +1289,23 @@ The special string value \fBdefault\fP switches
 settings back to their default kernel values and removes
 them from the list of settings stored in LVM metadata.
 See \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachesize\fP \fISize\fP[m|UNIT]
 .br
-The size of cache to use.
 .ad b
-.HP
+The size of cache to use.
+.TP
 .ad l
 \fB--cachevol\fP \fILV\fP
 .br
-The name of a cache volume.
 .ad b
-.HP
+The name of a cache volume.
+.TP
 .ad l
 \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 The size of chunks in a snapshot, cache pool or thin pool.
 For snapshots, the value must be a power of 2 between 4KiB and 512KiB
 and the default value is 4.
@@ -1302,66 +1316,66 @@ and the default value starts with 64 and scales up to fit the
 pool metadata size within 128MiB, if the pool metadata size is not specified.
 The value must be a multiple of 64KiB.
 See \fBlvmthin\fP(7) and \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--compression\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls whether compression is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--deduplication\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls whether deduplication is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
+.ad b
 Specifies how the device-mapper thin pool layer in the kernel should
 handle discards.
 \fBignore\fP causes the thin pool to ignore discards.
@@ -1370,18 +1384,18 @@ allow reuse of unneeded extents in the thin pool.
 \fBpassdown\fP causes the thin pool to process discards itself
 (like nopassdown) and pass the discards to the underlying device.
 See \fBlvmthin\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies thin pool behavior when data space is exhausted.
 When yes, device-mapper will immediately return an error
 when a thin pool is full and an I/O request requires space.
@@ -1390,57 +1404,57 @@ period of time to allow the thin pool to be extended.
 Errors are returned if no space is available after the timeout.
 (Also see dm-thin-pool kernel module option no_space_timeout.)
 See \fBlvmthin\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-i\fP|\fB--interval\fP \fINumber\fP
 .br
-Report progress at regular intervals.
 .ad b
-.HP
+Report progress at regular intervals.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--merge\fP
 .br
+.ad b
 An alias for --mergethin, --mergemirrors, or --mergesnapshot,
 depending on the type of LV.
-.ad b
-.HP
+.TP
 .ad l
 \fB--mergemirrors\fP
 .br
+.ad b
 Merge LV images that were split from a raid1 LV.
 See --splitmirrors with --trackchanges.
-.ad b
-.HP
+.TP
 .ad l
 \fB--mergesnapshot\fP
 .br
+.ad b
 Merge COW snapshot LV into its origin.
 When merging a snapshot, if both the origin and snapshot LVs are not open,
 the merge will start immediately. Otherwise, the merge will start the
@@ -1453,27 +1467,27 @@ reads or writes to the origin appear as being directed to the snapshot
 being merged. When the merge finishes, the merged snapshot is removed.
 Multiple snapshots may be specified on the command line or a @tag may be
 used to specify multiple snapshots be merged to their respective origin.
-.ad b
-.HP
+.TP
 .ad l
 \fB--mergethin\fP
 .br
+.ad b
 Merge thin LV into its origin LV.
 The origin thin LV takes the content of the thin snapshot,
 and the thin snapshot LV is removed.
 See \fBlvmthin\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
+.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP
 .br
+.ad b
 Specifies the type of mirror log for LVs with the "mirror" type
 (does not apply to the "raid1" type.)
 \fBdisk\fP is a persistent log and requires a small amount of
@@ -1483,11 +1497,11 @@ In this case, the mirror must be synchronized (by copying LV data from
 the first device to others) each time the LV is activated, e.g. after reboot.
 \fBmirrored\fP is a persistent log that is itself mirrored, but
 should be avoided. Instead, use the raid1 type for log redundancy.
-.ad b
-.HP
+.TP
 .ad l
 \fB-m\fP|\fB--mirrors\fP [\fB+\fP|\fB-\fP]\fINumber\fP
 .br
+.ad b
 Specifies the number of mirror images in addition to the original LV
 image, e.g. --mirrors 1 means there are two images of the data, the
 original and one mirror image.
@@ -1504,93 +1518,93 @@ the number is added to the current number of images,
 or the minus prefix \fB-\fP can be used, in which case
 the number is subtracted from the current number of images.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
+.ad b
 Specifies the name of a new LV.
 When unspecified, a default name of "lvol#" is
 generated, where # is a number generated by LVM.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB--originname\fP \fILV\fP
 .br
+.ad b
 Specifies the name to use for the external origin LV when converting an LV
 to a thin LV. The LV being converted becomes a read-only external origin
 with this name.
-.ad b
-.HP
+.TP
 .ad l
 \fB--poolmetadata\fP \fILV\fP
 .br
-The name of a an LV to use for storing pool metadata.
 .ad b
-.HP
+The name of a an LV to use for storing pool metadata.
+.TP
 .ad l
 \fB--poolmetadatasize\fP \fISize\fP[m|UNIT]
 .br
-Specifies the size of the new pool metadata LV.
 .ad b
-.HP
+Specifies the size of the new pool metadata LV.
+.TP
 .ad l
 \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Enable or disable the automatic creation and management of a
 spare pool metadata LV in the VG. A spare metadata LV is reserved
 space that can be used when repairing a pool.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--raidintegrity\fP \fBy\fP|\fBn\fP
 .br
-Enable or disable data integrity checksums for raid images.
 .ad b
-.HP
+Enable or disable data integrity checksums for raid images.
+.TP
 .ad l
 \fB--raidintegrityblocksize\fP \fINumber\fP
 .br
+.ad b
 The block size to use for dm-integrity on raid images.
 The integrity block size should usually match the device
 logical block size, or the file system block size.
 It may be less than the file system block size, but not
 less than the device logical block size.
 Possible values: 512, 1024, 2048, 4096.
-.ad b
-.HP
+.TP
 .ad l
 \fB--raidintegritymode\fP \fIString\fP
 .br
+.ad b
 Use a journal (default) or bitmap for keeping integrity checksums consistent
 in case of a crash. The bitmap areas are recalculated after a crash, so corruption
 in those areas would not be detected. A journal does not have this problem.
@@ -1598,135 +1612,135 @@ The journal mode doubles writes to storage, but can improve performance for
 scattered writes packed into a single journal write.
 bitmap mode can in theory achieve full write throughput of the device,
 but would not benefit from the potential scattered write optimization.
-.ad b
-.HP
+.TP
 .ad l
 \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
 .br
+.ad b
 Sets read ahead sector count of an LV.
 \fBauto\fP is the default which allows the kernel to choose
 a suitable value automatically.
 \fBnone\fP is equivalent to zero.
-.ad b
-.HP
+.TP
 .ad l
 \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 Size of each raid or mirror synchronization region.
 lvm.conf activation/raid_region_size can be used to
 configure a default.
-.ad b
-.HP
+.TP
 .ad l
 \fB--repair\fP
 .br
+.ad b
 Replace failed PVs in a raid or mirror LV, or run a repair
 utility on a thin pool. See \fBlvmraid\fP(7) and \fBlvmthin\fP(7)
 for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--replace\fP \fIPV\fP
 .br
+.ad b
 Replace a specific PV in a raid LV with another PV.
 The new PV to use can be optionally specified after the LV.
 Multiple PVs can be replaced by repeating this option.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-s\fP|\fB--snapshot\fP
 .br
+.ad b
 Combine a former COW snapshot LV with a former origin LV to reverse
 a previous --splitsnapshot command.
-.ad b
-.HP
+.TP
 .ad l
 \fB--splitcache\fP
 .br
+.ad b
 Separates a cache pool from a cache LV, and keeps the unused cache pool LV.
 Before the separation, the cache is flushed. Also see --uncache.
-.ad b
-.HP
+.TP
 .ad l
 \fB--splitmirrors\fP \fINumber\fP
 .br
+.ad b
 Splits the specified number of images from a raid1 or mirror LV
 and uses them to create a new LV. If --trackchanges is also specified,
 changes to the raid1 LV are tracked while the split LV remains detached.
 If --name is specified, then the images are permanently split from the
 original LV and changes are not tracked.
-.ad b
-.HP
+.TP
 .ad l
 \fB--splitsnapshot\fP
 .br
+.ad b
 Separates a COW snapshot from its origin LV. The LV that is split off
 contains the chunks that differ from the origin LV along with metadata
 describing them. This LV can be wiped and then destroyed with lvremove.
-.ad b
-.HP
+.TP
 .ad l
 \fB--startpoll\fP
 .br
-Start polling an LV to continue processing a conversion.
 .ad b
-.HP
+Start polling an LV to continue processing a conversion.
+.TP
 .ad l
 \fB--stripes\fP \fINumber\fP
 .br
+.ad b
 Specifies the number of stripes in a striped LV. This is the number of
 PVs (devices) that a striped LV is spread across. Data that
 appears sequential in the LV is spread across multiple devices in units of
 the stripe size (see --stripesize). This does not apply to
 existing allocated space, only newly allocated space can be striped.
-.ad b
-.HP
+.TP
 .ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
-.ad b
-.HP
+.TP
 .ad l
 \fB--swapmetadata\fP
 .br
+.ad b
 Extracts the metadata LV from a pool and replaces it with another specified LV.
 The extracted LV is preserved and given the name of the LV that replaced it.
 Use for repair only. When the metadata LV is swapped out of the pool, it can
 be activated directly and used with thin provisioning tools:
 \fBcache_dump\fP(8), \fBcache_repair\fP(8), \fBcache_restore\fP(8),
 \fBthin_dump\fP(8), \fBthin_repair\fP(8), \fBthin_restore\fP(8).
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-T\fP|\fB--thin\fP
 .br
+.ad b
 Specifies the command is handling a thin LV or thin pool.
 See --type thin, --type thin-pool, and --virtualsize.
 See \fBlvmthin\fP(7) for more information about LVM thin provisioning.
-.ad b
-.HP
+.TP
 .ad l
 \fB--thinpool\fP \fILV\fP
 .br
-The name of a thin pool LV.
 .ad b
-.HP
+The name of a thin pool LV.
+.TP
 .ad l
 \fB--trackchanges\fP
 .br
+.ad b
 Can be used with --splitmirrors on a raid1 LV. This causes
 changes to the original raid1 LV to be tracked while the split images
 remain detached. This is a temporary state that allows the read-only
@@ -1735,11 +1749,14 @@ Only the regions with changed data are resynchronized during merge.
 While a raid1 LV is tracking changes, operations on it are limited to
 merging the split image (see --mergemirrors) or permanently splitting
 the image (see --splitmirrors with --name.
-.ad b
-.HP
+.TP
 .ad l
-\fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBraid\fP|\fBmirror\fP|\fBthin\fP|\fBthin-pool\fP|\fBvdo\fP|\fBvdo-pool\fP|\fBcache\fP|\fBcache-pool\fP|\fBwritecache\fP
+\fB--type\fP 
+.nh
+\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+.hy
 .br
+.ad b
 The LV type, also known as "segment type" or "segtype".
 See usage descriptions for the specific ways to use these types.
 For more information about redundancy and performance (\fBraid\fP<N>, \fBmirror\fP, \fBstriped\fP, \fBlinear\fP) see \fBlvmraid\fP(7).
@@ -1751,45 +1768,45 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
-.ad b
-.HP
+.TP
 .ad l
 \fB--uncache\fP
 .br
+.ad b
 Separates a cache pool from a cache LV, and deletes the unused cache pool LV.
 Before the separation, the cache is flushed. Also see --splitcache.
-.ad b
-.HP
+.TP
 .ad l
 \fB--usepolicies\fP
 .br
+.ad b
 Perform an operation according to the policy configured in lvm.conf
 or a profile.
-.ad b
-.HP
+.TP
 .ad l
 \fB--vdopool\fP \fILV\fP
 .br
+.ad b
 The name of a VDO pool LV.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 The virtual size of a new thin LV.
 See \fBlvmthin\fP(7) for more information about LVM thin provisioning.
 Using virtual size (-V) and actual size (-L) together creates
@@ -1802,37 +1819,36 @@ When using a snapshot to create a sparse LV, a hidden virtual device
 is created using the zero target, and the LV has the suffix _vorigin.
 Snapshots are less efficient than thin provisioning when creating
 large sparse LVs (GiB).
-.ad b
-.HP
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 For snapshots, this controls zeroing of the first 4KiB of data in the
 snapshot. If the LV is read-only, the snapshot will not be zeroed.
 For thin pools, this controls zeroing of provisioned blocks.
 Provisioning of large zeroed chunks negatively impacts performance.
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
 LV followed by _<type> indicates that an LV of the
 given type is required. (raid represents raid<N> type)
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -1842,16 +1858,16 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -2295,70 +2311,71 @@ Detach and remove the cache pool from a cache LV.
 .br
 .B lvconvert --uncache vg/lvol1
 .SH SEE ALSO
-
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
-
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
-
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
-
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
-
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
-
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
+
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
+
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
+
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
+
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
+
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
+
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index c19b7da7b..e804f9ce0 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -19,7 +19,10 @@ lvcreate - Create a logical volume
 .ad b
 .br
 .ad l
-    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .ad b
 .br
 .ad l
@@ -234,6 +237,10 @@ lvcreate - Create a logical volume
  \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
 .ad b
 .br
+.ad l
+    \fB--setautoactivation\fP \fBy\fP|\fBn\fP
+.ad b
+.br
 .ad l
  \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT]
 .ad b
@@ -263,7 +270,10 @@ lvcreate - Create a logical volume
 .ad b
 .br
 .ad l
-    \fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBraid\fP|\fBmirror\fP|\fBthin\fP|\fBthin-pool\fP|\fBvdo\fP|\fBvdo-pool\fP|\fBcache\fP|\fBcache-pool\fP|\fBwritecache\fP
+    \fB--type\fP 
+.nh
+\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+.hy
 .ad b
 .br
 .ad l
@@ -1139,7 +1149,11 @@ Common options for command:
 .ad b
 .br
 .ad l
-[    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP ]
+[    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
+]
 .ad b
 .br
 .ad l
@@ -1169,6 +1183,10 @@ Common options for command:
 .ad l
 [    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
 .ad b
+.br
+.ad l
+[    \fB--setautoactivation\fP \fBy\fP|\fBn\fP ]
+.ad b
 .RE
 
 Common options for lvm:
@@ -1239,10 +1257,11 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
+.ad b
 Controls the active state of the new LV.
 \fBy\fP makes the LV active, or available.
 New LVs are made active by default.
@@ -1255,18 +1274,21 @@ If autoactivation \fBay\fP is used, the LV is only activated
 if it matches an item in lvm.conf activation/auto_activation_volume_list.
 \fBay\fP implies --zero n and --wipesignatures n.
 See \fBlvmlockd\fP(8) for more information about activation options for shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB--addtag\fP \fITag\fP
 .br
+.ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.ad b
-.HP
+.TP
 .ad l
-\fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+\fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
+.ad b
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -1283,38 +1305,38 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.ad b
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-H\fP|\fB--cache\fP
 .br
+.ad b
 Specifies the command is handling a cache LV or cache pool.
 See --type cache and --type cache-pool.
 See \fBlvmcache\fP(7) for more information about LVM caching.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachedevice\fP \fIPV\fP
 .br
-The name of a device to use for a cache.
 .ad b
-.HP
+The name of a device to use for a cache.
+.TP
 .ad l
 \fB--cachemetadataformat\fP \fBauto\fP|\fB1\fP|\fB2\fP
 .br
-Specifies the cache metadata format used by cache target.
 .ad b
-.HP
+Specifies the cache metadata format used by cache target.
+.TP
 .ad l
 \fB--cachemode\fP \fBwritethrough\fP|\fBwriteback\fP|\fBpassthrough\fP
 .br
+.ad b
 Specifies when writes to a cache LV should be considered complete.
 \fBwriteback\fP considers a write complete as soon as it is
 stored in the cache pool.
@@ -1326,24 +1348,24 @@ cache pool LV. With \fBpassthrough\fP, all reads are served
 from the origin LV (all reads miss the cache) and all writes are
 forwarded to the origin LV; additionally, write hits cause cache
 block invalidates. See \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachepolicy\fP \fIString\fP
 .br
+.ad b
 Specifies the cache policy for a cache LV.
 See \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachepool\fP \fILV\fP
 .br
-The name of a cache pool.
 .ad b
-.HP
+The name of a cache pool.
+.TP
 .ad l
 \fB--cachesettings\fP \fIString\fP
 .br
+.ad b
 Specifies tunable values for a cache LV in "Key = Value" form.
 Repeat this option to specify multiple values.
 (The default values should usually be adequate.)
@@ -1351,23 +1373,23 @@ The special string value \fBdefault\fP switches
 settings back to their default kernel values and removes
 them from the list of settings stored in LVM metadata.
 See \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--cachesize\fP \fISize\fP[m|UNIT]
 .br
-The size of cache to use.
 .ad b
-.HP
+The size of cache to use.
+.TP
 .ad l
 \fB--cachevol\fP \fILV\fP
 .br
-The name of a cache volume.
 .ad b
-.HP
+The name of a cache volume.
+.TP
 .ad l
 \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 The size of chunks in a snapshot, cache pool or thin pool.
 For snapshots, the value must be a power of 2 between 4KiB and 512KiB
 and the default value is 4.
@@ -1378,76 +1400,76 @@ and the default value starts with 64 and scales up to fit the
 pool metadata size within 128MiB, if the pool metadata size is not specified.
 The value must be a multiple of 64KiB.
 See \fBlvmthin\fP(7) and \fBlvmcache\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--compression\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls whether compression is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-C\fP|\fB--contiguous\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Sets or resets the contiguous allocation policy for LVs.
 Default is no contiguous allocation based on a next free principle.
 It is only possible to change a non-contiguous allocation policy
 to contiguous if all of the allocated physical extents in the LV
 are already contiguous.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--deduplication\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls whether deduplication is enabled or disable for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
+.ad b
 Specifies how the device-mapper thin pool layer in the kernel should
 handle discards.
 \fBignore\fP causes the thin pool to ignore discards.
@@ -1456,18 +1478,18 @@ allow reuse of unneeded extents in the thin pool.
 \fBpassdown\fP causes the thin pool to process discards itself
 (like nopassdown) and pass the discards to the underlying device.
 See \fBlvmthin\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies thin pool behavior when data space is exhausted.
 When yes, device-mapper will immediately return an error
 when a thin pool is full and an I/O request requires space.
@@ -1476,11 +1498,11 @@ period of time to allow the thin pool to be extended.
 Errors are returned if no space is available after the timeout.
 (Also see dm-thin-pool kernel module option no_space_timeout.)
 See \fBlvmthin\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-l\fP|\fB--extents\fP \fINumber\fP[PERCENT]
 .br
+.ad b
 Specifies the size of the new LV in logical extents.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -1496,81 +1518,81 @@ the whole origin).
 When expressed as a percentage, the size defines an upper limit for the
 number of logical extents in the new LV. The precise number of logical
 extents in the new LV is not determined until the command has completed.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-K\fP|\fB--ignoreactivationskip\fP
 .br
+.ad b
 Ignore the "activation skip" LV flag during activation
 to allow LVs with the flag set to be activated.
-.ad b
-.HP
+.TP
 .ad l
 \fB--ignoremonitoring\fP
 .br
+.ad b
 Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-j\fP|\fB--major\fP \fINumber\fP
 .br
-Sets the major number of an LV block device.
 .ad b
-.HP
+Sets the major number of an LV block device.
+.TP
 .ad l
 \fB--[raid]maxrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 Sets the maximum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
+.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--minor\fP \fINumber\fP
 .br
-Sets the minor number of an LV block device.
 .ad b
-.HP
+Sets the minor number of an LV block device.
+.TP
 .ad l
 \fB--[raid]minrecoveryrate\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 Sets the minimum recovery rate for a RAID LV.  The rate value
 is an amount of data per second for each device in the array.
 Setting the rate to 0 means it will be unbounded.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP
 .br
+.ad b
 Specifies the type of mirror log for LVs with the "mirror" type
 (does not apply to the "raid1" type.)
 \fBdisk\fP is a persistent log and requires a small amount of
@@ -1580,11 +1602,11 @@ In this case, the mirror must be synchronized (by copying LV data from
 the first device to others) each time the LV is activated, e.g. after reboot.
 \fBmirrored\fP is a persistent log that is itself mirrored, but
 should be avoided. Instead, use the raid1 type for log redundancy.
-.ad b
-.HP
+.TP
 .ad l
 \fB-m\fP|\fB--mirrors\fP \fINumber\fP
 .br
+.ad b
 Specifies the number of mirror images in addition to the original LV
 image, e.g. --mirrors 1 means there are two images of the data, the
 original and one mirror image.
@@ -1598,34 +1620,34 @@ Use lvm.conf global/mirror_segtype_default and
 global/raid10_segtype_default to configure the default types.
 See the --nosync option for avoiding initial image synchronization.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--monitor\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Start (yes) or stop (no) monitoring an LV with dmeventd.
 dmeventd monitors kernel events for an LV, and performs
 automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
+.ad b
 Specifies the name of a new LV.
 When unspecified, a default name of "lvol#" is
 generated, where # is a number generated by LVM.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--nosync\fP
 .br
+.ad b
 Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
 initial synchronization. In case of mirror, raid1 and raid10, any data
 written afterwards will be mirrored, but the original contents will not be
@@ -1638,77 +1660,77 @@ This option is not valid for raid6, because raid6 relies on proper parity
 to reconstruct proper user date in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
-.ad b
-.HP
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB-p\fP|\fB--permission\fP \fBrw\fP|\fBr\fP
 .br
-Set access permission to read only \fBr\fP or read and write \fBrw\fP.
 .ad b
-.HP
+Set access permission to read only \fBr\fP or read and write \fBrw\fP.
+.TP
 .ad l
 \fB-M\fP|\fB--persistent\fP \fBy\fP|\fBn\fP
 .br
-When yes, makes the specified minor number persistent.
 .ad b
-.HP
+When yes, makes the specified minor number persistent.
+.TP
 .ad l
 \fB--poolmetadatasize\fP \fISize\fP[m|UNIT]
 .br
-Specifies the size of the new pool metadata LV.
 .ad b
-.HP
+Specifies the size of the new pool metadata LV.
+.TP
 .ad l
 \fB--poolmetadataspare\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Enable or disable the automatic creation and management of a
 spare pool metadata LV in the VG. A spare metadata LV is reserved
 space that can be used when repairing a pool.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--raidintegrity\fP \fBy\fP|\fBn\fP
 .br
-Enable or disable data integrity checksums for raid images.
 .ad b
-.HP
+Enable or disable data integrity checksums for raid images.
+.TP
 .ad l
 \fB--raidintegrityblocksize\fP \fINumber\fP
 .br
+.ad b
 The block size to use for dm-integrity on raid images.
 The integrity block size should usually match the device
 logical block size, or the file system block size.
 It may be less than the file system block size, but not
 less than the device logical block size.
 Possible values: 512, 1024, 2048, 4096.
-.ad b
-.HP
+.TP
 .ad l
 \fB--raidintegritymode\fP \fIString\fP
 .br
+.ad b
 Use a journal (default) or bitmap for keeping integrity checksums consistent
 in case of a crash. The bitmap areas are recalculated after a crash, so corruption
 in those areas would not be detected. A journal does not have this problem.
@@ -1716,59 +1738,73 @@ The journal mode doubles writes to storage, but can improve performance for
 scattered writes packed into a single journal write.
 bitmap mode can in theory achieve full write throughput of the device,
 but would not benefit from the potential scattered write optimization.
-.ad b
-.HP
+.TP
 .ad l
 \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP
 .br
+.ad b
 Sets read ahead sector count of an LV.
 \fBauto\fP is the default which allows the kernel to choose
 a suitable value automatically.
 \fBnone\fP is equivalent to zero.
-.ad b
-.HP
+.TP
 .ad l
 \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 Size of each raid or mirror synchronization region.
 lvm.conf activation/raid_region_size can be used to
 configure a default.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-k\fP|\fB--setactivationskip\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Persistently sets (yes) or clears (no) the "activation skip" flag on an LV.
 An LV with this flag set is not activated unless the
 --ignoreactivationskip option is used by the activation command.
 This flag is set by default on new thin snapshot LVs.
 The flag is not applied to deactivation.
 The current value of the flag is indicated in the lvs lv_attr bits.
+.TP
+.ad l
+\fB--setautoactivation\fP \fBy\fP|\fBn\fP
+.br
 .ad b
-.HP
+Set the autoactivation property on a VG or LV.
+Display the property with vgs or lvs "-o autoactivation".
+When the autoactivation property is disabled, the VG or LV
+will not be activated by a command doing autoactivation
+(vgchange, lvchange, or pvscan using -aay.)
+If autoactivation is disabled on a VG, no LVs will be autoactivated
+in that VG, and the LV autoactivation property has no effect.
+If autoactivation is enabled on a VG, autoactivation can be disabled
+for individual LVs.
+.TP
 .ad l
 \fB-L\fP|\fB--size\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 Specifies the size of the new LV.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
 greater when redundant data is needed for RAID levels.
-.ad b
-.HP
+.TP
 .ad l
 \fB-s\fP|\fB--snapshot\fP
 .br
+.ad b
 Create a snapshot. Snapshots provide a "frozen image" of an origin LV.
 The snapshot LV can be used, e.g. for backups, while the origin LV
 continues to be used.
@@ -1794,11 +1830,11 @@ A small amount of the COW snapshot LV size is used to track COW block
 locations, so the full size is not available for COW data blocks.
 Use lvs to check how much space is used, and see --monitor to
 to automatically extend the size to avoid running out of space.
-.ad b
-.HP
+.TP
 .ad l
 \fB-i\fP|\fB--stripes\fP \fINumber\fP
 .br
+.ad b
 Specifies the number of stripes in a striped LV. This is the number of
 PVs (devices) that a striped LV is spread across. Data that
 appears sequential in the LV is spread across multiple devices in units of
@@ -1811,42 +1847,45 @@ when unspecified, the default depends on the RAID type
 (raid0: 2, raid10: 2, raid4/5: 3, raid6: 5.)
 To stripe a new raid LV across all PVs by default,
 see lvm.conf allocation/raid_stripe_all_devices.
-.ad b
-.HP
+.TP
 .ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-T\fP|\fB--thin\fP
 .br
+.ad b
 Specifies the command is handling a thin LV or thin pool.
 See --type thin, --type thin-pool, and --virtualsize.
 See \fBlvmthin\fP(7) for more information about LVM thin provisioning.
-.ad b
-.HP
+.TP
 .ad l
 \fB--thinpool\fP \fILV\fP
 .br
-The name of a thin pool LV.
 .ad b
-.HP
+The name of a thin pool LV.
+.TP
 .ad l
-\fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBraid\fP|\fBmirror\fP|\fBthin\fP|\fBthin-pool\fP|\fBvdo\fP|\fBvdo-pool\fP|\fBcache\fP|\fBcache-pool\fP|\fBwritecache\fP
+\fB--type\fP 
+.nh
+\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+.hy
 .br
+.ad b
 The LV type, also known as "segment type" or "segtype".
 See usage descriptions for the specific ways to use these types.
 For more information about redundancy and performance (\fBraid\fP<N>, \fBmirror\fP, \fBstriped\fP, \fBlinear\fP) see \fBlvmraid\fP(7).
@@ -1858,39 +1897,39 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
-.ad b
-.HP
+.TP
 .ad l
 \fB--vdo\fP
 .br
+.ad b
 Specifies the command is handling VDO LV.
 See --type vdo.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.ad b
-.HP
+.TP
 .ad l
 \fB--vdopool\fP \fILV\fP
 .br
+.ad b
 The name of a VDO pool LV.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-V\fP|\fB--virtualsize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 The virtual size of a new thin LV.
 See \fBlvmthin\fP(7) for more information about LVM thin provisioning.
 Using virtual size (-V) and actual size (-L) together creates
@@ -1903,11 +1942,11 @@ When using a snapshot to create a sparse LV, a hidden virtual device
 is created using the zero target, and the LV has the suffix _vorigin.
 Snapshots are less efficient than thin provisioning when creating
 large sparse LVs (GiB).
-.ad b
-.HP
+.TP
 .ad l
 \fB-W\fP|\fB--wipesignatures\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls detection and subsequent wiping of signatures on new LVs.
 There is a prompt for each signature detected to confirm its wiping
 (unless --yes is used to override confirmations.)
@@ -1921,42 +1960,41 @@ signatures that are recognized).
 Otherwise, native LVM code is used to detect signatures
 (only MD RAID, swap and LUKS signatures are detected in this case.)
 The LV is not wiped if the read only flag is set.
-.ad b
-.HP
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls zeroing of the first 4KiB of data in the new LV.
 Default is \fBy\fP.
 Snapshot COW volumes are always zeroed.
 For thin pools, this controls zeroing of provisioned blocks.
 LV is not zeroed if the read only flag is set.
 Warning: trying to mount an unzeroed LV can cause the system to hang.
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
 For lvcreate, the required VG positional arg may be
 omitted when the VG name is included in another option,
 e.g. --name VG/LV.
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
 LV followed by _<type> indicates that an LV of the
 given type is required. (raid represents raid<N> type)
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -1966,11 +2004,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -3192,70 +3230,71 @@ Create a VDO LV vdo0 with VDOPoolLV size of 10GiB and name vpool1.
 .br
 .B lvcreate --vdo --size 10G --name vdo0 vg00/vpool1
 .SH SEE ALSO
-
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
-
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
-
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
-
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
-
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
-
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
+
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
+
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
+
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
+
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
+
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
+
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index e19447c58..d1370d616 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -186,175 +186,176 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--aligned\fP
 .br
-Use with --separator to align the output columns
 .ad b
-.HP
+Use with --separator to align the output columns
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
+.ad b
 Show information about internal LVs.
 These are components of normal LVs, such as mirrors,
 which are not independently accessible, e.g. not mountable.
-.ad b
-.HP
+.TP
 .ad l
 \fB--binary\fP
 .br
+.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.ad b
-.HP
+.TP
 .ad l
 \fB-c\fP|\fB--colon\fP
 .br
+.ad b
 Generate colon separated output for easier parsing in scripts or programs.
 Also see \fBvgs\fP(8) which provides considerably more control over the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB-C\fP|\fB--columns\fP
 .br
+.ad b
 Display output in columns, the equivalent of \fBvgs\fP(8).
 Options listed are the same as options given in \fBvgs\fP(8).
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-See \fBlvmreport\fP(7).
 .ad b
-.HP
+See \fBlvmreport\fP(7).
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--foreign\fP
 .br
+.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-H\fP|\fB--history\fP
 .br
+.ad b
 Include historical LVs in the output.
 (This has no effect unless LVs were removed while
 lvm.conf metadata/record_lvs_history was enabled.
-.ad b
-.HP
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--logonly\fP
 .br
-Suppress command report and display only log report.
 .ad b
-.HP
+Suppress command report and display only log report.
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-m\fP|\fB--maps\fP
 .br
+.ad b
 Display the mapping of logical extents to PVs and physical extents.
 To map physical extents to logical extents use:
 pvs --segments -o+lv_name,seg_start_pe,segtype
-.ad b
-.HP
+.TP
 .ad l
 \fB--noheadings\fP
 .br
+.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--nosuffix\fP
 .br
+.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
+.ad b
 Comma-separated, ordered list of fields to display in columns.
 String arg syntax is: [+|-|#]Field1[,Field2 ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
@@ -372,52 +373,52 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--segments\fP
 .br
 .ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -426,96 +427,95 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
-String to use to separate each column. Useful if grepping the output.
 .ad b
-.HP
+String to use to separate each column. Useful if grepping the output.
+.TP
 .ad l
 \fB--shared\fP
 .br
+.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
+.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unbuffered\fP
 .br
-Produce output immediately without sorting or aligning the columns properly.
 .ad b
-.HP
+Produce output immediately without sorting or aligning the columns properly.
+.TP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
+.ad b
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -531,70 +531,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index cf7925ee0..a4a90994d 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -11,7 +11,10 @@ lvextend - Add space to a logical volume
 .br
 .P
 .ad l
-    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .ad b
 .br
 .ad l
@@ -119,7 +122,10 @@ lvextend - Add space to a logical volume
 .ad b
 .br
 .ad l
-    \fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBraid\fP|\fBmirror\fP|\fBthin\fP|\fBthin-pool\fP|\fBvdo\fP|\fBvdo-pool\fP|\fBcache\fP|\fBcache-pool\fP|\fBwritecache\fP
+    \fB--type\fP 
+.nh
+\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+.hy
 .ad b
 .br
 .ad l
@@ -268,7 +274,11 @@ Common options for command:
 .ad b
 .br
 .ad l
-[    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP ]
+[    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
+]
 .ad b
 .br
 .ad l
@@ -284,7 +294,11 @@ Common options for command:
 .ad b
 .br
 .ad l
-[    \fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBraid\fP|\fBmirror\fP|\fBthin\fP|\fBthin-pool\fP|\fBvdo\fP|\fBvdo-pool\fP|\fBcache\fP|\fBcache-pool\fP|\fBwritecache\fP ]
+[    \fB--type\fP 
+.nh
+\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+.hy
+]
 .ad b
 .RE
 
@@ -356,10 +370,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
-\fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+\fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
+.ad b
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -376,66 +394,66 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.ad b
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-l\fP|\fB--extents\fP [\fB+\fP]\fINumber\fP[PERCENT]
 .br
+.ad b
 Specifies the new size of the LV in logical extents.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -454,57 +472,57 @@ extents in the new LV is not determined until the command has completed.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-m\fP|\fB--mirrors\fP \fINumber\fP
 .br
-Not used.
 .ad b
-.HP
+Not used.
+.TP
 .ad l
 \fB-n\fP|\fB--nofsck\fP
 .br
+.ad b
 Do not perform fsck before resizing filesystem when filesystem
 requires it. You may need to use --force to proceed with
 this option.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--nosync\fP
 .br
+.ad b
 Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
 initial synchronization. In case of mirror, raid1 and raid10, any data
 written afterwards will be mirrored, but the original contents will not be
@@ -517,59 +535,59 @@ This option is not valid for raid6, because raid6 relies on proper parity
 to reconstruct proper user date in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
-.ad b
-.HP
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT]
 .br
+.ad b
 Specifies the new size of the pool metadata LV.
 The plus prefix \fB+\fP can be used, in which case
 the value is added to the current size.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-r\fP|\fB--resizefs\fP
 .br
-Resize underlying filesystem together with the LV using fsadm(8).
 .ad b
-.HP
+Resize underlying filesystem together with the LV using fsadm(8).
+.TP
 .ad l
 \fB-L\fP|\fB--size\fP [\fB+\fP]\fISize\fP[m|UNIT]
 .br
+.ad b
 Specifies the new size of the LV.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -577,11 +595,11 @@ greater when redundant data is needed for RAID levels.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.ad b
-.HP
+.TP
 .ad l
 \fB-i\fP|\fB--stripes\fP \fINumber\fP
 .br
+.ad b
 Specifies the number of stripes in a striped LV. This is the number of
 PVs (devices) that a striped LV is spread across. Data that
 appears sequential in the LV is spread across multiple devices in units of
@@ -594,28 +612,31 @@ when unspecified, the default depends on the RAID type
 (raid0: 2, raid10: 2, raid4/5: 3, raid6: 5.)
 To stripe a new raid LV across all PVs by default,
 see lvm.conf allocation/raid_stripe_all_devices.
-.ad b
-.HP
+.TP
 .ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
-\fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBraid\fP|\fBmirror\fP|\fBthin\fP|\fBthin-pool\fP|\fBvdo\fP|\fBvdo-pool\fP|\fBcache\fP|\fBcache-pool\fP|\fBwritecache\fP
+\fB--type\fP 
+.nh
+\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+.hy
 .br
+.ad b
 The LV type, also known as "segment type" or "segtype".
 See usage descriptions for the specific ways to use these types.
 For more information about redundancy and performance (\fBraid\fP<N>, \fBmirror\fP, \fBstriped\fP, \fBlinear\fP) see \fBlvmraid\fP(7).
@@ -627,44 +648,43 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
-.ad b
-.HP
+.TP
 .ad l
 \fB--usepolicies\fP
 .br
+.ad b
 Perform an operation according to the policy configured in lvm.conf
 or a profile.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
 LV followed by _<type> indicates that an LV of the
 given type is required. (raid represents raid<N> type)
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -674,11 +694,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -708,70 +728,71 @@ Extend an LV by 16MiB using specific physical extents.
 .br
 .B lvextend -L+16m vg01/lvol01 /dev/sda:8-9 /dev/sdb:8-9
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 7fb7d046d..7a63dc4ad 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -178,150 +178,151 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--aligned\fP
 .br
-Use with --separator to align the output columns
 .ad b
-.HP
+Use with --separator to align the output columns
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
-.HP
+.TP
 .ad l
 \fB--binary\fP
 .br
+.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-See \fBlvmreport\fP(7).
 .ad b
-.HP
+See \fBlvmreport\fP(7).
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--foreign\fP
 .br
+.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--logonly\fP
 .br
-Suppress command report and display only log report.
 .ad b
-.HP
+Suppress command report and display only log report.
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nameprefixes\fP
 .br
+.ad b
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
-.ad b
-.HP
+.TP
 .ad l
 \fB--noheadings\fP
 .br
+.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--nosuffix\fP
 .br
+.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
+.ad b
 Comma-separated, ordered list of fields to display in columns.
 String arg syntax is: [+|-|#]Field1[,Field2 ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
@@ -339,53 +340,53 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--rows\fP
 .br
-Output columns as rows.
 .ad b
-.HP
+Output columns as rows.
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -394,93 +395,92 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
-String to use to separate each column. Useful if grepping the output.
 .ad b
-.HP
+String to use to separate each column. Useful if grepping the output.
+.TP
 .ad l
 \fB--shared\fP
 .br
+.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
+.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unbuffered\fP
 .br
-Produce output immediately without sorting or aligning the columns properly.
 .ad b
-.HP
+Produce output immediately without sorting or aligning the columns properly.
+.TP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
+.ad b
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unquoted\fP
 .br
+.ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -496,70 +496,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen
index 87af9b925..328e980c0 100644
--- a/man/lvm-lvpoll.8_pregen
+++ b/man/lvm-lvpoll.8_pregen
@@ -104,167 +104,167 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--abort\fP
 .br
-Stop processing a poll operation in lvmpolld.
 .ad b
-.HP
+Stop processing a poll operation in lvmpolld.
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--handlemissingpvs\fP
 .br
+.ad b
 Allows a polling operation to continue when PVs are missing,
 e.g. for repairs due to faulty devices.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-i\fP|\fB--interval\fP \fINumber\fP
 .br
-Report progress at regular intervals.
 .ad b
-.HP
+Report progress at regular intervals.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--polloperation\fP \fBpvmove\fP|\fBconvert\fP|\fBmerge\fP|\fBmerge_thin\fP
 .br
-The command to perform from lvmpolld.
 .ad b
-.HP
+The command to perform from lvmpolld.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -311,70 +311,71 @@ Continue thin snapshot merge.
 .br
 .B lvm lvpoll --polloperation merge_thin vg/thin_snapshot
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen
index afb890cc3..8ddee04a7 100644
--- a/man/lvmconfig.8_pregen
+++ b/man/lvmconfig.8_pregen
@@ -31,7 +31,11 @@ line settings from --config.
 .ad b
 .br
 .ad l
-[    \fB--typeconfig\fP \fBcurrent\fP|\fBdefault\fP|\fBdiff\fP|\fBfull\fP|\fBlist\fP|\fBmissing\fP|\fBnew\fP|\fBprofilable\fP|\fBprofilable-command\fP|\fBprofilable-metadata\fP ]
+[    \fB--typeconfig\fP 
+.nh
+\fBcurrent\fP|\:\fBdefault\fP|\:\fBdiff\fP|\:\fBfull\fP|\:\fBlist\fP|\:\fBmissing\fP|\:\fBnew\fP|\:\fBprofilable\fP|\:\fBprofilable-command\fP|\:\fBprofilable-metadata\fP
+.hy
+]
 .ad b
 .br
 .ad l
@@ -173,10 +177,11 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--atversion\fP \fIString\fP
 .br
+.ad b
 Specify an LVM version in x.y.z format where x is the major version,
 the y is the minor version and z is the patchlevel (e.g. 2.2.106).
 When configuration is displayed, the configuration settings recognized
@@ -184,116 +189,116 @@ at this LVM version will be considered only. This can be used
 to display a configuration that a certain LVM version understands and
 which does not contain any newer settings for which LVM would
 issue a warning message when checking the configuration.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
-Write output to the named file.
 .ad b
-.HP
+Write output to the named file.
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignoreadvanced\fP
 .br
-Exclude advanced configuration settings from the output.
 .ad b
-.HP
+Exclude advanced configuration settings from the output.
+.TP
 .ad l
 \fB--ignorelocal\fP
 .br
+.ad b
 Ignore the local section. The local section should be defined in
 the lvmlocal.conf file, and should contain config settings
 specific to the local host which should not be copied to
 other hosts.
-.ad b
-.HP
+.TP
 .ad l
 \fB--ignoreunsupported\fP
 .br
+.ad b
 Exclude unsupported configuration settings from the output. These settings are
 either used for debugging and development purposes only or their support is not
 yet complete and they are not meant to be used in production. The \fBcurrent\fP
 and \fBdiff\fP types include unsupported settings in their output by default,
 all the other types ignore unsupported settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB-l\fP|\fB--list\fP
 .br
+.ad b
 List config settings with summarizing comment. This is the same as using
 options --typeconfig list --withsummary.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--mergedconfig\fP
 .br
+.ad b
 When the command is run with --config
 and/or --commandprofile (or using LVM_COMMAND_PROFILE
 environment variable), --profile, or --metadataprofile,
@@ -301,78 +306,81 @@ merge all the contents of the "config cascade" before displaying it.
 Without merging, only the configuration at the front of the
 cascade is displayed.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
+.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--showdeprecated\fP
 .br
+.ad b
 Include deprecated configuration settings in the output. These settings
 are deprecated after a certain version. If a concrete version is specified
 with --atversion, deprecated settings are automatically included
 if the specified version is lower than the version in which the settings were
 deprecated. The current and diff types include deprecated settings
 in their output by default, all the other types ignore deprecated settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--showunsupported\fP
 .br
+.ad b
 Include unsupported configuration settings in the output. These settings
 are either used for debugging or development purposes only, or their support
 is not yet complete and they are not meant to be used in production. The
 current and diff types include unsupported settings in their
 output by default, all the other types ignore unsupported settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--sinceversion\fP \fIString\fP
 .br
+.ad b
 Specify an LVM version in x.y.z format where x is the major version,
 the y is the minor version and z is the patchlevel (e.g. 2.2.106).
 This option is currently applicable only with --typeconfig new
 to display all configuration settings introduced since given version.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
-\fB--typeconfig\fP \fBcurrent\fP|\fBdefault\fP|\fBdiff\fP|\fBfull\fP|\fBlist\fP|\fBmissing\fP|\fBnew\fP|\fBprofilable\fP|\fBprofilable-command\fP|\fBprofilable-metadata\fP
+\fB--typeconfig\fP 
+.nh
+\fBcurrent\fP|\:\fBdefault\fP|\:\fBdiff\fP|\:\fBfull\fP|\:\fBlist\fP|\:\fBmissing\fP|\:\fBnew\fP|\:\fBprofilable\fP|\:\fBprofilable-command\fP|\:\fBprofilable-metadata\fP
+.hy
 .br
+.ad b
 \fBcurrent\fP prints the config settings that would be applied
 to an lvm command (assuming the command does not override them
 on the command line.) This includes:
@@ -405,89 +413,88 @@ with their default values.
 \fBprofilable-command\fP prints settings with their default values that can be set from a command profile.
 \fBprofilable-metadata\fP prints settings with their default values that can be set from a metadata profile.
 Also see \fBlvm.conf\fP(5).
-.ad b
-.HP
+.TP
 .ad l
 \fB--unconfigured\fP
 .br
-Internal option used for generating config file during build.
 .ad b
-.HP
+Internal option used for generating config file during build.
+.TP
 .ad l
 \fB--validate\fP
 .br
+.ad b
 Validate current configuration used and exit with appropriate
 return code. The validation is done only for the configuration
@the front of the "config cascade". To validate the whole
 merged configuration tree, also use --mergedconfig.
 The validation is done even if lvm.conf config/checks is disabled.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB--withcomments\fP
 .br
+.ad b
 Display a full comment for each configuration node. For deprecated
 settings, also display comments about deprecation.
-.ad b
-.HP
+.TP
 .ad l
 \fB--withgeneralpreamble\fP
 .br
-Include general config file preamble.
 .ad b
-.HP
+Include general config file preamble.
+.TP
 .ad l
 \fB--withlocalpreamble\fP
 .br
-Include local config file preamble.
 .ad b
-.HP
+Include local config file preamble.
+.TP
 .ad l
 \fB--withspaces\fP
 .br
-Where appropriate, add more spaces in output for better readability.
 .ad b
-.HP
+Where appropriate, add more spaces in output for better readability.
+.TP
 .ad l
 \fB--withsummary\fP
 .br
-Display a one line comment for each configuration node.
 .ad b
-.HP
+Display a one line comment for each configuration node.
+.TP
 .ad l
 \fB--withversions\fP
 .br
+.ad b
 Also display a comment containing the version of introduction for
 each configuration node. If the setting is deprecated, also display
 the version since which it is deprecated.
-.ad b
-.HP
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -503,70 +510,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
index 2922449bf..f576bdea4 100644
--- a/man/lvmdevices.8_pregen
+++ b/man/lvmdevices.8_pregen
@@ -309,166 +309,166 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--adddev\fP \fIPV\fP
 .br
-Add a device to the devices file.
 .ad b
-.HP
+Add a device to the devices file.
+.TP
 .ad l
 \fB--addpvid\fP \fIString\fP
 .br
-Find a device with the PVID and add the device to the devices file.
 .ad b
-.HP
+Find a device with the PVID and add the device to the devices file.
+.TP
 .ad l
 \fB--check\fP
 .br
-Check the content of the devices file.
 .ad b
-.HP
+Check the content of the devices file.
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--deldev\fP \fIPV\fP
 .br
-Remove a device from the devices file.
 .ad b
-.HP
+Remove a device from the devices file.
+.TP
 .ad l
 \fB--delpvid\fP \fIString\fP
 .br
-Remove a device with the PVID from the devices file.
 .ad b
-.HP
+Remove a device with the PVID from the devices file.
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB--update\fP
 .br
-Update the content of the devices file.
 .ad b
-.HP
+Update the content of the devices file.
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -484,70 +484,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen
index d47514027..0fb64dbe3 100644
--- a/man/lvmdiskscan.8_pregen
+++ b/man/lvmdiskscan.8_pregen
@@ -99,147 +99,147 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-l\fP|\fB--lvmpartition\fP
 .br
-Only report PVs.
 .ad b
-.HP
+Only report PVs.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -255,70 +255,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index 4fcc08f99..50c9ae453 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -130,65 +130,66 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-l\fP|\fB--extents\fP [\fB-\fP]\fINumber\fP[PERCENT]
 .br
+.ad b
 Specifies the new size of the LV in logical extents.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -207,91 +208,91 @@ extents in the new LV is not determined until the command has completed.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-n\fP|\fB--nofsck\fP
 .br
+.ad b
 Do not perform fsck before resizing filesystem when filesystem
 requires it. You may need to use --force to proceed with
 this option.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-r\fP|\fB--resizefs\fP
 .br
-Resize underlying filesystem together with the LV using fsadm(8).
 .ad b
-.HP
+Resize underlying filesystem together with the LV using fsadm(8).
+.TP
 .ad l
 \fB-L\fP|\fB--size\fP [\fB-\fP]\fISize\fP[m|UNIT]
 .br
+.ad b
 Specifies the new size of the LV.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -299,49 +300,48 @@ greater when redundant data is needed for RAID levels.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -362,70 +362,71 @@ Reduce the size of an LV by 3 logical extents:
 .br
 .B lvreduce -l -3 vg00/lvol1
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index b53b871cc..ca62d5d65 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -134,139 +134,140 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nohistory\fP
 .br
+.ad b
 Do not record history of LVs being removed.
 This has no effect unless the configuration setting
 metadata/record_lvs_history is enabled.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -275,64 +276,63 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -356,70 +356,71 @@ Remove all LVs the specified VG.
 .br
 .B lvremove vg00
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index 0a468aed3..7a3d78996 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -109,166 +109,166 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -293,70 +293,71 @@ An alternate syntax to rename "lvold" to "lvnew":
 .br
 .B lvrename vg02 lvold lvnew
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index 8c115198a..dfe30ca56 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -11,7 +11,10 @@ lvresize - Resize a logical volume
 .br
 .P
 .ad l
-    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .ad b
 .br
 .ad l
@@ -115,7 +118,10 @@ lvresize - Resize a logical volume
 .ad b
 .br
 .ad l
-    \fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBraid\fP|\fBmirror\fP|\fBthin\fP|\fBthin-pool\fP|\fBvdo\fP|\fBvdo-pool\fP|\fBcache\fP|\fBcache-pool\fP|\fBwritecache\fP
+    \fB--type\fP 
+.nh
+\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+.hy
 .ad b
 .br
 .ad l
@@ -216,7 +222,11 @@ Common options for command:
 .ad b
 .br
 .ad l
-[    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP ]
+[    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
+]
 .ad b
 .br
 .ad l
@@ -232,7 +242,11 @@ Common options for command:
 .ad b
 .br
 .ad l
-[    \fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBraid\fP|\fBmirror\fP|\fBthin\fP|\fBthin-pool\fP|\fBvdo\fP|\fBvdo-pool\fP|\fBcache\fP|\fBcache-pool\fP|\fBwritecache\fP ]
+[    \fB--type\fP 
+.nh
+\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+.hy
+]
 .ad b
 .RE
 
@@ -304,10 +318,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
-\fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+\fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
+.ad b
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -324,66 +342,66 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.ad b
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-l\fP|\fB--extents\fP [\fB+\fP|\fB-\fP]\fINumber\fP[PERCENT]
 .br
+.ad b
 Specifies the new size of the LV in logical extents.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -402,51 +420,51 @@ extents in the new LV is not determined until the command has completed.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-n\fP|\fB--nofsck\fP
 .br
+.ad b
 Do not perform fsck before resizing filesystem when filesystem
 requires it. You may need to use --force to proceed with
 this option.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--nosync\fP
 .br
+.ad b
 Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
 initial synchronization. In case of mirror, raid1 and raid10, any data
 written afterwards will be mirrored, but the original contents will not be
@@ -459,59 +477,59 @@ This option is not valid for raid6, because raid6 relies on proper parity
 to reconstruct proper user date in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
-.ad b
-.HP
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT]
 .br
+.ad b
 Specifies the new size of the pool metadata LV.
 The plus prefix \fB+\fP can be used, in which case
 the value is added to the current size.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-r\fP|\fB--resizefs\fP
 .br
-Resize underlying filesystem together with the LV using fsadm(8).
 .ad b
-.HP
+Resize underlying filesystem together with the LV using fsadm(8).
+.TP
 .ad l
 \fB-L\fP|\fB--size\fP [\fB+\fP|\fB-\fP]\fISize\fP[m|UNIT]
 .br
+.ad b
 Specifies the new size of the LV.
 The --size and --extents options are alternate methods of specifying size.
 The total number of physical extents used will be
@@ -519,11 +537,11 @@ greater when redundant data is needed for RAID levels.
 When the plus \fB+\fP or minus \fB-\fP prefix is used,
 the value is not an absolute size, but is relative and added or subtracted
 from the current size.
-.ad b
-.HP
+.TP
 .ad l
 \fB-i\fP|\fB--stripes\fP \fINumber\fP
 .br
+.ad b
 Specifies the number of stripes in a striped LV. This is the number of
 PVs (devices) that a striped LV is spread across. Data that
 appears sequential in the LV is spread across multiple devices in units of
@@ -536,28 +554,31 @@ when unspecified, the default depends on the RAID type
 (raid0: 2, raid10: 2, raid4/5: 3, raid6: 5.)
 To stripe a new raid LV across all PVs by default,
 see lvm.conf allocation/raid_stripe_all_devices.
-.ad b
-.HP
+.TP
 .ad l
 \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 The amount of data that is written to one device before
 moving to the next in a striped LV.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
-\fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBraid\fP|\fBmirror\fP|\fBthin\fP|\fBthin-pool\fP|\fBvdo\fP|\fBvdo-pool\fP|\fBcache\fP|\fBcache-pool\fP|\fBwritecache\fP
+\fB--type\fP 
+.nh
+\fBlinear\fP|\:\fBstriped\fP|\:\fBsnapshot\fP|\:\fBraid\fP|\:\fBmirror\fP|\:\fBthin\fP|\:\fBthin-pool\fP|\:\fBvdo\fP|\:\fBvdo-pool\fP|\:\fBcache\fP|\:\fBcache-pool\fP|\:\fBwritecache\fP
+.hy
 .br
+.ad b
 The LV type, also known as "segment type" or "segtype".
 See usage descriptions for the specific ways to use these types.
 For more information about redundancy and performance (\fBraid\fP<N>, \fBmirror\fP, \fBstriped\fP, \fBlinear\fP) see \fBlvmraid\fP(7).
@@ -569,37 +590,36 @@ Several commands omit an explicit type option because the type
 is inferred from other options or shortcuts
 (e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache, --vdo).
 Use inferred types with care because it can lead to unexpected results.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
 LV followed by _<type> indicates that an LV of the
 given type is required. (raid represents raid<N> type)
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -609,11 +629,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -634,70 +654,71 @@ Extend an LV by 16MB using specific physical extents:
 .br
 .B lvresize -L+16M vg1/lv1 /dev/sda:0-1 /dev/sdb:0-1
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index 8351aeea2..c45aacc61 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -182,161 +182,162 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--aligned\fP
 .br
-Use with --separator to align the output columns
 .ad b
-.HP
+Use with --separator to align the output columns
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
+.ad b
 Show information about internal LVs.
 These are components of normal LVs, such as mirrors,
 which are not independently accessible, e.g. not mountable.
-.ad b
-.HP
+.TP
 .ad l
 \fB--binary\fP
 .br
+.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-See \fBlvmreport\fP(7).
 .ad b
-.HP
+See \fBlvmreport\fP(7).
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--foreign\fP
 .br
+.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-H\fP|\fB--history\fP
 .br
+.ad b
 Include historical LVs in the output.
 (This has no effect unless LVs were removed while
 lvm.conf metadata/record_lvs_history was enabled.
-.ad b
-.HP
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--logonly\fP
 .br
-Suppress command report and display only log report.
 .ad b
-.HP
+Suppress command report and display only log report.
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nameprefixes\fP
 .br
+.ad b
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
-.ad b
-.HP
+.TP
 .ad l
 \fB--noheadings\fP
 .br
+.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--nosuffix\fP
 .br
+.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
+.ad b
 Comma-separated, ordered list of fields to display in columns.
 String arg syntax is: [+|-|#]Field1[,Field2 ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
@@ -354,59 +355,59 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--rows\fP
 .br
-Output columns as rows.
 .ad b
-.HP
+Output columns as rows.
+.TP
 .ad l
 \fB--segments\fP
 .br
-Use default columns that emphasize segment information.
 .ad b
-.HP
+Use default columns that emphasize segment information.
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -415,103 +416,102 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
-String to use to separate each column. Useful if grepping the output.
 .ad b
-.HP
+String to use to separate each column. Useful if grepping the output.
+.TP
 .ad l
 \fB--shared\fP
 .br
+.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
+.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unbuffered\fP
 .br
-Produce output immediately without sorting or aligning the columns properly.
 .ad b
-.HP
+Produce output immediately without sorting or aligning the columns properly.
+.TP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
+.ad b
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unquoted\fP
 .br
+.ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -609,70 +609,71 @@ Related to writecache logical volumes: (E)rror.
 .IP 10 3
 s(k)ip activation: this volume is flagged to be skipped during activation.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index 03c7806e2..ab3ed3670 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -109,173 +109,173 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
+.ad b
 Show information about internal LVs.
 These are components of normal LVs, such as mirrors,
 which are not independently accessible, e.g. not mountable.
-.ad b
-.HP
+.TP
 .ad l
 \fB-b\fP|\fB--blockdevice\fP
 .br
-No longer used.
 .ad b
-.HP
+No longer used.
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -291,70 +291,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index ccf7a613d..84b4e13e0 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -18,22 +18,14 @@ Change properties of all PVs.
 .P
 \fBpvchange\fP \fB-a\fP|\fB--all\fP
 .RS 4
-( \fB-x\fP|\fB--allocatable\fP \fBy\fP|\fBn\fP,
-.ad b
+( \fB-x\fP|\fB--allocatable\fP \fBy\fP|\fBn\fP
 .br
-.ad l
-  \fB-u\fP|\fB--uuid\fP,
-.ad b
+  \fB-u\fP|\fB--uuid\fP
 .br
-.ad l
-     \fB--addtag\fP \fITag\fP,
-.ad b
+     \fB--addtag\fP \fITag\fP
 .br
-.ad l
-     \fB--deltag\fP \fITag\fP,
-.ad b
+     \fB--deltag\fP \fITag\fP
 .br
-.ad l
      \fB--metadataignore\fP \fBy\fP|\fBn\fP )
 .RE
 .br
@@ -47,22 +39,14 @@ Change properties of specified PVs.
 .P
 \fBpvchange\fP
 .RS 4
-( \fB-x\fP|\fB--allocatable\fP \fBy\fP|\fBn\fP,
-.ad b
+( \fB-x\fP|\fB--allocatable\fP \fBy\fP|\fBn\fP
 .br
-.ad l
-  \fB-u\fP|\fB--uuid\fP,
-.ad b
+  \fB-u\fP|\fB--uuid\fP
 .br
-.ad l
-     \fB--addtag\fP \fITag\fP,
-.ad b
+     \fB--addtag\fP \fITag\fP
 .br
-.ad l
-     \fB--deltag\fP \fITag\fP,
-.ad b
+     \fB--deltag\fP \fITag\fP
 .br
-.ad l
      \fB--metadataignore\fP \fBy\fP|\fBn\fP )
 .RE
 .RS 4
@@ -166,157 +150,158 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--addtag\fP \fITag\fP
 .br
+.ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.ad b
-.HP
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
-Change all visible PVs.
 .ad b
-.HP
+Change all visible PVs.
+.TP
 .ad l
 \fB-x\fP|\fB--allocatable\fP \fBy\fP|\fBn\fP
 .br
-Enable or disable allocation of physical extents on this PV.
 .ad b
-.HP
+Enable or disable allocation of physical extents on this PV.
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--deltag\fP \fITag\fP
 .br
+.ad b
 Deletes a tag from a PV, VG or LV. This option can be repeated to delete
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--metadataignore\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies the metadataignore property of a PV.
 If yes, metadata areas on the PV are ignored, and lvm will
 not store metadata in the metadata areas of the PV.
 If no, lvm will store metadata on the PV.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -325,46 +310,45 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-u\fP|\fB--uuid\fP
 .br
-Generate new random UUID for specified PVs.
 .ad b
-.HP
+Generate new random UUID for specified PVs.
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -374,17 +358,17 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -406,70 +390,71 @@ disk errors, or because it will be removed after freeing it).
 .br
 .B pvchange -x n /dev/sdk1
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen
index 76671a515..8b1493b10 100644
--- a/man/pvck.8_pregen
+++ b/man/pvck.8_pregen
@@ -33,7 +33,10 @@ pvck - Check metadata on physical volumes
 .ad b
 .br
 .ad l
-    \fB--dump\fP \fBheaders\fP|\fBmetadata\fP|\fBmetadata_all\fP|\fBmetadata_search\fP
+    \fB--dump\fP 
+.nh
+\fBheaders\fP|\:\fBmetadata\fP|\:\fBmetadata_all\fP|\:\fBmetadata_search\fP
+.hy
 .ad b
 .br
 .ad l
@@ -252,7 +255,11 @@ Check for metadata on a device
 Check and print LVM headers and metadata on a device
 .br
 .P
-\fBpvck\fP \fB--dump\fP \fBheaders\fP|\fBmetadata\fP|\fBmetadata_all\fP|\fBmetadata_search\fP \fIPV\fP
+\fBpvck\fP \fB--dump\fP 
+.nh
+\fBheaders\fP|\:\fBmetadata\fP|\:\fBmetadata_all\fP|\:\fBmetadata_search\fP
+.hy 
+\fIPV\fP
 .br
 .RS 4
 .ad l
@@ -382,58 +389,62 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
-\fB--dump\fP \fBheaders\fP|\fBmetadata\fP|\fBmetadata_all\fP|\fBmetadata_search\fP
+\fB--dump\fP 
+.nh
+\fBheaders\fP|\:\fBmetadata\fP|\:\fBmetadata_all\fP|\:\fBmetadata_search\fP
+.hy
 .br
+.ad b
 Dump headers and metadata from a PV for debugging and repair.
 Option values include: \fBheaders\fP to print and check LVM headers,
 \fBmetadata\fP to print or save the current text metadata,
@@ -441,58 +452,58 @@ Option values include: \fBheaders\fP to print and check LVM headers,
 \fBmetadata_search\fP to list or save all versions of metadata,
 searching standard locations in case of damaged headers,
 \fBmetadata_area\fP to save an entire text metadata area to a file.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
-Metadata file to read or write.
 .ad b
-.HP
+Metadata file to read or write.
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--labelsector\fP \fINumber\fP
 .br
+.ad b
 By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB--[pv]metadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
+.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -500,67 +511,66 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--repair\fP
 .br
-Repair headers and metadata on a PV.
 .ad b
-.HP
+Repair headers and metadata on a PV.
+.TP
 .ad l
 \fB--repairtype\fP \fBpv_header\fP|\fBmetadata\fP|\fBlabel_header\fP
 .br
-Repair headers and metadata on a PV. See command description.
 .ad b
-.HP
+Repair headers and metadata on a PV. See command description.
+.TP
 .ad l
 \fB--settings\fP \fIString\fP
 .br
+.ad b
 Specifies command specific settings in "Key = Value" form.
 Combine multiple settings in quotes, or repeat the settings
 option for each.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -570,11 +580,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -598,70 +608,71 @@ parameter with a value of 204800 (100 * 1024 * 1024 / 512 = 204800).
 .br
 .B pvck --labelsector 204800 /dev/sda
 .SH SEE ALSO
-
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
-
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
-
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
-
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
-
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
-
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
+
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
+
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
+
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
+
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
+
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
+
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index 0df67bd5d..52ad1d5ee 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -222,10 +222,11 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--bootloaderareasize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 Reserve space for the bootloader between the LVM metadata area and the first PE.
 The bootloader area is reserved for bootloaders to embed their own data or
 metadata; LVM will not use it.
@@ -237,154 +238,154 @@ and --dataalignmentoffset. The bootloader area may be larger than requested
 due to the alignment, but it's never less than the requested size.
 To see the bootloader area start and size of
 an existing PV use pvs -o +pv_ba_start,pv_ba_size.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--dataalignment\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 Align the start of a PV data area with a multiple of this number.
 To see the location of the first Physical Extent (PE) of an existing PV,
 use pvs -o +pe_start. In addition, it may be shifted by an alignment offset,
 see --dataalignmentoffset.
 Also specify an appropriate PE size when creating a VG.
-.ad b
-.HP
+.TP
 .ad l
 \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT]
 .br
-Shift the start of the PV data area by this additional offset.
 .ad b
-.HP
+Shift the start of the PV data area by this additional offset.
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--labelsector\fP \fINumber\fP
 .br
+.ad b
 By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--metadataignore\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies the metadataignore property of a PV.
 If yes, metadata areas on the PV are ignored, and lvm will
 not store metadata in the metadata areas of the PV.
 If no, lvm will store metadata on the PV.
-.ad b
-.HP
+.TP
 .ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
-.ad b
-.HP
+.TP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
+.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--norestorefile\fP
 .br
+.ad b
 In conjunction with --uuid, this allows a uuid to be specified
 without also requiring that a backup of the metadata be provided.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB--[pv]metadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
+.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -392,29 +393,29 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--restorefile\fP \fIString\fP
 .br
+.ad b
 In conjunction with --uuid, this reads the file (produced by
 vgcfgbackup), extracts the location and size of the data on the PV,
 and ensures that the metadata produced by the program is consistent
@@ -422,28 +423,28 @@ with the contents of the file, i.e. the physical extents will be in
 the same place and not be overwritten by new metadata. This provides
 a mechanism to upgrade the metadata format or to add/remove metadata
 areas. Use with care.
-.ad b
-.HP
+.TP
 .ad l
 \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 Overrides the automatically detected size of the PV.
 Use with care, or prior to reducing the physical size of the device.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-u\fP|\fB--uuid\fP \fIString\fP
 .br
+.ad b
 Specify a UUID for the device.
 Without this option, a random UUID is generated.
 This option is needed before restoring a backup of LVM metadata
@@ -452,38 +453,37 @@ onto a replacement device; see \fBvgcfgrestore\fP(8). As such, use of
 All PVs must have unique UUIDs, and LVM will prevent certain operations
 if multiple devices are seen with the same UUID.
 See \fBvgimportclone\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls if the first 4 sectors (2048 bytes) of the device are wiped.
 The default is to wipe these sectors unless either or both of
 --restorefile or --uuid are specified.
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -493,11 +493,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -525,70 +525,71 @@ boundary) manually account for this when initializing for use by LVM.
 .br
 .B pvcreate --dataalignmentoffset 7s /dev/sdb
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index b560f9de2..1aebef484 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -182,164 +182,165 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--aligned\fP
 .br
-Use with --separator to align the output columns
 .ad b
-.HP
+Use with --separator to align the output columns
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
+.ad b
 Show information about devices that have not been initialized
 by LVM, i.e. they are not PVs.
-.ad b
-.HP
+.TP
 .ad l
 \fB--binary\fP
 .br
+.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.ad b
-.HP
+.TP
 .ad l
 \fB-c\fP|\fB--colon\fP
 .br
+.ad b
 Generate colon separated output for easier parsing in scripts or programs.
 Also see \fBvgs\fP(8) which provides considerably more control over the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB-C\fP|\fB--columns\fP
 .br
+.ad b
 Display output in columns, the equivalent of \fBvgs\fP(8).
 Options listed are the same as options given in \fBvgs\fP(8).
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-See \fBlvmreport\fP(7).
 .ad b
-.HP
+See \fBlvmreport\fP(7).
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--foreign\fP
 .br
+.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--logonly\fP
 .br
-Suppress command report and display only log report.
 .ad b
-.HP
+Suppress command report and display only log report.
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-m\fP|\fB--maps\fP
 .br
-Display the mapping of physical extents to LVs and logical extents.
 .ad b
-.HP
+Display the mapping of physical extents to LVs and logical extents.
+.TP
 .ad l
 \fB--noheadings\fP
 .br
+.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--nosuffix\fP
 .br
+.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
+.ad b
 Comma-separated, ordered list of fields to display in columns.
 String arg syntax is: [+|-|#]Field1[,Field2 ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
@@ -357,47 +358,47 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -406,84 +407,83 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
-String to use to separate each column. Useful if grepping the output.
 .ad b
-.HP
+String to use to separate each column. Useful if grepping the output.
+.TP
 .ad l
 \fB--shared\fP
 .br
+.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-s\fP|\fB--short\fP
 .br
-Only display the size of the given PVs.
 .ad b
-.HP
+Only display the size of the given PVs.
+.TP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
+.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unbuffered\fP
 .br
-Produce output immediately without sorting or aligning the columns properly.
 .ad b
-.HP
+Produce output immediately without sorting or aligning the columns properly.
+.TP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
+.ad b
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -493,16 +493,16 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -518,70 +518,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index a370e75ba..a9fab6eac 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -41,7 +41,11 @@ Move PV extents.
 .ad b
 .br
 .ad l
-[    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP ]
+[    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
+]
 .ad b
 .br
 .ad l
@@ -157,19 +161,23 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--abort\fP
 .br
+.ad b
 Abort any pvmove operations in progress. If a pvmove was started
 with the --atomic option, then all LVs will remain on the source PV.
 Otherwise, segments that have been moved will remain on the
 destination PV, while unmoved segments will remain on the source PV.
-.ad b
-.HP
+.TP
 .ad l
-\fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+\fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
+.ad b
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -186,181 +194,180 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.ad b
-.HP
+.TP
 .ad l
 \fB--atomic\fP
 .br
+.ad b
 Makes a pvmove operation atomic, ensuring that all affected LVs are
 moved to the destination PV, or none are if the operation is aborted.
-.ad b
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-b\fP|\fB--background\fP
 .br
+.ad b
 If the operation requires polling, this option causes the command to
 return before the operation is complete, and polling is done in the
 background.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-i\fP|\fB--interval\fP \fINumber\fP
 .br
-Report progress at regular intervals.
 .ad b
-.HP
+Report progress at regular intervals.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
-Move only the extents belonging to the named LV.
 .ad b
-.HP
+Move only the extents belonging to the named LV.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -370,11 +377,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -481,70 +488,71 @@ extents can also be picked out and moved.
 .br
 .B pvmove -n lvol1 /dev/sdb1:1000-1999 /dev/sdc1
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index 802e1d4a1..36577aff2 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -99,144 +99,144 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -246,11 +246,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -266,70 +266,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index 01cbc099f..bb3ab4cb2 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -94,144 +94,144 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--setphysicalvolumesize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 Overrides the automatically detected size of the PV.
 Use with care, or prior to reducing the physical size of the device.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -241,11 +241,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -273,70 +273,71 @@ appropriate for the intended new partition size).
 .br
 .B pvresize --setphysicalvolumesize 40G /dev/sda1
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index cb43845d2..12160af0d 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -178,152 +178,153 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--aligned\fP
 .br
-Use with --separator to align the output columns
 .ad b
-.HP
+Use with --separator to align the output columns
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
+.ad b
 Show information about devices that have not been initialized
 by LVM, i.e. they are not PVs.
-.ad b
-.HP
+.TP
 .ad l
 \fB--binary\fP
 .br
+.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-See \fBlvmreport\fP(7).
 .ad b
-.HP
+See \fBlvmreport\fP(7).
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--foreign\fP
 .br
+.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--logonly\fP
 .br
-Suppress command report and display only log report.
 .ad b
-.HP
+Suppress command report and display only log report.
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nameprefixes\fP
 .br
+.ad b
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
-.ad b
-.HP
+.TP
 .ad l
 \fB--noheadings\fP
 .br
+.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--nosuffix\fP
 .br
+.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
+.ad b
 Comma-separated, ordered list of fields to display in columns.
 String arg syntax is: [+|-|#]Field1[,Field2 ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
@@ -341,61 +342,61 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--rows\fP
 .br
-Output columns as rows.
 .ad b
-.HP
+Output columns as rows.
+.TP
 .ad l
 \fB--segments\fP
 .br
+.ad b
 Produces one line of output for each contiguous allocation of space on each
 PV, showing the start (pvseg_start) and length (pvseg_size) in units of
 physical extents.
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -404,85 +405,84 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
-String to use to separate each column. Useful if grepping the output.
 .ad b
-.HP
+String to use to separate each column. Useful if grepping the output.
+.TP
 .ad l
 \fB--shared\fP
 .br
+.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
+.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unbuffered\fP
 .br
-Produce output immediately without sorting or aligning the columns properly.
 .ad b
-.HP
+Produce output immediately without sorting or aligning the columns properly.
+.TP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
+.ad b
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unquoted\fP
 .br
+.ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -492,16 +492,16 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -526,70 +526,71 @@ e(x)ported
 .IP 3 3
 (m)issing
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index b604f9328..644c6a2fc 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -206,202 +206,202 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
+.ad b
 Auto-activate LVs in a VG when the PVs scanned have completed the VG.
 (Only \fBay\fP is applicable.)
-.ad b
-.HP
+.TP
 .ad l
 \fB--cache\fP
 .br
-Scan one or more devices and record that they are online.
 .ad b
-.HP
+Scan one or more devices and record that they are online.
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-e\fP|\fB--exported\fP
 .br
-Only show PVs belonging to exported VGs.
 .ad b
-.HP
+Only show PVs belonging to exported VGs.
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-j\fP|\fB--major\fP \fINumber\fP
 .br
-The major number of a device.
 .ad b
-.HP
+The major number of a device.
+.TP
 .ad l
 \fB--minor\fP \fINumber\fP
 .br
-The minor number of a device.
 .ad b
-.HP
+The minor number of a device.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB-n\fP|\fB--novolumegroup\fP
 .br
-Only show PVs not belonging to any VG.
 .ad b
-.HP
+Only show PVs not belonging to any VG.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-s\fP|\fB--short\fP
 .br
-Short listing format.
 .ad b
-.HP
+Short listing format.
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-u\fP|\fB--uuid\fP
 .br
-Show UUIDs in addition to device names.
 .ad b
-.HP
+Show UUIDs in addition to device names.
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -411,11 +411,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -431,70 +431,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index 8f662a7ad..5d359146a 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -125,178 +125,178 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
+.ad b
 Write the backup to the named file.
 When backing up more than one VG, the file name is
 treated as a template, and %s is replaced by the VG name.
-.ad b
-.HP
+.TP
 .ad l
 \fB--foreign\fP
 .br
+.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -312,70 +312,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen
index 43d863541..eb1564f70 100644
--- a/man/vgcfgrestore.8_pregen
+++ b/man/vgcfgrestore.8_pregen
@@ -229,166 +229,166 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--file\fP \fIString\fP
 .br
+.ad b
 Read metadata backup from the named file.
 Usually this file was created by vgcfgbackup.
-.ad b
-.HP
+.TP
 .ad l
 \fB--force\fP ...
 .br
+.ad b
 Force metadata restore even with thin pool LVs.
 Use with extreme caution. Most changes to thin metadata
 cannot be reverted.
 You may lose data if you restore metadata that does not match the
 thin pool kernel metadata precisely.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-l\fP|\fB--list\fP
 .br
+.ad b
 List metadata backup and archive files pertaining to the VG.
 May be used with --file. Does not restore the VG.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
+.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -413,70 +413,71 @@ arguments as appropriate) to initialise it with the same UUID as the
 missing PV. Repeat for all other missing PVs in the VG.  Then use
 \fBvgcfgrestore --file filename\fP to restore the VG's metadata.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 04cc23b8b..c5af0de36 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -23,7 +23,10 @@ vgchange - Change volume group attributes
 .ad b
 .br
 .ad l
-    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .ad b
 .br
 .ad l
@@ -170,6 +173,10 @@ vgchange - Change volume group attributes
  \fB-S\fP|\fB--select\fP \fIString\fP
 .ad b
 .br
+.ad l
+    \fB--setautoactivation\fP \fBy\fP|\fBn\fP
+.ad b
+.br
 .ad l
     \fB--sysinit\fP
 .ad b
@@ -214,55 +221,36 @@ required, after which the others are optional.
 .P
 \fBvgchange\fP
 .RS 4
-( \fB-l\fP|\fB--logicalvolume\fP \fINumber\fP,
-.ad b
+( \fB-l\fP|\fB--logicalvolume\fP \fINumber\fP
 .br
-.ad l
-  \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP,
-.ad b
+  \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
-.ad l
-  \fB-u\fP|\fB--uuid\fP,
-.ad b
+  \fB-u\fP|\fB--uuid\fP
 .br
-.ad l
-  \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT],
-.ad b
+  \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT]
 .br
-.ad l
-  \fB-x\fP|\fB--resizeable\fP \fBy\fP|\fBn\fP,
-.ad b
+  \fB-x\fP|\fB--resizeable\fP \fBy\fP|\fBn\fP
 .br
-.ad l
-     \fB--addtag\fP \fITag\fP,
-.ad b
+     \fB--addtag\fP \fITag\fP
 .br
-.ad l
-     \fB--deltag\fP \fITag\fP,
-.ad b
+     \fB--deltag\fP \fITag\fP
 .br
-.ad l
-     \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP,
-.ad b
+     \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
-.ad l
-     \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP,
-.ad b
+     \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
-.ad l
-     \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP,
-.ad b
+     \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
-.ad l
-     \fB--profile\fP \fIString\fP,
-.ad b
+     \fB--profile\fP \fIString\fP
 .br
-.ad l
-     \fB--detachprofile\fP,
-.ad b
+     \fB--detachprofile\fP
 .br
-.ad l
-     \fB--metadataprofile\fP \fIString\fP )
+     \fB--metadataprofile\fP \fIString\fP
+.br
+     \fB--setautoactivation\fP \fBy\fP|\fBn\fP )
 .RE
 .br
 .RS 4
@@ -645,10 +633,11 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-a\fP|\fB--activate\fP \fBy\fP|\fBn\fP|\fBay\fP
 .br
+.ad b
 Change the active state of LVs.
 An active LV can be used through a block device,
 allowing data on the LV to be accessed.
@@ -661,18 +650,23 @@ All software and scripts should access the device through the symbolic
 link and present this as the name of the device.
 The location and name of the underlying device node may depend on
 the distribution, configuration (e.g. udev), or release version.
-\fBay\fP specifies autoactivation, in which case an LV is activated
-only if it matches an item in lvm.conf activation/auto_activation_volume_list.
-If the list is not set, all LVs are considered to match, and if
-if the list is set but empty, no LVs match.
-Autoactivation should be used during system boot to make it possible
-to select which LVs should be automatically activated by the system.
+\fBay\fP specifies autoactivation, which is used by system-generated
+activation commands.  By default, LVs are autoactivated.
+An autoactivation property can be set on a VG or LV to disable autoactivation,
+see --setautoactivation y|n in vgchange, lvchange, vgcreate, and lvcreate.
+Display the property with vgs or lvs "-o autoactivation".
+The lvm.conf auto_activation_volume_list includes names of VGs or LVs
+that should be autoactivated, and anything not listed is not autoactivated.
+When auto_activation_volume_list is undefined (the default), it has no effect.
+If auto_activation_volume_list is defined and empty, no LVs are autoactivated.
+Items included by auto_activation_volume_list will not be autoactivated if
+the autoactivation property has been disabled.
 See \fBlvmlockd\fP(8) for more information about activation options \fBey\fP and \fBsy\fP for shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB--activationmode\fP \fBpartial\fP|\fBdegraded\fP|\fBcomplete\fP
 .br
+.ad b
 Determines if LV activation is allowed when PVs are missing,
 e.g. because of a device failure.
 \fBcomplete\fP only allows LVs with no missing PVs to be activated,
@@ -683,18 +677,21 @@ and is the most restrictive mode.
 should only be used for recovery or repair.
 For default, see lvm.conf/activation_mode.
 See \fBlvmraid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--addtag\fP \fITag\fP
 .br
+.ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.ad b
-.HP
+.TP
 .ad l
-\fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+\fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
+.ad b
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -711,205 +708,205 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.ad b
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--deltag\fP \fITag\fP
 .br
+.ad b
 Deletes a tag from a PV, VG or LV. This option can be repeated to delete
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.ad b
-.HP
+.TP
 .ad l
 \fB--detachprofile\fP
 .br
+.ad b
 Detaches a metadata profile from a VG or LV.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-K\fP|\fB--ignoreactivationskip\fP
 .br
+.ad b
 Ignore the "activation skip" LV flag during activation
 to allow LVs with the flag set to be activated.
-.ad b
-.HP
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--ignoremonitoring\fP
 .br
+.ad b
 Do not interact with dmeventd unless --monitor is specified.
 Do not use this if dmeventd is already monitoring a device.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockstart\fP
 .br
+.ad b
 Start the lockspace of a shared VG in lvmlockd.
 lvmlockd locks becomes available for the VG, allowing LVM to use the VG.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockstop\fP
 .br
+.ad b
 Stop the lockspace of a shared VG in lvmlockd.
 lvmlockd locks become unavailable for the VG, preventing LVM from using the VG.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--locktype\fP \fBsanlock\fP|\fBdlm\fP|\fBnone\fP
 .br
+.ad b
 Change the VG lock type to or from a shared lock type used with lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-l\fP|\fB--logicalvolume\fP \fINumber\fP
 .br
-Sets the maximum number of LVs allowed in a VG.
 .ad b
-.HP
+Sets the maximum number of LVs allowed in a VG.
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
+.ad b
 Sets the maximum number of PVs that can belong to the VG.
 The value 0 removes any limitation.
 For large numbers of PVs, also see options --pvmetadatacopies,
 and --vgmetadatacopies for improving performance.
-.ad b
-.HP
+.TP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
+.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--monitor\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Start (yes) or stop (no) monitoring an LV with dmeventd.
 dmeventd monitors kernel events for an LV, and performs
 automated maintenance for the LV in reponse to specific events.
 See \fBdmeventd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB-P\fP|\fB--partial\fP
 .br
+.ad b
 Commands will do their best to activate LVs with missing PV extents.
 Missing extents may be replaced with error or zero segments
 according to the lvm.conf missing_stripe_filler setting.
 Metadata may not be changed with this option.
-.ad b
-.HP
+.TP
 .ad l
 \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 Sets the physical extent size of PVs in the VG.
 The value must be either a power of 2 of at least 1 sector
 (where the sector size is the largest sector size of the PVs
@@ -919,11 +916,11 @@ without recreating the VG, unless no extents need moving.
 Before increasing the physical extent size, you might need to use lvresize,
 pvresize and/or pvmove so that everything fits. For example, every
 contiguous range of extents used in a LV must start and end on an extent boundary.
-.ad b
-.HP
+.TP
 .ad l
 \fB--poll\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 When yes, start the background transformation of an LV.
 An incomplete transformation, e.g. pvmove or lvconvert interrupted
 by reboot or crash, can be restarted from the last checkpoint with --poll y.
@@ -931,18 +928,18 @@ When no, background transformation of an LV will not occur, and the
 transformation will not complete. It may not be appropriate to immediately
 poll an LV after activation, in which case --poll n can be used to defer
 polling until a later --poll y command.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
+.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -950,56 +947,56 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--refresh\fP
 .br
+.ad b
 If the LV is active, reload its metadata.
 This is not necessary in normal operation, but may be useful
 if something has gone wrong, or if some form of manual LV
 sharing is being used.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-x\fP|\fB--resizeable\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Enables or disables the addition or removal of PVs to/from a VG
 (by vgextend/vgreduce).
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -1008,11 +1005,25 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
+.TP
+.ad l
+\fB--setautoactivation\fP \fBy\fP|\fBn\fP
+.br
 .ad b
-.HP
+Set the autoactivation property on a VG or LV.
+Display the property with vgs or lvs "-o autoactivation".
+When the autoactivation property is disabled, the VG or LV
+will not be activated by a command doing autoactivation
+(vgchange, lvchange, or pvscan using -aay.)
+If autoactivation is disabled on a VG, no LVs will be autoactivated
+in that VG, and the LV autoactivation property has no effect.
+If autoactivation is enabled on a VG, autoactivation can be disabled
+for individual LVs.
+.TP
 .ad l
 \fB--sysinit\fP
 .br
+.ad b
 Indicates that vgchange/lvchange is being invoked from early system initialisation
 scripts (e.g. rc.sysinit or an initrd), before writable filesystems are
 available. As such, some functionality needs to be disabled and this option
@@ -1020,49 +1031,49 @@ acts as a shortcut which selects an appropriate set of options. Currently,
 this is equivalent to using --ignorelockingfailure, --ignoremonitoring,
 --poll n, and setting env var LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES.
 vgchange/lvchange skip autoactivation, and defer to pvscan autoactivation.
-.ad b
-.HP
+.TP
 .ad l
 \fB--systemid\fP \fIString\fP
 .br
+.ad b
 Changes the system ID of the VG.  Using this option requires caution
 because the VG may become foreign to the host running the command,
 leaving the host unable to access it.
 See \fBlvmsystemid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-u\fP|\fB--uuid\fP
 .br
-Generate new random UUID for specified VGs.
 .ad b
-.HP
+Generate new random UUID for specified VGs.
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
+.ad b
 Number of copies of the VG metadata that are kept.
 VG metadata is kept in VG metadata areas on PVs in the VG,
 i.e. reserved space at the start and/or end of the PVs.
@@ -1076,36 +1087,35 @@ The number can also be replaced with special string values:
 metadataignore flags.
 \fBall\fP causes LVM to first clear the metadataignore flags on
 all PVs, and then to become unmanaged.
-.ad b
-.HP
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -1133,70 +1143,71 @@ Change the maximum number of LVs for an inactive VG.
 .br
 .B vgchange -l 128 vg00
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index 13f7a1eb9..7682431ff 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -112,118 +112,119 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB--updatemetadata\fP
 .br
+.ad b
 Update VG metadata to correct problems.
 If VG metadata was updated while a PV was missing, and the PV
 reappears with an old version of metadata, then this option
@@ -234,43 +235,42 @@ this option will clear the outdated metadata from the previously
 missing PV. If metadata text is damaged on one PV, using this
 option will replace the damaged metadata text. For more severe
 damage, e.g. with headers, see \fBpvck\fP(8).
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -286,70 +286,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index ab7c083e9..2f2ba8b75 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -115,10 +115,11 @@ Common options for lvm:
 .RE
 
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--bootloaderareasize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 Reserve space for the bootloader between the LVM metadata area and the first PE.
 The bootloader area is reserved for bootloaders to embed their own data or
 metadata; LVM will not use it.
@@ -130,122 +131,122 @@ and --dataalignmentoffset. The bootloader area may be larger than requested
 due to the alignment, but it's never less than the requested size.
 To see the bootloader area start and size of
 an existing PV use pvs -o +pv_ba_start,pv_ba_size.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--labelsector\fP \fINumber\fP
 .br
+.ad b
 By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
-.ad b
-.HP
+.TP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
+.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
+.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -253,66 +254,65 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -329,70 +329,71 @@ See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index 0b7802ed7..61823d579 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -59,7 +59,11 @@ device.
 .ad b
 .br
 .ad l
-[    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP ]
+[    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
+]
 .ad b
 .br
 .ad l
@@ -106,6 +110,10 @@ device.
 [    \fB--locktype\fP \fBsanlock\fP|\fBdlm\fP|\fBnone\fP ]
 .ad b
 .br
+.ad l
+[    \fB--setautoactivation\fP \fBy\fP|\fBn\fP ]
+.ad b
+.br
 [ COMMON_OPTIONS ]
 .RE
 .br
@@ -178,17 +186,21 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--addtag\fP \fITag\fP
 .br
+.ad b
 Adds a tag to a PV, VG or LV. This option can be repeated to add
 multiple tags at once. See \fBlvm\fP(8) for information about tags.
-.ad b
-.HP
+.TP
 .ad l
-\fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+\fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
+.ad b
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -205,192 +217,192 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.ad b
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 This option was specific to clvm and is now replaced by
 the --shared option with \fBlvmlockd\fP(8).
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--dataalignment\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 Align the start of a PV data area with a multiple of this number.
 To see the location of the first Physical Extent (PE) of an existing PV,
 use pvs -o +pe_start. In addition, it may be shifted by an alignment offset,
 see --dataalignmentoffset.
 Also specify an appropriate PE size when creating a VG.
-.ad b
-.HP
+.TP
 .ad l
 \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT]
 .br
-Shift the start of the PV data area by this additional offset.
 .ad b
-.HP
+Shift the start of the PV data area by this additional offset.
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--labelsector\fP \fINumber\fP
 .br
+.ad b
 By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--locktype\fP \fBsanlock\fP|\fBdlm\fP|\fBnone\fP
 .br
+.ad b
 Specify the VG lock type directly in place of using --shared.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-l\fP|\fB--maxlogicalvolumes\fP \fINumber\fP
 .br
-Sets the maximum number of LVs allowed in a VG.
 .ad b
-.HP
+Sets the maximum number of LVs allowed in a VG.
+.TP
 .ad l
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
+.ad b
 Sets the maximum number of PVs that can belong to the VG.
 The value 0 removes any limitation.
 For large numbers of PVs, also see options --pvmetadatacopies,
 and --vgmetadatacopies for improving performance.
-.ad b
-.HP
+.TP
 .ad l
 \fB--metadataprofile\fP \fIString\fP
 .br
+.ad b
 The metadata profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
-.ad b
-.HP
+.TP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
+.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 Sets the physical extent size of PVs in the VG.
 The value must be either a power of 2 of at least 1 sector
 (where the sector size is the largest sector size of the PVs
 currently used in the VG), or at least 128KiB.
 Once this value has been set, it is difficult to change
 without recreating the VG, unless no extents need moving.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
+.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -398,39 +410,53 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
+.TP
+.ad l
+\fB--setautoactivation\fP \fBy\fP|\fBn\fP
+.br
 .ad b
-.HP
+Set the autoactivation property on a VG or LV.
+Display the property with vgs or lvs "-o autoactivation".
+When the autoactivation property is disabled, the VG or LV
+will not be activated by a command doing autoactivation
+(vgchange, lvchange, or pvscan using -aay.)
+If autoactivation is disabled on a VG, no LVs will be autoactivated
+in that VG, and the LV autoactivation property has no effect.
+If autoactivation is enabled on a VG, autoactivation can be disabled
+for individual LVs.
+.TP
 .ad l
 \fB--shared\fP
 .br
+.ad b
 Create a shared VG using lvmlockd if LVM is compiled with lockd support.
 lvmlockd will select lock type sanlock or dlm depending on which lock
 manager is running. This allows multiple hosts to share a VG on shared
 devices. lvmlockd and a lock manager must be configured and running.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB--systemid\fP \fIString\fP
 .br
+.ad b
 Specifies the system ID that will be given to the new VG, overriding the
 system ID of the host running the command. A VG is normally created
 without this option, in which case the new VG is given the system ID of
@@ -438,34 +464,34 @@ the host creating it. Using this option requires caution because the
 system ID of the new VG may not match the system ID of the host running
 the command, leaving the VG inaccessible to the host.
 See \fBlvmsystemid\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
+.ad b
 Number of copies of the VG metadata that are kept.
 VG metadata is kept in VG metadata areas on PVs in the VG,
 i.e. reserved space at the start and/or end of the PVs.
@@ -479,29 +505,28 @@ The number can also be replaced with special string values:
 metadataignore flags.
 \fBall\fP causes LVM to first clear the metadataignore flags on
 all PVs, and then to become unmanaged.
-.ad b
-.HP
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls if the first 4 sectors (2048 bytes) of the device are wiped.
 The default is to wipe these sectors unless either or both of
 --restorefile or --uuid are specified.
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -511,11 +536,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -536,70 +561,71 @@ Create a VG with two PVs, using the default physical extent size.
 .br
 .B vgcreate myvg /dev/sdk1 /dev/sdl1
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index 559d64c25..1684a68ba 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -177,158 +177,159 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--activevolumegroups\fP
 .br
+.ad b
 Only select active VGs. The VG is considered active
 if at least one of its LVs is active.
-.ad b
-.HP
+.TP
 .ad l
 \fB--aligned\fP
 .br
-Use with --separator to align the output columns
 .ad b
-.HP
+Use with --separator to align the output columns
+.TP
 .ad l
 \fB--binary\fP
 .br
+.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.ad b
-.HP
+.TP
 .ad l
 \fB-c\fP|\fB--colon\fP
 .br
+.ad b
 Generate colon separated output for easier parsing in scripts or programs.
 Also see \fBvgs\fP(8) which provides considerably more control over the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB-C\fP|\fB--columns\fP
 .br
+.ad b
 Display output in columns, the equivalent of \fBvgs\fP(8).
 Options listed are the same as options given in \fBvgs\fP(8).
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-See \fBlvmreport\fP(7).
 .ad b
-.HP
+See \fBlvmreport\fP(7).
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--foreign\fP
 .br
+.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--logonly\fP
 .br
-Suppress command report and display only log report.
 .ad b
-.HP
+Suppress command report and display only log report.
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--noheadings\fP
 .br
+.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--nosuffix\fP
 .br
+.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
+.ad b
 Comma-separated, ordered list of fields to display in columns.
 String arg syntax is: [+|-|#]Field1[,Field2 ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
@@ -346,47 +347,47 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -395,97 +396,96 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
-String to use to separate each column. Useful if grepping the output.
 .ad b
-.HP
+String to use to separate each column. Useful if grepping the output.
+.TP
 .ad l
 \fB--shared\fP
 .br
+.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-s\fP|\fB--short\fP
 .br
-Give a short listing showing the existence of VGs.
 .ad b
-.HP
+Give a short listing showing the existence of VGs.
+.TP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
+.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unbuffered\fP
 .br
-Produce output immediately without sorting or aligning the columns properly.
 .ad b
-.HP
+Produce output immediately without sorting or aligning the columns properly.
+.TP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
+.ad b
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -501,70 +501,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index e88d91922..eb10961ce 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -128,113 +128,114 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -243,59 +244,58 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -311,70 +311,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index 1aef95d6e..e82cdb4e8 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -143,153 +143,154 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--dataalignment\fP \fISize\fP[k|UNIT]
 .br
+.ad b
 Align the start of a PV data area with a multiple of this number.
 To see the location of the first Physical Extent (PE) of an existing PV,
 use pvs -o +pe_start. In addition, it may be shifted by an alignment offset,
 see --dataalignmentoffset.
 Also specify an appropriate PE size when creating a VG.
-.ad b
-.HP
+.TP
 .ad l
 \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT]
 .br
-Shift the start of the PV data area by this additional offset.
 .ad b
-.HP
+Shift the start of the PV data area by this additional offset.
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--labelsector\fP \fINumber\fP
 .br
+.ad b
 By default the PV is labelled with an LVM2 identifier in its second
 sector (sector 1). This lets you use a different sector near the
 start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
 in the source). Use with care.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--metadataignore\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies the metadataignore property of a PV.
 If yes, metadata areas on the PV are ignored, and lvm will
 not store metadata in the metadata areas of the PV.
 If no, lvm will store metadata on the PV.
-.ad b
-.HP
+.TP
 .ad l
 \fB--metadatasize\fP \fISize\fP[m|UNIT]
 .br
+.ad b
 The approximate amount of space used for each VG metadata area.
 The size may be rounded.
-.ad b
-.HP
+.TP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
+.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB--pvmetadatacopies\fP \fB0\fP|\fB1\fP|\fB2\fP
 .br
+.ad b
 The number of metadata areas to set aside on a PV for storing VG metadata.
 When 2, one copy of the VG metadata is stored at the front of the PV
 and a second copy is stored at the end.
@@ -297,77 +298,76 @@ When 1, one copy of the VG metadata is stored at the front of the PV.
 When 0, no copies of the VG metadata are stored on the given PV.
 This may be useful in VGs containing many PVs (this places limitations
 on the ability to use vgsplit later.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--restoremissing\fP
 .br
+.ad b
 Add a PV back into a VG after the PV was missing and then returned,
 e.g. due to a transient failure. The PV is not reinitialized.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
-.HP
+.TP
 .ad l
 \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Controls if the first 4 sectors (2048 bytes) of the device are wiped.
 The default is to wipe these sectors unless either or both of
 --restorefile or --uuid are specified.
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -377,11 +377,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -402,70 +402,71 @@ Add two PVs to a VG.
 .br
 .B vgextend vg00 /dev/sda4 /dev/sdn1
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index 2592fb4d9..b119a4e15 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -118,121 +118,122 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
-Import all visible VGs.
 .ad b
-.HP
+Import all visible VGs.
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -241,59 +242,58 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -309,70 +309,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen
index 8e0144655..42dfa3487 100644
--- a/man/vgimportclone.8_pregen
+++ b/man/vgimportclone.8_pregen
@@ -102,149 +102,149 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-n\fP|\fB--basevgname\fP \fIString\fP
 .br
+.ad b
 By default the snapshot VG will be renamed to the original name plus a
 numeric suffix to avoid duplicate naming (e.g. 'test_vg' would be renamed
 to 'test_vg1'). This option will override the base VG name that is
 used for all VG renames. If a VG already exists with the specified name
 a numeric suffix will be added (like the previous example) to make it unique.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-i\fP|\fB--import\fP
 .br
+.ad b
 Import exported VGs. Otherwise VGs that have been exported
 will not be changed (nor will their associated PVs).
-.ad b
-.HP
+.TP
 .ad l
 \fB--importdevices\fP
 .br
-Add devices to the devices file.
 .ad b
-.HP
+Add devices to the devices file.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -254,11 +254,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -282,70 +282,71 @@ Rename the VG associated with "/dev/sdc" and "/dev/sdd" from "vg00" to "vg00_sna
 .br
 .B vgimportclone --basevgname vg00_snap /dev/sdc /dev/sdd
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgimportdevices.8_pregen b/man/vgimportdevices.8_pregen
index b08c205cd..1472de265 100644
--- a/man/vgimportdevices.8_pregen
+++ b/man/vgimportdevices.8_pregen
@@ -124,120 +124,121 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
 .ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--foreign\fP
 .br
+.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -246,59 +247,58 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -314,70 +314,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen
index b555a8365..f0ef43ddc 100644
--- a/man/vgmerge.8_pregen
+++ b/man/vgmerge.8_pregen
@@ -95,147 +95,147 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB-l\fP|\fB--list\fP
 .br
-Display merged destination VG like vgdisplay -v.
 .ad b
-.HP
+Display merged destination VG like vgdisplay -v.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -257,70 +257,71 @@ Merge an inactive VG named "vg00" into the active or inactive VG named
 .br
 .B vgmerge -v databases vg00
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index 66c16a9f6..476b76ed5 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -106,171 +106,171 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--refresh\fP
 .br
+.ad b
 If the LV is active, reload its metadata.
 This is not necessary in normal operation, but may be useful
 if something has gone wrong, or if some form of manual LV
 sharing is being used.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fILV\fP
 .br
 Logical Volume name.  See \fBlvm\fP(8) for valid names.
 An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -286,70 +286,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index 6aded0070..72937ce67 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -219,123 +219,124 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
-Removes all empty PVs if none are named on the command line.
 .ad b
-.HP
+Removes all empty PVs if none are named on the command line.
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--mirrorsonly\fP
 .br
-Only remove missing PVs from mirror LVs.
 .ad b
-.HP
+Only remove missing PVs from mirror LVs.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--removemissing\fP
 .br
+.ad b
 Removes all missing PVs from the VG, if there are no LVs allocated
 on them. This resumes normal operation of the VG (new LVs may again
 be created, changed and so on).
@@ -346,55 +347,54 @@ were partly on the missing disks are removed completely, including
 those parts on disks that are still present.
 If LVs spanned several disks, including ones that are lost, salvaging
 some data first may be possible by activating LVs in partial mode.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -404,11 +404,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -424,70 +424,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index f78f9b476..b80dc09ba 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -109,124 +109,125 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--noudevsync\fP
 .br
+.ad b
 Disables udev synchronisation. The process will not wait for notification
 from udev. It will continue irrespective of any possible udev processing
 in the background. Only use this if udev is not running or has rules that
 ignore the devices LVM creates.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -235,59 +236,58 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fISelect\fP
 .br
 Select indicates that a required positional parameter can
 be omitted if the \fB--select\fP option is used.
 No arg appears in this position.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -303,70 +303,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index 3444a64ac..e22bca88c 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -122,159 +122,159 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-f\fP|\fB--force\fP ...
 .br
+.ad b
 Override various checks, confirmations and protections.
 Use with extreme caution.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -299,70 +299,71 @@ Rename the VG with the specified UUID to "myvg".
 .br
 .B vgrename Zvlifi-Ep3t-e0Ng-U42h-o0ye-KHu1-nl7Ns4 myvg
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index 29ed39e2a..ae18b1c10 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -174,151 +174,152 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--aligned\fP
 .br
-Use with --separator to align the output columns
 .ad b
-.HP
+Use with --separator to align the output columns
+.TP
 .ad l
 \fB-a\fP|\fB--all\fP
 .br
-List all VGs. Equivalent to not specifying any VGs.
 .ad b
-.HP
+List all VGs. Equivalent to not specifying any VGs.
+.TP
 .ad l
 \fB--binary\fP
 .br
+.ad b
 Use binary values "0" or "1" instead of descriptive literal values
 for columns that have exactly two valid values to report (not counting
 the "unknown" value which denotes that the value could not be determined).
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
 .br
-See \fBlvmreport\fP(7).
 .ad b
-.HP
+See \fBlvmreport\fP(7).
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB--foreign\fP
 .br
+.ad b
 Report/display foreign VGs that would otherwise be skipped.
 See \fBlvmsystemid\fP(7) for more information about foreign VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--logonly\fP
 .br
-Suppress command report and display only log report.
 .ad b
-.HP
+Suppress command report and display only log report.
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--nameprefixes\fP
 .br
+.ad b
 Add an "LVM2_" prefix plus the field name to the output. Useful
 with --noheadings to produce a list of field=value pairs that can
 be used to set environment variables (for example, in udev rules).
-.ad b
-.HP
+.TP
 .ad l
 \fB--noheadings\fP
 .br
+.ad b
 Suppress the headings line that is normally the first line of output.
 Useful if grepping the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--nosuffix\fP
 .br
+.ad b
 Suppress the suffix on output sizes. Use with --units
 (except h and H) if processing the output.
-.ad b
-.HP
+.TP
 .ad l
 \fB-o\fP|\fB--options\fP \fIString\fP
 .br
+.ad b
 Comma-separated, ordered list of fields to display in columns.
 String arg syntax is: [+|-|#]Field1[,Field2 ...]
 The prefix \fB+\fP will append the specified fields to the default fields,
@@ -336,53 +337,53 @@ Use field name \fBlv_all\fP to view all LV fields,
 \fBpvseg_all\fP all PV segment columns.
 See the lvm.conf report section for more config options.
 See \fBlvmreport\fP(7) for more information about reporting.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--readonly\fP
 .br
+.ad b
 Run the command in a special read-only mode which will read on-disk
 metadata without needing to take any locks. This can be used to peek
 inside metadata used by a virtual machine image while the virtual
 machine is running. No attempt will be made to communicate with the
 device-mapper kernel driver, so this option is unable to report whether
 or not LVs are actually in use.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--rows\fP
 .br
-Output columns as rows.
 .ad b
-.HP
+Output columns as rows.
+.TP
 .ad l
 \fB-S\fP|\fB--select\fP \fIString\fP
 .br
+.ad b
 Select objects for processing and reporting based on specified criteria.
 The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
 For reporting commands, one row is displayed for each object matching the criteria.
@@ -391,98 +392,97 @@ Rows can be displayed with an additional "selected" field (-o selected)
 showing 1 if the row matches the selection and 0 otherwise.
 For non-reporting commands which process LVM entities, the selection is
 used to choose items to process.
-.ad b
-.HP
+.TP
 .ad l
 \fB--separator\fP \fIString\fP
 .br
-String to use to separate each column. Useful if grepping the output.
 .ad b
-.HP
+String to use to separate each column. Useful if grepping the output.
+.TP
 .ad l
 \fB--shared\fP
 .br
+.ad b
 Report/display shared VGs that would otherwise be skipped when
 lvmlockd is not being used on the host.
 See \fBlvmlockd\fP(8) for more information about shared VGs.
-.ad b
-.HP
+.TP
 .ad l
 \fB-O\fP|\fB--sort\fP \fIString\fP
 .br
+.ad b
 Comma-separated ordered list of columns to sort by. Replaces the default
 selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unbuffered\fP
 .br
-Produce output immediately without sorting or aligning the columns properly.
 .ad b
-.HP
+Produce output immediately without sorting or aligning the columns properly.
+.TP
 .ad l
 \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
 .br
+.ad b
 All sizes are output in these units:
 human-(r)eadable with '<' rounding indicator,
 (h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
 (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
 Capitalise to use multiples of 1000 (S.I.) instead of 1024.
 Custom units can be specified, e.g. --units 3M.
-.ad b
-.HP
+.TP
 .ad l
 \fB--unquoted\fP
 .br
+.ad b
 When used with --nameprefixes, output values in the field=value
 pairs are not quoted.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fITag\fP
 .br
 Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
 in place of a VG, LV or PV.
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -514,70 +514,71 @@ Allocation policy: (c)ontiguous, c(l)ing, (n)ormal, @nywhere
 .IP 6 3
 (c)lustered, (s)hared
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index 1772a450d..4cbf08d91 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -101,163 +101,163 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--ignorelockingfailure\fP
 .br
+.ad b
 Allows a command to continue with read-only metadata
 operations after locking failures.
-.ad b
-.HP
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB--mknodes\fP
 .br
+.ad b
 Also checks the LVM special files in /dev that are needed for active
 LVs and creates any missing ones and removes unused ones.
-.ad b
-.HP
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--notifydbus\fP
 .br
+.ad b
 Send a notification to D-Bus. The command will exit with an error
 if LVM is not built with support for D-Bus notification, or if the
 notify_dbus config setting is disabled.
-.ad b
-.HP
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
 .br
+.ad b
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in lvm.conf.
 \fBbasic\fP is the original format with columns and rows.
 If there is more than one report per command, each report is prefixed
 with the report name for identification. \fBjson\fP produces report
 output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -273,70 +273,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)
diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen
index 9aa79e890..9a1a6083e 100644
--- a/man/vgsplit.8_pregen
+++ b/man/vgsplit.8_pregen
@@ -63,7 +63,11 @@ Common options for command:
 .ad b
 .br
 .ad l
-[    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP ]
+[    \fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
+]
 .ad b
 .br
 .ad l
@@ -139,10 +143,14 @@ Common options for lvm:
 .ad b
 .RE
 .SH OPTIONS
-.HP
+.TP
 .ad l
-\fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
+\fB--alloc\fP 
+.nh
+\fBcontiguous\fP|\:\fBcling\fP|\:\fBcling_by_tags\fP|\:\fBnormal\fP|\:\fBanywhere\fP|\:\fBinherit\fP
+.hy
 .br
+.ad b
 Determines the allocation policy when a command needs to allocate
 Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
 which can be changed with vgchange/lvchange, or overridden on the
@@ -159,157 +167,157 @@ e.g. by placing two stripes on the same PV.
 Optional positional PV args on the command line can also be used to limit
 which PVs the command will use for allocation.
 See \fBlvm\fP(8) for more information about allocation.
-.ad b
-.HP
+.TP
 .ad l
 \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 Specifies if metadata should be backed up automatically after a change.
 Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--commandprofile\fP \fIString\fP
 .br
+.ad b
 The command profile to use for command configuration.
 See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
+.TP
 .ad l
 \fB--config\fP \fIString\fP
 .br
+.ad b
 Config settings for the command. These override lvm.conf settings.
 The String arg uses the same format as lvm.conf,
 or may use section/field syntax.
 See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
+.TP
 .ad l
 \fB-d\fP|\fB--debug\fP ...
 .br
+.ad b
 Set debug level. Repeat from 1 to 6 times to increase the detail of
 messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
+.TP
 .ad l
 \fB--devices\fP \fIPV\fP
 .br
+.ad b
 Devices that the command can use. This option can be repeated
 or accepts a comma separated list of devices. This overrides
 the devices file.
-.ad b
-.HP
+.TP
 .ad l
 \fB--devicesfile\fP \fIString\fP
 .br
+.ad b
 A file listing devices that LVM should use.
 The file must exist in /etc/lvm/devices/ and is managed
 with the lvmdevices(8) command.
 This overrides the lvm.conf devices/devicesfile and
 devices/use_devicesfile settings.
-.ad b
-.HP
+.TP
 .ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
+.ad b
 If set to no, the command will not attempt to use device-mapper.
 For testing and debugging.
-.ad b
-.HP
+.TP
 .ad l
 \fB-h\fP|\fB--help\fP
 .br
-Display help text.
 .ad b
-.HP
+Display help text.
+.TP
 .ad l
 \fB--lockopt\fP \fIString\fP
 .br
+.ad b
 Used to pass options for special cases to lvmlockd.
 See \fBlvmlockd\fP(8) for more information.
-.ad b
-.HP
+.TP
 .ad l
 \fB--longhelp\fP
 .br
-Display long help text.
 .ad b
-.HP
+Display long help text.
+.TP
 .ad l
 \fB-l\fP|\fB--maxlogicalvolumes\fP \fINumber\fP
 .br
-Sets the maximum number of LVs allowed in a VG.
 .ad b
-.HP
+Sets the maximum number of LVs allowed in a VG.
+.TP
 .ad l
 \fB-p\fP|\fB--maxphysicalvolumes\fP \fINumber\fP
 .br
+.ad b
 Sets the maximum number of PVs that can belong to the VG.
 The value 0 removes any limitation.
 For large numbers of PVs, also see options --pvmetadatacopies,
 and --vgmetadatacopies for improving performance.
-.ad b
-.HP
+.TP
 .ad l
 \fB-M\fP|\fB--metadatatype\fP \fBlvm2\fP
 .br
+.ad b
 Specifies the type of on-disk metadata to use.
 \fBlvm2\fP (or just \fB2\fP) is the current, standard format.
 \fBlvm1\fP (or just \fB1\fP) is no longer used.
-.ad b
-.HP
+.TP
 .ad l
 \fB-n\fP|\fB--name\fP \fIString\fP
 .br
-Move only PVs used by the named LV.
 .ad b
-.HP
+Move only PVs used by the named LV.
+.TP
 .ad l
 \fB--nolocking\fP
 .br
-Disable locking.
 .ad b
-.HP
+Disable locking.
+.TP
 .ad l
 \fB--profile\fP \fIString\fP
 .br
+.ad b
 An alias for --commandprofile or --metadataprofile, depending
 on the command.
-.ad b
-.HP
+.TP
 .ad l
 \fB-q\fP|\fB--quiet\fP ...
 .br
+.ad b
 Suppress output and log messages. Overrides --debug and --verbose.
 Repeat once to also suppress any prompts with answer 'no'.
-.ad b
-.HP
+.TP
 .ad l
 \fB-t\fP|\fB--test\fP
 .br
+.ad b
 Run in test mode. Commands will not update metadata.
 This is implemented by disabling all metadata writing but nevertheless
 returning success to the calling function. This may lead to unusual
 error messages in multi-stage operations if a tool relies on reading
 back metadata it believes has changed but hasn't.
-.ad b
-.HP
+.TP
 .ad l
 \fB-v\fP|\fB--verbose\fP ...
 .br
+.ad b
 Set verbose level. Repeat from 1 to 4 times to increase the detail
 of messages sent to stdout and stderr.
-.ad b
-.HP
+.TP
 .ad l
 \fB--version\fP
 .br
-Display version information.
 .ad b
-.HP
+Display version information.
+.TP
 .ad l
 \fB--[vg]metadatacopies\fP \fBall\fP|\fBunmanaged\fP|\fINumber\fP
 .br
+.ad b
 Number of copies of the VG metadata that are kept.
 VG metadata is kept in VG metadata areas on PVs in the VG,
 i.e. reserved space@the start and/or end of the PVs.
@@ -323,21 +331,20 @@ The number can also be replaced with special string values:
 metadataignore flags.
 \fBall\fP causes LVM to first clear the metadataignore flags on
 all PVs, and then to become unmanaged.
-.ad b
-.HP
+.TP
 .ad l
 \fB-y\fP|\fB--yes\fP
 .br
+.ad b
 Do not prompt for confirmation interactively but always assume the
 answer yes. Use with extreme caution.
 (For automatic no, see -qq.)
-.ad b
 .SH VARIABLES
-.HP
+.TP
 \fIVG\fP
 .br
 Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
+.TP
 \fIPV\fP
 .br
 Physical Volume name, a device path under /dev.
@@ -347,11 +354,11 @@ of physical extents (PEs). When the first PE is omitted, it defaults
 to the start of the device, and when the last PE is omitted it defaults to end.
 Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
 Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
+.TP
 \fIString\fP
 .br
 See the option description for information about the string content.
-.HP
+.TP
 \fISize\fP[UNIT]
 .br
 Size is an input number that accepts an optional unit.
@@ -367,70 +374,71 @@ capital letters mean multiple of 1000.)
 See \fBlvm\fP(8) for information about environment variables used by lvm.
 For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
 .SH SEE ALSO
+.nh
+.ad l
+.BR lvm (8),
+.BR lvm.conf (5),
+.BR lvmconfig (8),
+.BR lvmdevices (8),
 
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-.BR lvmdevices (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
+.BR pvchange (8),
+.BR pvck (8),
+.BR pvcreate (8),
+.BR pvdisplay (8),
+.BR pvmove (8),
+.BR pvremove (8),
+.BR pvresize (8),
+.BR pvs (8),
+.BR pvscan (8),
 
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgimportdevices (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
+.BR vgcfgbackup (8),
+.BR vgcfgrestore (8),
+.BR vgchange (8),
+.BR vgck (8),
+.BR vgcreate (8),
+.BR vgconvert (8),
+.BR vgdisplay (8),
+.BR vgexport (8),
+.BR vgextend (8),
+.BR vgimport (8),
+.BR vgimportclone (8),
+.BR vgimportdevices (8),
+.BR vgmerge (8),
+.BR vgmknodes (8),
+.BR vgreduce (8),
+.BR vgremove (8),
+.BR vgrename (8),
+.BR vgs (8),
+.BR vgscan (8),
+.BR vgsplit (8),
 
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
+.BR lvcreate (8),
+.BR lvchange (8),
+.BR lvconvert (8),
+.BR lvdisplay (8),
+.BR lvextend (8),
+.BR lvreduce (8),
+.BR lvremove (8),
+.BR lvrename (8),
+.BR lvresize (8),
+.BR lvs (8),
+.BR lvscan (8),
 
-.BR lvm-fullreport (8)
-.BR lvm-lvpoll (8)
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
+.BR lvm-fullreport (8),
+.BR lvm-lvpoll (8),
+.BR lvm2-activation-generator (8),
+.BR blkdeactivate (8),
+.BR lvmdump (8),
 
-.BR dmeventd (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
+.BR dmeventd (8),
+.BR lvmpolld (8),
+.BR lvmlockd (8),
+.BR lvmlockctl (8),
+.BR cmirrord (8),
+.BR lvmdbusd (8),
 
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
+.BR lvmsystemid (7),
+.BR lvmreport (7),
+.BR lvmraid (7),
+.BR lvmthin (7),
 .BR lvmcache (7)



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-03-19 23:17 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2021-03-19 23:17 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c6a76c1ffe8321a4f2ed988fe5884541489e120f
Commit:        c6a76c1ffe8321a4f2ed988fe5884541489e120f
Parent:        81d3639955f0553d691e304dcc0b2eaaf6f24bb6
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Thu Mar 18 23:01:26 2021 +0100
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Mar 19 23:21:18 2021 +0100

make: generate

Add new lvmdevices.8_pregen and vgimportdevices.8_pregen.
---
 man/lvconvert.8_pregen       |   6 +-
 man/lvmdevices.8_pregen      | 553 +++++++++++++++++++++++++++++++++++++++++++
 man/vgimportdevices.8_pregen | 383 ++++++++++++++++++++++++++++++
 3 files changed, 939 insertions(+), 3 deletions(-)

diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index c645d6a56..63fbc093c 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -597,7 +597,7 @@ Merge LV images that were split from a raid1 LV.
 Convert LV to a thin LV, using the original LV as an external origin.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBthin\fP \fB--thinpool\fP \fILV\fP \fILV\fP\fI_linear_striped_thin_cache_raid\fP
+\fBlvconvert\fP \fB--type\fP \fBthin\fP \fB--thinpool\fP \fILV\fP \fILV\fP\fI_linear_striped_thin_cache_raid_error_zero\fP
 .br
 .RS 4
 .ad l
@@ -803,7 +803,7 @@ Add a cache to an LV, using a specified cache device.
 Convert LV to type thin-pool.
 .br
 .P
-\fBlvconvert\fP \fB--type\fP \fBthin-pool\fP \fILV\fP\fI_linear_striped_cache_raid\fP
+\fBlvconvert\fP \fB--type\fP \fBthin-pool\fP \fILV\fP\fI_linear_striped_cache_raid_error_zero\fP
 .br
 .RS 4
 .ad l
@@ -1899,7 +1899,7 @@ Convert LV to a thin LV, using the original LV as an external origin
 (infers --type thin).
 .br
 .P
-\fBlvconvert\fP \fB-T\fP|\fB--thin\fP \fB--thinpool\fP \fILV\fP \fILV\fP\fI_linear_striped_thin_cache_raid\fP
+\fBlvconvert\fP \fB-T\fP|\fB--thin\fP \fB--thinpool\fP \fILV\fP \fILV\fP\fI_linear_striped_thin_cache_raid_error_zero\fP
 .br
 .RS 4
 .ad l
diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
new file mode 100644
index 000000000..2922449bf
--- /dev/null
+++ b/man/lvmdevices.8_pregen
@@ -0,0 +1,553 @@
+.TH LVMDEVICES 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.SH NAME
+lvmdevices - Manage the devices file
+.
+.SH SYNOPSIS
+\fBlvmdevices\fP \fIoption_args\fP
+.br
+    [ \fIoption_args\fP ]
+.br
+.P
+.ad l
+    \fB--adddev\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--addpvid\fP \fIString\fP
+.ad b
+.br
+.ad l
+    \fB--check\fP
+.ad b
+.br
+.ad l
+    \fB--commandprofile\fP \fIString\fP
+.ad b
+.br
+.ad l
+    \fB--config\fP \fIString\fP
+.ad b
+.br
+.ad l
+ \fB-d\fP|\fB--debug\fP
+.ad b
+.br
+.ad l
+    \fB--deldev\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--delpvid\fP \fIString\fP
+.ad b
+.br
+.ad l
+    \fB--devices\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--devicesfile\fP \fIString\fP
+.ad b
+.br
+.ad l
+    \fB--driverloaded\fP \fBy\fP|\fBn\fP
+.ad b
+.br
+.ad l
+ \fB-h\fP|\fB--help\fP
+.ad b
+.br
+.ad l
+    \fB--lockopt\fP \fIString\fP
+.ad b
+.br
+.ad l
+    \fB--longhelp\fP
+.ad b
+.br
+.ad l
+    \fB--nolocking\fP
+.ad b
+.br
+.ad l
+    \fB--profile\fP \fIString\fP
+.ad b
+.br
+.ad l
+ \fB-q\fP|\fB--quiet\fP
+.ad b
+.br
+.ad l
+ \fB-t\fP|\fB--test\fP
+.ad b
+.br
+.ad l
+    \fB--update\fP
+.ad b
+.br
+.ad l
+ \fB-v\fP|\fB--verbose\fP
+.ad b
+.br
+.ad l
+    \fB--version\fP
+.ad b
+.br
+.ad l
+ \fB-y\fP|\fB--yes\fP
+.ad b
+.SH DESCRIPTION
+The LVM devices file lists devices that lvm can use.  The default file is
+/etc/lvm/devices/system.devices, and the lvmdevices(8) command is used to
+add or remove device entries.  If the file does not exist, or if lvm.conf
+includes use_devicesfile=0, then lvm will not use a devices file.
+
+To use a device with lvm, add it to the devices file with the command
+lvmdevices --adddev, and to prevent lvm from seeing or using a device,
+remove it from the devices file with lvmdevices --deldev.  The
+vgimportdevices(8) command adds all PVs from a VG to the devices file,
+and updates the VG metadata to include device IDs of the PVs.
+
+Commands adding new devices to the devices file necessarily look outside
+the existing devices file to find the devices to add.  pvcreate, vgcreate,
+and vgextend also look outside the devices file to create new PVs and add
+them to the devices file.
+
+LVM records devices in the devices file using hardware-specific IDs, such
+as the WWID, and attempts to use subsystem-specific IDs for virtual device
+types (which also aim to be as unique and stable as possible.)
+These device IDs are also written in the VG metadata.  When no hardware or
+virtual ID is available, lvm falls back using the unstable device name as
+the device ID.  When devnames are used, lvm performs extra scanning to
+find devices if their devname changes, e.g. after reboot.
+
+When proper device IDs are used, an lvm command will not look at devices
+outside the devices file, but when devnames are used as a fallback, lvm
+will scan devices outside the devices file to locate PVs on renamed
+devices.  A config setting search_for_devnames can be used to control the
+scanning for renamed devname entries.
+
+Related to the devices file, the new command option --devices <devnames>
+allows a list of devices to be specified for the command to use,
+overriding the devices file.  The listed devices act as a sort of devices
+file in terms of limiting which devices lvm will see and use.  Devices
+that are not listed will appear to be missing to the lvm command.
+    
+Multiple devices files can be kept in /etc/lvm/devices, which allows lvm
+to be used with different sets of devices, e.g. system devices do not need
+to be exposed to a specific application, and the application can use lvm on
+its own devices that are not exposed to the system.  The option
+--devicesfile <filename> is used to select the devices file to use with the
+command.  Without the option set, the default system devices file is used.
+
+Setting --devicesfile "" causes lvm to not use a devices file.
+
+With no devices file, lvm will use any device on the system, and applies
+the filter to limit the full set of system devices.  With a devices file,
+the regex filter is not used, and the filter settings in lvm.conf or the
+command line are ignored.  The vgimportdevices command is one exception
+which does apply the regex filter when looking for a VG to import.
+
+If a devices file exists, lvm will use it, even if it's empty.  An empty
+devices file means lvm will see no devices.
+
+If the system devices file does not yet exist, the pvcreate or vgcreate
+commands will create it if they see no existing VGs on the system.
+lvmdevices --addev and vgimportdevices will always create a new devices file
+if it does not yet exist.
+
+It is recommended to use lvm commands to make changes to the devices file to
+ensure proper updates.
+
+.SH USAGE
+Print devices in the devices file.
+.br
+.P
+\fBlvmdevices\fP
+.br
+.RS 4
+[ COMMON_OPTIONS ]
+.RE
+.br
+-
+
+Check the devices file and report incorrect values.
+.br
+.P
+\fBlvmdevices\fP \fB--check\fP
+.br
+.RS 4
+[ COMMON_OPTIONS ]
+.RE
+.br
+-
+
+Update the devices file to fix incorrect values.
+.br
+.P
+\fBlvmdevices\fP \fB--update\fP
+.br
+.RS 4
+[ COMMON_OPTIONS ]
+.RE
+.br
+-
+
+Add a device to the devices file.
+.br
+.P
+\fBlvmdevices\fP \fB--adddev\fP \fIPV\fP
+.br
+.RS 4
+[ COMMON_OPTIONS ]
+.RE
+.br
+-
+
+Remove a device from the devices file.
+.br
+.P
+\fBlvmdevices\fP \fB--deldev\fP \fIPV\fP
+.br
+.RS 4
+[ COMMON_OPTIONS ]
+.RE
+.br
+-
+
+Find the device with the given PVID and add it to the devices file.
+.br
+.P
+\fBlvmdevices\fP \fB--addpvid\fP \fIString\fP
+.br
+.RS 4
+[ COMMON_OPTIONS ]
+.RE
+.br
+-
+
+Remove the devices file entry for the given PVID.
+.br
+.P
+\fBlvmdevices\fP \fB--delpvid\fP \fIString\fP
+.br
+.RS 4
+[ COMMON_OPTIONS ]
+.RE
+.br
+-
+
+Common options for command:
+.
+.RS 4
+.RE
+
+Common options for lvm:
+.
+.RS 4
+.ad l
+[ \fB-d\fP|\fB--debug\fP ]
+.ad b
+.br
+.ad l
+[ \fB-h\fP|\fB--help\fP ]
+.ad b
+.br
+.ad l
+[ \fB-q\fP|\fB--quiet\fP ]
+.ad b
+.br
+.ad l
+[ \fB-t\fP|\fB--test\fP ]
+.ad b
+.br
+.ad l
+[ \fB-v\fP|\fB--verbose\fP ]
+.ad b
+.br
+.ad l
+[ \fB-y\fP|\fB--yes\fP ]
+.ad b
+.br
+.ad l
+[    \fB--commandprofile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
+[    \fB--config\fP \fIString\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
+[    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
+.ad b
+.br
+.ad l
+[    \fB--lockopt\fP \fIString\fP ]
+.ad b
+.br
+.ad l
+[    \fB--longhelp\fP ]
+.ad b
+.br
+.ad l
+[    \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
+[    \fB--profile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
+[    \fB--version\fP ]
+.ad b
+.RE
+.SH OPTIONS
+.HP
+.ad l
+\fB--adddev\fP \fIPV\fP
+.br
+Add a device to the devices file.
+.ad b
+.HP
+.ad l
+\fB--addpvid\fP \fIString\fP
+.br
+Find a device with the PVID and add the device to the devices file.
+.ad b
+.HP
+.ad l
+\fB--check\fP
+.br
+Check the content of the devices file.
+.ad b
+.HP
+.ad l
+\fB--commandprofile\fP \fIString\fP
+.br
+The command profile to use for command configuration.
+See \fBlvm.conf\fP(5) for more information about profiles.
+.ad b
+.HP
+.ad l
+\fB--config\fP \fIString\fP
+.br
+Config settings for the command. These override lvm.conf settings.
+The String arg uses the same format as lvm.conf,
+or may use section/field syntax.
+See \fBlvm.conf\fP(5) for more information about config.
+.ad b
+.HP
+.ad l
+\fB-d\fP|\fB--debug\fP ...
+.br
+Set debug level. Repeat from 1 to 6 times to increase the detail of
+messages sent to the log file and/or syslog (if configured).
+.ad b
+.HP
+.ad l
+\fB--deldev\fP \fIPV\fP
+.br
+Remove a device from the devices file.
+.ad b
+.HP
+.ad l
+\fB--delpvid\fP \fIString\fP
+.br
+Remove a device with the PVID from the devices file.
+.ad b
+.HP
+.ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
+\fB--driverloaded\fP \fBy\fP|\fBn\fP
+.br
+If set to no, the command will not attempt to use device-mapper.
+For testing and debugging.
+.ad b
+.HP
+.ad l
+\fB-h\fP|\fB--help\fP
+.br
+Display help text.
+.ad b
+.HP
+.ad l
+\fB--lockopt\fP \fIString\fP
+.br
+Used to pass options for special cases to lvmlockd.
+See \fBlvmlockd\fP(8) for more information.
+.ad b
+.HP
+.ad l
+\fB--longhelp\fP
+.br
+Display long help text.
+.ad b
+.HP
+.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
+\fB--profile\fP \fIString\fP
+.br
+An alias for --commandprofile or --metadataprofile, depending
+on the command.
+.ad b
+.HP
+.ad l
+\fB-q\fP|\fB--quiet\fP ...
+.br
+Suppress output and log messages. Overrides --debug and --verbose.
+Repeat once to also suppress any prompts with answer 'no'.
+.ad b
+.HP
+.ad l
+\fB-t\fP|\fB--test\fP
+.br
+Run in test mode. Commands will not update metadata.
+This is implemented by disabling all metadata writing but nevertheless
+returning success to the calling function. This may lead to unusual
+error messages in multi-stage operations if a tool relies on reading
+back metadata it believes has changed but hasn't.
+.ad b
+.HP
+.ad l
+\fB--update\fP
+.br
+Update the content of the devices file.
+.ad b
+.HP
+.ad l
+\fB-v\fP|\fB--verbose\fP ...
+.br
+Set verbose level. Repeat from 1 to 4 times to increase the detail
+of messages sent to stdout and stderr.
+.ad b
+.HP
+.ad l
+\fB--version\fP
+.br
+Display version information.
+.ad b
+.HP
+.ad l
+\fB-y\fP|\fB--yes\fP
+.br
+Do not prompt for confirmation interactively but always assume the
+answer yes. Use with extreme caution.
+(For automatic no, see -qq.)
+.ad b
+.SH VARIABLES
+.HP
+\fIString\fP
+.br
+See the option description for information about the string content.
+.HP
+\fISize\fP[UNIT]
+.br
+Size is an input number that accepts an optional unit.
+Input units are always treated as base two values, regardless of
+capitalization, e.g. 'k' and 'K' both refer to 1024.
+The default input unit is specified by letter, followed by |UNIT.
+UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+(This should not be confused with the output control --units, where
+capital letters mean multiple of 1000.)
+.SH ENVIRONMENT VARIABLES
+See \fBlvm\fP(8) for information about environment variables used by lvm.
+For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
+.SH SEE ALSO
+
+.BR lvm (8)
+.BR lvm.conf (5)
+.BR lvmconfig (8)
+.BR lvmdevices (8)
+
+.BR pvchange (8)
+.BR pvck (8)
+.BR pvcreate (8)
+.BR pvdisplay (8)
+.BR pvmove (8)
+.BR pvremove (8)
+.BR pvresize (8)
+.BR pvs (8)
+.BR pvscan (8) 
+
+.BR vgcfgbackup (8)
+.BR vgcfgrestore (8)
+.BR vgchange (8)
+.BR vgck (8)
+.BR vgcreate (8)
+.BR vgconvert (8)
+.BR vgdisplay (8)
+.BR vgexport (8)
+.BR vgextend (8)
+.BR vgimport (8)
+.BR vgimportclone (8)
+.BR vgimportdevices (8)
+.BR vgmerge (8)
+.BR vgmknodes (8)
+.BR vgreduce (8)
+.BR vgremove (8)
+.BR vgrename (8)
+.BR vgs (8)
+.BR vgscan (8)
+.BR vgsplit (8) 
+
+.BR lvcreate (8)
+.BR lvchange (8)
+.BR lvconvert (8)
+.BR lvdisplay (8)
+.BR lvextend (8)
+.BR lvreduce (8)
+.BR lvremove (8)
+.BR lvrename (8)
+.BR lvresize (8)
+.BR lvs (8)
+.BR lvscan (8)
+
+.BR lvm-fullreport (8)
+.BR lvm-lvpoll (8)
+.BR lvm2-activation-generator (8)
+.BR blkdeactivate (8)
+.BR lvmdump (8)
+
+.BR dmeventd (8)
+.BR lvmpolld (8)
+.BR lvmlockd (8)
+.BR lvmlockctl (8)
+.BR cmirrord (8)
+.BR lvmdbusd (8)
+
+.BR lvmsystemid (7)
+.BR lvmreport (7)
+.BR lvmraid (7)
+.BR lvmthin (7)
+.BR lvmcache (7)
diff --git a/man/vgimportdevices.8_pregen b/man/vgimportdevices.8_pregen
new file mode 100644
index 000000000..b08c205cd
--- /dev/null
+++ b/man/vgimportdevices.8_pregen
@@ -0,0 +1,383 @@
+.TH VGIMPORTDEVICES 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
+.SH NAME
+vgimportdevices - Add devices for a VG to the devices file.
+.
+.SH SYNOPSIS
+\fBvgimportdevices\fP \fIoption_args\fP \fIposition_args\fP
+.br
+    [ \fIoption_args\fP ]
+.br
+.SH DESCRIPTION
+vgimportdevices adds PVs from a VG to the devices file.  This is similar
+to using using lvmdevices --adddev to add each PV to the devices file
+individually.  vgimportdevices will also update the VG metadata to include
+the device IDs of each PV.  vgimportdevices will create a new devices file
+if none exists.
+
+When a devices file is used, the regex filter is ignored, except in the case
+of vgimportdevices which will apply the regex filter when looking for the VGs
+to import to the devices file.  Use vgimportdevices -a to import all VGs on a
+system to the devices file.
+
+.SH USAGE
+Add devices from specific VGs to the devices file.
+.br
+.P
+\fBvgimportdevices\fP \fIVG\fP|\fITag\fP|\fISelect\fP ...
+.br
+.RS 4
+.ad l
+[ \fB-S\fP|\fB--select\fP \fIString\fP ]
+.ad b
+.br
+[ COMMON_OPTIONS ]
+.RE
+.br
+
+Add devices from all accessible VGs to the devices file.
+.br
+.P
+\fBvgimportdevices\fP \fB-a\fP|\fB--all\fP
+.br
+.RS 4
+[ COMMON_OPTIONS ]
+.RE
+.br
+
+Common options for command:
+.
+.RS 4
+.ad l
+[    \fB--foreign\fP ]
+.ad b
+.br
+.ad l
+[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
+.ad b
+.RE
+
+Common options for lvm:
+.
+.RS 4
+.ad l
+[ \fB-d\fP|\fB--debug\fP ]
+.ad b
+.br
+.ad l
+[ \fB-h\fP|\fB--help\fP ]
+.ad b
+.br
+.ad l
+[ \fB-q\fP|\fB--quiet\fP ]
+.ad b
+.br
+.ad l
+[ \fB-t\fP|\fB--test\fP ]
+.ad b
+.br
+.ad l
+[ \fB-v\fP|\fB--verbose\fP ]
+.ad b
+.br
+.ad l
+[ \fB-y\fP|\fB--yes\fP ]
+.ad b
+.br
+.ad l
+[    \fB--commandprofile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
+[    \fB--config\fP \fIString\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
+[    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
+.ad b
+.br
+.ad l
+[    \fB--lockopt\fP \fIString\fP ]
+.ad b
+.br
+.ad l
+[    \fB--longhelp\fP ]
+.ad b
+.br
+.ad l
+[    \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
+[    \fB--profile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
+[    \fB--version\fP ]
+.ad b
+.RE
+.SH OPTIONS
+.HP
+.ad l
+\fB-a\fP|\fB--all\fP
+.br
+.ad b
+.HP
+.ad l
+\fB--commandprofile\fP \fIString\fP
+.br
+The command profile to use for command configuration.
+See \fBlvm.conf\fP(5) for more information about profiles.
+.ad b
+.HP
+.ad l
+\fB--config\fP \fIString\fP
+.br
+Config settings for the command. These override lvm.conf settings.
+The String arg uses the same format as lvm.conf,
+or may use section/field syntax.
+See \fBlvm.conf\fP(5) for more information about config.
+.ad b
+.HP
+.ad l
+\fB-d\fP|\fB--debug\fP ...
+.br
+Set debug level. Repeat from 1 to 6 times to increase the detail of
+messages sent to the log file and/or syslog (if configured).
+.ad b
+.HP
+.ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
+\fB--driverloaded\fP \fBy\fP|\fBn\fP
+.br
+If set to no, the command will not attempt to use device-mapper.
+For testing and debugging.
+.ad b
+.HP
+.ad l
+\fB--foreign\fP
+.br
+Report/display foreign VGs that would otherwise be skipped.
+See \fBlvmsystemid\fP(7) for more information about foreign VGs.
+.ad b
+.HP
+.ad l
+\fB-h\fP|\fB--help\fP
+.br
+Display help text.
+.ad b
+.HP
+.ad l
+\fB--lockopt\fP \fIString\fP
+.br
+Used to pass options for special cases to lvmlockd.
+See \fBlvmlockd\fP(8) for more information.
+.ad b
+.HP
+.ad l
+\fB--longhelp\fP
+.br
+Display long help text.
+.ad b
+.HP
+.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
+\fB--profile\fP \fIString\fP
+.br
+An alias for --commandprofile or --metadataprofile, depending
+on the command.
+.ad b
+.HP
+.ad l
+\fB-q\fP|\fB--quiet\fP ...
+.br
+Suppress output and log messages. Overrides --debug and --verbose.
+Repeat once to also suppress any prompts with answer 'no'.
+.ad b
+.HP
+.ad l
+\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
+.br
+Overrides current output format for reports which is defined globally by
+the report/output_format setting in lvm.conf.
+\fBbasic\fP is the original format with columns and rows.
+If there is more than one report per command, each report is prefixed
+with the report name for identification. \fBjson\fP produces report
+output in JSON format. See \fBlvmreport\fP(7) for more information.
+.ad b
+.HP
+.ad l
+\fB-S\fP|\fB--select\fP \fIString\fP
+.br
+Select objects for processing and reporting based on specified criteria.
+The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
+For reporting commands, one row is displayed for each object matching the criteria.
+See \fB--options help\fP for selectable object fields.
+Rows can be displayed with an additional "selected" field (-o selected)
+showing 1 if the row matches the selection and 0 otherwise.
+For non-reporting commands which process LVM entities, the selection is
+used to choose items to process.
+.ad b
+.HP
+.ad l
+\fB-t\fP|\fB--test\fP
+.br
+Run in test mode. Commands will not update metadata.
+This is implemented by disabling all metadata writing but nevertheless
+returning success to the calling function. This may lead to unusual
+error messages in multi-stage operations if a tool relies on reading
+back metadata it believes has changed but hasn't.
+.ad b
+.HP
+.ad l
+\fB-v\fP|\fB--verbose\fP ...
+.br
+Set verbose level. Repeat from 1 to 4 times to increase the detail
+of messages sent to stdout and stderr.
+.ad b
+.HP
+.ad l
+\fB--version\fP
+.br
+Display version information.
+.ad b
+.HP
+.ad l
+\fB-y\fP|\fB--yes\fP
+.br
+Do not prompt for confirmation interactively but always assume the
+answer yes. Use with extreme caution.
+(For automatic no, see -qq.)
+.ad b
+.SH VARIABLES
+.HP
+\fIVG\fP
+.br
+Volume Group name.  See \fBlvm\fP(8) for valid names.
+.HP
+\fITag\fP
+.br
+Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
+in place of a VG, LV or PV.
+.HP
+\fISelect\fP
+.br
+Select indicates that a required positional parameter can
+be omitted if the \fB--select\fP option is used.
+No arg appears in this position.
+.HP
+\fIString\fP
+.br
+See the option description for information about the string content.
+.HP
+\fISize\fP[UNIT]
+.br
+Size is an input number that accepts an optional unit.
+Input units are always treated as base two values, regardless of
+capitalization, e.g. 'k' and 'K' both refer to 1024.
+The default input unit is specified by letter, followed by |UNIT.
+UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
+(This should not be confused with the output control --units, where
+capital letters mean multiple of 1000.)
+.SH ENVIRONMENT VARIABLES
+See \fBlvm\fP(8) for information about environment variables used by lvm.
+For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
+.SH SEE ALSO
+
+.BR lvm (8)
+.BR lvm.conf (5)
+.BR lvmconfig (8)
+.BR lvmdevices (8)
+
+.BR pvchange (8)
+.BR pvck (8)
+.BR pvcreate (8)
+.BR pvdisplay (8)
+.BR pvmove (8)
+.BR pvremove (8)
+.BR pvresize (8)
+.BR pvs (8)
+.BR pvscan (8) 
+
+.BR vgcfgbackup (8)
+.BR vgcfgrestore (8)
+.BR vgchange (8)
+.BR vgck (8)
+.BR vgcreate (8)
+.BR vgconvert (8)
+.BR vgdisplay (8)
+.BR vgexport (8)
+.BR vgextend (8)
+.BR vgimport (8)
+.BR vgimportclone (8)
+.BR vgimportdevices (8)
+.BR vgmerge (8)
+.BR vgmknodes (8)
+.BR vgreduce (8)
+.BR vgremove (8)
+.BR vgrename (8)
+.BR vgs (8)
+.BR vgscan (8)
+.BR vgsplit (8) 
+
+.BR lvcreate (8)
+.BR lvchange (8)
+.BR lvconvert (8)
+.BR lvdisplay (8)
+.BR lvextend (8)
+.BR lvreduce (8)
+.BR lvremove (8)
+.BR lvrename (8)
+.BR lvresize (8)
+.BR lvs (8)
+.BR lvscan (8)
+
+.BR lvm-fullreport (8)
+.BR lvm-lvpoll (8)
+.BR lvm2-activation-generator (8)
+.BR blkdeactivate (8)
+.BR lvmdump (8)
+
+.BR dmeventd (8)
+.BR lvmpolld (8)
+.BR lvmlockd (8)
+.BR lvmlockctl (8)
+.BR cmirrord (8)
+.BR lvmdbusd (8)
+
+.BR lvmsystemid (7)
+.BR lvmreport (7)
+.BR lvmraid (7)
+.BR lvmthin (7)
+.BR lvmcache (7)



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-03-05 12:01 Marian Csontos
  0 siblings, 0 replies; 24+ messages in thread
From: Marian Csontos @ 2021-03-05 12:01 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2244a56021475179b8cc3633c8cb6534eaa18025
Commit:        2244a56021475179b8cc3633c8cb6534eaa18025
Parent:        3bea8937334ab9a7852947a30862d6e457f093b6
Author:        Marian Csontos <mcsontos@redhat.com>
AuthorDate:    Fri Mar 5 12:53:35 2021 +0100
Committer:     Marian Csontos <mcsontos@redhat.com>
CommitterDate: Fri Mar 5 12:53:35 2021 +0100

make: generate

---
 conf/example.conf.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/conf/example.conf.in b/conf/example.conf.in
index 8ac376303..204ec82d1 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -1122,6 +1122,17 @@ global {
 	# This configuration option has an automatic default value.
 	# sanlock_lv_extend = 256
 
+	# Configuration option global/lvmlockctl_kill_command.
+	# The command that lvmlockctl --kill should use to force LVs offline.
+	# The lvmlockctl --kill command is run when a shared VG has lost
+	# access to locks (e.g. when sanlock has lost access to storage.)
+	# An empty string means that there will be no automatic attempt by
+	# lvmlockctl --kill to forcibly shut down LVs in the VG, and the user
+	# can manually intervene as described in lvmlockd(8).
+	# The VG name will be appended to the command specified here.
+	# This configuration option has an automatic default value.
+	# lvmlockctl_kill_command = ""
+
 	# Configuration option global/thin_check_executable.
 	# The full path to the thin_check command.
 	# LVM uses this command to check that a thin metadata device is in a



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-03-02 21:58 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2021-03-02 21:58 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9cb913ab4bf8e8e98f2f84210e4bee55d7f177a8
Commit:        9cb913ab4bf8e8e98f2f84210e4bee55d7f177a8
Parent:        8e1771f8571c54cc053b077305b886278086dd03
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Wed Feb 24 12:40:15 2021 +0100
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Tue Mar 2 22:57:35 2021 +0100

make: generate

---
 conf/example.conf.in        | 32 ++++++++++++++++++++++++++++++++
 man/lvchange.8_pregen       | 36 ++++++++++++++++++++++++++++++++++++
 man/lvconvert.8_pregen      | 36 ++++++++++++++++++++++++++++++++++++
 man/lvcreate.8_pregen       | 36 ++++++++++++++++++++++++++++++++++++
 man/lvdisplay.8_pregen      | 28 ++++++++++++++++++++++++++++
 man/lvextend.8_pregen       | 36 ++++++++++++++++++++++++++++++++++++
 man/lvm-fullreport.8_pregen | 28 ++++++++++++++++++++++++++++
 man/lvm-lvpoll.8_pregen     | 28 ++++++++++++++++++++++++++++
 man/lvmconfig.8_pregen      | 28 ++++++++++++++++++++++++++++
 man/lvmdiskscan.8_pregen    | 28 ++++++++++++++++++++++++++++
 man/lvreduce.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/lvremove.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/lvrename.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/lvresize.8_pregen       | 36 ++++++++++++++++++++++++++++++++++++
 man/lvs.8_pregen            | 28 ++++++++++++++++++++++++++++
 man/lvscan.8_pregen         | 28 ++++++++++++++++++++++++++++
 man/pvchange.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/pvck.8_pregen           | 36 ++++++++++++++++++++++++++++++++++++
 man/pvcreate.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/pvdisplay.8_pregen      | 28 ++++++++++++++++++++++++++++
 man/pvmove.8_pregen         | 28 ++++++++++++++++++++++++++++
 man/pvremove.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/pvresize.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/pvs.8_pregen            | 28 ++++++++++++++++++++++++++++
 man/pvscan.8_pregen         | 28 ++++++++++++++++++++++++++++
 man/vgcfgbackup.8_pregen    | 28 ++++++++++++++++++++++++++++
 man/vgcfgrestore.8_pregen   | 36 ++++++++++++++++++++++++++++++++++++
 man/vgchange.8_pregen       | 36 ++++++++++++++++++++++++++++++++++++
 man/vgck.8_pregen           | 28 ++++++++++++++++++++++++++++
 man/vgconvert.8_pregen      | 28 ++++++++++++++++++++++++++++
 man/vgcreate.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/vgdisplay.8_pregen      | 28 ++++++++++++++++++++++++++++
 man/vgexport.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/vgextend.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/vgimport.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/vgimportclone.8_pregen  | 38 ++++++++++++++++++++++++++++++++++++++
 man/vgmerge.8_pregen        | 28 ++++++++++++++++++++++++++++
 man/vgmknodes.8_pregen      | 28 ++++++++++++++++++++++++++++
 man/vgreduce.8_pregen       | 36 ++++++++++++++++++++++++++++++++++++
 man/vgremove.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/vgrename.8_pregen       | 28 ++++++++++++++++++++++++++++
 man/vgs.8_pregen            | 28 ++++++++++++++++++++++++++++
 man/vgscan.8_pregen         | 28 ++++++++++++++++++++++++++++
 man/vgsplit.8_pregen        | 28 ++++++++++++++++++++++++++++
 44 files changed, 1318 insertions(+)

diff --git a/conf/example.conf.in b/conf/example.conf.in
index fc0a16bf1..8ac376303 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -124,6 +124,38 @@ devices {
 	#
 	# This configuration option does not have a default value defined.
 
+	# Configuration option devices/use_devicesfile.
+	# Enable or disable the use of a devices file.
+	# When enabled, lvm will only use devices that
+	# are lised in the devices file. A devices file will
+	# be used, regardless of this setting, when the --devicesfile
+	# option is set to a specific file name.
+	# This configuration option has an automatic default value.
+	# use_devicesfile = 0
+
+	# Configuration option devices/devicesfile.
+	# The name of the system devices file, listing devices that LVM should use.
+	# This should not be used to select a non-system devices file.
+	# The --devicesfile option is intended for alternative devices files.
+	# This configuration option has an automatic default value.
+	# devicesfile = "system.devices"
+
+	# Configuration option devices/search_for_devnames.
+	# Look outside of the devices file for missing devname entries.
+	# A devname entry is used for a device that does not have a stable
+	# device id, e.g. wwid, so the unstable device name is used as
+	# the device id. After reboot, or if the device is reattached,
+	# the device name may change, in which case lvm will not find
+	# the expected PV on the device listed in the devices file.
+	# This setting controls whether lvm will search other devices,
+	# outside the devices file, to look for the missing PV on a
+	# renamed device. If "none", lvm will not look at other devices,
+	# and the PV may appear to be missing. If "auto", lvm will look
+	# at other devices, but only those that are likely to have the PV.
+	# If "all", lvm will look at all devices on the system.
+	# This configuration option has an automatic default value.
+	# search_for_devnames = "auto"
+
 	# Configuration option devices/filter.
 	# Limit the block devices that are used by LVM commands.
 	# This is a list of regular expressions used to accept or reject block
diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index e133387af..572f84aa8 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -72,6 +72,14 @@ lvchange - Change the attributes of logical volume(s)
     \fB--detachprofile\fP
 .ad b
 .br
+.ad l
+    \fB--devices\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--devicesfile\fP \fIString\fP
+.ad b
+.br
 .ad l
     \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .ad b
@@ -586,6 +594,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -782,6 +798,24 @@ See \fBlvm.conf\fP(5) for more information about profiles.
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
 Specifies how the device-mapper thin pool layer in the kernel should
@@ -1192,6 +1226,7 @@ Change LV permission to read-only:
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -1214,6 +1249,7 @@ Change LV permission to read-only:
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index 01fbc7154..c645d6a56 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -78,6 +78,14 @@ lvconvert - Change logical volume layout
     \fB--deduplication\fP \fBy\fP|\fBn\fP
 .ad b
 .br
+.ad l
+    \fB--devices\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--devicesfile\fP \fIString\fP
+.ad b
+.br
 .ad l
     \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .ad b
@@ -1146,6 +1154,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -1326,6 +1342,24 @@ See \fBlvmvdo\fP(7) for more information about VDO usage.
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
 Specifies how the device-mapper thin pool layer in the kernel should
@@ -2265,6 +2299,7 @@ Detach and remove the cache pool from a cache LV.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -2287,6 +2322,7 @@ Detach and remove the cache pool from a cache LV.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index 716db5053..8f548811e 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -90,6 +90,14 @@ lvcreate - Create a logical volume
     \fB--deduplication\fP \fBy\fP|\fBn\fP
 .ad b
 .br
+.ad l
+    \fB--devices\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--devicesfile\fP \fIString\fP
+.ad b
+.br
 .ad l
     \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .ad b
@@ -1199,6 +1207,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -1412,6 +1428,24 @@ See \fBlvmvdo\fP(7) for more information about VDO usage.
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--discards\fP \fBpassdown\fP|\fBnopassdown\fP|\fBignore\fP
 .br
 Specifies how the device-mapper thin pool layer in the kernel should
@@ -3162,6 +3196,7 @@ Create a VDO LV vdo0 with VDOPoolLV size of 10GiB and name vpool1.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -3184,6 +3219,7 @@ Create a VDO LV vdo0 with VDOPoolLV size of 10GiB and name vpool1.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index 9751b7656..e19447c58 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -154,6 +154,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -245,6 +253,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -509,6 +535,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -531,6 +558,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index 3dd4d0f3f..4ccfa809b 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -30,6 +30,14 @@ lvextend - Add space to a logical volume
  \fB-d\fP|\fB--debug\fP
 .ad b
 .br
+.ad l
+    \fB--devices\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--devicesfile\fP \fIString\fP
+.ad b
+.br
 .ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .ad b
@@ -316,6 +324,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -393,6 +409,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -678,6 +712,7 @@ Extend an LV by 16MiB using specific physical extents.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -700,6 +735,7 @@ Extend an LV by 16MiB using specific physical extents.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index b6212a6f0..7fb7d046d 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -146,6 +146,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -220,6 +228,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -474,6 +500,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -496,6 +523,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen
index bbfa1216d..87af9b925 100644
--- a/man/lvm-lvpoll.8_pregen
+++ b/man/lvm-lvpoll.8_pregen
@@ -72,6 +72,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -134,6 +142,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -289,6 +315,7 @@ Continue thin snapshot merge.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -311,6 +338,7 @@ Continue thin snapshot merge.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen
index b2ab265ca..afb890cc3 100644
--- a/man/lvmconfig.8_pregen
+++ b/man/lvmconfig.8_pregen
@@ -141,6 +141,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -202,6 +210,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -481,6 +507,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -503,6 +530,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen
index 62dc2afdd..d47514027 100644
--- a/man/lvmdiskscan.8_pregen
+++ b/man/lvmdiskscan.8_pregen
@@ -67,6 +67,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -116,6 +124,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -233,6 +259,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -255,6 +282,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index 9e3dbfe87..4fcc08f99 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -98,6 +98,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -154,6 +162,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -340,6 +366,7 @@ Reduce the size of an LV by 3 logical extents:
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -362,6 +389,7 @@ Reduce the size of an LV by 3 logical extents:
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index 4635ec77c..b53b871cc 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -102,6 +102,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -158,6 +166,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -334,6 +360,7 @@ Remove all LVs the specified VG.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -356,6 +383,7 @@ Remove all LVs the specified VG.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index 1cfc887a8..0a468aed3 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -77,6 +77,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -133,6 +141,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -271,6 +297,7 @@ An alternate syntax to rename "lvold" to "lvnew":
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -293,6 +320,7 @@ An alternate syntax to rename "lvold" to "lvnew":
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index 83b060d86..528066154 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -30,6 +30,14 @@ lvresize - Resize a logical volume
  \fB-d\fP|\fB--debug\fP
 .ad b
 .br
+.ad l
+    \fB--devices\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--devicesfile\fP \fIString\fP
+.ad b
+.br
 .ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .ad b
@@ -264,6 +272,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -341,6 +357,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -604,6 +638,7 @@ Extend an LV by 16MB using specific physical extents:
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -626,6 +661,7 @@ Extend an LV by 16MB using specific physical extents:
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index 57b3736f9..8351aeea2 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -150,6 +150,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -227,6 +235,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -587,6 +613,7 @@ s(k)ip activation: this volume is flagged to be skipped during activation.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -609,6 +636,7 @@ s(k)ip activation: this volume is flagged to be skipped during activation.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index 0b782fedf..03c7806e2 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -77,6 +77,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -140,6 +148,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -269,6 +295,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -291,6 +318,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index 234a114a9..ccf7a613d 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -134,6 +134,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -216,6 +224,24 @@ multiple tags at once. See \fBlvm\fP(8) for information about tags.
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -384,6 +410,7 @@ disk errors, or because it will be removed after freeing it).
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -406,6 +433,7 @@ disk errors, or because it will be removed after freeing it).
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen
index eac6634ce..76671a515 100644
--- a/man/pvck.8_pregen
+++ b/man/pvck.8_pregen
@@ -20,6 +20,14 @@ pvck - Check metadata on physical volumes
  \fB-d\fP|\fB--debug\fP
 .ad b
 .br
+.ad l
+    \fB--devices\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--devicesfile\fP \fIString\fP
+.ad b
+.br
 .ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .ad b
@@ -342,6 +350,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -391,6 +407,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -568,6 +602,7 @@ parameter with a value of 204800 (100 * 1024 * 1024 / 512 = 204800).
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -590,6 +625,7 @@ parameter with a value of 204800 (100 * 1024 * 1024 / 512 = 204800).
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index 781762521..b43dbdd16 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -190,6 +190,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -271,6 +279,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -503,6 +529,7 @@ boundary) manually account for this when initializing for use by LVM.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -525,6 +552,7 @@ boundary) manually account for this when initializing for use by LVM.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index 7c4500131..b560f9de2 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -150,6 +150,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -240,6 +248,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -496,6 +522,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -518,6 +545,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index a34271ff8..0fc745009 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -125,6 +125,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -226,6 +234,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -459,6 +485,7 @@ extents can also be picked out and moved.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -481,6 +508,7 @@ extents can also be picked out and moved.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index 784fcbe12..802e1d4a1 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -67,6 +67,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -116,6 +124,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -244,6 +270,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -266,6 +293,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index fc79a3a5f..01cbc099f 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -62,6 +62,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -111,6 +119,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -251,6 +277,7 @@ appropriate for the intended new partition size).
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -273,6 +300,7 @@ appropriate for the intended new partition size).
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index d85ae6cda..cb43845d2 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -146,6 +146,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -222,6 +230,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -504,6 +530,7 @@ e(x)ported
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -526,6 +553,7 @@ e(x)ported
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index 27e1a773e..b604f9328 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -174,6 +174,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -236,6 +244,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -409,6 +435,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -431,6 +458,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index 6401ee4fb..8f662a7ad 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -93,6 +93,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -142,6 +150,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -290,6 +316,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -312,6 +339,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen
index a174d7642..43d863541 100644
--- a/man/vgcfgrestore.8_pregen
+++ b/man/vgcfgrestore.8_pregen
@@ -22,6 +22,14 @@ vgcfgrestore - Restore volume group configuration
  \fB-d\fP|\fB--debug\fP
 .ad b
 .br
+.ad l
+    \fB--devices\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--devicesfile\fP \fIString\fP
+.ad b
+.br
 .ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .ad b
@@ -189,6 +197,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -238,6 +254,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -383,6 +417,7 @@ missing PV. Repeat for all other missing PVs in the VG.  Then use
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -405,6 +440,7 @@ missing PV. Repeat for all other missing PVs in the VG.  Then use
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 9016e76dd..cb3c3500a 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -50,6 +50,14 @@ vgchange - Change volume group attributes
     \fB--detachprofile\fP
 .ad b
 .br
+.ad l
+    \fB--devices\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--devicesfile\fP \fIString\fP
+.ad b
+.br
 .ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .ad b
@@ -605,6 +613,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -742,6 +758,24 @@ See \fBlvm.conf\fP(5) for more information about profiles.
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -1103,6 +1137,7 @@ Change the maximum number of LVs for an inactive VG.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -1125,6 +1160,7 @@ Change the maximum number of LVs for an inactive VG.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index 9226dc4a6..13f7a1eb9 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -80,6 +80,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -129,6 +137,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -264,6 +290,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -286,6 +313,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index 09b6f1d31..ab7c083e9 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -82,6 +82,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -148,6 +156,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -307,6 +333,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -329,6 +356,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index adef80999..91fa6a67e 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -146,6 +146,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -253,6 +261,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -514,6 +540,7 @@ Create a VG with two PVs, using the default physical extent size.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -536,6 +563,7 @@ Create a VG with two PVs, using the default physical extent size.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index f7db557b7..559d64c25 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -145,6 +145,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -235,6 +243,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -479,6 +505,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -501,6 +528,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index a9a9dc6fb..e88d91922 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -96,6 +96,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -150,6 +158,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -289,6 +315,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -311,6 +338,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index 40a34d9e0..1aef95d6e 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -111,6 +111,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -183,6 +191,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -380,6 +406,7 @@ Add two PVs to a VG.
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -402,6 +429,7 @@ Add two PVs to a VG.
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index b82a1847e..2592fb4d9 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -86,6 +86,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -141,6 +149,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -287,6 +313,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -309,6 +336,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen
index 8cb048ffa..8e0144655 100644
--- a/man/vgimportclone.8_pregen
+++ b/man/vgimportclone.8_pregen
@@ -26,6 +26,10 @@ changes the associated VG and PV UUIDs.
 [ \fB-i\fP|\fB--import\fP ]
 .ad b
 .br
+.ad l
+[    \fB--importdevices\fP ]
+.ad b
+.br
 [ COMMON_OPTIONS ]
 .RE
 .br
@@ -66,6 +70,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -125,6 +137,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -145,6 +175,12 @@ will not be changed (nor will their associated PVs).
 .ad b
 .HP
 .ad l
+\fB--importdevices\fP
+.br
+Add devices to the devices file.
+.ad b
+.HP
+.ad l
 \fB--lockopt\fP \fIString\fP
 .br
 Used to pass options for special cases to lvmlockd.
@@ -250,6 +286,7 @@ Rename the VG associated with "/dev/sdc" and "/dev/sdd" from "vg00" to "vg00_sna
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -272,6 +309,7 @@ Rename the VG associated with "/dev/sdc" and "/dev/sdd" from "vg00" to "vg00_sna
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen
index 03aa096eb..b555a8365 100644
--- a/man/vgmerge.8_pregen
+++ b/man/vgmerge.8_pregen
@@ -63,6 +63,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -119,6 +127,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -235,6 +261,7 @@ Merge an inactive VG named "vg00" into the active or inactive VG named
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -257,6 +284,7 @@ Merge an inactive VG named "vg00" into the active or inactive VG named
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index 4243b0923..66c16a9f6 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -74,6 +74,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -123,6 +131,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -264,6 +290,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -286,6 +313,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index 1f1d8d94e..6aded0070 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -28,6 +28,14 @@ vgreduce - Remove physical volume(s) from a volume group
  \fB-d\fP|\fB--debug\fP
 .ad b
 .br
+.ad l
+    \fB--devices\fP \fIPV\fP
+.ad b
+.br
+.ad l
+    \fB--devicesfile\fP \fIString\fP
+.ad b
+.br
 .ad l
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .ad b
@@ -179,6 +187,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -241,6 +257,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -394,6 +428,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -416,6 +451,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index c715742ad..f78f9b476 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -77,6 +77,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -126,6 +134,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -281,6 +307,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -303,6 +330,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index b9ac143e5..3444a64ac 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -90,6 +90,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -146,6 +154,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -277,6 +303,7 @@ Rename the VG with the specified UUID to "myvg".
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -299,6 +326,7 @@ Rename the VG with the specified UUID to "myvg".
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index f50e43fbd..29ed39e2a 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -142,6 +142,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -217,6 +225,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -492,6 +518,7 @@ Allocation policy: (c)ontiguous, c(l)ing, (n)ormal, (a)nywhere
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -514,6 +541,7 @@ Allocation policy: (c)ontiguous, c(l)ing, (n)ormal, (a)nywhere
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index 5d329f921..1772a450d 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -69,6 +69,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -118,6 +126,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -251,6 +277,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -273,6 +300,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)
diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen
index 9731aa4fa..fe680982d 100644
--- a/man/vgsplit.8_pregen
+++ b/man/vgsplit.8_pregen
@@ -107,6 +107,14 @@ Common options for lvm:
 .ad b
 .br
 .ad l
+[    \fB--devices\fP \fIPV\fP ]
+.ad b
+.br
+.ad l
+[    \fB--devicesfile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -184,6 +192,24 @@ messages sent to the log file and/or syslog (if configured).
 .ad b
 .HP
 .ad l
+\fB--devices\fP \fIPV\fP
+.br
+Devices that the command can use. This option can be repeated
+or accepts a comma separated list of devices. This overrides
+the devices file.
+.ad b
+.HP
+.ad l
+\fB--devicesfile\fP \fIString\fP
+.br
+A file listing devices that LVM should use.
+The file must exist in /etc/lvm/devices/ and is managed
+with the lvmdevices(8) command.
+This overrides the lvm.conf devices/devicesfile and
+devices/use_devicesfile settings.
+.ad b
+.HP
+.ad l
 \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .br
 If set to no, the command will not attempt to use device-mapper.
@@ -345,6 +371,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR lvm (8)
 .BR lvm.conf (5)
 .BR lvmconfig (8)
+.BR lvmdevices (8)
 
 .BR pvchange (8)
 .BR pvck (8)
@@ -367,6 +394,7 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
 .BR vgextend (8)
 .BR vgimport (8)
 .BR vgimportclone (8)
+.BR vgimportdevices (8)
 .BR vgmerge (8)
 .BR vgmknodes (8)
 .BR vgreduce (8)



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-02-17 10:54 Zdenek Kabelac
  0 siblings, 0 replies; 24+ messages in thread
From: Zdenek Kabelac @ 2021-02-17 10:54 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2c5e034cd3cb480d79ac4cc23a6d5079bb053f28
Commit:        2c5e034cd3cb480d79ac4cc23a6d5079bb053f28
Parent:        b9846bdc3e420348646d26259ad57c60b6f2ebf9
Author:        Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate:    Tue Feb 16 21:30:06 2021 +0100
Committer:     Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Wed Feb 17 11:53:19 2021 +0100

make: generate

---
 man/lvconvert.8_pregen | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index 170eec815..01fbc7154 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -86,6 +86,10 @@ lvconvert - Change logical volume layout
     \fB--driverloaded\fP \fBy\fP|\fBn\fP
 .ad b
 .br
+.ad l
+    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP
+.ad b
+.br
 .ad l
  \fB-f\fP|\fB--force\fP
 .ad b
@@ -819,6 +823,10 @@ Convert LV to type thin-pool.
 .ad b
 .br
 .ad l
+[    \fB--errorwhenfull\fP \fBy\fP|\fBn\fP ]
+.ad b
+.br
+.ad l
 [    \fB--poolmetadata\fP \fILV\fP ]
 .ad b
 .br
@@ -915,6 +923,18 @@ Convert LV to type vdopool.
 .ad b
 .br
 .ad l
+[ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
+.ad b
+.br
+.ad l
+[ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
+.ad b
+.br
+.ad l
+[    \fB--metadataprofile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--compression\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br
@@ -1326,6 +1346,19 @@ For testing and debugging.
 .ad b
 .HP
 .ad l
+\fB--errorwhenfull\fP \fBy\fP|\fBn\fP
+.br
+Specifies thin pool behavior when data space is exhausted.
+When yes, device-mapper will immediately return an error
+when a thin pool is full and an I/O request requires space.
+When no, device-mapper will queue these I/O requests for a
+period of time to allow the thin pool to be extended.
+Errors are returned if no space is available after the timeout.
+(Also see dm-thin-pool kernel module option no_space_timeout.)
+See \fBlvmthin\fP(7) for more information.
+.ad b
+.HP
+.ad l
 \fB-f\fP|\fB--force\fP ...
 .br
 Override various checks, confirmations and protections.
@@ -1981,6 +2014,14 @@ Convert LV to type vdopool.
 .br
 .RS 4
 .ad l
+[ \fB-r\fP|\fB--readahead\fP \fBauto\fP|\fBnone\fP|\fINumber\fP ]
+.ad b
+.br
+.ad l
+[ \fB-Z\fP|\fB--zero\fP \fBy\fP|\fBn\fP ]
+.ad b
+.br
+.ad l
 [ \fB-n\fP|\fB--name\fP \fILV\fP\fI_new\fP ]
 .ad b
 .br
@@ -1993,6 +2034,10 @@ Convert LV to type vdopool.
 .ad b
 .br
 .ad l
+[    \fB--metadataprofile\fP \fIString\fP ]
+.ad b
+.br
+.ad l
 [    \fB--compression\fP \fBy\fP|\fBn\fP ]
 .ad b
 .br



^ permalink raw reply related	[flat|nested] 24+ messages in thread
* main - make: generate
@ 2021-01-18 13:46 Marian Csontos
  0 siblings, 0 replies; 24+ messages in thread
From: Marian Csontos @ 2021-01-18 13:46 UTC (permalink / raw)
  To: lvm-devel

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9757b4726c6f1e16c84210a3c4578db29eb7662d
Commit:        9757b4726c6f1e16c84210a3c4578db29eb7662d
Parent:        37227b8ad6ba67804f98cdadd0ed6f2b369ae656
Author:        Marian Csontos <mcsontos@redhat.com>
AuthorDate:    Mon Jan 18 14:46:22 2021 +0100
Committer:     Marian Csontos <mcsontos@redhat.com>
CommitterDate: Mon Jan 18 14:46:22 2021 +0100

make: generate

---
 man/lvconvert.8_pregen | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index a47ccac08..170eec815 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -772,6 +772,10 @@ Add a cache to an LV, using a specified cache device.
 .br
 .RS 4
 .ad l
+[ \fB-c\fP|\fB--chunksize\fP \fISize\fP[k|UNIT] ]
+.ad b
+.br
+.ad l
 [    \fB--cachesize\fP \fISize\fP[m|UNIT] ]
 .ad b
 .br



^ permalink raw reply related	[flat|nested] 24+ messages in thread
end of thread, other threads:[~2023-06-23 16:09 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-23 21:06 main - make: generate Zdenek Kabelac
  -- strict thread matches above, loose matches on Subject: below --
2023-06-23 16:09 Zdenek Kabelac
2023-03-22 12:44 Tony Asleson
2023-03-21 12:39 Marian Csontos
2022-11-10 13:22 Marian Csontos
2022-09-21 12:59 Zdenek Kabelac
2022-08-11 11:06 Peter Rajnoha
2022-07-10 23:22 Zdenek Kabelac
2022-05-18 16:15 Marian Csontos
2022-05-03 17:11 Zdenek Kabelac
2022-02-07 19:03 Zdenek Kabelac
2021-10-14 21:37 Zdenek Kabelac
2021-10-07 17:43 David Teigland
2021-09-23 14:52 Zdenek Kabelac
2021-08-09 14:27 Marian Csontos
2021-05-07 15:45 Marian Csontos
2021-04-19 13:01 Zdenek Kabelac
2021-04-12  9:13 Zdenek Kabelac
2021-04-12  7:55 Zdenek Kabelac
2021-03-19 23:17 Zdenek Kabelac
2021-03-05 12:01 Marian Csontos
2021-03-02 21:58 Zdenek Kabelac
2021-02-17 10:54 Zdenek Kabelac
2021-01-18 13:46 Marian Csontos

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.