*: spelling and grammar fixes

diff --git a/Documentation/howto-pull-request.txt b/Documentation/howto-pull-request.txt
index b3e53901a8b3d831c54c552a62393ec1722928b9..c35ae03abc928918e71e8438e01baccfff8b9a09 100644 (file)
--- a/Documentation/howto-pull-request.txt
+++ b/Documentation/howto-pull-request.txt
@@ -12,7 +12,7 @@ Setup
 1. Find a git server that can be reached from anywhere in internet
 anonymously.  Github is for example a popular choice.
 
-2. Create your own util-linux contributor repository, and push a upstream
+2. Create your own util-linux contributor repository, and push an upstream
 clone to there.
 
 3. In these instructions the upstream remote repository is called

diff --git a/Documentation/release-schedule.txt b/Documentation/release-schedule.txt
index 0e126948d1525ca7e3350673edc330f7bae3eaee..cca3bca57dd17f7ef8d7ab090321653c5368bb1d 100644 (file)
--- a/Documentation/release-schedule.txt
+++ b/Documentation/release-schedule.txt
@@ -1,7 +1,7 @@
 Release schedule
 ----------------
 
-The util-linux package uses the <major>.<minor>.<maintenaince> version
+The util-linux package uses the <major>.<minor>.<maintenance> version
 numbering scheme.  Since the major version is pretty much fixed, any
 release means an increment of the minor number.  The minor version is
 incremented roughly twice per year.  The easiest way to estimate when

diff --git a/configure.ac b/configure.ac
index 26ecef1680038e6bd4f6d2f16321c4d9ef5b3baa..3ec4f0652bf03d01d0ab47e1fcfb54d4017138a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2440,7 +2440,7 @@ AC_ARG_ENABLE([sulogin-emergency-mount],
 
 AS_IF([test "x$enable_sulogin_emergency_mount" = xyes], [
   AC_DEFINE([USE_SULOGIN_EMERGENCY_MOUNT], [1],
-           [Should sulogin use a emergency mount of /dev and /proc?])
+           [Should sulogin use an emergency mount of /dev and /proc?])
 ])
 
 

diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index 38849eb7e040c795b8498ae16392ef214736f25a..23609adf988c90a19497eaab3e8bd1137654eaf3 100644 (file)
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -222,7 +222,7 @@ int main(int argc, char **argv)
        if (stat(argv[0], &st) < 0)
                err(EXIT_FAILURE, _("stat of %s failed"), argv[0]);
        if (!S_ISBLK(st.st_mode))
-               /* do not test major - perhaps this was an USB floppy */
+               /* do not test major - perhaps this was a USB floppy */
                errx(EXIT_FAILURE, _("%s: not a block device"), argv[0]);
        ctrl = open_blkdev_or_file(&st, argv[0], O_RDWR);
        if (ctrl < 0)

diff --git a/libblkid/samples/mkfs.c b/libblkid/samples/mkfs.c
index 5423f91dc6754438ee6cdabcd41e668a1fab433e..250782ab46f3cd8d48907ed68c00e11551233b26 100644 (file)
--- a/libblkid/samples/mkfs.c
+++ b/libblkid/samples/mkfs.c
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
                                        "%s superblock", devname, type);
 
                if (!blkid_probe_lookup_value(pr, "PTTYPE", &type, NULL))
-                       errx(EXIT_FAILURE, "%s: appears to contain an partition "
+                       errx(EXIT_FAILURE, "%s: appears to contain a partition "
                                        "table (%s)", devname, type);
        }
 

diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 08c38082056bd31445dfc82b5307ce3f03e315e1..40690076fe8ac9486afe6d9cabb9c3c4a2eb6fe1 100644 (file)
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -851,7 +851,7 @@ int main(int argc, char **argv)
        INIT_LIST_HEAD(&consoles);
 
        /*
-        * If we are init we need to set up a own session.
+        * If we are init we need to set up an own session.
         */
        if ((pid = getpid()) == 1) {
                setsid();

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 2c7392b2857f780fc79424a0f2ad4e59a79ff536..fa8db173bedbfcead707be9f6cc2de4381acde98 100644 (file)
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -58,7 +58,7 @@
 
 #include "nls.h"
 
-/* Protocol segment lenghts */
+/* Protocol segment lengths */
 typedef uint8_t        uuidd_prot_op_t;        /* client operation field */
 typedef int32_t        uuidd_prot_num_t;       /* number of requested uuids */
 

diff --git a/sys-utils/flock.1 b/sys-utils/flock.1
index 5235f83039d71a3636b11c5c9531e36e2beb17f3..9d7a56fe15584eb594d37fd075d1c41f47d66388 100644 (file)
--- a/sys-utils/flock.1
+++ b/sys-utils/flock.1
@@ -131,7 +131,7 @@ exit status values for everything, except when using either of the options
 .B \-n
 or
 .B \-w
-which report a failure to acquire the lock with a exit status given by the
+which report a failure to acquire the lock with an exit status given by the
 .B \-E
 option, or 1 by default.  The exit status given by
 .B \-E has to be in the range of 0 to 255.

diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index 225b01c2c70d0f0b3545a9be0e01a48552c782c3..765e1170ec6ba56c2f4beb7703e88142bd159b30 100644 (file)
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -331,7 +331,7 @@ static void selinux_warning(struct libmnt_context *cxt, const char *tgt)
                if (!selinux_file_context_cmp(raw, def))
                        printf(_(
        "mount: %s does not contain SELinux labels.\n"
-       "       You just mounted an file system that supports labels which does not\n"
+       "       You just mounted a file system that supports labels which does not\n"
        "       contain labels, onto an SELinux box. It is likely that confined\n"
        "       applications will generate AVC messages and not be allowed access to\n"
        "       this file system.  For more details see restorecon(8) and mount(8).\n"),
@@ -1007,4 +1007,3 @@ done:
        env_list_free(envs_removed);
        return rc;
 }
-