From: Ville Skyttä Date: Thu, 17 Dec 2020 21:39:05 +0000 (+0200) Subject: *: spelling and grammar fixes X-Git-Tag: v2.37-rc1~210^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c560686099581d6b00291eef7426e9a86e331d8;p=thirdparty%2Futil-linux.git *: spelling and grammar fixes --- diff --git a/Documentation/howto-pull-request.txt b/Documentation/howto-pull-request.txt index b3e53901a8..c35ae03abc 100644 --- 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 0e126948d1..cca3bca57d 100644 --- a/Documentation/release-schedule.txt +++ b/Documentation/release-schedule.txt @@ -1,7 +1,7 @@ Release schedule ---------------- -The util-linux package uses the .. version +The util-linux package uses the .. 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 26ecef1680..3ec4f0652b 100644 --- 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 38849eb7e0..23609adf98 100644 --- 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 5423f91dc6..250782ab46 100644 --- 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 08c3808205..40690076fe 100644 --- 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 2c7392b285..fa8db173be 100644 --- 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 5235f83039..9d7a56fe15 100644 --- 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 225b01c2c7..765e1170ec 100644 --- 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; } -