31 files changed, 121 insertions, 121 deletions
diff --git a/disk-utils/fdformat.8 b/disk-utils/fdformat.8
index 9e1b98965..b7b3a351d 100644
--- a/disk-utils/fdformat.8
+++ b/disk-utils/fdformat.8
@@ -54,7 +54,7 @@ Stop at the track \fIN\fR.
 \fB\-r\fR, \fB\-\-repair\fR \fIN\fR
 Try to repair tracks failed during the verification (max \fIN\fR retries).
 .TP
-\fB\-n\fR, \fB\-\-no-verify\fR
+\fB\-n\fR, \fB\-\-no\-verify\fR
 Skip the verification that is normally performed after the formatting.
 .TP
 \fB\-V\fR, \fB\-\-version\fR
diff --git a/disk-utils/fdisk.8 b/disk-utils/fdisk.8
index a61176d44..d9c4d270e 100644
--- a/disk-utils/fdisk.8
+++ b/disk-utils/fdisk.8
@@ -46,7 +46,7 @@ is not guaranteed.  The input (the commands) should always be backward compatibl
 
 .SH OPTIONS
 .TP
-\fB\-b\fR, \fB\-\-sector-size\fR \fIsectorsize\fP
+\fB\-b\fR, \fB\-\-sector\-size\fR \fIsectorsize\fP
 Specify the sector size of the disk.  Valid values are 512, 1024, 2048, and 4096.
 (Recent kernels know the sector size.  Use this option only on old kernels or
 to override the kernel's ideas.)  Since util-linux-2.17, \fBfdisk\fR differentiates
diff --git a/disk-utils/sfdisk.8 b/disk-utils/sfdisk.8
index bb0ba83dc..185972c42 100644
--- a/disk-utils/sfdisk.8
+++ b/disk-utils/sfdisk.8
@@ -67,14 +67,14 @@ then all partitions with an enabled flag are listed.
 Dump the partitions of a device in a format that is usable as input to sfdisk.
 See the section \fBBACKING UP THE PARTITION TABLE\fR.
 .TP
-.BR \-g , " \-\-show-geometry " [ \fIdevice ...]
+.BR \-g , " \-\-show\-geometry " [ \fIdevice ...]
 List the geometry of all or the specified devices.
 .TP
 .BR \-l , " \-\-list " [ \fIdevice ...]
 List the partitions of all or the specified devices.  This command can be used
 together with \fB\-\-verify\fR.
 .TP
-.BR \-\-part-attrs " \fIdevice partno [" \fIattrs ]
+.BR \-\-part\-attrs " \fIdevice partno [" \fIattrs ]
 Change the GPT partition attribute bits.  If \fIattrs\fR is not specified,
 then print the current partition settings.  The \fIattrs\fR argument is a
 comma- or space-delimited list of bits.  The currently supported attribute
@@ -82,24 +82,24 @@ bits are: RequiredPartiton, NoBlockIOProtocol, LegacyBIOSBootable
 and GUID-specific bits in the range from 48 to 63.  For example, the string
 "RequiredPartiton,50,51" sets three bits.
 .TP
-.BR \-\-part-label " \fIdevice partno [" \fIlabel ]
+.BR \-\-part\-label " \fIdevice partno [" \fIlabel ]
 Change the GPT partition name (label).  If \fIlabel\fR is nto specified,
 then print the current partition label.
 .TP
-.BR \-\-part-type " \fIdevice partno [" \fItype ]
+.BR \-\-part\-type " \fIdevice partno [" \fItype ]
 Change the partition type.  If \fItype\fR is not specified, then print the
 current partition type.  The \fItype\fR argument is hexadecimal for MBR,
 or a GUID for GPT.  For backward compatibility the options \fB\-c\fR and
 \fB\-\-id\fR have the same meaning.
 .TP
-.BR \-\-part-uuid " \fIdevice partno [" \fIuuid ]
+.BR \-\-part\-uuid " \fIdevice partno [" \fIuuid ]
 Change the GPT partition UUID.  If \fIuuid\fR is not specified,
 then print the current partition UUID.
 .TP
-.BR \-s , " \-\-show-size " [ \fIdevice ...]
+.BR \-s , " \-\-show\-size " [ \fIdevice ...]
 List the sizes of all or the specified devices.
 .TP
-.BR \-T , " \-\-list-types"
+.BR \-T , " \-\-list\-types"
 Print all supported types for the current disk label or the label specified by
 \fB\-\-label\fR.
 .TP
@@ -114,7 +114,7 @@ Don't create a new partition table, but only append the specified partitions.
 .BR \-b , " \-\-backup"
 Back up the current partition table sectors before starting the partitioning.
 The default backup file name is ~/sfdisk-<device>-<offset>.bak; to use another
-name see \fB\-\-backup-file\fR.
+name see \fB\-\-backup\-file\fR.
 .TP
 .BR \-f , " \-\-force"
 Disable all consistency checking.
@@ -127,7 +127,7 @@ to get a list of all supported columns.
 The default list of columns may be extended if \fIlist\fP is
 specified in the format \fI+list\fP (e.g. \fB-o +UUID\fP).
 .TP
-.BR \-O , " \-\-backup-file " \fIpath\fR
+.BR \-O , " \-\-backup\-file " \fIpath\fR
 Override the default backup file name.  Note that the device name and offset
 are always appended to the file name.
 .TP
@@ -137,7 +137,7 @@ Suppress extra info messages.
 .BR \-n , " \-\-no\-act"
 Do everything except write to device.
 .TP
-.B \-\-no-reread
+.B \-\-no\-reread
 Do not check through the re-read-partition-table ioctl whether the device is in use.
 .TP
 .BR \-u , " \-\-unit S"
@@ -152,7 +152,7 @@ Specify the disk label type (e.g. \fBdos\fR, \fBgpt\fR, ...).  If this option
 is not given, then \fBsfdisk\fR defaults to the existing label, but if there
 is no label on the device yet, then the type defaults to \fBdos\fR.
 .TP
