Hi,
Attached bunch of patches mainly normalizes the formatting of the
man pages in the misc-utils directory. The second patch adds -V for
--version to the blkid command (instead of just -v). And the seventh
patch makes the section AVAILABILITY always be the last one in all
man pages.
CC'ing Davidlohr because the sixth patch touches the man page of
his lslocks command. This man page makes a reference to chmod(1),
but on my machine chmod(1) does not say anything about lock files,
nor anything about being mandatory or advisory -- only fcntl(2) does.
So I have changed that reference, but am unsure whether this is
okay. The man page also referes to lockf(2), but on my machine
there is only a lockf(3); so I've changed that one too, but again am
unsure whether it is okay. Davidlohr?
Regards,
Benno
--
http://www.fastmail.fm - Same, same, but different...
From f578e3cc728c93e722cbdad6dd9ea1329bb4993b Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Fri, 1 Mar 2013 22:11:52 +0100
Subject: [PATCH 1/8] docs: improve wording and formatting of blkid man page
Furthermore, explain the device argument right at the beginning,
since it is not an option, and alphabetize -k.
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
misc-utils/blkid.8 | 137 +++++++++++++++++++++++++--------------------------
1 files changed, 67 insertions(+), 70 deletions(-)
diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8
index 46caabd..73a257a 100644
--- a/misc-utils/blkid.8
+++ b/misc-utils/blkid.8
@@ -5,15 +5,14 @@
.\" This file may be copied under the terms of the GNU Public License.
.\"
.\" Based on uuidgen, Mon Sep 17 10:42:12 2000, Andreas Dilger
-.TH BLKID 8 "February 2011" "util-linux" "System Administration"
+.TH BLKID 8 "March 2013" "util-linux" "System Administration"
.SH NAME
blkid \- locate/print block device attributes
.SH SYNOPSIS
.B blkid
-.RB \-L
-.IR label " | "
-.RB \-U
-.IR uuid
+.BI \-L " label"
+|
+.BI \-U " uuid"
.B blkid
.RB [ \-dghlv ]
@@ -21,22 +20,21 @@ blkid \- locate/print block device attributes
.IR file ]
.RB [ \-o
.IR format ]
-.in +6
.RB [ \-s
.IR tag ]
+.in +6
.RB [ \-t
.IR NAME=value ]
-[\fIdevice\fR ...]
+.RI [ device " ...]"
.in -6
.B blkid
-.RB -p
-.RB [ \-O
+.BR -p " [" \-O
.IR offset ]
-.RB [ \-S
-.IR size ]
.RB [ \-o
.IR format ]
+.RB [ \-S
+.IR size ]
.RB [ \-s
.IR tag ]
.in +9
@@ -44,16 +42,15 @@ blkid \- locate/print block device attributes
.IR list ]
.RB [ \-u
.IR list ]
-.IR device " ... "
+.IR device " ..."
.in -9
.B blkid
-.RB -i
-.RB [ \-o
+.BR -i " [" \-o
.IR format ]
.RB [ \-s
.IR tag ]
-.IR device " ... "
+.IR device " ..."
.SH DESCRIPTION
The
@@ -61,15 +58,25 @@ The
program is the command-line interface to working with the
.BR libblkid (3)
library. It can determine the type of content (e.g. filesystem or swap)
-that a block device holds, and also attributes (tokens, NAME=value pairs)
+that a block device holds, and also the attributes (tokens, NAME=value pairs)
from the content metadata (e.g. LABEL or UUID fields).
.PP
+When
+.I device
+is specified, tokens from only this device are displayed.
+It is possible to specify multiple
+.I device
+arguments on the command line.
+If none is given, all devices which appear in
+.I /proc/partitions
+are shown, if they are recognized.
+.PP
Note that
.B blkid
reads information directly from devices and for non-root users
-it returns cached unverified information. It's better to use
+it returns cached unverified information. It is better to use
.B lsblk --fs
-to get user-friendly overview about filesystems and devices.
+to get a user-friendly overview of filesystems and devices.
.BR lsblk (8)
is also easy to use in scripts.
.B blkid
@@ -81,22 +88,22 @@ specific NAME=value pair, or displaying NAME=value pairs for one or
more specified devices.
.SH OPTIONS
The \fIsize\fR and \fIoffset\fR arguments may be followed by the multiplicative
-suffixes KiB=1024, 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, PB, EB, ZB and YB.
+suffixes like KiB (=1024), 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, PB, EB, ZB and YB.
.TP
.BI \-c " cachefile"
Read from
.I cachefile
-instead of reading from the default cache file (see CONFIGURATION FILE section
+instead of reading from the default cache file (see the CONFIGURATION FILE section
for more details). If you want to start with a clean cache (i.e. don't report
devices previously scanned but not necessarily available at this time), specify
.IR /dev/null .
.TP
.B \-d
-Don't encode non-printing characters. The non-printing characters are encoded
-by ^ and M- notation by default. Note that \fB-o udev\fR output format uses
-a different encoding and this encoding cannot be disabled.
+Don't encode non-printing characters. The non-printing characters are encoded
+by ^ and M- notation by default. Note that the \fB-o udev\fR output format uses
+a different encoding which cannot be disabled.
.TP
.B \-g
Perform a garbage collection pass on the blkid cache to remove
@@ -106,36 +113,37 @@ devices which no longer exist.
Display a usage message and exit.
.TP
.B \-i
-Display I/O Limits (aka I/O topology) information. The 'export' output format is
+Display information about I/O Limits (aka I/O topology). The 'export' output format is
automatically enabled. This option can be used together with the \fB-p\fR option.
.TP
+.B \-k
+List all known filesystems and RAIDs and exit.
+.TP
.B \-l
-Look up only one device that matches the search parameter specified with \fB-t\fR
+Look up only one device that matches the search parameter specified with the \fB-t\fR
option. If there are multiple devices that match the specified search
parameter, then the device with the highest priority is returned, and/or
the first device found at a given priority. Device types in order of
-decreasing priority are Device Mapper, EVMS, LVM, MD, and finally regular
+decreasing priority are: Device Mapper, EVMS, LVM, MD, and finally regular
block devices. If this option is not specified,
.B blkid
will print all of the devices that match the search parameter.
.TP
-.B \-k
-List all known filesystems and RAIDs and exit.
-.TP
.BI \-L " label"
-Look up the device that uses this filesystem \fIlabel\fR (equal to: -l -o device -t
-LABEL=<label>). This lookup method is able to reliably use /dev/disk/by-label
+Look up the device that uses this filesystem \fIlabel\fR; this is equal to
+.BR "-l -o device -t LABEL=\fIlabel\fR" .
+This lookup method is able to reliably use /dev/disk/by-label
udev symlinks (dependent on a setting in /etc/blkid.conf). Avoid using the
symlinks directly; it is not reliable to use the symlinks without verification.
The \fB-L\fR option works on systems with and without udev.
Unfortunately, the original
.BR blkid (8)
-from e2fsprogs use the \fB-L\fR option as a
-synonym for the \fB-o list\fR option. For better portability, use \fB-l -o device
--t LABEL=<label>\fR and \fB-o list\fR in your scripts rather than the \fB-L\fR option.
+from e2fsprogs uses the \fB-L\fR option as a
+synonym for \fB-o list\fR. For better portability, use \fB-l -o device
+-t LABEL=\fIlabel\fR and \fB-o list\fR in your scripts rather than the \fB-L\fR option.
.TP
-.BI \-n " list "
+.BI \-n " list"
Restrict the probing functions to the specified (comma-separated) \fIlist\fR of
superblock types (names).
The list items may be prefixed with "no" to specify the types which should be ignored.
@@ -151,10 +159,8 @@ probes for all supported formats except minix filesystems.
This option is only useful together with \fB-p\fR.
.TP
.BI \-o " format"
-Display
-.BR blkid 's
-output using the specified format. Note that the variables order and
-devices order is variable. See also \fB-s\fR. The
+Use the specified output format. Note that the order of variables and
+devices is not fixed. See also option \fB-s\fR. The
.I format
parameter may be:
.RS
@@ -167,13 +173,14 @@ print the value of the tags
.TP
.B list
print the devices in a user-friendly format; this output format is unsupported
-for low-level probing (\fB-p\fR or \fB-i\fR). This output format is \fBDEPRECATED\fR
-in favour of
+for low-level probing (\fB-p\fR or \fB-i\fR).
+
+This output format is \fBDEPRECATED\fR in favour of the
.BR lsblk (8)
command.
.TP
.B device
-print the device name only; this output format is always enabled for \fB-L\fR
+print the device name only; this output format is always enabled for the \fB-L\fR
and \fB-U\fR options
.TP
.B udev
@@ -182,7 +189,7 @@ prefixed by ID_FS_ or ID_PART_ prefixes
The udev output returns the ID_FS_AMBIVALENT tag if more superblocks are detected,
and ID_PART_ENTRY_* tags are always returned for all partitions including empty
-partitions. This output format is \fBDEPRECATED\fR.
+partitions. This output format is \fBDEPRECATED\fR.
.TP
.B export
print key=value pairs for easy import into the environment; this output format
@@ -194,7 +201,7 @@ Probe at the given \fIoffset\fR (only useful with \fB-p\fR). This option can be
used together with the \fB-i\fR option.
.TP
.BI \-p
-Switch to low-level superblock probing mode (bypass cache).
+Switch to low-level superblock probing mode (bypassing the cache).
Note that low-level probing also returns information about partition table type
(PTTYPE tag) and partitions (PART_ENTRY_* tags).
@@ -211,9 +218,9 @@ In order to just refresh the cache without showing any tokens, use
with no other options.
.TP
.BI \-S " size"
-Overwrite device/file size (only useful with \fB-p\fR).
+Override the size of device/file (only useful with \fB-p\fR).
.TP
-.BI \-t " NAME" = "value"
+.BI \-t " NAME" = value
Search for block devices with tokens named
.I NAME
that have the value
@@ -229,7 +236,7 @@ and
If there are no devices specified on the command line, all block devices
will be searched; otherwise only the specified devices are searched.
.TP
-.BI \-u " list "
+.BI \-u " list"
Restrict the probing functions to the specified (comma-separated) \fIlist\fR of "usage" types.
Supported usage types are: filesystem, raid, crypto and other. The list items may be
prefixed with "no" to specify the usage types which should be ignored. For example:
@@ -243,20 +250,11 @@ probes for all filesystem and other (e.g. swap) formats, and
probes for all supported formats except RAIDs.
This option is only useful together with \fB-p\fR.
.TP
-.BI \-U " uuid "
+.BI \-U " uuid"
Look up the device that uses this filesystem \fIuuid\fR. For more details see the \fB-L\fR option.
.TP
.B \-v
Display version number and exit.
-.TP
-.I device
-Display tokens from only the specified device. It is possible to
-give multiple
-.I device
-options on the command line. If none is given, all devices which
-appear in
-.I /proc/partitions
-are shown, if they are recognized.
.SH "RETURN CODE"
If the specified token was found, or if any tags were shown from (specified)
devices, 0 is returned.
@@ -266,7 +264,7 @@ identified, an exit code of 2 is returned.
For usage or other errors, an exit code of 4 is returned.
-If the ambivalent low-level probing result was detected, an exit code of 8 is
+If an ambivalent low-level probing result was detected, an exit code of 8 is
returned.
.SH CONFIGURATION FILE
The standard location of the
@@ -277,20 +275,20 @@ The following options control the libblkid library:
.I SEND_UEVENT=<yes|not>
Sends uevent when
.I /dev/disk/by-{label,uuid,partuuid,partlabel}/
-symlink does not match with LABEL, UUID, PARTUUID or PARTLABEL on the device. Default is "yes".
+symlink does not match with LABEL, UUID, PARTUUID or PARTLABEL on the device. Default is "yes".
.TP
.I CACHE_FILE=<path>
-Overrides the standard location of the cache file. This setting can be
-overridden by the environment variable BLKID_FILE. Default is
-.I /run/blkid/blkid.tab
+Overrides the standard location of the cache file. This setting can be
+overridden by the environment variable BLKID_FILE. Default is
+.IR /run/blkid/blkid.tab ,
or
.I /etc/blkid.tab
-on systems without /run directory
+on systems without a /run directory.
.TP
.I EVALUATE=<methods>
-Defines LABEL and UUID evaluation method(s). Currently, the libblkid library
-supports "udev" and "scan" methods. More than one methods may be specified in
-a comma separated list. Default is "udev,scan". The "udev" method uses udev
+Defines LABEL and UUID evaluation method(s). Currently, the libblkid library
+supports the "udev" and "scan" methods. More than one method may be specified in
+a comma-separated list. Default is "udev,scan". The "udev" method uses udev
.I /dev/disk/by-*
symlinks and the "scan" method scans all block devices from the
.I /proc/partitions
@@ -300,8 +298,7 @@ file.
was written by Andreas Dilger for libblkid and improved by Theodore Ts'o
and Karel Zak.
.SH ENVIRONMENT
-.IP LIBBLKID_DEBUG=0xffff
-enables debug output.
+.IP "Setting LIBBLKID_DEBUG=0xffff enables debug output."
.SH AVAILABILITY
The blkid command is part of the util-linux package and is available from
ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
--
1.7.0.4
From 78a61c8ebc17f60d60cb1425f503a5a5ff5d9a91 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Fri, 1 Mar 2013 22:18:30 +0100
Subject: [PATCH 2/8] blkid: also accept -V for displaying version information
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
misc-utils/blkid.8 | 2 +-
misc-utils/blkid.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8
index 73a257a..1e4741e 100644
--- a/misc-utils/blkid.8
+++ b/misc-utils/blkid.8
@@ -253,7 +253,7 @@ This option is only useful together with \fB-p\fR.
.BI \-U " uuid"
Look up the device that uses this filesystem \fIuuid\fR. For more details see the \fB-L\fR option.
.TP
-.B \-v
+.B \-V
Display version number and exit.
.SH "RETURN CODE"
If the specified token was found, or if any tags were shown from (specified)
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 52e280f..78e0a93 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -88,7 +88,7 @@ static void usage(int error)
" -l look up only first device with token specified by -t\n"
" -L <label> convert LABEL to device name\n"
" -U <uuid> convert UUID to device name\n"
- " -v print version and exit\n"
+ " -V print version and exit\n"
" <dev> specify device(s) to probe (default: all devices)\n\n"
"Low-level probing options:\n"
" -p low-level superblocks probing (bypass cache)\n"
@@ -687,7 +687,7 @@ int main(int argc, char **argv)
atexit(close_stdout);
while ((c = getopt (argc, argv,
- "c:df:ghilL:n:ko:O:ps:S:t:u:U:w:v")) != EOF) {
+ "c:df:ghilL:n:ko:O:ps:S:t:u:U:w:Vv")) != EOF) {
err_exclusive_options(c, NULL, excl, excl_st);
@@ -785,6 +785,7 @@ int main(int argc, char **argv)
usage(err);
}
break;
+ case 'V':
case 'v':
version = 1;
break;
--
1.7.0.4
From 2681a2b58093346c3dd73500db9966d20ece51e7 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Fri, 1 Mar 2013 22:50:05 +0100
Subject: [PATCH 3/8] docs: sort the options in findmnt man page alphabetically
Also improve wording and formatting a bit.
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
misc-utils/findmnt.8 | 128 +++++++++++++++++++++++++------------------------
1 files changed, 65 insertions(+), 63 deletions(-)
diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index d0d0442..429c0fa 100644
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -31,28 +31,13 @@ or
.IR mountpoint
is not given, all filesystems are shown.
.PP
-The device may be specified by device name, maj:min, filesystem LABEL or UUID
-or partition PARTUUID or PARTLABEL. Note that device name may be interpreted
-as mountpoint (and vice versa) if --target or --source options are not
-specified.
+The device may be specified by device name, maj:min, filesystem LABEL or UUID,
+or partition PARTUUID or PARTLABEL. Note that a device name may be interpreted
+as a mountpoint (and vice versa) if the \fB--target\fR or \fB--source\fR options
+are not specified.
.PP
The command prints all mounted filesystems in the tree-like format by default.
.SH OPTIONS
-.IP "\fB\-h, \-\-help\fP"
-Print help and exit.
-.IP "\fB\-s, \-\-fstab\fP"
-Search in
-.IR /etc/fstab .
-The output is in the list format (see --list).
-.IP "\fB\-m, \-\-mtab\fP"
-Search in
-.IR /etc/mtab .
-The output is in the list format (see \fB\-\-list\fP).
-.IP "\fB\-k, \-\-kernel\fP"
-Search in
-.IR /proc/self/mountinfo .
-The output is in the tree-like format. This is the default.
-
.IP "\fB\-A, \-\-all\fP"
Disable all built-in filters and print all filesystems.
.IP "\fB\-a, \-\-ascii\fP"
@@ -60,48 +45,50 @@ Use ascii characters for tree formatting.
.IP "\fB\-c, \-\-canonicalize\fP"
Canonicalize all printed paths.
.IP "\fB\-D, \-\-df\fP"
-Imitate the output of df(1). This option is equivalent to
-"-o SOURCE,FSTYPE,SIZE,USED,AVAIL,USE%,TARGET", but excludes all
-pseudo filesystem. Use \fB\-\-all\fP to print all filesystems.
+Imitate the output of
+.BR df (1).
+This option is equivalent to
+.B -o SOURCE,FSTYPE,SIZE,USED,AVAIL,USE%,TARGET
+but excludes all pseudo filesystems.
+Use \fB\-\-all\fP to print all filesystems.
.IP "\fB\-d, \-\-direction \fIword\fP"
-The search direction -
+The search direction, either
.IR forward
or
.IR backward .
.IP "\fB\-e, \-\-evaluate\fP"
Convert all tags (LABEL, UUID, PARTUUID or PARTLABEL) to the device names.
.IP "\fB\-F, \-\-tab\-file \fIpath\fP"
-Search in an alternative file, if used with \fB\-\-fstab\fP, \fB\-\-mtab\fP
-or \fB\-\-kernel\fP then overwrites the default paths, if specified more than
-once, then tree-like output is disabled (see the \fB\-\-list\fP option).
+Search in an alternative file. If used with \fB\-\-fstab\fP, \fB\-\-mtab\fP
+or \fB\-\-kernel\fP, then it overrides the default paths. If specified more
+than once, then tree-like output is disabled (see the \fB\-\-list\fP option).
.IP "\fB\-f, \-\-first\-only\fP"
Print the first matching filesystem only.
+.IP "\fB\-h, \-\-help\fP"
+Print help and exit.
.IP "\fB\-i, \-\-invert\fP"
Invert the sense of matching.
+.IP "\fB\-k, \-\-kernel\fP"
+Search in
+.IR /proc/self/mountinfo .
+The output is in the tree-like format. This is the default.
.IP "\fB\-l, \-\-list\fP"
-Use the list output format. This output format is automatically enabled if the
-output is restricted by \fB\-t\fP, \fB\-O\fP, \fB\-S\fP or \fB\-T\fP
+Use the list output format. This output format is automatically enabled if the
+output is restricted by the \fB\-t\fP, \fB\-O\fP, \fB\-S\fP or \fB\-T\fP
option and the option \fB\-\-submounts\fP is not used or if more that one
source file (the option \fB\-F\fP) is specified.
-.IP "\fB\-v, \-\-nofsroot\fP"
-Do not print a [/dir] in the SOURCE column for bind-mounts or btrfs subvolumes.
+.IP "\fB\-m, \-\-mtab\fP"
+Search in
+.IR /etc/mtab .
+The output is in the list format (see \fB\-\-list\fP).
.IP "\fB\-N, \-\-task \fItid\fP"
Use alternative namespace /proc/<tid>/mountinfo rather than the default
-/proc/self/mountinfo. If the option is specified more than once, then
-tree-like output is disabled (see the \fB\-\-list\fP option). See also
+/proc/self/mountinfo. If the option is specified more than once, then
+tree-like output is disabled (see the \fB\-\-list\fP option). See also the
.BR unshare (1)
command.
.IP "\fB\-n, \-\-noheadings\fP"
Do not print a header line.
-.IP "\fB\-u, \-\-notruncate\fP"
-Do not truncate text in columns. The default is to not truncate the
-.BR TARGET ,
-.BR SOURCE ,
-.BR UUID ,
-.BR LABEL ,
-.BR PARTUUID ,
-.BR PARTLABEL
-columns. This option disables text truncation also in all other columns.
.IP "\fB\-O, \-\-options \fIlist\fP"
Limit the set of printed filesystems. More than one option
may be specified in a comma-separated list. The
@@ -112,12 +99,12 @@ options are cumulative in effect. It is different from
.B \-t
in that each option is matched exactly; a leading
.I no
-at the beginning does not have global meaning. The "no" could used for
-individual items in the list. The "no" prefix interpratation could be disabled
+at the beginning does not have global meaning. The "no" can used for
+individual items in the list. The "no" prefix interpretation can be disabled
by "+" prefix.
.IP "\fB\-o, \-\-output \fIlist\fP"
-Define output columns. See the \fB\-\-help\fP output to get list of the
-currently supported columns. The
+Define output columns. See the \fB\-\-help\fP output to get a list of the
+currently supported columns. The
.BR TARGET
column contains tree formatting if the
.B \-\-list
@@ -127,10 +114,12 @@ options are not specified.
The default list of columns may be extended if \fIlist\fP is
specified in the format \fI+list\fP (e.g. \fBfindmnt -o +PROPAGATION\fP).
+.IP "\fB\-P, \-\-pairs\fP"
+Use key="value" output format. All potentially unsafe characters are hex-escaped (\\x<code>).
.IP "\fB\-p, \-\-poll\fR[\fI=list\fR]\fP"
-Monitor changes in the /proc/self/mountinfo file. Supported actions are: mount,
-umount, remount and move. More than one action may be specified in a
-comma-separated list. All actions are monitored by default.
+Monitor changes in the /proc/self/mountinfo file. Supported actions are: mount,
+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.
@@ -151,34 +140,47 @@ available for umount and move actions
.B OLD-OPTIONS
available for umount and remount actions
.RE
-.IP "\fB\-P, \-\-pairs\fP"
-Use key="value" output format. All potentially unsafe characters are hex-escaped (\\x<code>).
-.IP "\fB\-r, \-\-raw\fP"
-Use raw output format. All potentially unsafe characters are hex-escaped (\\x<code>).
-.IP "\fB\-t, \-\-types \fIlist\fP"
-Limit the set of printed filesystems. More than one type may be
-specified in a comma-separated list. The list of filesystem types can be
-prefixed with
-.I no
-to specify the filesystem types on which no action should be taken. For
-more details see
-.BR mount (8).
.IP "\fB\-R, \-\-submounts\fP"
Print recursively all submounts for the selected filesystems. The restrictions
defined by options \fB\-t\fP, \fB\-O\fP, \fB\-S\fP, \fB\-T\fP and
\fB\--direction\fP are not applied to submounts. All submounts are always
printed in tree-like order. The option enables the tree-like output format by
default. This option has no effect for \fB\-\-mtab\fP or \fB\-\-fstab\fP.
+.IP "\fB\-r, \-\-raw\fP"
+Use raw output format. All potentially unsafe characters are hex-escaped (\\x<code>).
.IP "\fB\-S, \-\-source \fIspec\fP"
Explicitly define the mount source. Supported are \fIdevice\fR, \fImaj:min\fR,
\fILABEL=\fR, \fIUUID=\fR, \fIPARTLABEL=\fR or \fIPARTUUID=\fR.
+.IP "\fB\-s, \-\-fstab\fP"
+Search in
+.IR /etc/fstab .
+The output is in the list format (see \fB--list\fR).
.IP "\fB\-T, \-\-target \fIdir\fP"
Explicitly define the mount target (mountpoint directory).
+.IP "\fB\-t, \-\-types \fIlist\fP"
+Limit the set of printed filesystems. More than one type may be
+specified in a comma-separated list. The list of filesystem types can be
+prefixed with
+.I no
+to specify the filesystem types on which no action should be taken. For
+more details see
+.BR mount (8).
+.IP "\fB\-u, \-\-notruncate\fP"
+Do not truncate text in columns. The default is to not truncate the
+.BR TARGET ,
+.BR SOURCE ,
+.BR UUID ,
+.BR LABEL ,
+.BR PARTUUID ,
+.BR PARTLABEL
+columns. This option disables text truncation also in all other columns.
+.IP "\fB\-v, \-\-nofsroot\fP"
+Do not print a [/dir] in the SOURCE column for bind-mounts or btrfs subvolumes.
.IP "\fB\-w, \-\-timeout \fImilliseconds\fP"
Specify an upper limit on the time for which \fB--poll\fR will block, in milliseconds.
.SH EXAMPLES
.IP "\fBfindmnt \-\-fstab \-t nfs\fP"
-Prints all nfs filesystems defined in
+Prints all NFS filesystems defined in
.IR /etc/fstab .
.IP "\fBfindmnt \-\-fstab /mnt/foo\fP"
Prints all
@@ -196,9 +198,9 @@ filesystems and converts LABEL= and UUID= tags to the real device names.
.IP "\fBfindmnt -n --raw --evaluate --output=target LABEL=/boot\fP"
Prints only the mountpoint where the filesystem with label "/boot" is mounted.
.IP "\fBfindmnt --poll --target /mnt/foo\fP"
-Monitors mount, umount, remount and move on /mnt/foo.
+Monitors mount, unmount, remount and move on /mnt/foo.
.IP "\fBfindmnt --poll=umount --first-only --target /mnt/foo\fP"
-Waits for /mnt/foo umount.
+Waits for /mnt/foo unmount.
.IP "\fBfindmnt --poll=remount -t ext3 -O ro\fP"
Monitors remounts to read-only mode on all ext3 filesystems.
.SH ENVIRONMENT
--
1.7.0.4
From f2b602e2ea2ebd836a59e0ab92fcac3bab619464 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Mon, 4 Mar 2013 21:01:29 +0100
Subject: [PATCH 4/8] docs: normalize formatting of findmnt man page
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
misc-utils/findmnt.8 | 84 +++++++++++++++++++++++++++++++++----------------
1 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index 429c0fa..407636e 100644
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -38,58 +38,74 @@ are not specified.
.PP
The command prints all mounted filesystems in the tree-like format by default.
.SH OPTIONS
-.IP "\fB\-A, \-\-all\fP"
+.TP
+.BR \-A , " \-\-all"
Disable all built-in filters and print all filesystems.
-.IP "\fB\-a, \-\-ascii\fP"
+.TP
+.BR \-a , " \-\-ascii"
Use ascii characters for tree formatting.
-.IP "\fB\-c, \-\-canonicalize\fP"
+.TP
+.BR \-c , " \-\-canonicalize"
Canonicalize all printed paths.
-.IP "\fB\-D, \-\-df\fP"
+.TP
+.BR \-D , " \-\-df"
Imitate the output of
.BR df (1).
This option is equivalent to
.B -o SOURCE,FSTYPE,SIZE,USED,AVAIL,USE%,TARGET
but excludes all pseudo filesystems.
Use \fB\-\-all\fP to print all filesystems.
-.IP "\fB\-d, \-\-direction \fIword\fP"
+.TP
+.BR \-d , " \-\-direction \fIword\fP"
The search direction, either
.IR forward
or
.IR backward .
-.IP "\fB\-e, \-\-evaluate\fP"
+.TP
+.BR \-e , " \-\-evaluate"
Convert all tags (LABEL, UUID, PARTUUID or PARTLABEL) to the device names.
-.IP "\fB\-F, \-\-tab\-file \fIpath\fP"
+.TP
+.BR \-F , " \-\-tab\-file \fIpath\fP"
Search in an alternative file. If used with \fB\-\-fstab\fP, \fB\-\-mtab\fP
or \fB\-\-kernel\fP, then it overrides the default paths. If specified more
than once, then tree-like output is disabled (see the \fB\-\-list\fP option).
-.IP "\fB\-f, \-\-first\-only\fP"
+.TP
+.BR \-f , " \-\-first\-only"
Print the first matching filesystem only.
-.IP "\fB\-h, \-\-help\fP"
+.TP
+.BR \-h , " \-\-help"
Print help and exit.
-.IP "\fB\-i, \-\-invert\fP"
+.TP
+.BR \-i , " \-\-invert"
Invert the sense of matching.
-.IP "\fB\-k, \-\-kernel\fP"
+.TP
+.BR \-k , " \-\-kernel"
Search in
.IR /proc/self/mountinfo .
The output is in the tree-like format. This is the default.
-.IP "\fB\-l, \-\-list\fP"
+.TP
+.BR \-l , " \-\-list"
Use the list output format. This output format is automatically enabled if the
output is restricted by the \fB\-t\fP, \fB\-O\fP, \fB\-S\fP or \fB\-T\fP
option and the option \fB\-\-submounts\fP is not used or if more that one
source file (the option \fB\-F\fP) is specified.
-.IP "\fB\-m, \-\-mtab\fP"
+.TP
+.BR \-m , " \-\-mtab"
Search in
.IR /etc/mtab .
The output is in the list format (see \fB\-\-list\fP).
-.IP "\fB\-N, \-\-task \fItid\fP"
+.TP
+.BR \-N , " \-\-task \fItid\fP"
Use alternative namespace /proc/<tid>/mountinfo rather than the default
/proc/self/mountinfo. If the option is specified more than once, then
tree-like output is disabled (see the \fB\-\-list\fP option). See also the
.BR unshare (1)
command.
-.IP "\fB\-n, \-\-noheadings\fP"
+.TP
+.BR \-n , " \-\-noheadings"
Do not print a header line.
-.IP "\fB\-O, \-\-options \fIlist\fP"
+.TP
+.BR \-O , " \-\-options \fIlist\fP"
Limit the set of printed filesystems. More than one option
may be specified in a comma-separated list. The
.B \-t
@@ -102,7 +118,8 @@ in that each option is matched exactly; a leading
at the beginning does not have global meaning. The "no" can used for
individual items in the list. The "no" prefix interpretation can be disabled
by "+" prefix.
-.IP "\fB\-o, \-\-output \fIlist\fP"
+.TP
+.BR \-o , " \-\-output \fIlist\fP"
Define output columns. See the \fB\-\-help\fP output to get a list of the
currently supported columns. The
.BR TARGET
@@ -114,9 +131,11 @@ options are not specified.
The default list of columns may be extended if \fIlist\fP is
specified in the format \fI+list\fP (e.g. \fBfindmnt -o +PROPAGATION\fP).
-.IP "\fB\-P, \-\-pairs\fP"
+.TP
+.BR \-P , " \-\-pairs"
Use key="value" output format. All potentially unsafe characters are hex-escaped (\\x<code>).
-.IP "\fB\-p, \-\-poll\fR[\fI=list\fR]\fP"
+.TP
+.BR \-p , " \-\-poll\fR[\fI=list\fR]"
Monitor changes in the /proc/self/mountinfo file. Supported actions are: mount,
umount, remount and move. More than one action may be specified in a
comma-separated list. All actions are monitored by default.
@@ -140,24 +159,30 @@ available for umount and move actions
.B OLD-OPTIONS
available for umount and remount actions
.RE
-.IP "\fB\-R, \-\-submounts\fP"
+.TP
+.BR \-R , " \-\-submounts"
Print recursively all submounts for the selected filesystems. The restrictions
defined by options \fB\-t\fP, \fB\-O\fP, \fB\-S\fP, \fB\-T\fP and
\fB\--direction\fP are not applied to submounts. All submounts are always
printed in tree-like order. The option enables the tree-like output format by
default. This option has no effect for \fB\-\-mtab\fP or \fB\-\-fstab\fP.
-.IP "\fB\-r, \-\-raw\fP"
+.TP
+.BR \-r , " \-\-raw"
Use raw output format. All potentially unsafe characters are hex-escaped (\\x<code>).
-.IP "\fB\-S, \-\-source \fIspec\fP"
+.TP
+.BR \-S , " \-\-source \fIspec\fP"
Explicitly define the mount source. Supported are \fIdevice\fR, \fImaj:min\fR,
\fILABEL=\fR, \fIUUID=\fR, \fIPARTLABEL=\fR or \fIPARTUUID=\fR.
-.IP "\fB\-s, \-\-fstab\fP"
+.TP
+.BR \-s , " \-\-fstab"
Search in
.IR /etc/fstab .
The output is in the list format (see \fB--list\fR).
-.IP "\fB\-T, \-\-target \fIdir\fP"
+.TP
+.BR \-T , " \-\-target \fIdir\fP"
Explicitly define the mount target (mountpoint directory).
-.IP "\fB\-t, \-\-types \fIlist\fP"
+.TP
+.BR \-t , " \-\-types \fIlist\fP"
Limit the set of printed filesystems. More than one type may be
specified in a comma-separated list. The list of filesystem types can be
prefixed with
@@ -165,7 +190,8 @@ prefixed with
to specify the filesystem types on which no action should be taken. For
more details see
.BR mount (8).
-.IP "\fB\-u, \-\-notruncate\fP"
+.TP
+.BR \-u , " \-\-notruncate"
Do not truncate text in columns. The default is to not truncate the
.BR TARGET ,
.BR SOURCE ,
@@ -174,9 +200,11 @@ Do not truncate text in columns. The default is to not truncate the
.BR PARTUUID ,
.BR PARTLABEL
columns. This option disables text truncation also in all other columns.
-.IP "\fB\-v, \-\-nofsroot\fP"
+.TP
+.BR \-v , " \-\-nofsroot"
Do not print a [/dir] in the SOURCE column for bind-mounts or btrfs subvolumes.
-.IP "\fB\-w, \-\-timeout \fImilliseconds\fP"
+.TP
+.BR \-w , " \-\-timeout \fImilliseconds\fP"
Specify an upper limit on the time for which \fB--poll\fR will block, in milliseconds.
.SH EXAMPLES
.IP "\fBfindmnt \-\-fstab \-t nfs\fP"
--
1.7.0.4
From f3a68e0ce33e199bca5a5323ca29887285e9551c Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sun, 17 Mar 2013 20:39:12 +0100
Subject: [PATCH 5/8] docs: normalize formatting of wipefs man page
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
misc-utils/wipefs.8 | 68 ++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/misc-utils/wipefs.8 b/misc-utils/wipefs.8
index 67261ee..9487a3e 100644
--- a/misc-utils/wipefs.8
+++ b/misc-utils/wipefs.8
@@ -7,16 +7,16 @@
wipefs \- wipe a signature from a device
.SH SYNOPSIS
.B wipefs
-.RB [ \-ahnptV ]
+.RB [ \-ahnpqtV ]
.RB [ \-o
.IR offset ]
-.I device...
+.IR device ...
.SH DESCRIPTION
.B wipefs
-can erase filesystem, raid or partition table signatures (magic strings) from
+can erase filesystem, raid or partition-table signatures (magic strings) from
the specified
.I device
-to make the signature invisible for libblkid.
+to make the signatures invisible for libblkid.
.B wipefs
does not erase the filesystem itself nor any other data from the device.
@@ -24,53 +24,61 @@ When used without options \fB-a\fR or \fB-o\fR, it lists all visible filesystems
and the offsets of their basic signatures.
Note that some filesystems or some partition tables store more magic strings on
-the devices. The
+the devices. The
.B wipefs
-lists the first offset where a magic string has been detected. The device is
-not scanned for additional magic strings for the same filesystem. It's possible
-that after \fBwipefs -o <offset>\fR will be the same filesystem or partition
-table visible by another magic string on another offset.
+command lists only the first offset where a magic string has been detected. The device
+is not scanned for additional magic strings for the same filesystem. It is possible
+that after \fBwipefs -o \fIoffset\fR the same filesystem or partition
+table will still be visible by another magic string on another offset.
-When used with option \fB-a\fR then all for libblkid visible magic strings are
+When used with option \fB-a\fR, all magic strings that are visible for libblkid are
erased.
.SH OPTIONS
-.IP "\fB\-a, \-\-all\fP"
-Erase all available signatures. This set of erased signatures could be
-restricted by \fB\-t <list>\fP option.
-.IP "\fB\-f, \-\-force\fP"
+.TP
+.BR \-a , " \-\-all"
+Erase all available signatures. The set of erased signatures can be
+restricted with the \fB\-t\fP \fIlist\fP option.
+.TP
+.BR \-f , " \-\-force"
Force erasure, even if the filesystem is mounted. This is required in
order to erase the partition table on a block device.
-.IP "\fB\-h, \-\-help\fP"
+.TP
+.BR \-h , " \-\-help"
Print help and exit.
-.IP "\fB\-n, \-\-no\-act\fP"
+.TP
+.BR -n , " \-\-no\-act"
Causes everything to be done except for the write() call.
-.IP "\fB\-o, \-\-offset\fP \fIoffset\fP
+.TP
+.BR \-o , " \-\-offset " \fIoffset\fP
Specify the location (in bytes) of the signature which should be erased from the
device. The \fIoffset\fR number may include a "0x" prefix; then the number will be
interpreted as a hex value. It is possible to specify multiple \fB-o\fR options.
The \fIoffset\fR argument may be followed by the multiplicative
-suffixes KiB=1024, 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, PB, EB, ZB and YB.
-.IP "\fB\-p, \-\-parsable\fP"
+suffixes KiB (=1024), 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, PB, EB, ZB and YB.
+.TP
+.BR \-p , " \-\-parsable"
Print out in parsable instead of printable format. Encode all potentially unsafe
characters of a string to the corresponding hex value prefixed by '\\x'.
-.IP "\fB\-q, \-\-quiet\fP"
+.TP
+.BR \-q , " \-\-quiet"
Suppress output messages after successful signature wipe.
-.IP "\fB\-t, \-\-types\fP \fIlist\fP
-Used to limit the set of printed or erased signatures. More than one type may
-be specified in a comma-separated list. The list of types or individual types
+.TP
+.BR \-t , " \-\-types " \fIlist\fP
+Limit the set of printed or erased signatures. More than one type may
+be specified in a comma-separated list. The list or individual types
can be prefixed with 'no' to specify the types on which no action should be
-taken. For more details see mount(8).
-.IP "\fB\-V, \-\-version\fP"
+taken. For more details see mount(8).
+.TP
+.BR -V , " \-\-version"
Output version information and exit.
.SH AUTHOR
-Karel Zak <kzak@xxxxxxxxxx>.
+Karel Zak <kzak@xxxxxxxxxx>
.SH ENVIRONMENT
-.IP LIBBLKID_DEBUG=0xffff
-enables debug output.
+.IP "Setting LIBBLKID_DEBUG=0xffff enables debug output."
.SH AVAILABILITY
The wipefs command is part of the util-linux package and is available from
ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
--
1.7.0.4
From ccaf0a80de80887d96430747e6214bc00d8bd5a0 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sun, 17 Mar 2013 21:59:21 +0100
Subject: [PATCH 6/8] docs: normalize formatting of lslocks man page
Also alphabetize the options and improve some wording.
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
misc-utils/lslocks.8 | 55 ++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/misc-utils/lslocks.8 b/misc-utils/lslocks.8
index 10d6490..dca99b9 100644
--- a/misc-utils/lslocks.8
+++ b/misc-utils/lslocks.8
@@ -1,56 +1,63 @@
-.\" lslocks.8 --
+.\" -*- nroff -*-
+.\" Man page for the lslocks command.
.\" Copyright 2012 Davidlohr Bueso <dave@xxxxxxx>
.\" May be distributed under the GNU General Public License
.TH LSLOCKS 8 "February 2012" "util-linux" "System Administration"
.SH NAME
-lslocks \-
-list local system locks
+lslocks \- list local system locks
.SH SYNOPSIS
-.B lslocks
-.RB [options]
+.BR lslocks " [" options ]
.SH DESCRIPTION
.B lslocks
-lists information about all the file held locks in a Linux system.
+lists information about all the currently held file locks in a Linux system.
.SH OPTIONS
-.IP "\fB\-p, \-\-pid\fP"
-Specify the process id, if none is given, it will display all locks
-.IP "\fB\-h, \-\-help\fP"
+.TP
+.BR \-h , " \-\-help"
Print a help text and exit.
-.IP "\fB\-o, \-\-output \fIlist\fP"
-Specify which output columns to print. Use
+.TP
+.BR \-n , " \-\-noheadings"
+Do not print a header line.
+.TP
+.BR \-o , " \-\-output " \fIlist\fP
+Specify which output columns to print. Use
.B "--help"
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. \fBlslocks -o +BLOCKER\fP).
-.IP "\fB\-n, \-\-noheadings\fP"
-Do not print a header line.
-.IP "\fB\-u, \-\-notruncate\fP"
-Do not truncate text in columns.
-.IP "\fB\-r, \-\-raw\fP"
+.TP
+.BR \-p , " \-\-pid " \fIpid\fP
+Display only the locks held by the process with this \fIpid\fR.
+.TP
+.BR \-r , " \-\-raw"
Use the raw output format.
+.TP
+.BR \-u , " \-\-notruncate"
+Do not truncate text in columns.
.SH OUTPUT
.IP "COMMAND"
The command name of the process holding the lock.
.IP "PID"
-Process ID which holds the lock.
+The process ID of the process which holds the lock.
.IP "TYPE"
-Type of lock, can be FLOCK (created with flock(2)) or POSIX (created with fcntl(2) and lockf(2))
+The type of lock; can be FLOCK (created with flock(2)) or POSIX (created with fcntl(2) and lockf(3)).
.IP "SIZE"
Size of the locked file.
.IP "MODE"
-Lock access permissions (read, write). If the process is blocked and waiting for the lock
-than the '*' (asterisk) postfix is used for the mode.
+The lock's access permissions (read, write). If the process is blocked and waiting for the lock,
+then the mode is postfixed with an '*' (asterisk).
+
.IP "M"
-Mandatory state of the lock: 0 if none; 1 if set. (See chmod(1)).
+Whether the lock is mandatory; 0 means no (meaning the lock is only advisory), 1 means yes.
+(See fcntl(2)).
.IP "START"
Relative byte offset of the lock.
@@ -59,13 +66,13 @@ Relative byte offset of the lock.
Ending offset of the lock.
.IP "PATH"
-Full path of the lock - if none is found or no permissions to read the path it
-will fallback to the device's mountpoint. The path might be truncated, use
+Full path of the lock. If none is found, or there are no permissions to read the path,
+it will fall back to the device's mountpoint. The path might be truncated; use
.B "--notruncate"
to get the full path.
.IP "BLOCKER"
-Process ID which blocks the lock.
+The PID of the process which blocks the lock.
.SH NOTES
.nf
--
1.7.0.4
From 5c52bc1da2cfdebb4c67c4af784a56d5bb9bdcc7 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sun, 17 Mar 2013 22:05:19 +0100
Subject: [PATCH 7/8] docs: make the section AVAILABILITY always come last in man pages
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
disk-utils/fsck.8 | 18 +++++++++---------
libblkid/libblkid.3 | 7 +++----
login-utils/login.1 | 4 +---
misc-utils/blkid.8 | 8 ++++----
misc-utils/findfs.8 | 6 +++---
misc-utils/uuidgen.1 | 4 ++--
misc-utils/wipefs.8 | 6 +++---
term-utils/scriptreplay.1 | 4 +---
text-utils/rev.1 | 4 ++--
9 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/disk-utils/fsck.8 b/disk-utils/fsck.8
index 3bb54d5..52629c7 100644
--- a/disk-utils/fsck.8
+++ b/disk-utils/fsck.8
@@ -385,15 +385,6 @@ and
do not support the
.B -y
option as of this writing.
-.SH AUTHOR
-.MT tytso@xxxxxxx
-Theodore Ts'o
-.ME
-.SH AVAILABILITY
-The fsck command is part of the util-linux package and is available from
-.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
-Linux Kernel Archive
-.UE .
.SH FILES
.IR /etc/fstab .
.SH ENVIRONMENT VARIABLES
@@ -466,3 +457,12 @@ or
.BR fsck.xfs (8),
.BR fsck.xiafs (8),
.BR reiserfsck (8).
+.SH AUTHOR
+.MT tytso@xxxxxxx
+Theodore Ts'o
+.ME
+.SH AVAILABILITY
+The fsck command is part of the util-linux package and is available from
+.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
+Linux Kernel Archive
+.UE .
diff --git a/libblkid/libblkid.3 b/libblkid/libblkid.3
index ff84e7d..c96bc87 100644
--- a/libblkid/libblkid.3
+++ b/libblkid/libblkid.3
@@ -67,10 +67,6 @@ was written by Andreas Dilger for the ext2 filesystem utilties, with input
from Ted Ts'o. The library was subsequently heavily modified by Ted Ts'o.
The low-level probing code was rewritten by Karel Zak.
-.SH AVAILABILITY
-.B libblkid
-is part of the util-linux package since version 2.15 and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
.SH COPYING
.B libblkid
is available under the terms of the GNU Library General Public License (LGPL),
@@ -78,3 +74,6 @@ version 2 (or at your discretion any later version).
.SH "SEE ALSO"
.BR blkid (8)
.BR findfs (8)
+.SH AVAILABILITY
+libblkid is part of the util-linux package since version 2.15 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/login-utils/login.1 b/login-utils/login.1
index e37e5e6..216645e 100644
--- a/login-utils/login.1
+++ b/login-utils/login.1
@@ -328,9 +328,7 @@ Rewritten to PAM-only version by
Karel Zak
.ME
.SH AVAILABILITY
-The
-.B login
-command is part of the util-linux package and is
+The login command is part of the util-linux package and is
available from
.UR ftp:\://ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
Linux Kernel Archive
diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8
index 1e4741e..77304da 100644
--- a/misc-utils/blkid.8
+++ b/misc-utils/blkid.8
@@ -299,10 +299,10 @@ was written by Andreas Dilger for libblkid and improved by Theodore Ts'o
and Karel Zak.
.SH ENVIRONMENT
.IP "Setting LIBBLKID_DEBUG=0xffff enables debug output."
-.SH AVAILABILITY
-The blkid command is part of the util-linux package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
-.SH "SEE ALSO"
+.SH SEE ALSO
.BR libblkid (3)
.BR findfs (8)
.BR wipefs (8)
+.SH AVAILABILITY
+The blkid command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/misc-utils/findfs.8 b/misc-utils/findfs.8
index 8b6b395..530f186 100644
--- a/misc-utils/findfs.8
+++ b/misc-utils/findfs.8
@@ -28,10 +28,10 @@ the util-linux package by Karel Zak (kzak@xxxxxxxxxx).
.SH ENVIRONMENT
.IP LIBBLKID_DEBUG=0xffff
enables debug output.
-.SH AVAILABILITY
-The findfs command is part of the util-linux package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
.SH SEE ALSO
.BR blkid (8)
.BR fsck (8)
+.SH AVAILABILITY
+The findfs command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1
index ad409b9..4d64a10 100644
--- a/misc-utils/uuidgen.1
+++ b/misc-utils/uuidgen.1
@@ -56,8 +56,8 @@ OSF DCE 1.1
.SH AUTHOR
.B uuidgen
was written by Andreas Dilger for libuuid.
+.SH SEE ALSO
+.BR libuuid (3)
.SH AVAILABILITY
The uuidgen command is part of the util-linux package and is available from
ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
-.SH "SEE ALSO"
-.BR libuuid (3)
diff --git a/misc-utils/wipefs.8 b/misc-utils/wipefs.8
index 9487a3e..c6913aa 100644
--- a/misc-utils/wipefs.8
+++ b/misc-utils/wipefs.8
@@ -79,10 +79,10 @@ Output version information and exit.
Karel Zak <kzak@xxxxxxxxxx>
.SH ENVIRONMENT
.IP "Setting LIBBLKID_DEBUG=0xffff enables debug output."
-.SH AVAILABILITY
-The wipefs command is part of the util-linux package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
.SH SEE ALSO
.BR blkid (8)
.BR findfs (8)
+.SH AVAILABILITY
+The wipefs command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/term-utils/scriptreplay.1 b/term-utils/scriptreplay.1
index b4b34a6..343f436 100644
--- a/term-utils/scriptreplay.1
+++ b/term-utils/scriptreplay.1
@@ -99,9 +99,7 @@ and
Karel Zak
.ME .
.SH AVAILABILITY
-The
-.B scriptreplay
-command is part of the util-linux package and is available from
+The scriptreplay command is part of the util-linux package and is available from
.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
Linux Kernel Archive
.UE .
diff --git a/text-utils/rev.1 b/text-utils/rev.1
index b9b5f48..a50a4c5 100644
--- a/text-utils/rev.1
+++ b/text-utils/rev.1
@@ -51,10 +51,10 @@ Output version information and exit.
.TP
\fB\-h\fR, \fB\-\-help\fR
Output help and exit.
+.SH SEE ALSO
+.BR tac (1)
.SH AVAILABILITY
The rev command is part of the util-linux package and is available from
.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
Linux Kernel Archive
.UE .
-.SH SEE ALSO
-.BR tac (1)
--
1.7.0.4
From f98a84abf483ca89c299e7d35e8f9e033de8fbfa Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sun, 17 Mar 2013 22:23:45 +0100
Subject: [PATCH 8/8] docs: add AVAILABILITY section to isosize man page, and tweak wording
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
disk-utils/isosize.8 | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/disk-utils/isosize.8 b/disk-utils/isosize.8
index 6cbc1ff..c888967 100644
--- a/disk-utils/isosize.8
+++ b/disk-utils/isosize.8
@@ -5,12 +5,11 @@ isosize \- output the length of an iso9660 filesystem
.B isosize
.RI [ options ] " iso9660_image_file"
.SH DESCRIPTION
-.\" Add any additional description here
.PP
-This command outputs the length of an iso9660 file system that
-is contained in the given file. That file may be a normal file or
+This command outputs the length of an iso9660 filesystem that
+is contained in the specified file. This file may be a normal file or
a block device (e.g. /dev/hdd or /dev/sr0). In the absence of
-any switches (and errors) it will output the size of the iso9660
+any options (and errors), it will output the size of the iso9660
filesystem in bytes. This can now be a large number (>> 4 GB).
.SH OPTIONS
.TP
@@ -33,3 +32,8 @@ filesystem can be marginally larger than the actual size of the
iso9660 filesystem. One reason for this is that cd writers
are allowed to add "run out" sectors at the end of an iso9660
image.
+.SH AVAILABILITY
+The isosize command is part of the util-linux package and is available from
+.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
+Linux Kernel Archive
+.UE .
--
1.7.0.4
