summaryrefslogtreecommitdiffstats
path: root/sys-utils
diff options
context:
space:
mode:
authorBenno Schulenberg2015-01-18 21:17:09 +0100
committerKarel Zak2015-01-26 11:17:55 +0100
commit54fefa078e54718acbd2489b0f92328f272f9a3c (patch)
treeb568d511dcdfba35be9bd36ba15c65ec9d7e78a3 /sys-utils
parentdocs: fix grammar and punctuation and typos in 2.26 release notes (diff)
downloadkernel-qcow2-util-linux-54fefa078e54718acbd2489b0f92328f272f9a3c.tar.gz
kernel-qcow2-util-linux-54fefa078e54718acbd2489b0f92328f272f9a3c.tar.xz
kernel-qcow2-util-linux-54fefa078e54718acbd2489b0f92328f272f9a3c.zip
textual: fix spellos and inconsistencies in several program messages
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Diffstat (limited to 'sys-utils')
-rw-r--r--sys-utils/swapon.c6
-rw-r--r--sys-utils/unshare.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index c5106abcc..bcceb7c69 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -758,9 +758,9 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
" <file> name of file to be used\n"), out);
fputs(_("\nAvailable discard policy types (for --discard):\n"
- " once : only single-time area discards are issued\n"
- " pages : freed pages are discarded before they are reused\n"
- " If no policy is selected, both discard types are enabled (default).\n"), out);
+ " once : only single-time area discards are issued\n"
+ " pages : freed pages are discarded before they are reused\n"
+ "If no policy is selected, both discard types are enabled (default).\n"), out);
fputs(_("\nAvailable columns (for --show):\n"), out);
for (i = 0; i < ARRAY_SIZE(infos); i++)
diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 83c4a0059..58e91648a 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -121,7 +121,7 @@ static void usage(int status)
fputs(_(" -f, --fork fork before launching <program>\n"), out);
fputs(_(" --mount-proc[=<dir>] mount proc filesystem first (implies --mount)\n"), out);
fputs(_(" -r, --map-root-user map current user to root (implies --user)\n"), out);
- fputs(_(" -s, --setgroups <allow|deny> control setgroups syscall in user namespaces\n"), out);
+ fputs(_(" -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n"), out);
fputs(USAGE_SEPARATOR, out);
fputs(USAGE_HELP, out);
@@ -235,7 +235,7 @@ int main(int argc, char *argv[])
if (maproot) {
if (setgrpcmd == SETGROUPS_ALLOW)
errx(EXIT_FAILURE, _("options --setgroups=allow and "
- "--map-root-user are mutually exclusive."));
+ "--map-root-user are mutually exclusive"));
/* since Linux 3.19 unprivileged writing of /proc/self/gid_map
* has s been disabled unless /proc/self/setgroups is written