-.BR \-Y , " \-\-label-nested " \fItype
+.BR \-Y , " \-\-label\-nested " \fItype
 Force editing of a nested disk label.  The primary disk label has to exist already.
 This option allows to edit for example a hybrid/protective MBR on devices with GPT.
 .TP
@@ -291,7 +291,7 @@ Mark the partition as bootable.
 .TP
 .BI attrs= string
 Partition attributes, usually GPT partition attribute bits.  See
-\fB\-\-part-attrs\fR for more details about the GPT-bits string format.
+\fB\-\-part\-attrs\fR for more details about the GPT-bits string format.
 .TP
 .BI uuid= string
 GPT partition UUID.
@@ -351,12 +351,12 @@ provides all necessary functionality.
 
 .SH NOTES
 Since version 2.26 \fBsfdisk\fR no longer provides the \fB\-R\fR or
-\fB\-\-re-read\fR option to force the kernel to reread the partition table.
+\fB\-\-re\-read\fR option to force the kernel to reread the partition table.
 Use \fBblockdev \-\-rereadpt\fR instead.
 .PP
-Since version 2.26 \fBsfdisk\fR does not provide the \fB\-\-DOS\fR, \fB\-\-IBM\fR, \fB\-\-DOS-extended\fR,
-\fB\-\-unhide\fR, \fB\-\-show-extended\fR, \fB\-\-cylinders\fR, \fB\-\-heads\fR, \fB\-\-sectors\fR,
-\fB\-\-inside-outer\fR, \fB\-\-not-inside-outer\fR options.
+Since version 2.26 \fBsfdisk\fR does not provide the \fB\-\-DOS\fR, \fB\-\-IBM\fR, \fB\-\-DOS\-extended\fR,
+\fB\-\-unhide\fR, \fB\-\-show\-extended\fR, \fB\-\-cylinders\fR, \fB\-\-heads\fR, \fB\-\-sectors\fR,
+\fB\-\-inside\-outer\fR, \fB\-\-not\-inside\-outer\fR options.
 
 .SH ENVIRONMENT
 .IP LIBFDISK_DEBUG=all
diff --git a/login-utils/chfn.1 b/login-utils/chfn.1
index 564fed301..bd93449ea 100644
--- a/login-utils/chfn.1
+++ b/login-utils/chfn.1
@@ -52,16 +52,16 @@ otherwise use \fBypchfn\fR, \fBlchfn\fR or any other implementation for
 non-local entries.
 .SH OPTIONS
 .TP
-.BR \-f , " \-\-full-name " \fIfull-name
+.BR \-f , " \-\-full\-name " \fIfull-name
 Specify your real name.
 .TP
 .BR \-o , " \-\-office " \fIoffice
 Specify your office room number.
 .TP
-.BR \-p , " \-\-office-phone " \fIoffice-phone
+.BR \-p , " \-\-office\-phone " \fIoffice-phone
 Specify your office phone number.
 .TP
-.BR \-h , " \-\-home-phone " \fIhome-phone
+.BR \-h , " \-\-home\-phone " \fIhome-phone
 Specify your home phone number.
 .TP
 .BR \-u , " \-\-help"
diff --git a/login-utils/chsh.1 b/login-utils/chsh.1
index eb59c5c06..33082a61a 100644
--- a/login-utils/chsh.1
+++ b/login-utils/chsh.1
@@ -33,7 +33,7 @@ non-local entries.
 .BR \-s , " \-\-shell " \fIshell
 Specify your login shell.
 .TP
-.BR \-l , " \-\-list-shells"
+.BR \-l , " \-\-list\-shells"
 Print the list of shells listed in
 .I /etc/shells
 and exit.
diff --git a/login-utils/lslogins.1 b/login-utils/lslogins.1
index fb45b79db..fd1c66157 100644
--- a/login-utils/lslogins.1
+++ b/login-utils/lslogins.1
@@ -77,7 +77,7 @@ Show system accounts.  These are by default all accounts with a UID below 1000
 threshold can also be specified explicitly (necessary for some distributions that
 allocate UIDs starting from 100, 500 - or an entirely different value - rather than 1000).
 .TP
-\fB\-\-time-format\fR \fItype\fP
+\fB\-\-time\-format\fR \fItype\fP
 Display dates in short, full or iso format.  The default is short, this time
 format is designed to be space efficient and human readable.
 .TP
diff --git a/login-utils/runuser.1 b/login-utils/runuser.1
index 3526c070c..1fec182c8 100644
--- a/login-utils/runuser.1
+++ b/login-utils/runuser.1
@@ -66,7 +66,7 @@ shell.
 .BR \-g , " \-\-group" = \fIgroup
 The primary group to be used.  This option is allowed for the root user only.
 .TP
-.BR \-G , " \-\-supp-group" = \fIgroup
+.BR \-G , " \-\-supp\-group" = \fIgroup
 A supplemental group to be used.  This option is allowed for the root user only.
 .TP
 .BR \- , " \-l" , " \-\-login"
@@ -95,7 +95,7 @@ sets argv[0] of the shell to
 in order to make the shell a login shell
 .RE
 .TP
-.BR \-m , " \-p" , " \-\-preserve-environment"
+.BR \-m , " \-p" , " \-\-preserve\-environment"
 Preserve the entire environment, i.e. it does not set
 .BR HOME ,
 .BR SHELL ,
@@ -117,7 +117,7 @@ o
 the shell specified in the environment variable
 .B SHELL
 if the
-.B \-\-preserve-environment
+.B \-\-preserve\-environment
 option is used
 .TP
 o
diff --git a/login-utils/su.1 b/login-utils/su.1
index d0635829b..f5fecf199 100644
--- a/login-utils/su.1
+++ b/login-utils/su.1
@@ -56,7 +56,7 @@ to the shell, which may or may not be useful, depending on the shell.
 .BR \-g , " \-\-group" = \fIgroup
 Specify the primary group.  This option is available to the root user only.
 .TP
