textual: fix several typos and angular brackets in messages

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 161a7aa1b3c7c7cbcec0a2e823c67f24964ee756..07176470e5451cbf23b6ee3cd33eff15a27587af 100644 (file)
--- 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 20df6fa6c4699c64c114aae2591dfe0463c2be06..e9af42729a8e8bc342d96d9e77c1957b44c0f445 100644 (file)
--- 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 bdcd06e37b4deea1810aa4008c45ed74b174fa24..0e15c01b0883ad09de6a67492c22f312d9b2fb06 100644 (file)
--- 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 3322e142d820fb15f8c48c5a1c694af0b9abc60e..1a1091ded13709397dce67aa73e5b89b7e20d04d 100644 (file)
--- 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 17764b534f64e0b5cb978f42d314e7ec69a17897..e3f0e2dd0a17401b7e11903cede3495ba10c5be1 100644 (file)
--- 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 2649feceebdb1d8f9d20a736df160ebbae3ddf74..e29ea473a9068c82db728e128cffdeb02183f9f2 100644 (file)
--- 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);