Skip to content

Commit 0791a05

Browse files
Benno Schulenbergkarelzak
authored andcommitted
textual: tweak several manpages, mainly the blkid one
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
1 parent 70532ed commit 0791a05

7 files changed

Lines changed: 70 additions & 72 deletions

File tree

misc-utils/blkid.8

Lines changed: 47 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
.\" This file may be copied under the terms of the GNU Public License.
66
.\"
77
.\" Based on uuidgen, Mon Sep 17 10:42:12 2000, Andreas Dilger
8-
.TH BLKID 8 "February 2009" "Linux" "MAINTENANCE COMMANDS"
8+
.TH BLKID 8 "February 2011" "Linux" "MAINTENANCE COMMANDS"
99
.SH NAME
10-
blkid \- command\-line utility to locate/print block device attributes
10+
blkid \- locate/print block device attributes
1111
.SH SYNOPSIS
1212
.B blkid
1313
.RB \-L
@@ -46,8 +46,7 @@ blkid \- command\-line utility to locate/print block device attributes
4646
.IR list ]
4747
.RB [ \-u
4848
.IR list ]
49-
.I device
50-
[\fIdevice\fR ...]
49+
.IR device " ... "
5150
.in -9
5251

5352
.B blkid
@@ -56,22 +55,21 @@ blkid \- command\-line utility to locate/print block device attributes
5655
.IR format ]
5756
.RB [ \-s
5857
.IR tag ]
59-
.I device
60-
[\fIdevice\fR ...]
58+
.IR device " ... "
6159