-.BR \-G , " \-\-supp-group" = \fIgroup
+.BR \-G , " \-\-supp\-group" = \fIgroup
 Specify a supplemental group.  This option is available to the root user only.
 .TP
 .BR \- , " \-l" , " \-\-login"
@@ -85,7 +85,7 @@ sets argv[0] of the shell to
 in order to make the shell a login shell
 .RE
 .TP
-.BR \-m , " \-p" , " \-\-preserve-environment"
+.BR \-m , " \-p" , " \-\-preserve\-environment"
 Preserve the entire environment, i.e. it does not set
 .BR HOME ,
 .BR SHELL ,
@@ -107,7 +107,7 @@ o
 the shell specified in the environment variable
 .BR SHELL ,
 if the
-.B \-\-preserve-environment
+.B \-\-preserve\-environment
 option is used
 .TP
 o
@@ -124,7 +124,7 @@ option and the
 .B SHELL
 environment variables are ignored unless the calling user is root.
 .TP
-.BI \-\-session-command= command
+.BI \-\-session\-command= command
 Same as
 .B \-c
 but do not create a new session.  (Discouraged.)
diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index 287827812..45cb49b4a 100644
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -147,7 +147,7 @@ umount, remount and move.  More than one action may be specified in a
 comma-separated list.  All actions are monitored by default.
 
 The time for which \fB--poll\fR will block can be restricted with the \fB\-\-timeout\fP
-or \fB\-\-first-only\fP options.
+or \fB\-\-first\-only\fP options.
 
 The standard columns always use the new version of the information from the
 mountinfo file, except the umount action which is based on the original
diff --git a/misc-utils/logger.1 b/misc-utils/logger.1
index ff81fce4c..46ddbcf60 100644
--- a/misc-utils/logger.1
+++ b/misc-utils/logger.1
@@ -108,7 +108,7 @@ For example, \fB\-p local3.info\fR
 logs the message as informational in the local3 facility.
 The default is \fBuser.notice\fR.
 .TP
-.B \-\-prio-prefix
+.B \-\-prio\-prefix
 Look for a syslog prefix on every line read from standard input.
 This prefix is a decimal number within angle brackets that encodes both
 the facility and the level.  The number is constructed by multiplying the
diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8
index b259120b7..bc7c3afc2 100644
--- a/misc-utils/lsblk.8
+++ b/misc-utils/lsblk.8
@@ -93,7 +93,7 @@ to get a list of all supported columns.
 The default list of columns may be extended if \fIlist\fP is
 specified in the format \fI+list\fP (e.g. \fBlsblk -o +UUID\fP).
 .TP
-.BR \-O , " \-\-output-all "
+.BR \-O , " \-\-output\-all "
 Output all available columns.
 .TP
 .BR \-P , " \-\-pairs"
diff --git a/schedutils/taskset.1 b/schedutils/taskset.1
index 74fcf9d79..50cbe6be4 100644
--- a/schedutils/taskset.1
+++ b/schedutils/taskset.1
@@ -70,10 +70,10 @@ returns, it is guaranteed that the given program has been scheduled to a legal
 CPU.
 .SH OPTIONS
 .TP
-.BR \-a ,\  \-\-all-tasks
+.BR \-a ,\  \-\-all\-tasks
 Set or retrieve the CPU affinity of all the tasks (threads) for a given PID.
 .TP
-.BR \-c ,\  \-\-cpu-list \ \fInumbers
+.BR \-c ,\  \-\-cpu\-list \ \fInumbers
 Specify a numerical list of processors instead of a bitmask.  The \fInumbers\fR
 are separated by commas and may include ranges.  For example:
 .BR 0,5,8-11 .
diff --git a/sys-utils/dmesg.1 b/sys-utils/dmesg.1
index bf525e4e9..a28a4f922 100644
--- a/sys-utils/dmesg.1
+++ b/sys-utils/dmesg.1
@@ -9,13 +9,13 @@ dmesg \- print or control the kernel ring buffer
 .sp
 .B dmesg \-\-clear
 .br
-.BR "dmesg \-\-read-clear " [options]
+.BR "dmesg \-\-read\-clear " [options]
 .br
-.BI "dmesg \-\-console-level " level
+.BI "dmesg \-\-console\-level " level
 .br
-.B dmesg \-\-console-on
+.B dmesg \-\-console\-on
 .br
-.B dmesg \-\-console-off
+.B dmesg \-\-console\-off
 .SH DESCRIPTION
 .B dmesg
 is used to examine or control the kernel ring buffer.
@@ -24,25 +24,25 @@ The default action is to display all messages from the kernel ring buffer.
 .SH OPTIONS
 The
 .BR \-\-clear ,
-.BR \-\-read-clear ,
-.BR \-\-console-on ,
-.BR \-\-console-off ,
+.BR \-\-read\-clear ,
+.BR \-\-console\-on ,
+.BR \-\-console\-off ,
 and
-.B \-\-console-level
+.B \-\-console\-level
 options are mutually exclusive.
 .PP
 .IP "\fB\-C\fR, \fB\-\-clear\fR"
 Clear the ring buffer.
-.IP "\fB\-c\fR, \fB\-\-read-clear\fR"
+.IP "\fB\-c\fR, \fB\-\-read\-clear\fR"
 Clear the ring buffer after first printing its contents.
-.IP "\fB\-D\fR, \fB\-\-console-off\fR"
+.IP "\fB\-D\fR, \fB\-\-console\-off\fR"
 Disable the printing of messages to the console.
-.IP "\fB\-d\fR, \fB\-\-show-delta\fR"
+.IP "\fB\-d\fR, \fB\-\-show\-delta\fR"
 Display the timestamp and the time delta spent between messages.  If used
 together with
 .B \-\-notime
 then only the time delta without the timestamp is printed.
-.IP "\fB\-E\fR, \fB\-\-console-on\fR"
+.IP "\fB\-E\fR, \fB\-\-console\-on\fR"
 Enable printing messages to the console.
 .IP "\fB\-e\fR, \fB\-\-reltime\fR"
 Display the local time and the delta in human-readable format.
