summaryrefslogtreecommitdiffstats
path: root/sys-utils
diff options
context:
space:
mode:
authorBenno Schulenberg2014-12-22 22:57:17 +0100
committerKarel Zak2015-01-06 11:27:38 +0100
commit451dbcfae1406f526208faf6033d6dcc8ac100da (patch)
tree594265cfbfad9989191ae3df877d7e6c300699a8 /sys-utils
parentchsh: keep struct options in .rodata (diff)
downloadkernel-qcow2-util-linux-451dbcfae1406f526208faf6033d6dcc8ac100da.tar.gz
kernel-qcow2-util-linux-451dbcfae1406f526208faf6033d6dcc8ac100da.tar.xz
kernel-qcow2-util-linux-451dbcfae1406f526208faf6033d6dcc8ac100da.zip
textual: add a docstring to most of the utilities
This adds a concise description of a tool to its usage text. A first form of this patch was proposed by Steven Honeyman (see http://www.spinics.net/lists/util-linux-ng/msg09994.html). Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Diffstat (limited to 'sys-utils')
-rw-r--r--sys-utils/blkdiscard.c4
-rw-r--r--sys-utils/chcpu.c3
-rw-r--r--sys-utils/ctrlaltdel.c4
-rw-r--r--sys-utils/dmesg.c4
-rw-r--r--sys-utils/eject.c4
-rw-r--r--sys-utils/fallocate.c5
-rw-r--r--sys-utils/flock.c4
-rw-r--r--sys-utils/fsfreeze.c4
-rw-r--r--sys-utils/fstrim.c4
-rw-r--r--sys-utils/hwclock.c3
-rw-r--r--sys-utils/ipcmk.c5
-rw-r--r--sys-utils/ipcrm.c6
-rw-r--r--sys-utils/ipcs.c6
-rw-r--r--sys-utils/ldattach.c5
-rw-r--r--sys-utils/losetup.c3
-rw-r--r--sys-utils/lscpu.c3
-rw-r--r--sys-utils/mount.c3
-rw-r--r--sys-utils/mountpoint.c3
-rw-r--r--sys-utils/nsenter.c3
-rw-r--r--sys-utils/pivot_root.c4
-rw-r--r--sys-utils/prlimit.c3
-rw-r--r--sys-utils/readprofile.c5
-rw-r--r--sys-utils/renice.c4
-rw-r--r--sys-utils/rtcwake.c3
-rw-r--r--sys-utils/setarch.c4
-rw-r--r--sys-utils/setpriv.c3
-rw-r--r--sys-utils/setsid.c3
-rw-r--r--sys-utils/swapoff.c4
-rw-r--r--sys-utils/swapon.c4
-rw-r--r--sys-utils/switch_root.c4
-rw-r--r--sys-utils/tunelp.c3
-rw-r--r--sys-utils/umount.c3
-rw-r--r--sys-utils/unshare.c3
-rw-r--r--sys-utils/wdctl.c4
-rw-r--r--sys-utils/zramctl.c3
35 files changed, 123 insertions, 10 deletions
diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c
index 6075d8684..e33f9b9d6 100644
--- a/sys-utils/blkdiscard.c
+++ b/sys-utils/blkdiscard.c
@@ -61,6 +61,10 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fputs(USAGE_HEADER, out);
fprintf(out,
_(" %s [options] <device>\n"), program_invocation_short_name);
+
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Discard the content of sectors on a device.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -o, --offset <num> offset in bytes to discard from\n"
" -l, --length <num> length of bytes to discard from the offset\n"
diff --git a/sys-utils/chcpu.c b/sys-utils/chcpu.c
index aba9d6bc8..428fdc271 100644
--- a/sys-utils/chcpu.c
+++ b/sys-utils/chcpu.c
@@ -238,6 +238,9 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
"\nUsage:\n"
" %s [options]\n"), program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Configure CPUs in a multi-processor system.\n"), out);
+
puts(_( "\nOptions:\n"
" -h, --help print this help\n"
" -e, --enable <cpu-list> enable cpus\n"
diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c
index 863632fc3..8f646e5ac 100644
--- a/sys-utils/ctrlaltdel.c
+++ b/sys-utils/ctrlaltdel.c
@@ -19,6 +19,10 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
{
fprintf(out, USAGE_HEADER);
fprintf(out, _(" %s hard|soft\n"), program_invocation_short_name);
+
+ fprintf(out, USAGE_SEPARATOR);
+ fprintf(out, "Set the function of the Ctrl-Alt-Del combination.\n");
+
fprintf(out, USAGE_OPTIONS);
fprintf(out, USAGE_HELP);
fprintf(out, USAGE_VERSION);
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index c6152d49a..267e546d6 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -261,6 +261,10 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options]\n"), program_invocation_short_name);
+
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Display or control the kernel ring buffer.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -C, --clear clear the kernel ring buffer\n"), out);
fputs(_(" -c, --read-clear read and clear all messages\n"), out);
diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index a816b208f..2114780a3 100644
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -130,10 +130,12 @@ static inline void info(const char *fmt, ...)
static void __attribute__ ((__noreturn__)) usage(FILE * out)
{
fputs(USAGE_HEADER, out);
-
fprintf(out,
_(" %s [options] [<device>|<mountpoint>]\n"), program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Eject removable media.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --auto <on|off> turn auto-eject feature on or off\n"
" -c, --changerslot <slot> switch discs on a CD-ROM changer\n"
diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c
index 0e06524b8..0e4eb4971 100644
--- a/sys-utils/fallocate.c
+++ b/sys-utils/fallocate.c
@@ -76,8 +76,11 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fputs(USAGE_HEADER, out);
fprintf(out,
_(" %s [options] <filename>\n"), program_invocation_short_name);
- fputs(USAGE_OPTIONS, out);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Preallocate space to, or deallocate space from a file.\n"), out);
+
+ fputs(USAGE_OPTIONS, out);
fputs(_(" -c, --collapse-range remove a range from the file\n"), out);
fputs(_(" -d, --dig-holes detect zeroes and replace with holes\n"), out);
fputs(_(" -l, --length <num> length for range operations, in bytes\n"), out);
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 2550a5be7..38281551b 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -53,6 +53,10 @@ static void __attribute__((__noreturn__)) usage(int ex)
" %1$s [options] <file>|<directory> -c <command>\n"
" %1$s [options] <file descriptor number>\n"),
program_invocation_short_name);
+
+ fputs(USAGE_SEPARATOR, stderr);
+ fputs(_("Manage file locks from shell scripts.\n"), stderr);
+
fputs(USAGE_OPTIONS, stderr);
fputs(_( " -s, --shared get a shared lock\n"), stderr);
fputs(_( " -x, --exclusive get an exclusive lock (default)\n"), stderr);
diff --git a/sys-utils/fsfreeze.c b/sys-utils/fsfreeze.c
index 961f8c1f9..d8b0a684c 100644
--- a/sys-utils/fsfreeze.c
+++ b/sys-utils/fsfreeze.c
@@ -48,6 +48,10 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fprintf(out, USAGE_HEADER);
fprintf(out,
_(" %s [options] <mountpoint>\n"), program_invocation_short_name);
+
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Suspend access to a filesystem (ext3/4, ReiserFS, JFS, XFS).\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -f, --freeze freeze the filesystem\n"), out);
fputs(_(" -u, --unfreeze unfreeze the filesystem\n"), out);
diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index b18cdb263..fca74825f 100644
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -228,6 +228,10 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fputs(USAGE_HEADER, out);
fprintf(out,
_(" %s [options] <mount point>\n"), program_invocation_short_name);
+
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Discard unused blocks on a mounted filesystem.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --all trim all mounted filesystems that are supported\n"), out);
fputs(_(" -o, --offset <num> the offset in bytes to start discarding from\n"), out);
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 008b20abe..c236b03bf 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1566,6 +1566,9 @@ static void usage(const char *fmt, ...)
fputs(USAGE_HEADER, usageto);
fputs(_(" hwclock [function] [option...]\n"), usageto);
+ fputs(USAGE_SEPARATOR, usageto);
+ fputs(_("Query or set the hardware clock.\n"), usageto);
+
fputs(_("\nFunctions:\n"), usageto);
fputs(_(" -h, --help show this help text and exit\n"
" -r, --show read hardware clock and print result\n"
diff --git a/sys-utils/ipcmk.c b/sys-utils/ipcmk.c
index 3ff021e94..eae493546 100644
--- a/sys-utils/ipcmk.c
+++ b/sys-utils/ipcmk.c
@@ -64,8 +64,11 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
{
fprintf(out, USAGE_HEADER);
fprintf(out, _(" %s [options]\n"), program_invocation_short_name);
- fprintf(out, USAGE_OPTIONS);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Create various IPC resources.\n"), out);
+
+ fputs(USAGE_OPTIONS, out);
fputs(_(" -M, --shmem <size> create shared memory segment of size <size>\n"), out);
fputs(_(" -S, --semaphore <nsems> create semaphore array with <nsems> elements\n"), out);
fputs(_(" -Q, --queue create message queue\n"), out);
diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c
index 5fe3df849..670263199 100644
--- a/sys-utils/ipcrm.c
+++ b/sys-utils/ipcrm.c
@@ -49,7 +49,11 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
fprintf(out, USAGE_HEADER);
fprintf(out, " %s [options]\n", program_invocation_short_name);
fprintf(out, " %s shm|msg|sem <id>...\n", program_invocation_short_name);
- fprintf(out, USAGE_OPTIONS);
+
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Remove certain IPC resources.\n"), out);
+
+ fputs(USAGE_OPTIONS, out);
fputs(_(" -m, --shmem-id <id> remove shared memory segment by id\n"), out);
fputs(_(" -M, --shmem-key <key> remove shared memory segment by key\n"), out);
fputs(_(" -q, --queue-id <id> remove message queue by id\n"), out);
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index a2d7f12ad..3bfba0a7b 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -52,7 +52,11 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
fprintf(out, USAGE_HEADER);
fprintf(out, " %s [resource ...] [output-format]\n", program_invocation_short_name);
fprintf(out, " %s [resource] -i <id>\n", program_invocation_short_name);
- fprintf(out, USAGE_OPTIONS);
+
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Show information on IPC facilities.\n"), out);
+
+ fputs(USAGE_OPTIONS, out);
fputs(_(" -i, --id <id> print details on resource identified by <id>\n"), out);
fprintf(out, USAGE_HELP);
fprintf(out, USAGE_VERSION);
diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index 853a3ede7..33c7aa289 100644
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -193,8 +193,11 @@ static void __attribute__ ((__noreturn__)) usage(int exitcode)
fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options] <ldisc> <device>\n"), program_invocation_short_name);
- fputs(USAGE_OPTIONS, out);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Attach a line discipline to a serial line.\n"), out);
+
+ fputs(USAGE_OPTIONS, out);
fputs(_(" -d, --debug print verbose messages to stderr\n"), out);
fputs(_(" -s, --speed <value> set serial line speed\n"), out);
fputs(_(" -c, --intro-command <string> intro sent before ldattach\n"), out);
diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index 95e99bb8c..29084eab2 100644
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -368,6 +368,9 @@ static void usage(FILE *out)
" %1$s [options] -f | <loopdev> <file>\n"),
program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Set up and control loop devices.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --all list all used devices\n"), out);
fputs(_(" -d, --detach <loopdev>... detach one or more devices\n"), out);
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 2a5032517..9b3adbcd5 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1629,6 +1629,9 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options]\n"), program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Display information about the CPU architecture.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --all print both online and offline CPUs (default for -e)\n"), out);
fputs(_(" -b, --online print online CPUs only (default for -p)\n"), out);
diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index 14a5e5c79..141098548 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -718,6 +718,9 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
" %1$s <operation> <mountpoint> [<target>]\n"),
program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Mount a filesystem.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fprintf(out, _(
" -a, --all mount all filesystems mentioned in fstab\n"
diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
index 0aaa290fe..a43bfd6dd 100644
--- a/sys-utils/mountpoint.c
+++ b/sys-utils/mountpoint.c
@@ -118,6 +118,9 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
_(" %1$s [-qd] /path/to/directory\n"
" %1$s -x /dev/device\n"), program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Check whether a directory or file is a mountpoint.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -q, --quiet quiet mode - don't print anything\n"
" -d, --fs-devno print maj:min device number of the filesystem\n"
diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index c54d63f9d..e00a3e472 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -65,6 +65,9 @@ static void usage(int status)
fprintf(out, _(" %s [options] <program> [<argument>...]\n"),
program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Run a program with namespaces of other processes.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -t, --target <pid> target process to get namespaces from\n"), out);
fputs(_(" -m, --mount[=<file>] enter mount namespace\n"), out);
diff --git a/sys-utils/pivot_root.c b/sys-utils/pivot_root.c
index 31ceabb78..a7b28bf09 100644
--- a/sys-utils/pivot_root.c
+++ b/sys-utils/pivot_root.c
@@ -32,6 +32,10 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
fprintf(out, USAGE_HEADER);
fprintf(out, _(" %s [options] new_root put_old\n"),
program_invocation_short_name);
+
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Change the root filesystem.\n"), out);
+
fprintf(out, USAGE_OPTIONS);
fprintf(out, USAGE_HELP);
fprintf(out, USAGE_VERSION);
diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c
index 8d0a1100b..ddab76e23 100644
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -162,6 +162,9 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
fprintf(out,
_(" %s [options] COMMAND\n"), program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Show or change the resource limits of a process.\n"), out);
+
fputs(_("\nGeneral Options:\n"), out);
fputs(_(" -p, --pid <pid> process id\n"
" -o, --output <list> define which output columns to use\n"
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index 79de7c2e2..eb6b8ec88 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -102,8 +102,11 @@ static void __attribute__ ((__noreturn__))
{
fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options]\n"), program_invocation_short_name);
- fputs(USAGE_OPTIONS, out);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Display kernel profiling information.\n"), out);
+
+ fputs(USAGE_OPTIONS, out);
fprintf(out,
_(" -m, --mapfile <mapfile> (defaults: \"%s\" and\n"), defaultmap);
fprintf(out,
diff --git a/sys-utils/renice.c b/sys-utils/renice.c
index c96e39ad1..656a111da 100644
--- a/sys-utils/renice.c
+++ b/sys-utils/renice.c
@@ -62,6 +62,10 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
" %1$s [-n] <priority> -g|--pgrp <pgid>...\n"
" %1$s [-n] <priority> -u|--user <user>...\n"),
program_invocation_short_name);
+
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Alter the priority of running processes.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -n, --priority <num> specify the nice increment value\n"), out);
fputs(_(" -p, --pid <id> interpret argument as process ID (default)\n"), out);
diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index e1cd41d3a..35ca7e893 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -71,6 +71,9 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fprintf(out,
_(" %s [options]\n"), program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Enter a system sleep state until a specified wakeup time.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --auto reads the clock mode from adjust file (default)\n"), out);
fprintf(out,
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index ed2a6a64c..09430380a 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -94,6 +94,10 @@ static void __attribute__((__noreturn__)) show_help(void)
printf(_(" %s%s [options] [program [program arguments]]\n"),
program_invocation_short_name,
!strcmp(program_invocation_short_name, "setarch") ? " <arch>" : "");
+
+ fputs(USAGE_SEPARATOR, stdout);
+ fputs(_("Change the reported architecture and set personality flags.\n"), stdout);
+
fputs(USAGE_OPTIONS, stdout);
fputs(_(" -v, --verbose says what options are being switched on\n"), stdout);
fputs(_(" -R, --addr-no-randomize disables randomization of the virtual address space\n"), stdout);
diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c
index 06d9fe429..163012223 100644
--- a/sys-utils/setpriv.c
+++ b/sys-utils/setpriv.c
@@ -93,6 +93,9 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fprintf(out, _(" %s [options] <program> [<argument>...]\n"),
program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Run a program with different privilege settings.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -d, --dump show current state (and do not exec anything)\n"), out);
fputs(_(" --nnp, --no-new-privs disallow granting new privileges\n"), out);
diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c
index 782de82b5..adc34ecb3 100644
--- a/sys-utils/setsid.c
+++ b/sys-utils/setsid.c
@@ -32,6 +32,9 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
" %s [options] <program> [arguments ...]\n"),
program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Run a program in a new session.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -c, --ctty set the controlling terminal to the current one\n"), out);
fputs(_(" -w, --wait wait program to exit, and use the same return\n"), out);
diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c
index b725462eb..168d10f3f 100644
--- a/sys-utils/swapoff.c
+++ b/sys-utils/swapoff.c
@@ -116,9 +116,11 @@ static int swapoff_by(const char *name, const char *value, int quiet)
static void __attribute__ ((__noreturn__)) usage(FILE * out)
{
fputs(USAGE_HEADER, out);
-
fprintf(out, _(" %s [options] [<spec>]\n"), program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Disable devices and files for paging and swapping.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --all disable all swaps from /proc/swaps\n"
" -v, --verbose verbose mode\n"), out);
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index a45760766..8a3a21739 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -724,9 +724,11 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
{
size_t i;
fputs(USAGE_HEADER, out);
-
fprintf(out, _(" %s [options] [<spec>]\n"), program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Enable devices and files for paging and swapping.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --all enable all swaps from /etc/fstab\n"), out);
fputs(_(" -d, --discard[=<policy>] enable swap discards, if supported by device\n"), out);
diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c
index 534d44ac7..be23fd809 100644
--- a/sys-utils/switch_root.c
+++ b/sys-utils/switch_root.c
@@ -200,6 +200,10 @@ static void __attribute__((__noreturn__)) usage(FILE *output)
fputs(USAGE_HEADER, output);
fprintf(output, _(" %s [options] <newrootdir> <init> <args to init>\n"),
program_invocation_short_name);
+
+ fputs(USAGE_SEPARATOR, output);
+ fputs(_("Switch to another filesystem as the root of the mount tree.\n"), output);
+
fputs(USAGE_OPTIONS, output);
fputs(USAGE_HELP, output);
fputs(USAGE_VERSION, output);
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index 08cef5c37..b132d7aaf 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -88,6 +88,9 @@ static void __attribute__((__noreturn__)) print_usage(FILE *out)
fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options] <device>\n"), program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Set various parameters for the line printer.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -i, --irq <num> specify parallel port irq\n"), out);
fputs(_(" -t, --time <ms> driver wait time in milliseconds\n"), out);
diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index 8bc6655ea..464c4c87f 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -78,6 +78,9 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
" %1$s [options] <source> | <directory>\n"),
program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Unmount filesystems.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --all unmount all filesystems\n"), out);
fputs(_(" -A, --all-targets unmount all mountpoints for the given device in the\n"
diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 933f62152..fccdba2f6 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -63,6 +63,9 @@ static void usage(int status)
fprintf(out, _(" %s [options] <program> [<argument>...]\n"),
program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Run a program with some namespaces unshared from the parent.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -m, --mount unshare mounts namespace\n"), out);
fputs(_(" -u, --uts unshare UTS namespace (hostname etc)\n"), out);
diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c
index 0628c8eca..095d8ed43 100644
--- a/sys-utils/wdctl.c
+++ b/sys-utils/wdctl.c
@@ -173,8 +173,10 @@ static void usage(FILE *out)
fprintf(out,
_(" %s [options] [<device> ...]\n"), program_invocation_short_name);
- fputs(USAGE_OPTIONS, out);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Show the status of the hardware watchdog.\n"), out);
+ fputs(USAGE_OPTIONS, out);
fputs(_(" -f, --flags <list> print selected flags only\n"
" -F, --noflags don't print information about flags\n"
" -I, --noident don't print watchdog identity information\n"
diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index 786be0628..4abc587a7 100644
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -378,6 +378,9 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
" %1$s [options] -f | <device> -s <size>\n"),
program_invocation_short_name);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Set up and control zram devices.\n"), out);
+
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --algorithm lzo|lz4 compression algorithm to use\n"), out);
fputs(_(" -b, --bytes print sizes in bytes rather than in human readable format\n"), out);