6260
.SH DESCRIPTION
6361
The
6462
.B blkid
65-
program is the command-line interface to working with
63+
program is the command-line interface to working with the
6664
.BR libblkid (3)
67-
library. It can determine the type of content (e.g. filesystem, swap)
68-
a block device holds, and also attributes (tokens, NAME=value pairs)
65+
library. It can determine the type of content (e.g. filesystem or swap)
66+
that a block device holds, and also attributes (tokens, NAME=value pairs)
6967
from the content metadata (e.g. LABEL or UUID fields).
7068
.PP
7169
.B blkid
7270
has two main forms of operation: either searching for a device with a
7371
specific NAME=value pair, or displaying NAME=value pairs for one or
74-
more devices.
72+
more specified devices.
7573
.SH OPTIONS
7674
The \fIsize\fR and \fIoffset\fR arguments may be followed by binary (2^N)
7775
suffixes KiB, MiB, GiB, TiB, PiB and EiB (the "iB" is optional, e.g. "K" has the
@@ -94,12 +92,11 @@ devices which no longer exist.
9492
Display a usage message and exit.
9593
.TP
9694
.B \-i
97-
Display I/O Limits (aka I/O topology) information. The 'export' output format is
98-
automatically enabled. This option could be used together with \fB-p\fR option.
95+
Display I/O Limits (aka I/O topology) information. The 'export' output format is
96+
automatically enabled. This option can be used together with the \fB-p\fR option.
9997
.TP
10098
.B \-l
101-
Look up one device that matches the search parameter specified using
102-
the
99+
Look up only one device that matches the search parameter specified with the
103100
.B \-t
104101
option. If there are multiple devices that match the specified search
105102
parameter, then the device with the highest priority is returned, and/or
@@ -109,33 +106,33 @@ block devices. If this option is not specified,
109106
.B blkid
110107
will print all of the devices that match the search parameter.
111108
.TP
112-
.B \-L " label "
113-
Look up one device that uses the label (same as: -l -o device -t
114-
LABEL=<label>). This look up method is able to reliable use /dev/disk/by-label
115-
udev symlinks (depends on setting in /etc/blkid.conf). Avoid to use the
116-
symlinks directly. It is not reliable to use the symlinks without verification.
109+
.BI \-L " label"
110+
Look up the device that uses this \fIlabel\fR (equal to: -l -o device -t
111+
LABEL=<label>). This lookup method is able to reliably use /dev/disk/by-label
112+
udev symlinks (dependent on a setting in /etc/blkid.conf). Avoid using the
113+
symlinks directly; it is not reliable to use the symlinks without verification.
117114
The \fB-L\fR option works on systems with and without udev.
118115

119116
Unfortunately, the original
120117
.B blkid(8)
121118
from e2fsprogs use the \fB-L\fR option as a
122-
synonym to the \fB-o list\fR option. For better portability use "-l -o device
123-
-t LABEL=<label>" and "-o list" in your scripts rather than -L option.
119+
synonym for the \fB-o list\fR option. For better portability, use \fB-l -o device
120+
-t LABEL=<label>\fR and \fB-o list\fR in your scripts rather than the \fB-L\fR option.
124121
.TP
125-
.B \-n " list "
126-
Restrict probing functions to defined (comma separated) list of superblock types (names).
127-
The list can be prefixed with "no" to specify the types which should be ignored.
122+
.BI \-n " list "
123+
Restrict the probing functions to the specified (comma-separated) \fIlist\fR of
124+
superblock types (names).
125+
The list items may be prefixed with "no" to specify the types which should be ignored.
128126
For example:
129127
.sp
130128
blkid -p -n vfat,ext3,ext4 /dev/sda1
131129
.sp
132130
probes for vfat, ext3 and ext4 filesystems, and
133131
.sp
134-
blkid -p -u nominix /dev/sda1
132+
blkid -p -n nominix /dev/sda1
135133
.sp
136-
probes for all supported formats exclude minix filesystem. This option is
137-
useful with
138-
\fB-p\fR only.
134+
probes for all supported formats except minix filesystems.
135+
This option is only useful together with \fB-p\fR.
139136
.TP
140137
.BI \-o " format"
141138
Display
@@ -152,29 +149,29 @@ print all tags (the default)
152149
print the value of the tags
153150
.TP
154151
.B list
155-
print the devices in a user-friendly format, this output format is unsupported
152+
print the devices in a user-friendly format; this output format is unsupported
156153
for low-level probing (\fB-p\fR or \fB-i\fR)
157154
.TP
158155
.B device
159-
print the device name only, this output format is always enabled for \fB-L\fR
156+
print the device name only; this output format is always enabled for \fB-L\fR
160157
and \fB-U\fR options
161158
.TP
162159
.B udev
163-
print key="value" pairs for easy import into the udev environment. The keys are
164-
prefixed by ID_FS_ or ID_PART_ prefixes.
160+
print key="value" pairs for easy import into the udev environment; the keys are
161+
prefixed by ID_FS_ or ID_PART_ prefixes
165162

166-
The udev output returns ID_FS_AMBIVALENT tag if more superblocks are detected,
163+
The udev output returns the ID_FS_AMBIVALENT tag if more superblocks are detected,
167164
and ID_PART_ENTRY_* tags are always returned for all partitions including empty
168165
partitions.
169166
.TP
170167
.B export
171-
print key=value pairs for easy import into the environment. This output format
172-
is automatically enabled when I/O Limits (\fB-i\fR option) are requested.
168+
print key=value pairs for easy import into the environment; this output format
169+
is automatically enabled when I/O Limits (\fB-i\fR option) are requested
173170
.RE
174171
.TP
175172
.BI \-O " offset"
176-
Probe at the given offset (only useful with \fB-p\fR). This option could be
177-
used together with \fB-i\fR option.
173+
Probe at the given \fIoffset\fR (only useful with \fB-p\fR). This option can be
174+
used together with the \fB-i\fR option.
178175
.TP
179176
.BI \-p
180177
Switch to low-level superblock probing mode (bypass cache).
@@ -212,22 +209,22 @@ and
212209
If there are no devices specified on the command line, all block devices
213210
will be searched; otherwise only the specified devices are searched.
214211
.TP
215-
.B \-u " list "
216-
Restrict probing functions to defined (comma separated) list of "usage" types.
217-
Supported usage types are: filesystem, raid, crypto and other. The list can be
218-
prefixed with "no" to specify the usage types which should be ignored. For example:
212+
.BI \-u " list "
213+
Restrict the probing functions to the specified (comma-separated) \fIlist\fR of "usage" types.
214+
Supported usage types are: filesystem, raid, crypto and other. The list items may be
215+
prefixed with "no" to specify the usage types which should be ignored. For example:
219216
.sp
220217
blkid -p -u filesystem,other /dev/sda1
221218
.sp
222-
probes for all filesystems and others (e.g. swap) formats, and
219+
probes for all filesystem and other (e.g. swap) formats, and
223220
.sp
224221
blkid -p -u noraid /dev/sda1
225222
.sp
226-
probes for all supported formats exclude RAIDs. This option is useful with
227-
\fB-p\fR only.
223+
probes for all supported formats except RAIDs.
224+
This option is only useful together with \fB-p\fR.
228225
.TP
229-
.B \-U " uuid "
230-
Look up one device that uses the uuid. For more details see the \fB-L\fR option.
226+
.BI \-U " uuid "
227+
Look up the device that uses this \fIuuid\fR. For more details see the \fB-L\fR option.
231228
.TP
232229
.B \-v
233230
Display version number and exit.
@@ -237,9 +234,9 @@ Write the device cache to
237234
.I writecachefile
238235
instead of writing it to the default cache file
239236
.IR /etc/blkid.tab .
240-
If you don't want to save the cache to the default file, specify
237+
If you don't want to save the cache at all, specify
241238
.IR /dev/null.
242-
If not specified it will be the same file as that given by the
239+
If not specified, it will be the same file as that given with the
243240
.B \-c
244241
option.
245242
.TP
@@ -256,11 +253,11 @@ If the specified token was found, or if any tags were shown from (specified)
256253
devices, 0 is returned.
257254

258255
If the specified token was not found, or no (specified) devices could be
259-
identified an exit code of 2 is returned.
256+
identified, an exit code of 2 is returned.
260257

261258
For usage or other errors, an exit code of 4 is returned.
262259

263-
If the ambivalent low-level probing result was detected an exit code of 8 is
260+
If the ambivalent low-level probing result was detected, an exit code of 8 is
264261
returned.
265262
.SH AUTHOR
266263
.B blkid

misc-utils/findfs.8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
.\"
55
.TH FINDFS 8 "February 2009" "Linux" "MAINTENANCE COMMANDS"
66
.SH NAME
7-
findfs \- Find a filesystem by label or UUID
7+
findfs \- find a filesystem by label or UUID
88
.SH SYNOPSIS
99
.B findfs
1010
.BI LABEL= label
@@ -24,7 +24,7 @@ be printed on stdout.
2424
.SH AUTHOR
2525
.B findfs
2626
was originally written by Theodore Ts'o (tytso@mit.edu) and re-written for
27-
util-linux package by Karel Zak (kzak@redhat.com).
27+
the util-linux package by Karel Zak (kzak@redhat.com).
2828
.SH AVAILABILITY
2929
The findfs command is part of the util-linux package and is available from
3030
ftp://ftp.kernel.org/pub/linux/utils/util-linux/.

misc-utils/kill.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ it may be necessary to use the KILL (9) signal, since this signal cannot
2626
be caught.
2727
.PP
2828
Most modern shells have a builtin kill function, with a usage rather similar
29-
to that of the command described here. The `-a' and `-p' options,
30-
and the possibility to specify pids by command name is a local extension.
29+
to that of the command described here. The `-a' and `-p' options,
30+
and the possibility to specify processes by command name are a local extension.
3131
.PP
3232
If sig is 0, then no signal is sent, but error checking is still performed.
3333
.SH OPTIONS

misc-utils/look.1

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ Options:
7272
.Bl -tag -width Ds
7373
.It Fl d
7474
Dictionary character set and order, i.e. only alphanumeric characters
75-
are compared. (On by default if no file specified).
75+
are compared. (On by default if no file is specified).
7676
.It Fl f
77-
Ignore the case of alphabetic characters. (On by default if no file specified).
77+
Ignore the case of alphabetic characters. (On by default if no file is specified).
7878
.It Fl a
7979
Use the alternate dictionary
80-
.Pa /usr/share/dict/web2
81-
.It Fl t
80+
.Pa /usr/share/dict/web2 .
81+
.It Fl t Ar termchar
8282
Specify a string termination character, i.e. only the characters
8383
in
8484
.Ar string
@@ -109,8 +109,9 @@ option was specified.
109109
This was incorrect and the current man page matches the historic
110110
implementation.
111111
.Sh HISTORY
112-
.Nm Look
113-
appeared in Version 7 AT&T Unix.
112+
The
113+
.Nm look
114+
utility appeared in Version 7 AT&T Unix.
114115
.Sh AVAILABILITY
115116
The look command is part of the util-linux package and is available from
116117
ftp://ftp.kernel.org/pub/linux/utils/util-linux/.

misc-utils/lsblk.8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ lsblk \- list block devices
1111
.IR device...
1212
.SH DESCRIPTION
1313
.B lsblk
14-
lists information about all or the specified block devices. The
14+
lists information about all or the specified block devices. The
1515
.B lsblk
1616
command reads the
1717
.I sysfs
@@ -30,7 +30,7 @@ Print the SIZE column in bytes rather than in human-readable format.
3030
Don't print device holders or slaves. For example "lsblk --nodeps /dev/sda" prints
3131
information about the sda device only.
3232
.IP "\fB\-e, \-\-exclude \fIlist\fP
33-
Exclude the devices specified by a comma-delimited list of major device numbers.
33+
Exclude the devices specified by a comma-separated \fIlist\fR of major device numbers.
3434
Note that RAM disks (major=1) are excluded by default.
3535
.IP "\fB\-f, \-\-fs\fP
3636
Output info about filesystems. This option is equivalent to "-o NAME,FSTYPE,LABEL,MOUNTPOINT".

misc-utils/rename.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.\"
44
.TH RENAME 1 "1 January 2000" "" "Linux Programmer's Manual"
55
.SH NAME
6-
rename \- Rename files
6+
rename \- rename files
77
.SH SYNOPSIS
88
.B rename
99
.IR "from to file" ...
@@ -19,9 +19,9 @@ in their name by
1919
.TP
2020
.BR \-V , " \-\-version"
2121
Display version information and exit.
22-
.TP
2322

24-
For example, given the files
23+
.SH EXAMPLES
24+
Given the files
2525
.IR foo1 ", ..., " foo9 ", " foo10 ", ..., " foo278 ,
2626
the commands
2727

misc-utils/wipefs.8

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ wipefs \- wipe a filesystem signature from a device
1313
.I device
1414
.SH DESCRIPTION
1515
.B wipefs
16-
allows to erase filesystem or raid signatures (magic strings) from the
16+
can erase filesystem or raid signatures (magic strings) from the specified
1717
.I device
1818
to make the filesystem invisible for libblkid.
1919
.B wipefs
20-
does not erase the whole filesystem or any other data from the device.
21-
When used without options -a or -o, it lists all visible filesystems and offsets
22-
of their signatures.
20+
does not erase the filesystem itself nor any other data from the device.
21+
When used without options \fB-a\fR or \fB-o\fR, it lists all visible filesystems
22+
and the offsets of their signatures.
2323
.SH OPTIONS
2424
.IP "\fB\-a, \-\-all\fP"
2525
Erase all available signatures.
@@ -28,9 +28,9 @@ Print help and exit.
2828
.IP "\fB\-n, \-\-no\-act\fP"
2929
Causes everything to be done except for the write() call.
3030
.IP "\fB\-o, \-\-offset\fP \fIoffset\fP
31-
Specifies location (in bytes) of the signature which should be erased from the
32-
device. The offset number may include a "0x" prefix, and then the number will be
33-
read as a hex value. It is possible to specify multiple -o options.
31+
Specify the location (in bytes) of the signature which should be erased from the
32+
device. The \fIoffset\fR number may include a "0x" prefix; then the number will be
33+
interpreted as a hex value. It is possible to specify multiple \fB-o\fR options.
3434

3535
The \fIoffset\fR argument may be followed by binary (2^N) suffixes KiB, MiB,
3636
GiB, TiB, PiB and EiB (the "iB" is optional, e.g. "K" has the same meaning as

0 commit comments

Comments
 (0)