@@ -83,7 +83,7 @@ of levels.  For example:
 will print error and warning messages only.  For all supported levels see the
 .B \-\-help
 output.
-.IP "\fB\-n\fR, \fB\-\-console-level \fIlevel\fR
+.IP "\fB\-n\fR, \fB\-\-console\-level \fIlevel\fR
 Set the
 .I level
 at which printing of messages is done to the console.  The
@@ -131,7 +131,7 @@ kernel interface to read kernel messages.  The default is to use /dev/kmsg rathe
 than
 .BR syslog (2)
 since kernel 3.5.0.
-.IP "\fB\-s\fR, \fB\-\-buffer-size \fIsize\fR
+.IP "\fB\-s\fR, \fB\-\-buffer\-size \fIsize\fR
 Use a buffer of
 .I size
 to query the kernel ring buffer.  This is 16392 by default.  (The default
diff --git a/sys-utils/eject.1 b/sys-utils/eject.1
index 43aca27cc..edc6a2ac9 100644
--- a/sys-utils/eject.1
+++ b/sys-utils/eject.1
@@ -60,13 +60,13 @@ drive will not be ejected when the button is pressed.  This is useful when you
 are carrying a laptop in a bag or case and don't want it to eject if the button
 is inadvertently pressed.
 .TP
-.BR \-M , " \-\-no-partitions-unmount"
+.BR \-M , " \-\-no\-partitions\-unmount"
 The option tells eject to not try to unmount other partitions on partitioned
 devices.  If another partition is still mounted, the program will not attempt
 to eject the media.  It will attempt to unmount only the device or mountpoint
 given on the command line.
 .TP
-.BR \-m , " \-\-no-unmount"
+.BR \-m , " \-\-no\-unmount"
 The option tells eject to not try to unmount at all.
 .TP
 .BR \-n , " \-\-noop"
diff --git a/sys-utils/fallocate.1 b/sys-utils/fallocate.1
index d166ad857..dd9f293db 100644
--- a/sys-utils/fallocate.1
+++ b/sys-utils/fallocate.1
@@ -37,10 +37,10 @@ MiB (=1024*1024), and so on for GiB, TiB, PiB, EiB, ZiB and YiB (the "iB" is
 optional, e.g., "K" has the same meaning as "KiB") or the suffixes
 KB (=1000), MB (=1000*1000), and so on for GB, TB, PB, EB, ZB and YB.
 .PP
-The options \fB\-\-collapse-range\fP, \fB\-\-dig-holes\fP, \fB\-\-punch-hole\fP and
-\fB\-\-zero-range\fP are mutually exclusive.
+The options \fB\-\-collapse\-range\fP, \fB\-\-dig\-holes\fP, \fB\-\-punch\-hole\fP and
+\fB\-\-zero\-range\fP are mutually exclusive.
 .TP
-.BR \-c , " \-\-collapse-range"
+.BR \-c , " \-\-collapse\-range"
 Removes a byte range from a file, without leaving a hole.  The byte range
 to be collapsed starts at \fIoffset\fP and continues
 for \fIlength\fR bytes.  At the completion of the operation, the contents of
@@ -50,36 +50,36 @@ location \fIoffset\fR, and the file will be \fIlength\fR bytes smaller.  The opt
 .sp
 Available since Linux 3.15 for ext4 (only for extent-based files) and XFS.
 .TP
-.BR \-d , " \-\-dig-holes"
+.BR \-d , " \-\-dig\-holes"
 Detect and dig holes.  This makes the file sparse in-place, without using extra
 disk space.  The minimum size of the hole depends on filesystem I/O block size
-(usually 4096 bytes).  Also, when using this option, \fB\-\-keep-size\fP is
+(usually 4096 bytes).  Also, when using this option, \fB\-\-keep\-size\fP is
 implied.  If no range is specified by \fB\-\-offset\fP and \fB\-\-length\fP,
 then the entire file is analyzed for holes.
 .sp
 You can think of this option as doing a "\fBcp --sparse\fP" and then renaming
 the destination file to the original, without the need for extra disk space.
 .sp
-See \fB\-\-punch-hole\fP for a list of supported filesystems.
+See \fB\-\-punch\-hole\fP for a list of supported filesystems.
 .TP
 .BR \-l , " \-\-length " \fIlength
 Specifies the length of the range, in bytes.
 .TP
-.BR \-n , " \-\-keep-size"
+.BR \-n , " \-\-keep\-size"
 Do not modify the apparent length of the file.  This may effectively allocate
 blocks past EOF, which can be removed with a truncate.
 .TP
 .BR \-o , " \-\-offset " \fIoffset
 Specifies the beginning offset of the range, in bytes.
 .TP
-.BR \-p , " \-\-punch-hole"
+.BR \-p , " \-\-punch\-hole"
 Deallocates space (i.e., creates a hole) in the byte range starting at
 \fIoffset\fP and continuing for \fIlength\fR bytes.  Within the
 specified range, partial filesystem blocks are zeroed, and whole
 filesystem blocks are removed from the file.  After a successful
 call, subsequent reads from this range will return zeroes.  This option
-may not be specified at the same time as  the \fB\-\-zero-range\fP option.
-Also, when using this option, \fB\-\-keep-size\fP is implied.
+may not be specified at the same time as  the \fB\-\-zero\-range\fP option.
+Also, when using this option, \fB\-\-keep\-size\fP is implied.
 .sp
 Supported for XFS (since Linux 2.6.38), ext4 (since Linux 3.0),
 Btrfs (since Linux 3.7) and tmpfs (since Linux 3.5).
@@ -87,7 +87,7 @@ Btrfs (since Linux 3.7) and tmpfs (since Linux 3.5).
 .BR \-v , " \-\-verbose"
 Enable verbose mode.
 .TP
-.BR \-z , " \-\-zero-range"
+.BR \-z , " \-\-zero\-range"
 Zeroes space in the byte range starting at \fIoffset\fP and
 continuing for \fIlength\fR bytes.  Within the specified range, blocks are
 preallocated for the regions that span the holes in the file.  After
diff --git a/sys-utils/flock.1 b/sys-utils/flock.1
index f69040190..cdc294b24 100644
--- a/sys-utils/flock.1
+++ b/sys-utils/flock.1
@@ -65,7 +65,7 @@ See the examples below for how that can be used.
 Pass a single \fIcommand\fR, without arguments, to the shell with
 .BR \-c .
 .TP
-.BR \-E , " \-\-conflict-exit-code " \fInumber
+.BR \-E , " \-\-conflict\-exit\-code " \fInumber
 The exit code used when the \fB\-n\fP option is in use, and the
 conflicting lock exists, or the \fB\-w\fP option is in use,
 and the timeout is reached.  The default value is \fB1\fR.
diff --git a/sys-utils/ipcrm.1 b/sys-utils/ipcrm.1
index 6f58d0fcf..b4420c978 100644
--- a/sys-utils/ipcrm.1
+++ b/sys-utils/ipcrm.1
@@ -55,29 +55,29 @@ if you are unsure how the software using the resources might react to missing
 objects.  Some programs create these resources at startup and may not have
 any code to deal with an unexpected disappearance.
 .TP
-.BR \-M , " \-\-shmem-key " \fIshmkey
+.BR \-M , " \-\-shmem\-key " \fIshmkey
 Remove the shared memory segment created with
 .I shmkey
 after the last detach is performed.
 .TP
-.BR \-m , " \-\-shmem-id " \fIshmid
+.BR \-m , " \-\-shmem\-id " \fIshmid
 Remove the shared memory segment identified by
 .I shmid
 after the last detach is performed.
 .TP
-.BR \-Q , " \-\-queue-key " \fImsgkey
+.BR \-Q , " \-\-queue\-key " \fImsgkey
 Remove the message queue created with
 .IR msgkey .
 .TP
-.BR \-q , " \-\-queue-id " \fImsgid
+.BR \-q , " \-\-queue\-id " \fImsgid
 Remove the message queue identified by
 .IR msgid .
 .TP
-.BR \-S , " \-\-semaphore-key " \fIsemkey
+.BR \-S , " \-\-semaphore\-key " \fIsemkey
 Remove the semaphore created with
 .IR semkey .
 .TP
-.BR \-s , " \-\-semaphore-id " \fIsemid
+.BR \-s , " \-\-semaphore\-id " \fIsemid
 Remove the semaphore identified by
 .IR semid .
 .TP
diff --git a/sys-utils/ldattach.8 b/sys-utils/ldattach.8
index 412ea3868..55a43ca89 100644
--- a/sys-utils/ldattach.8
+++ b/sys-utils/ldattach.8
@@ -129,7 +129,7 @@ Set the parity of the serial line to odd.
 .BR  \-s , " \-\-speed " \fIvalue
 Set the speed (the baud rate) of the serial line to the specified \fIvalue\fR.
 .TP
-.BR \-c , " \-\-intro-command " \fIstring
+.BR \-c , " \-\-intro\-command " \fIstring
 Define an intro command that is sent through the serial line before the invocation
 of ldattach. E.g. in conjunction with line discipline GSM0710, the command
 \'AT+CMUX=0\\r\' is commonly suitable to switch the modem into the CMUX mode.
diff --git a/sys-utils/losetup.8 b/sys-utils/losetup.8
index b0b59226c..6f18e540f 100644
--- a/sys-utils/losetup.8
+++ b/sys-utils/losetup.8
@@ -81,14 +81,14 @@ Show the status of all loop devices.  Note that not all information is accessibl
 for non-root users.  See also \fB\-\-list\fR.  The old output format (as printed
 without \fB--list)\fR is deprecated.
 .TP
-.BR \-c , " \-\-set-capacity " \fIloopdev
+.BR \-c , " \-\-set\-capacity " \fIloopdev
 Force the loop driver to reread the size of the file associated with the
 specified loop device.
 .TP
 .BR \-d , " \-\-detach " \fIloopdev\fR...
 Detach the file or device associated with the specified loop device(s).
 .TP
-.BR \-D , " \-\-detach-all"
+.BR \-D , " \-\-detach\-all"
 Detach all associated loop devices.
 .TP
 .BR \-f , " \-\-find"
@@ -120,7 +120,7 @@ Force the kernel to scan the partition table on a newly created loop device.
 .IP "\fB\-\-raw\fP"
 Use the raw \fB\-\-list\fP output format.
 .TP
-.BR \-r , " \-\-read-only"
+.BR \-r , " \-\-read\-only"
 Set up a read-only loop device.
 .IP "\fB\-\-sizelimit \fIsize\fP"
 The data end is set to no more than \fIsize\fP bytes after the data start.
diff --git a/sys-utils/mount.8 b/sys-utils/mount.8
index 69412167d..15f8bfc7f 100644
--- a/sys-utils/mount.8
+++ b/sys-utils/mount.8
@@ -447,10 +447,10 @@ Supported operations are:
 
 .RS
 .nf
-.BI "mount \-\-make-shared " mountpoint
-.BI "mount \-\-make-slave " mountpoint
-.BI "mount \-\-make-private " mountpoint
-.BI "mount \-\-make-unbindable " mountpoint
+.BI "mount \-\-make\-shared " mountpoint
+.BI "mount \-\-make\-slave " mountpoint
+.BI "mount \-\-make\-private " mountpoint
+.BI "mount \-\-make\-unbindable " mountpoint
 .fi
 .RE
 
@@ -459,10 +459,10 @@ mounts under a given mountpoint.
 
 .RS
 .nf
-.BI "mount \-\-make-rshared " mountpoint
-.BI "mount \-\-make-rslave " mountpoint
-.BI "mount \-\-make-rprivate " mountpoint
-.BI "mount \-\-make-runbindable " mountpoint
+.BI "mount \-\-make\-rshared " mountpoint
+.BI "mount \-\-make\-rslave " mountpoint
+.BI "mount \-\-make\-rprivate " mountpoint
+.BI "mount \-\-make\-runbindable " mountpoint
 .fi
 .RE
 
@@ -497,7 +497,7 @@ For example:
 
 .RS
 .nf
-.BI "mount \-\-make-private \-\-make-unbindable /dev/sda1 /foo"
+.BI "mount \-\-make\-private \-\-make\-unbindable /dev/sda1 /foo"
 .fi
 .RE
 
@@ -506,8 +506,8 @@ is the same as:
 .RS
 .nf
 .BI "mount /dev/sda1 /foo"
-.BI "mount \-\-make-private /foo"
-.BI "mount \-\-make-unbindable /foo"
+.BI "mount \-\-make\-private /foo"
+.BI "mount \-\-make\-unbindable /foo"
 .fi
 .RE
 .RE
@@ -544,7 +544,7 @@ keyword).  The filesystems are mounted following their order in
 Remount a subtree somewhere else (so that its contents are available
 in both places).  See above.
 .TP
