textual: fix typos, and rephrase some things for clarity

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

diff --git a/login-utils/simpleinit.c b/login-utils/simpleinit.c
index cc844c90914051c67ed182bb04a6b99c69e44adf..8cff848cf653dd38e3da628f8513e0ca1582eac7 100644 (file)
--- a/login-utils/simpleinit.c
+++ b/login-utils/simpleinit.c
@@ -935,7 +935,7 @@ static void process_command (const struct command_struct *command)
                execlp (get_path (victim->first_service->name),
                        victim->first_service->name, "stop", NULL);
                snprintf (txt, sizeof(txt),
-                       _("error stopping service: \"%s\"\n"),
+                       _("error at stopping service \"%s\"\n"),
                         victim->first_service->name);
                err (txt);
                _exit (SIG_NOT_STOPPED);
@@ -1067,7 +1067,7 @@ static int run_command (const char *file, const char *name, pid_t pid)
            for (i = 1; i < NSIG; i++) signal (i, SIG_DFL);
            execlp (get_path (file), service->name, "start", NULL);
            snprintf (txt, sizeof(txt),
-               _("error running programme: \"%s\"\n"), service->name);
+               _("error at starting service \"%s\"\n"), service->name);
            err (txt);
            _exit (SIG_FAILED);
            break;

diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index 17654728c11e6dbee56fcda057ccd5565733237a..e1cb8ff2333d3e5b9720f00ffddc8037c15019cc 100644 (file)
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -18,9 +18,9 @@ findmnt \- find a filesystem
 .IR mountpoint
 .SH DESCRIPTION
 .B findmnt
-will list all mounted filesytems or search for a filesystem. The
+will list all mounted filesytems or search for a filesystem.  The
 .B findmnt
-is able to search in
+command is able to search in
 .IR /etc/fstab ,
 .IR /etc/mtab
 or
@@ -29,9 +29,9 @@ If
 .IR device
 or
 .IR mountpoint
-is not given, all filesystems are show.
+is not given, all filesystems are shown.
 .PP
-The command prints all mounted filesystems in tree-like format by default.
+The command prints all mounted filesystems in the tree-like format by default.
 .SH OPTIONS
 .IP "\fB\-h, \-\-help\fP"
 Print help and exit.
@@ -46,11 +46,11 @@ The output is in the list format (see --list).
 .IP "\fB\-k, \-\-kernel\fP"
 Search in
 .IR /proc/self/mountinfo .
-The output is in the tree-like format. This is the default.
+The output is in the tree-like format.  This is the default.
 .IP "\fB\-c, \-\-canonicalize\fP"
 Canonicalize all printed paths.
 .IP "\fB\-d, \-\-direction \fIword\fP"
-Search direction -
+The search direction -
 .IR forward
 or
 .IR backward .
@@ -59,34 +59,34 @@ Convert all tags (LABEL or UUID) to the device names.
 .IP "\fB\-f, \-\-first-only\fP"
 Print the first matching filesystem only.
 .IP "\fB\-i, \-\-invert\fP"
-Invert sense of matching.
+Invert the sense of matching.
 .IP "\fB\-l, \-\-list\fP"
-Use list output format.
+Use the list output format.
 .IP "\fB\-n, \-\-noheadings\fP"
-Do not print header line.
+Do not print a header line.
 .IP "\fB\-u, \-\-notruncate\fP"
-Do not truncate text in columns. The default is not truncate
+Do not truncate text in columns.  The default is to not truncate the
 .BR TARGET ,
 .BR SOURCE ,
 .BR UUID
 and
 .BR LABEL
-columns. This option disables text truncation in the all others columns.
+columns.  This option disables text truncation also in all other columns.
 .IP "\fB\-O, \-\-options \fIlist\fP"
-Used to limit the set of printed filesystems. More than one option
-may be specified in a comma separated list. The
+Used to limit the set of printed filesystems.  More than one option
+may be specified in a comma-separated list.  The
 .B \-t
 and
 .B \-O
-options are cumulative in effect. It is different from
+options are cumulative in effect.  It is different from
 .B \-t
 in that each option is matched exactly; a leading
 .I no
 at the beginning
-of one option does not negate the rest. For more details see
+of one option does not negate the rest.  For more details see
 .BR mount (8).
 .IP "\fB\-o, \-\-output \fIlist\fP"
-Define output columns. Currently are supported
+Define output columns.  Currently supported are
 .BR SOURCE ,
 .BR TARGET ,
 .BR FSTYPE ,
@@ -106,19 +106,19 @@ options are not specified.
 .IP "\fB\-r, \-\-raw\fP"
 Use raw output format.
 .IP "\fB\-a, \-\-ascii\fP"
-Use ascii chars for tree formatting.
+Use ascii characters for tree formatting.
 .IP "\fB\-t, \-\-types \fIlist\fP"
