swapon.8: reorder options, lowercase command names, tweak sentences.
swapon.c: tweak descriptions, adjust spaces for proper alignment.
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
mount/swapon.8 | 38 ++++++++++++++++----------------------
mount/swapon.c | 18 +++++++++---------
2 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/mount/swapon.8 b/mount/swapon.8
index 138b819..776783b 100644
--- a/mount/swapon.8
+++ b/mount/swapon.8
@@ -42,21 +42,21 @@
.SH NAME
swapon, swapoff \- enable/disable devices and files for paging and swapping
.SH SYNOPSIS
-.B /sbin/swapon [\-h \-V]
+.B /sbin/swapon \-a [\-e] [\-v]
.br
-.B /sbin/swapon \-a [\-v] [\-e]
+.BI "/sbin/swapon [\-p " "priority" "] [\-v]" " specialfile"...
.br
-.BI "/sbin/swapon [\-v] [\-p " "priority" "] " " specialfile " ...
+.B /sbin/swapon \-s
.br
-.B /sbin/swapon [\-s]
+.B /sbin/swapon \-h | \-V
.br
-.B /sbin/swapoff [\-h \-V]
+.B /sbin/swapoff \-a [\-v]
.br
-.B /sbin/swapoff \-a
+.BI "/sbin/swapoff [\-v]" " specialfile"...
.br
-.BI /sbin/swapoff " specialfile " ...
+.B /sbin/swapoff \-h | \-V
.SH DESCRIPTION
-.B Swapon
+.B swapon
is used to specify devices on which paging and swapping are to take place.
The device or file used is given by the
@@ -77,20 +77,16 @@ is interleaved across several devices and files.
Normally, the first form is used:
.TP
.B \-a
-All devices marked as ``swap'' swap devices in
+All devices marked as ``swap'' in
.I /etc/fstab
are made available, except for those with the ``noauto'' option.
-Devices that are already running as swap are silently skipped.
+Devices that are already being used as swap are silently skipped.
.TP
.B \-e
-When
-.B \-a
-is used with swapon,
-.B \-e
-makes swapon silently skip devices that do not exist.
+Silently skip devices that do not exist.
.TP
.B \-h
-Provide help
+Provide help.
.TP
.BI \-L " label"
Use the partition that has the specified
@@ -100,11 +96,9 @@ Use the partition that has the specified
is needed.)
.TP
.BI \-p " priority"
-Specify priority for
-.BR swapon .
-This option is only available if
+Specify the priority of the swap device. This option is only available if
.B swapon
-was compiled under and is used under a 1.3.2 or later kernel.
+was compiled and is used under a 1.3.2 or later kernel.
.I priority
is a value between 0 and 32767. Higher numbers indicate higher
priority. See
@@ -131,9 +125,9 @@ is needed.)
Be verbose.
.TP
.B \-V
-Display version
+Display version.
.PP
-.B Swapoff
+.B swapoff
disables swapping on the specified devices and files.
When the
.B \-a
diff --git a/mount/swapon.c b/mount/swapon.c
index c89c02f..34a183f 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -61,16 +61,16 @@ static int cannot_find(const char *special);
#define PRINT_USAGE_SPECIAL(_fp) \
fprintf(_fp, _( \
"The <special> parameter:\n" \
- " {-L label | LABEL=label} volume LABEL\n" \
- " {-U uuid | UUID=uuid} volume UUID\n" \
- " <file> swap file\n" \
- " <device> swap device\n\n"))
+ " {-L label | LABEL=label} LABEL of device to be used\n" \
+ " {-U uuid | UUID=uuid} UUID of device to be used\n" \
+ " <device> name of device to be used\n" \
+ " <file> name of file to be used\n\n"))
static void
swapon_usage(FILE *fp, int n) {
fprintf(fp, _("\nUsage:\n"
" %1$s -a [-e] [-v] enable all swaps from /etc/fstab\n"
- " %1$s [-v] [-p priority] <special> enable swap\n"
+ " %1$s [-p priority] [-v] <special> enable given swap\n"
" %1$s -s display swap usage summary\n"
" %1$s -h display help\n"
" %1$s -V display version\n\n"), progname);
@@ -83,10 +83,10 @@ swapon_usage(FILE *fp, int n) {
static void
swapoff_usage(FILE *fp, int n) {
fprintf(fp, _("\nUsage:\n"
- " %1$s -a [-v] disable all swaps\n"
- " %1$s [-v] <special> disable given swap\n"
- " %1$s -h display help\n"
- " %1$s -V display version\n\n"), progname);
+ " %1$s -a [-v] disable all swaps\n"
+ " %1$s [-v] <special> disable given swap\n"
+ " %1$s -h display help\n"
+ " %1$s -V display version\n\n"), progname);
PRINT_USAGE_SPECIAL(fp);
--
1.5.2.5
-
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