-.BR \-c , " \-\-no-canonicalize"
+.BR \-c , " \-\-no\-canonicalize"
 Don't canonicalize paths.  The mount command canonicalizes all paths
 (from command line or fstab) by default.  This option can be used
 together with the
@@ -579,14 +579,14 @@ command is trying to do.  It can also be used to add entries for devices
 that were mounted earlier with the \fB\-n\fR option.  The \fB\-f\fR option
 checks for an existing record in /etc/mtab and fails when the record already
 exists (with a regular non-fake mount, this check is done by the kernel).
-.IP "\fB\-i, \-\-internal-only\fP"
+.IP "\fB\-i, \-\-internal\-only\fP"
 Don't call the \fB/sbin/mount.\fIfilesystem\fR helper even if it exists.
 .TP
 .BR \-L , " \-\-label " \fIlabel
 Mount the partition that has the specified
 .IR label .
 .TP
-.BR \-l , " \-\-show-labels"
+.BR \-l , " \-\-show\-labels"
 Add the labels in the mount output.  \fBmount\fR must have
 permission to read the disk device (e.g.\& be suid root) for this to work.
 One can set such a label for ext2, ext3 or ext4 using the
@@ -599,14 +599,14 @@ or for reiserfs using
 .BR \-M , " \-\-move"
 Move a subtree to some other place.  See above.
 .TP