-Used to limit the set of printed filesystems. More than one type may be
-specified in a comma separated list. The list of filesystem types can be
+Used to limit the set of printed filesystems.  More than one type may be
+specified in a comma-separated list.  The list of filesystem types can be
 prefixed with
 .I no
-to specify the filesystem types on which no action should be taken. For
+to specify the filesystem types on which no action should be taken.  For
 more details see
 .BR mount (8).
 .IP "\fB\-S, \-\-source \fIspec\fP"
-Explicitly define mount source. Supported are device, LABEL= or UUID=.
+Explicitly define the mount source.  Supported are device, LABEL= or UUID=.
 .IP "\fB\-T, \-\-target \fIdir\fP"
-Explicitly define mount target (mountpoint directory).
+Explicitly define the mount target (mountpoint directory).
 .SH EXAMPLES
 .IP "\fBfindmnt \-\-fstab \-t nfs\fP"
 Prints all nfs filesystems defined in
@@ -126,18 +126,18 @@ Prints all nfs filesystems defined in
 .IP "\fBfindmnt \-\-fstab /mnt/foo\fP"
 Prints all
 .IR /etc/fstab
-filesystems where mountpoint directory is /mnt/foo. It also prints bind mounts where /mnt/foo
+filesystems where the mountpoint directory is /mnt/foo.  It also prints bind mounts where /mnt/foo
 is a source.
 .IP "\fBfindmnt \-\-fstab --target /mnt/foo\fP"
 Prints all
 .IR /etc/fstab
-filesystems where mountpoint directory is /mnt/foo.
+filesystems where the mountpoint directory is /mnt/foo.
 .IP "\fBfindmnt --fstab --evaluate\fP"
 Prints all
 .IR /etc/fstab
 filesystems and converts LABEL= and UUID= tags to the real device names.
 .IP "\fBfindmnt -n --raw --evaluate --output=target LABEL=/boot
-Prints only mountpoint where is mounted filesystem with a label "/boot".
+Prints only the mountpoint where the filesystem with label "/boot" is mounted.
 .SH AUTHORS
 .nf
 Karel Zak <kzak@redhat.com>

diff --git a/misc-utils/namei.1 b/misc-utils/namei.1
index a54fa8ac25dbddb95a2f5b67c9ca21fb6c68e22b..fc10781bad37c7ada45a324362e170675bbd1d2f 100644 (file)
--- a/misc-utils/namei.1
+++ b/misc-utils/namei.1
@@ -9,26 +9,26 @@ namei - follow a pathname until a terminal point is found
 .RI [ options ]
 .IR  pathname ...
 .SH DESCRIPTION
-.B Namei
+.B namei
 uses its arguments as pathnames to any type
 of Unix file (symlinks, files, directories, and so forth).
-.B Namei
-then follows each pathname until a terminal
-point is found (a file, directory, char device, etc).
-If it finds a symbolic link, we show the link, and start
+.B namei
+then follows each pathname until an endpoint
+is found (a file, a directory, a device node, etc).
+If it finds a symbolic link, it shows the link, and starts
 following it, indenting the output to show the context.
 .PP
-This program is useful for finding a "too many levels of
+This program is useful for finding "too many levels of
 symbolic links" problems.
 .PP
-For each line output,
+For each line of output,
 .B namei
-outputs a the following characters to identify the file types found:
+uses the following characters to identify the file type found:
 .LP
 .nf
-   f: = the pathname we are currently trying to resolve
+   f: = the pathname currently being resolved
     d = directory
