summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--misc-utils/logger.c6
-rw-r--r--schedutils/chrt.c2
-rw-r--r--sys-utils/blkdiscard.c2
-rw-r--r--sys-utils/flock.c2
-rw-r--r--sys-utils/umount.c24
-rw-r--r--text-utils/column.c6
6 files changed, 21 insertions, 21 deletions
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 161a7aa1b..07176470e 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -182,7 +182,7 @@ static int inet_socket(const char *servername, const char *port,
hints.ai_family = AF_UNSPEC;
errcode = getaddrinfo(servername, p, &hints, &res);
if (errcode != 0)
- errx(EXIT_FAILURE, _("getaddrinfo %s:%s: %s"),
+ errx(EXIT_FAILURE, _("failed to resolve name %s port %s: %s"),
servername, p, gai_strerror(errcode));
if ((fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) == -1) {
freeaddrinfo(res);
@@ -199,7 +199,7 @@ static int inet_socket(const char *servername, const char *port,
}
if (i == 0)
- errx(EXIT_FAILURE, _("failed to connect %s port %s"), servername, p);
+ errx(EXIT_FAILURE, _("failed to connect to %s port %s"), servername, p);
return fd;
}
@@ -235,7 +235,7 @@ static void mysyslog(int fd, int logflags, int pri, char *tag, char *msg)
static void __attribute__ ((__noreturn__)) usage(FILE *out)
{
fputs(USAGE_HEADER, out);
- fprintf(out, _(" %s [options] [message]\n"), program_invocation_short_name);
+ fprintf(out, _(" %s [options] [<message>]\n"), program_invocation_short_name);
fputs(USAGE_OPTIONS, out);
fputs(_(" -T, --tcp use TCP only\n"), out);
diff --git a/schedutils/chrt.c b/schedutils/chrt.c
index 20df6fa6c..e9af42729 100644
--- a/schedutils/chrt.c
+++ b/schedutils/chrt.c
@@ -62,7 +62,7 @@ static void __attribute__((__noreturn__)) show_usage(int rc)
fprintf(out, _(
"\nchrt - manipulate real-time attributes of a process\n"
"\nSet policy:\n"
- " chrt [options] [-policy] <priority> [-p <pid> | <command> <arg> ...]\n"
+ " chrt [options] [<policy>] <priority> [-p <pid> | <command> [<arg>...]]\n"
"\nGet policy:\n"
" chrt [options] -p <pid>\n"));
diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c
index bdcd06e37..0e15c01b0 100644
--- a/sys-utils/blkdiscard.c
+++ b/sys-utils/blkdiscard.c
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
}
if (optind == argc)
- errx(EXIT_FAILURE, _("no device specified."));
+ errx(EXIT_FAILURE, _("no device specified"));
path = argv[optind++];
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 3322e142d..1a1091ded 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -49,7 +49,7 @@ static void __attribute__((__noreturn__)) usage(int ex)
{
fprintf(stderr, USAGE_HEADER);
fprintf(stderr,
- _(" %1$s [options] <file|directory> <command> [command args]\n"
+ _(" %1$s [options] <file|directory> <command> [<arguments>...]\n"
" %1$s [options] <file|directory> -c <command>\n"
" %1$s [options] <file descriptor number>\n"),
program_invocation_short_name);
diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index 17764b534..e3f0e2dd0 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -80,18 +80,18 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --all unmount all filesystems\n"), out);
- fputs(_(" -A, --all-targets unmount all mountpoins for the given device\n"
- " in the current namespace\n"), out);
+ fputs(_(" -A, --all-targets unmount all mountpoins for the given device in the\n"
+ " current namespace\n"), out);
fputs(_(" -c, --no-canonicalize don't canonicalize paths\n"), out);
fputs(_(" -d, --detach-loop if mounted loop device, also free this loop device\n"), out);
fputs(_(" --fake dry run; skip the umount(2) syscall\n"), out);
fputs(_(" -f, --force force unmount (in case of an unreachable NFS system)\n"), out);
fputs(_(" -i, --internal-only don't call the umount.<type> helpers\n"), out);
fputs(_(" -n, --no-mtab don't write to /etc/mtab\n"), out);
- fputs(_(" -l, --lazy detach the filesystem now, and cleanup all later\n"), out);
+ fputs(_(" -l, --lazy detach the filesystem now, clean up things later\n"), out);
fputs(_(" -O, --test-opts <list> limit the set of filesystems (use with -a)\n"), out);
fputs(_(" -R, --recursive recursively unmount a target with all its children\n"), out);
- fputs(_(" -r, --read-only In case unmounting fails, try to remount read-only\n"), out);
+ fputs(_(" -r, --read-only in case unmounting fails, try to remount read-only\n"), out);
fputs(_(" -t, --types <list> limit the set of filesystem types\n"), out);
fputs(_(" -v, --verbose say what is being done\n"), out);
@@ -207,7 +207,7 @@ static int mk_exit_code(struct libmnt_context *cxt, int rc)
*/
if (rc < 0)
return handle_generic_errors(rc,
- _("%s: filesystem umounted, but mount(8) failed"),
+ _("%s: filesystem was unmounted, but mount(8) failed"),
tgt);
return MOUNT_EX_SOFTWARE; /* internal error */
@@ -230,23 +230,23 @@ static int mk_exit_code(struct libmnt_context *cxt, int rc)
warnx(_("%s: can't write superblock"), tgt);
break;
case EBUSY:
- warnx(_("%s: target is busy.\n"
- " (In some cases useful info about processes that use\n"
- " the device is found by lsof(8) or fuser(1))"),
+ warnx(_("%s: target is busy\n"
+ " (In some cases useful info about processes that\n"
+ " use the device is found by lsof(8) or fuser(1).)"),
tgt);
break;
case ENOENT:
warnx(_("%s: not found"), tgt);
break;
case EPERM:
- warnx(_("%s: must be superuser to umount"), tgt);
+ warnx(_("%s: must be superuser to unmount"), tgt);
break;
case EACCES:
- warnx(_("%s: block devices not permitted on fs"), tgt);
+ warnx(_("%s: block devices are not permitted on filesystem"), tgt);
break;
default:
errno = syserr;
- warn(_("%s"), tgt);
+ warn("%s", tgt);
break;
}
return MOUNT_EX_FAIL;
@@ -275,7 +275,7 @@ static int umount_all(struct libmnt_context *cxt)
rc |= mk_exit_code(cxt, mntrc);
if (mnt_context_is_verbose(cxt))
- printf("%-25s: successfully umounted\n", tgt);
+ printf("%-25s: successfully unmounted\n", tgt);
}
}
diff --git a/text-utils/column.c b/text-utils/column.c
index 2649fecee..e29ea473a 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -89,13 +89,13 @@ static void __attribute__((__noreturn__)) usage(int rc)
FILE *out = rc == EXIT_FAILURE ? stderr : stdout;
fputs(USAGE_HEADER, out);
- fprintf(out, _(" %s [options] [file ...]\n"), program_invocation_short_name);
+ fprintf(out, _(" %s [options] [<file>...]\n"), program_invocation_short_name);
fputs(USAGE_OPTIONS, out);
fputs(_(" -c, --columns <width> width of output in number of characters\n"), out);
fputs(_(" -t, --table create a table\n"), out);
fputs(_(" -s, --separator <string> possible table delimiters\n"), out);
- fputs(_(" -o, --output-separator <string>\n"), out);
- fputs(_(" table output column separator, default is two spaces\n"), out);
+ fputs(_(" -o, --output-separator <string>\n"
+ " columns separator for table output; default is two spaces\n"), out);
fputs(_(" -x, --fillrows fill rows before columns\n"), out);
fputs(USAGE_SEPARATOR, out);
fputs(USAGE_HELP, out);
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-06-04 05:42:49 +0200