-.BR \-n , " \-\-no-mtab"
+.BR \-n , " \-\-no\-mtab"
 Mount without writing in
 .IR /etc/mtab .
 This is necessary for example when
 .I /etc
 is on a read-only filesystem.
 .TP
-.BR \-O , " \-\-test-opts " \fIopts
+.BR \-O , " \-\-test\-opts " \fIopts
 Limit the set of filesystems to which the
 .B \-a
 option applies.  In this regard it is like the
@@ -670,7 +670,7 @@ sections.
 Remount a subtree and all possible submounts somewhere else (so that its
 contents are available in both places).  See above.
 .TP
-.BR \-r , " \-\-read-only"
+.BR \-r , " \-\-read\-only"
 Mount the filesystem read-only.  A synonym is
 .BR "\-o ro" .
 .sp
@@ -821,7 +821,7 @@ Mount the partition that has the specified
 .BR \-v , " \-\-verbose"
 Verbose mode.
 .TP
-.BR \-w , " \-\-rw" , " \-\-read-write"
+.BR \-w , " \-\-rw" , " \-\-read\-write"
 Mount the filesystem read/write.  This is the default.  A synonym is
 .BR "\-o rw" .
 .TP
diff --git a/sys-utils/nsenter.1 b/sys-utils/nsenter.1
index 0b1fceb36..8a3b25ecc 100644
--- a/sys-utils/nsenter.1
+++ b/sys-utils/nsenter.1
@@ -136,7 +136,7 @@ Set the user ID which will be used in the entered namespace.
 .BR nsenter (1)
 always sets UID for user namespaces, the default is 0.
 .TP
-\fB\-\-preserve-credentials\fR
+\fB\-\-preserve\-credentials\fR
 Don't modify UID and GID when enter user namespace. The default is to
 drops supplementary groups and sets GID and UID to 0.
 .TP
@@ -150,7 +150,7 @@ Set the working directory.  If no directory is specified, set the working
 directory to the working directory of the target process.  If directory is
 specified, set the working directory to the specified directory.
 .TP
-\fB\-F\fR, \fB\-\-no-fork\fR
+\fB\-F\fR, \fB\-\-no\-fork\fR
 Do not fork before exec'ing the specified program.  By default, when entering a
 PID namespace, \fBnsenter\fP calls \fBfork\fP before calling \fBexec\fP so that
 any children will also be in the newly entered PID namespace.
diff --git a/sys-utils/setpriv.1 b/sys-utils/setpriv.1
index 2a104248b..099a4bc75 100644
--- a/sys-utils/setpriv.1
+++ b/sys-utils/setpriv.1
@@ -21,7 +21,7 @@ mostly useless, information.  Incompatible with all other options.
 .B \-\-groups \fIgroup\fR...
 Set supplementary groups.  The argument is a comma-separated list.
 .TP
-.BR \-\-inh-caps " (" + | \- ) \fIcap "...  or  " \-\-bounding\-set " (" + | \- ) \fIcap ...
+.BR \-\-inh\-caps " (" + | \- ) \fIcap "...  or  " \-\-bounding\-set " (" + | \- ) \fIcap ...
 Set the inheritable capabilities or the capability bounding set.  See
 .BR capabilities (7).
 The argument is a comma-separated list of
@@ -49,7 +49,7 @@ Preserve supplementary groups.  Only useful in conjunction with
 .BR \-\-list\-caps
 List all known capabilities.  This option must be specified alone.
 .TP
-.B \-\-no-new-privs
+.B \-\-no\-new\-privs
 Set the
 .I no_new_privs
 bit.  With this bit set,
@@ -71,9 +71,9 @@ Set the real, effective, or both gids.  The \fIgid\fR argument can be
 given as textual group name.
 .sp
 For safety, you must specify one of