-    l = symbolic link (both the link and it's contents are output)
+    l = symbolic link (both the link and its contents are output)
     s = socket
     b = block device
     c = character device
@@ -37,12 +37,12 @@ outputs a the following characters to identify the file types found:
     ? = an error of some kind
 .fi
 .PP
-.B Namei
+.B namei
 prints an informative message when
 the maximum number of symbolic links this system can have has been exceeded.
 .SH OPTIONS
 .IP "\fB\-l, \-\-long\fP"
-Use a long listing format (same as -m -o -v).
+Use the long listing format (same as -m -o -v).
 .IP "\fB\-m, \-\-modes\fP"
 Show the mode bits of each file type in the style of ls(1),
 for example 'rwxr-xr-x'.
@@ -51,9 +51,9 @@ Show owner and group name of each file.
 .IP "\fB\-n, \-\-nosymlinks\fP"
 Don't follow symlinks.
 .IP "\fB\-v, \-\-vertical\fP"
-Vertical align of modes and owners.
+Vertically align the modes and owners.
 .IP "\fB\-x, \-\-mountpoints\fP"
-Show mount point directories with a 'D', rather than a 'd'.
+Show mountpoint directories with a 'D' rather than a 'd'.
 .SH AUTHOR
 The original
 .B namei

diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
index 9c3b54d645d4342fda53cebf5bcd35f6bba6b262..adb8028ff53d65dcc356b4a90d4ab3c30bc704ea 100644 (file)
--- a/misc-utils/uuidd.8
+++ b/misc-utils/uuidd.8
@@ -27,9 +27,9 @@ uuidd \- UUID generation daemon
 The
 .B uuidd
 daemon is used by the UUID library to generate
-universally unique identifiers (UUIDs), especially time-based UUIDs
+universally unique identifiers (UUIDs), especially time-based UUIDs,
 in a secure and guaranteed-unique fashion, even in the face of large
-numbers of threads trying to grab UUIDs running on different CPUs.
+numbers of threads running on different CPUs trying to grab UUIDs.
 .SH OPTIONS
 .TP
 .B \-d
@@ -38,7 +38,7 @@ Run
 in debugging mode.  This prevents uuidd from running as a daemon.
 .TP
 .B \-k
-If a currently uuidd daemon is running, kill it.
+If currently a uuidd daemon is running, kill it.
 .TP
 .BI \-n " number"
 When issuing a test request to a running uuidd, request a bulk response

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 4d85050112f6501e3ef13f5e511860919a43da10..aa4b696f6623cb5ff4d0156d051c5fe50b38eee0 100644 (file)
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -256,8 +256,8 @@ do_wipe_offset(int fd, struct wipe_desc *wp, const char *fname, int noact)
        size_t len;
 
        if (!wp->type) {
-               warnx(_("can't found a magic string at offset "
-                               "0x%jx - ignore."), wp->offset);
+               warnx(_("no magic string found at offset "
+                       "0x%jx -- ignored"), wp->offset);
                return 0;
        }
 
@@ -309,7 +309,7 @@ strtoll_offset(const char *str)
        uintmax_t sz;
 
        if (strtosize(str, &sz))
-               errx(EXIT_FAILURE, _("invalid offset '%s' value specified"), str);
+               errx(EXIT_FAILURE, _("invalid offset value '%s' specified"), str);
        return sz;
 }
 
@@ -322,8 +322,8 @@ usage(FILE *out)
 
        fprintf(out, _(
        " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-       " -h, --help          this help\n"
-       " -n, --no-act        everything to be done except for the write() call\n"
+       " -h, --help          show this help text\n"
+       " -n, --no-act        do everything except the actual write() call\n"
        " -o, --offset <num>  offset to erase, in bytes\n"
        " -p, --parsable      print out in parsable instead of printable format\n"));
 

diff --git a/mount/umount.c b/mount/umount.c
index 75507b76a60b376b367ba816b7acd4bab045a431..5bd536047583cb6b2079f1cccc91a5ca0c865e9e 100644 (file)
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -275,7 +275,7 @@ umount_one (const char *spec, const char *node, const char *type,
        if (res >= 0) {
                /* Umount succeeded */
                if (verbose)
-                       printf (_("%s umounted\n"), spec);
+                       printf (_("%s has been unmounted\n"), spec);
 
                /* Free any loop devices that we allocated ourselves */
                if (mc) {
@@ -490,13 +490,13 @@ umount_file (char *arg) {
        int ok;
 
        if (!*arg) {            /* "" would be expanded to `pwd` */
-               die(2, _("Cannot umount \"\"\n"));
+               die(2, _("Cannot unmount \"\"\n"));
                return 0;
        }
 
        file = canonicalize(arg); /* mtab paths are canonicalized */
        if (verbose > 1)
-               printf(_("Trying to umount %s\n"), file);
+               printf(_("Trying to unmount %s\n"), file);
 
        mc = getmntdirbackward(file, NULL);
        if (!mc) {
@@ -514,8 +514,8 @@ umount_file (char *arg) {
                        if (strcmp(file, mc1->m.mnt_fsname)) {
                                /* Something was stacked over `file' on the
                                   same mount point. */
-                               die(EX_FAIL, _("umount: cannot umount %s -- %s is "
-                                   "mounted over it on the same point."),
+                               die(EX_FAIL, _("umount: cannot unmount %s -- %s is "
+                                   "mounted over it on the same point"),
                                    file, mc1->m.mnt_fsname);
                        }
                }

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 6b786e8cc4bf57782ed72ec6ce78c71b27d52885..780f1d6243f6acf808027f0f112a75dd5f238e0b 100644 (file)
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -362,7 +362,7 @@ read_basicinfo(struct lscpu_desc *desc)
                /* the root is '/' so we are working with data from the current kernel */
                maxcpus = get_max_number_of_cpus();
        else
-               /* we are reading some /sys snapshot instead the real /sys,
+               /* we are reading some /sys snapshot instead of the real /sys,
                 * let's use any crazy number... */
                maxcpus = desc->ncpus > 2048 ? desc->ncpus : 2048;
 }