-.BR \-\-clear-groups ,
+.BR \-\-clear\-groups ,
 .BR \-\-groups ", or"
-.BR \-\-keep-groups
+.BR \-\-keep\-groups
 if you set any primary
 .IR gid .
 .TP
@@ -105,7 +105,7 @@ is cleared by
 .BR execve (2)
 and is therefore not allowed.
 .TP
-.BI \-\-selinux-label " label"
+.BI \-\-selinux\-label " label"
 Request a particular SELinux transition (using a transition on exec, not
 dyntrans).  This will fail and cause
 .BR setpriv (1)
@@ -117,7 +117,7 @@ conjunction with
 This is similar to
 .BR runcon (1).
 .TP
-.BI \-\-apparmor-profile " profile"
+.BI \-\-apparmor\-profile " profile"
 Request a particular AppArmor profile (using a transition on exec).  This will
 fail and cause
 .BR setpriv (1)
diff --git a/sys-utils/tunelp.8 b/sys-utils/tunelp.8
index c70623631..a69d88a4f 100644
--- a/sys-utils/tunelp.8
+++ b/sys-utils/tunelp.8
@@ -116,7 +116,7 @@ you must try to know if your printer will work or not...
 This option resets the port.  It requires a Linux kernel version of 1.1.80 or
 later.
 .TP
-\fB\-q\fR, \fB\-\-print-irq\fR \fI<on|off>\fR
+\fB\-q\fR, \fB\-\-print\-irq\fR \fI<on|off>\fR
 This option sets printing the display of the current IRQ setting.
 .SH NOTES
 .BR \-o ,
diff --git a/sys-utils/umount.8 b/sys-utils/umount.8
index b0bfa9a84..887d0ee02 100644
--- a/sys-utils/umount.8
+++ b/sys-utils/umount.8
@@ -63,7 +63,7 @@ All of the filesystems described in
 .I /etc/mtab
 are unmounted, except the \fIproc\fR filesystem.
 .TP
-.BR \-A , " \-\-all-targets"
+.BR \-A , " \-\-all\-targets"
 Unmount all mountpoints in the current namespace for the specified filesystem.
 The filesystem can be specified by one of the mountpoints or the device name (or
 UUID, etc.).  When this option is used together with \fB\-\-recursive\fR, then
@@ -71,14 +71,14 @@ all nested mounts within the filesystem are recursively unmounted.
 This option is only supported on systems where /etc/mtab is a symlink
 to /proc/mounts.
 .TP
-.BR \-c , " \-\-no-canonicalize"
+.BR \-c , " \-\-no\-canonicalize"
 Do not canonicalize paths.  For more details about this option see the
 .BR mount (8)
 man page.  Note that \fBumount\fR does not pass this option to the
 .BI /sbin/umount. type
 helpers.
 .TP
-.BR \-d , " \-\-detach-loop"
+.BR \-d , " \-\-detach\-loop"
 When the unmounted device was a loop device, also free this loop
 device.
 .TP
@@ -94,7 +94,7 @@ option.
 Force an unmount (in case of an unreachable NFS system).  (Requires kernel
 2.1.116 or later.)
 .TP
-.BR \-i , " \-\-internal-only"
+.BR \-i , " \-\-internal\-only"
 Do not call the \fB/sbin/umount.\fIfilesystem\fR helper even if it exists.
 By default such a helper program is called if it exists.
 .TP
@@ -103,11 +103,11 @@ Lazy unmount.  Detach the filesystem from the file hierarchy now,
 and clean up all references to this filesystem as soon as it is not busy
 anymore.  (Requires kernel 2.4.11 or later.)
 .TP
-.BR \-n , " \-\-no-mtab"
+.BR \-n , " \-\-no\-mtab"
 Unmount without writing in
 .IR /etc/mtab .
 .TP
-.BR \-O , " \-\-test-opts " \fIoption\fR...
+.BR \-O , " \-\-test\-opts " \fIoption\fR...
 Unmount only the filesystems that have the specified option set in
 .IR /etc/fstab .
 More than one option may be specified in a comma-separated list.
@@ -122,7 +122,7 @@ between mountpoints is determined by /proc/self/mountinfo entries.  The filesyst
 must be specified by mountpoint path; a recursive unmount by device name (or UUID)
 is unsupported.
 .TP
-.BR \-r , " \-\-read-only"
+.BR \-r , " \-\-read\-only"
 When an unmount fails, try to remount the filesystem read-only.
 .TP
 .BR \-t , " \-\-types " \fItype\fR...
diff --git a/sys-utils/unshare.1 b/sys-utils/unshare.1
index 0ef43a1c9..f5975d180 100644
--- a/sys-utils/unshare.1
+++ b/sys-utils/unshare.1
@@ -68,14 +68,14 @@ Unshare the user namespace.
 Fork the specified \fIprogram\fR as a child process of \fBunshare\fR rather than
 running it directly.  This is useful when creating a new pid namespace.
 .TP
-.BR \-\-mount-proc "[=\fImountpoint\fP]"
+.BR \-\-mount\-proc "[=\fImountpoint\fP]"
 Just before running the program, mount the proc filesystem at \fImountpoint\fP
 (default is /proc).  This is useful when creating a new pid namespace.  It also
 implies creating a new mount namespace since the /proc mount would otherwise
 mess up existing programs on the system.  The new proc filesystem is explicitly
 mounted as private (by MS_PRIVATE|MS_REC).
 .TP
-.BR \-r , " \-\-map-root-user"
+.BR \-r , " \-\-map\-root\-user"
 Run the program only after the current effective user and group IDs have been mapped to
 the superuser UID and GID in the newly created user namespace.  This makes it possible to
 conveniently gain capabilities needed to manage various aspects of the newly created
diff --git a/sys-utils/wdctl.8 b/sys-utils/wdctl.8
index c2a428271..9f9776ebd 100644
--- a/sys-utils/wdctl.8
+++ b/sys-utils/wdctl.8
@@ -45,7 +45,7 @@ Set the watchdog timeout in seconds.
 .TP
 .BR \-T , " \-\-notimeouts"
 Do not print watchdog timeouts.
-.IP "\fB\-x\fR, \fB\-\-flags-only\fP"
+.IP "\fB\-x\fR, \fB\-\-flags\-only\fP"
 Same as \fB\-I \-T\fP.
 .TP
 .BR \-V , " \-\-version"
diff --git a/term-utils/agetty.8 b/term-utils/agetty.8
index 10f339586..1652e0aef 100644
--- a/term-utils/agetty.8
+++ b/term-utils/agetty.8
@@ -22,7 +22,7 @@ The program can handle 7-bit characters with even, odd, none or space
 parity, and 8-bit characters with no parity. The following special
 characters are recognized: Control-U (kill); DEL and
 backspace (erase); carriage return and line feed (end of line).
-See also the \fB\-\-erase-chars\fP and \fB\-\-kill-chars\fP options.
+See also the \fB\-\-erase\-chars\fP and \fB\-\-kill\-chars\fP options.
 .IP \(bu
 Optionally deduces the baud rate from the CONNECT messages produced by
 Hayes(tm)-compatible modems.
@@ -71,7 +71,7 @@ null character (Ctrl\-@) can also be used for baud-rate switching.
 This argument is optional and unnecessary for \fBvirtual terminals\fP.
 .sp
 The default for \fBserial terminals\fP is keep the current baud rate
-(see \fB\-\-keep-baud\fP) and if unsuccessful then default to '9600'.
+(see \fB\-\-keep\-baud\fP) and if unsuccessful then default to '9600'.
 .TP
 term
 The value to be used for the TERM environment variable. This overrides
@@ -91,7 +91,7 @@ Assume that the tty is 8-bit clean, hence disable parity detection.
 \-a, \-\-autologin \fIusername\fP
 Log the specified user automatically in without asking for a login name and
 password. The \-f \fIusername\fP option is added to the \fB/bin/login\fP
-command line by default. The \-\-login-options option changes this default
+command line by default. The \-\-login\-options option changes this default
 behavior and then only \\u is replaced by the \fIusername\fP and no other
 option is added to the login command line.
 .TP
diff --git a/term-utils/setterm.1 b/term-utils/setterm.1
index 7525d411d..da0762436 100644
--- a/term-utils/setterm.1
+++ b/term-utils/setterm.1
@@ -63,7 +63,7 @@ The various color options may be set independently, at least on virtual
 consoles, though the results of setting multiple modes (for example,
 .B \-\-underline
 and
-.BR \-\-half-bright )
+.BR \-\-half\-bright )
 are hardware-dependent.
 .TP
 \fB\-\-appcursorkeys\fP [\fBon\fP|\fBoff\fP]  (virtual consoles only)
@@ -159,9 +159,9 @@ truncated, see PATH_MAX from linux/limits.h for the value.
 \fB\-\-foreground\fP \fI8-color\fP|\fBdefault\fP
 Sets the foreground text color.
 .TP
-.BR \-\-half-bright " [" on | off ]
+.BR \-\-half\-bright " [" on | off ]
 Turns dim (half-brightness) mode on or off.  Except on a virtual console,
-.B \-\-half-bright off
+.B \-\-half\-bright off
 turns off all attributes (bold, half-brightness, blink, reverse).
 .TP
 \fB\-\-hbcolor\fP \fI16-color\fP
diff --git a/text-utils/col.1 b/text-utils/col.1
index 1e536e643..907172af0 100644
--- a/text-utils/col.1
+++ b/text-utils/col.1
@@ -54,7 +54,7 @@ and
 reads from standard input and writes to standard output.
 .SH OPTIONS
 .TP
-\fB\-b\fR, \fB\-\-no-backspaces\fR
+\fB\-b\fR, \fB\-\-no\-backspaces\fR
 Do not output any backspaces, printing only the last character written to
 each column position.
 .TP
diff --git a/text-utils/colcrt.1 b/text-utils/colcrt.1
index 3b8cd09e5..88a124a93 100644
--- a/text-utils/colcrt.1
+++ b/text-utils/colcrt.1
@@ -46,13 +46,13 @@ Half-line characters and underlining (changed to dashing `\-') are placed on
 new lines in between the normal output lines.
 .SH OPTIONS
 .TP
-\fB\-\fR, \fB\-\-no-underlining\fR
+\fB\-\fR, \fB\-\-no\-underlining\fR
 Suppress all underlining.  This option is especially useful for previewing
 .I allboxed
 tables from
 .BR tbl (1).
 .TP
-\fB\-2\fR, \fB\-\-half-lines\fR
+\fB\-2\fR, \fB\-\-half\-lines\fR
 Causes all half-lines to be printed, effectively double spacing the output.
 Normally, a minimal space output format is used which will suppress empty
 lines.  The program never suppresses two consecutive empty lines, however.
diff --git a/text-utils/column.1 b/text-utils/column.1
index 73f522c39..2e7bad9e9 100644
--- a/text-utils/column.1
+++ b/text-utils/column.1
@@ -47,14 +47,14 @@ otherwise from standard input.  Empty lines are ignored.
 .SH OPTIONS
 .IP "\fB\-c, \-\-columns\fP \fIwidth\fP"
 Output is formatted to a width specified as number of characters.
-.IP "\fB\-o, \-\-output-separator\fP \fIstring\fP"
+.IP "\fB\-o, \-\-output\-separator\fP \fIstring\fP"
 Specify the columns delimiter for table output (default is two spaces).
 .IP "\fB\-s, \-\-separator\fP \fIseparators\fP"
 Specify the possible input item delimiters (default is whitespace).
 .IP "\fB\-t, \-\-table\fP"
 Determine the number of columns the input contains and create a table.
 Columns are delimited with whitespace, by default, or with the characters
-supplied using the \fB\-\-output-separator\fP option.
+supplied using the \fB\-\-output\-separator\fP option.
 Table output is useful for pretty-printing.
 .IP "\fB\-x, \-\-fillrows\fP"
 Fill columns before filling rows.