diff options
36 files changed, 54 insertions, 54 deletions
diff --git a/Documentation/TODO b/Documentation/TODO index 092289146..7b61ce72a 100644 --- a/Documentation/TODO +++ b/Documentation/TODO @@ -118,7 +118,7 @@ login-utils: * the unique functionality provided by newgpr(1) is support for group passwords [/etc/gshadow] -- do we really need this functionality? * maybe we can mark group-passwords as deprecated, and replace sg(1) and - newgpr(1) with su(1) code. The another way is to ask fro group password in + newgpr(1) with su(1) code. The another way is to ask for group password in su --group too. * note that shadow-utils newgpr(1) provides support for syslog and audit log. diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt index f1ec8953d..d31ac51df 100644 --- a/Documentation/deprecated.txt +++ b/Documentation/deprecated.txt @@ -72,7 +72,7 @@ Why: use less(1) or more(1) -------------------------- What: CHS stuff in fdisk (except SUN where are partitions addresses by cylinders only) -Why: use addresssing by sectors, CHS does not work with modern disks, +Why: use addressing by sectors, CHS does not work with modern disks, confusing for users... -------------------------- diff --git a/Documentation/parse-date.txt b/Documentation/parse-date.txt index 56bed1e22..b23abe7ff 100644 --- a/Documentation/parse-date.txt +++ b/Documentation/parse-date.txt @@ -462,7 +462,7 @@ parse more locale-specific dates using `strptime', but relies on an environment variable and external file, and lacks the thread-safety of `parse_datetime'. - This chapter was originally produced by Franc,ois Pinard + This chapter was originally produced by François Pinard (<pinard@iro.umontreal.ca>) from the `parse_datetime.y' source code, and then edited by K. Berry (<kb@cs.umb.edu>). diff --git a/Documentation/releases/v2.32-ReleaseNotes b/Documentation/releases/v2.32-ReleaseNotes index 168dc7a23..7536b0dff 100644 --- a/Documentation/releases/v2.32-ReleaseNotes +++ b/Documentation/releases/v2.32-ReleaseNotes @@ -13,7 +13,7 @@ width to format output. The library libblkid has been extended to support LUKS2, Micron mpool, VDO and Atari partition table. -The command rfkill(8) has been move to /usr/sbin to be compatible with the +The command rfkill(8) has been moved to /usr/sbin to be compatible with the original rfkill implementation. The command dmesg(1) provides better support for multi-line messages and the @@ -1348,12 +1348,12 @@ HIGHLIGHTS for version 2.8: util-linux 2.7: -HIGLIGHTS for version 2.7: +HIGHLIGHTS for version 2.7: 1) util-linux now _requires_ ncurses. Several programs are completely converted to use terminfo (instead of termcap). -2) Removed progams: +2) Removed programs: - clock: Dropped entirely. Use hwclock (included). - sync: is in gnu fileutils. - setserial: Is being maintained by Ted Ts'o, he recommends @@ -1423,7 +1423,7 @@ HIGHLIGHTS for version 2.6: 2) Bugfixes, additions: - SECURITY: All known holes in mount have been fixed. UPGRADE NOW if you haven't already! - - Portability enhancments to the minix filesystem utils (m68k and + - Portability enhancements to the minix filesystem utils (m68k and Arm patches). - passwd/chsh/chfn will not mess up the passwd file on a NIS machine - others too numerous to enumerate. @@ -1491,7 +1491,7 @@ HIGHLIGHTS for version 2.4 (2.3 was never released): 4) fdisk and cfdisk have been patched with the latest llseek.c. Although I had a lot of bug reports about fdisk from util-linux-2.2, I was unable to reproduce any of the problems. Some of the problems appeared to be - releated to a failure to reboot the machine after changing the partition + related to a failure to reboot the machine after changing the partition table, and some may have been due to a specific kernel revision problem. However, this doesn't seem to account for all of the bug reports -- if this version gives you problem, please send as complete a bug report as diff --git a/configure.ac b/configure.ac index 23a0f7907..0b042cb19 100644 --- a/configure.ac +++ b/configure.ac @@ -1378,7 +1378,7 @@ AC_ARG_ENABLE([agetty], ) UL_BUILD_INIT([agetty]) UL_REQUIRES_HAVE([agetty], [utmpx_h], [utmpx.h header]) -UL_REQUIRES_HAVE([agetty], [gnu_utmpx], [GNU utmpx fucntions]) +UL_REQUIRES_HAVE([agetty], [gnu_utmpx], [GNU utmpx functions]) AM_CONDITIONAL([BUILD_AGETTY], [test "x$build_agetty" = xyes]) AS_IF([test "x$have_futimens" = xyes -a "x$have_inotify_init1" = xyes ], [ AC_DEFINE([AGETTY_RELOAD], [1], [Enable agetty --reload feature]) @@ -1504,7 +1504,7 @@ UL_BUILD_INIT([lslogins]) UL_REQUIRES_BUILD([lslogins], [libsmartcols]) UL_REQUIRES_HAVE([lslogins], [shadow_h], [shadow.h header]) UL_REQUIRES_HAVE([lslogins], [utmpx_h], [utmpx.h header]) -UL_REQUIRES_HAVE([lslogins], [gnu_utmpx], [GNU utmpx fucntions]) +UL_REQUIRES_HAVE([lslogins], [gnu_utmpx], [GNU utmpx functions]) AM_CONDITIONAL([BUILD_LSLOGINS], [test "x$build_lslogins" = xyes]) @@ -1781,7 +1781,7 @@ AC_ARG_ENABLE([last], ) UL_BUILD_INIT([last]) UL_REQUIRES_HAVE([last], [utmpx_h], [utmpx.h header]) -UL_REQUIRES_HAVE([last], [gnu_utmpx], [GNU utmpx fucntions]) +UL_REQUIRES_HAVE([last], [gnu_utmpx], [GNU utmpx functions]) AM_CONDITIONAL([BUILD_LAST], [test "x$build_last" = xyes]) @@ -1791,7 +1791,7 @@ AC_ARG_ENABLE([utmpdump], ) UL_BUILD_INIT([utmpdump]) UL_REQUIRES_HAVE([utmpdump], [utmpx_h], [utmpx.h header]) -UL_REQUIRES_HAVE([utmpdump], [gnu_utmpx], [GNU utmpx fucntions]) +UL_REQUIRES_HAVE([utmpdump], [gnu_utmpx], [GNU utmpx functions]) AM_CONDITIONAL([BUILD_UTMPDUMP], [test "x$build_utmpdump" = xyes]) @@ -1904,7 +1904,7 @@ UL_BUILD_INIT([login]) UL_REQUIRES_HAVE([login], [security_pam_appl_h], [PAM header file]) UL_REQUIRES_HAVE([login], [security_pam_misc_h, security_openpam_h], [PAM conversation functions]) UL_REQUIRES_HAVE([login], [utmpx_h], [utmpx.h header]) -UL_REQUIRES_HAVE([login], [gnu_utmpx], [GNU utmpx fucntions]) +UL_REQUIRES_HAVE([login], [gnu_utmpx], [GNU utmpx functions]) AM_CONDITIONAL([BUILD_LOGIN], [test "x$build_login" = xyes]) AC_ARG_ENABLE([login-chown-vcs], @@ -1950,7 +1950,7 @@ AC_ARG_ENABLE([su], UL_BUILD_INIT([su]) UL_REQUIRES_HAVE([su], [security_pam_appl_h], [PAM header file]) UL_REQUIRES_HAVE([su], [utmpx_h], [utmpx.h header]) -UL_REQUIRES_HAVE([su], [gnu_utmpx], [GNU utmpx fucntions]) +UL_REQUIRES_HAVE([su], [gnu_utmpx], [GNU utmpx functions]) AM_CONDITIONAL([BUILD_SU], [test "x$build_su" = xyes]) @@ -1961,7 +1961,7 @@ AC_ARG_ENABLE([runuser], UL_BUILD_INIT([runuser]) UL_REQUIRES_HAVE([runuser], [security_pam_appl_h], [PAM header file]) UL_REQUIRES_HAVE([runuser], [utmpx_h], [utmpx.h header]) -UL_REQUIRES_HAVE([runuser], [gnu_utmpx], [GNU utmpx fucntions]) +UL_REQUIRES_HAVE([runuser], [gnu_utmpx], [GNU utmpx functions]) AM_CONDITIONAL([BUILD_RUNUSER], [test "x$build_runuser" = xyes]) @@ -2076,7 +2076,7 @@ AC_ARG_ENABLE([write], ) UL_BUILD_INIT([write]) UL_REQUIRES_HAVE([write], [utmpx_h], [utmpx.h header]) -UL_REQUIRES_HAVE([write], [gnu_utmpx], [GNU utmpx fucntions]) +UL_REQUIRES_HAVE([write], [gnu_utmpx], [GNU utmpx functions]) AM_CONDITIONAL([BUILD_WRITE], [test "x$build_write" = xyes]) diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c index b8a2e6003..b2cb0d7cb 100644 --- a/disk-utils/fdisk-menu.c +++ b/disk-utils/fdisk-menu.c @@ -1006,7 +1006,7 @@ static int bsd_menu_cb(struct fdisk_context **cxt0, /* C/H/S commands * - * The geometry setting from this dialog is not persistent and maybe reseted by + * The geometry setting from this dialog is not persistent and maybe reset by * fdisk_reset_device_properties() (for example when you create a new disk * label). Note that on command line specified -C/-H/-S setting is persistent * as it's based on fdisk_save_user_geometry(). diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c index 2a4f75a8c..0d9bdadf7 100644 --- a/disk-utils/fsck.cramfs.c +++ b/disk-utils/fsck.cramfs.c @@ -47,7 +47,7 @@ /* We don't use our include/crc32.h, but crc32 from zlib! * - * The zlib implemenation performs pre/post-conditioning. The util-linux + * The zlib implementation performs pre/post-conditioning. The util-linux * imlemenation requires post-conditioning (xor) in the applications. */ #include <zlib.h> diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c index 729765078..7104d50af 100644 --- a/disk-utils/mkfs.cramfs.c +++ b/disk-utils/mkfs.cramfs.c @@ -39,7 +39,7 @@ /* We don't use our include/crc32.h, but crc32 from zlib! * - * The zlib implemenation performs pre/post-conditioning. The util-linux + * The zlib implementation performs pre/post-conditioning. The util-linux * imlemenation requires post-conditioning (xor) in the applications. */ #include <zlib.h> diff --git a/include/nls.h b/include/nls.h index fd62c07d4..dd315c167 100644 --- a/include/nls.h +++ b/include/nls.h @@ -25,7 +25,7 @@ struct lconv # include <libintl.h> /* * For NLS support in the public shared libraries we have to specify text - * domain name to be independend on the main program. For this purpose define + * domain name to be independent on the main program. For this purpose define * UL_TEXTDOMAIN_EXPLICIT before you include nls.h to your shared library code. */ # ifdef UL_TEXTDOMAIN_EXPLICIT diff --git a/lib/loopdev.c b/lib/loopdev.c index e37b29213..54d337ea3 100644 --- a/lib/loopdev.c +++ b/lib/loopdev.c @@ -147,7 +147,7 @@ int loopcxt_has_device(struct loopdev_cxt *lc) * Note about LOOPDEV_FL_{RDONLY,RDWR} flags. These flags are used for open(2) * syscall to open loop device. By default is the device open read-only. * - * The expection is loopcxt_setup_device(), where the device is open read-write + * The exception is loopcxt_setup_device(), where the device is open read-write * if LO_FLAGS_READ_ONLY flags is not set (see loopcxt_set_flags()). * * Returns: <0 on error, 0 on success. diff --git a/libblkid/docs/Makefile.am b/libblkid/docs/Makefile.am index 83232c4a0..c735a132c 100644 --- a/libblkid/docs/Makefile.am +++ b/libblkid/docs/Makefile.am @@ -68,7 +68,7 @@ HTML_IMAGES= # e.g. content_files=running.sgml building.sgml changes-2.0.sgml content_files = $(builddir)/version.xml $(srcdir)/libblkid-config.xml -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded +# SGML files where gtk-doc abbreviations (#GtkWidget) are expanded # These files must be listed here *and* in content_files # e.g. expand_content_files=running.sgml expand_content_files= diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c index b8ffe466e..74eaffd2b 100644 --- a/libblkid/src/probe.c +++ b/libblkid/src/probe.c @@ -1147,7 +1147,7 @@ int blkid_do_probe(blkid_probe pr) * After successful signature removing the @pr prober will be moved one step * back and the next blkid_do_probe() call will again call previously called * probing function. All in-memory cached data from the device are always - * reseted. + * reset. * * <example> * <title>wipe all filesystems or raids from the device</title> @@ -1248,7 +1248,7 @@ int blkid_do_wipe(blkid_probe pr, int dryrun) * according to the current libblkid probing result. * * Note that blkid_probe_hide_range() changes semantic of this function and - * cached bufferes are not reseted, but library uses in-memory modified + * cached bufferes are not reset, but library uses in-memory modified * buffers to call the next probing function. * * <example> diff --git a/libfdisk/docs/Makefile.am b/libfdisk/docs/Makefile.am index dc7097995..f91cc88d8 100644 --- a/libfdisk/docs/Makefile.am +++ b/libfdisk/docs/Makefile.am @@ -67,7 +67,7 @@ HTML_IMAGES= # e.g. content_files=running.sgml building.sgml changes-2.0.sgml content_files = $(builddir)/version.xml -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded +# SGML files where gtk-doc abbreviations (#GtkWidget) are expanded # These files must be listed here *and* in content_files # e.g. expand_content_files=running.sgml expand_content_files= diff --git a/libfdisk/samples/mkpart-fullspec.c b/libfdisk/samples/mkpart-fullspec.c index 01f1ebabe..8b439f7ad 100644 --- a/libfdisk/samples/mkpart-fullspec.c +++ b/libfdisk/samples/mkpart-fullspec.c @@ -127,13 +127,13 @@ int main(int argc, char *argv[]) if (*str == '-') { /* partno unspecified */ if (sscanf(str, "-,%"SCNu64",%"SCNu64"", &start, &size) != 2) - errx(EXIT_FAILURE, "faild to parse %s", str); + errx(EXIT_FAILURE, "failed to parse %s", str); fdisk_partition_partno_follow_default(pa, 1); fdisk_partition_unset_partno(pa); } else { /* partno specified */ if (sscanf(str, "%u,%"SCNu64",%"SCNu64"", &partno, &start, &size) != 3) - errx(EXIT_FAILURE, "faild to parse %s", str); + errx(EXIT_FAILURE, "failed to parse %s", str); fdisk_partition_partno_follow_default(pa, 0); fdisk_partition_set_partno(pa, partno - 1); /* library uses 0..n */ diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c index ee9c40ea6..4b7899ff8 100644 --- a/libfdisk/src/context.c +++ b/libfdisk/src/context.c @@ -800,7 +800,7 @@ static inline int add_to_partitions_array( * advantage is that unmodified partitions maybe mounted. * * The function behavies like fdisk_reread_partition_table() on systems where - * are no avaialble BLKPG_* ioctls. + * are no available BLKPG_* ioctls. * * Returns: <0 on error, or 0. */ diff --git a/libfdisk/src/item.c b/libfdisk/src/item.c index 6c98228f4..86fa0fb1f 100644 --- a/libfdisk/src/item.c +++ b/libfdisk/src/item.c @@ -224,7 +224,7 @@ static int test_listitems(struct fdisk_test *ts, int argc, char *argv[]) printf("%s: %"PRIu64"\n", name, num); break; } - case 1: /* item unsuported by label -- ignore */ + case 1: /* item unsupported by label -- ignore */ rc = 0; break; case 2: /* end (out of range) */ diff --git a/libfdisk/src/libfdisk.h.in b/libfdisk/src/libfdisk.h.in index ddf4a91e6..bffa9dd51 100644 --- a/libfdisk/src/libfdisk.h.in +++ b/libfdisk/src/libfdisk.h.in @@ -106,7 +106,7 @@ struct fdisk_script; /** * fdisk_sector_t * - * LBA adresses type + * LBA addresses type */ typedef uint64_t fdisk_sector_t; diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c index cccd9a1b3..085d0cfab 100644 --- a/libfdisk/src/partition.c +++ b/libfdisk/src/partition.c @@ -709,7 +709,7 @@ int fdisk_partition_is_wholedisk(struct fdisk_partition *pa) * * If @pa is NULL, or @pa does not specify any semantic for the next partno * then use Ask API to ask user for the next partno. In this case returns 1 if - * no free partition avaialble. If fdisk dialogs are disabled then returns -EINVAL. + * no free partition available. If fdisk dialogs are disabled then returns -EINVAL. * * Returns: 0 on success, <0 on error, or 1 for non-free partno by Ask API. */ diff --git a/libmount/docs/Makefile.am b/libmount/docs/Makefile.am index 2c0363f37..18b036fb0 100644 --- a/libmount/docs/Makefile.am +++ b/libmount/docs/Makefile.am @@ -67,7 +67,7 @@ HTML_IMAGES= # e.g. content_files=running.sgml building.sgml changes-2.0.sgml content_files = $(builddir)/version.xml -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded +# SGML files where gtk-doc abbreviations (#GtkWidget) are expanded # These files must be listed here *and* in content_files # e.g. expand_content_files=running.sgml expand_content_files= diff --git a/libmount/src/context_loopdev.c b/libmount/src/context_loopdev.c index ab80bd110..b1608dd45 100644 --- a/libmount/src/context_loopdev.c +++ b/libmount/src/context_loopdev.c @@ -225,12 +225,12 @@ int mnt_context_setup_loopdev(struct libmnt_context *cxt) rc = loopcxt_find_overlap(&lc, backing_file, offset, sizelimit); switch (rc) { case 0: /* not found */ - DBG(LOOP, ul_debugobj(cxt, "not found overlaping loopdev")); + DBG(LOOP, ul_debugobj(cxt, "not found overlapping loopdev")); loopcxt_deinit(&lc); break; case 1: /* overlap */ - DBG(LOOP, ul_debugobj(cxt, "overlaping %s detected", + DBG(LOOP, ul_debugobj(cxt, "overlapping %s detected", loopcxt_get_device(&lc))); rc = -MNT_ERR_LOOPOVERLAP; goto done; diff --git a/libmount/src/fs.c b/libmount/src/fs.c index a801d8c1d..def32253c 100644 --- a/libmount/src/fs.c +++ b/libmount/src/fs.c @@ -416,8 +416,8 @@ int mnt_fs_set_source(struct libmnt_fs *fs, const char *source) * @fs: fs * @path: source path * - * Compares @fs source path with @path. The redundant slashs are ignored. - * This function compares strings and does not cannonicalize the paths. + * Compares @fs source path with @path. The redundant slashes are ignored. + * This function compares strings and does not canonicalize the paths. * See also more heavy and generic mnt_fs_match_source(). * * Returns: 1 if @fs source path equal to @path, otherwise 0. @@ -445,8 +445,8 @@ int mnt_fs_streq_srcpath(struct libmnt_fs *fs, const char *path) * @fs: fs * @path: mount point * - * Compares @fs target path with @path. The redundant slashs are ignored. - * This function compares strings and does not cannonicalize the paths. + * Compares @fs target path with @path. The redundant slashes are ignored. + * This function compares strings and does not canonicalize the paths. * See also more generic mnt_fs_match_target(). * * Returns: 1 if @fs target path equal to @path, otherwise 0. diff --git a/libsmartcols/docs/Makefile.am b/libsmartcols/docs/Makefile.am index f84156ab6..e8a7600e9 100644 --- a/libsmartcols/docs/Makefile.am +++ b/libsmartcols/docs/Makefile.am @@ -67,7 +67,7 @@ HTML_IMAGES= # e.g. content_files=running.sgml building.sgml changes-2.0.sgml content_files = $(builddir)/version.xml -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded +# SGML files where gtk-doc abbreviations (#GtkWidget) are expanded # These files must be listed here *and* in content_files # e.g. expand_content_files=running.sgml expand_content_files= diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c index 408a95cc4..2a9fd1778 100644 --- a/libsmartcols/src/table.c +++ b/libsmartcols/src/table.c @@ -259,7 +259,7 @@ int scols_table_remove_columns(struct libscols_table *tb) * scols_table_move_column: * @tb: table * @pre: column before the column - * @cl: colum to move + * @cl: column to move * * Move the @cl behind @pre. If the @pre is NULL then the @col is the first * column in the table. diff --git a/login-utils/su-common.c b/login-utils/su-common.c index 8105e6ccd..c1b1a04e4 100644 --- a/login-utils/su-common.c +++ b/login-utils/su-common.c @@ -173,7 +173,7 @@ static void su_init_debug(void) static void init_tty(struct su_context *su) { su->isterm = isatty(STDIN_FILENO) ? 1 : 0; - DBG(TTY, ul_debug("initilize [is-term=%s]", su->isterm ? "true" : "false")); + DBG(TTY, ul_debug("initialize [is-term=%s]", su->isterm ? "true" : "false")); if (su->isterm) get_terminal_name(NULL, &su->tty_name, &su->tty_number); } @@ -433,7 +433,7 @@ AC_DEFUN([UL_DEFAULT_ENABLE], [ dnl UL_ENABLE_ALIAS(NAME, MASTERNAME) dnl dnl Initializes $enable_<name> variable according to $enable_<mastername>. This -dnl is usefull for example if you want to use one --enable-mastername option +dnl is useful for example if you want to use one --enable-mastername option dnl for group of programs. dnl AC_DEFUN([UL_ENABLE_ALIAS], [ diff --git a/misc-utils/logger.c b/misc-utils/logger.c index 862b8a48b..846c85273 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -494,7 +494,7 @@ static void write_output(struct logger_ctl *ctl, const char *const msg) * Let's do the same to be robust. [kzak -- Oct 2017] * * MSG_NOSIGNAL is POSIX.1-2008 compatible, but it for example - * no suported by apple-darwin15.6.0. + * not supported by apple-darwin15.6.0. */ #ifndef MSG_NOSIGNAL # define MSG_NOSIGNAL 0 diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1 index d5e1a5675..75fef5df6 100644 --- a/misc-utils/uuidgen.1 +++ b/misc-utils/uuidgen.1 @@ -48,7 +48,7 @@ an alias to one of the well-known UUIDs defined in RFC 4122, that is or .BR @x500 . The \fIname\fR is an arbitrary string value. The generated UUID is the -digest of the concatentation of the namespace UUID and the name value, hashed +digest of the concatenation of the namespace UUID and the name value, hashed with the MD5 or SHA1 algorithms. It is, therefore, a predictable value which may be useful when UUIDs are being used as handles or nonces for more complex values or values which shouldn't be disclosed directly. @@ -75,7 +75,7 @@ Display version information and exit. Use MD5 as the hash algorithm. .TP .BR \-s , " \-\-sha1" -Use SHA1 as the hash algorith. +Use SHA1 as the hash algorithm. .TP .BR \-n , " \-\-namespace " \fInamespace\fP Generate the hash with the \fInamespace\fP prefix. The \fInamespace\fP is UUID, @@ -86,7 +86,7 @@ or '@ns' where "ns" is well-known predefined UUID addressed by namespace name Generate the hash of the \fIname\fR. .TP .BR \-x , " \-\-hex" -Interpret name \fIname\fR as a hexidecimal string. +Interpret name \fIname\fR as a hexadecimal string. .SH "CONFORMING TO" OSF DCE 1.1 .SH EXAMPLES diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c index 0e2fad658..22c381c1d 100644 --- a/sys-utils/dmesg.c +++ b/sys-utils/dmesg.c @@ -1194,7 +1194,7 @@ mesg: /* The message text is terminated by \n, but it's possible that the * message contains another stuff behind this linebreak; in this case * the previous skip_item() returns pointer to the stuff behind \n. - * Let's notmalize all these sitations and make sure we always point to + * Let's normalize all these situations and make sure we always point to * the \n. * * Note that the next unhexmangle_to_buffer() will replace \n by \0. diff --git a/sys-utils/lsmem.1 b/sys-utils/lsmem.1 index 8f72bbc1e..d11c5275e 100644 --- a/sys-utils/lsmem.1 +++ b/sys-utils/lsmem.1 @@ -24,7 +24,7 @@ ranges. The opposite semantic is \fB\-\-all\fR to list individual memory blocks. Note that some output columns may provide inaccurate information if a split policy -forces \fBlsmem\fP to ignore diffrences in some attributes. For example if you +forces \fBlsmem\fP to ignore differences in some attributes. For example if you merge removable and non-removable memory blocks to the one range than all the range will be marked as non-removable on \fBlsmem\fP output. diff --git a/sys-utils/rfkill.c b/sys-utils/rfkill.c index 031fe436f..211316ce7 100644 --- a/sys-utils/rfkill.c +++ b/sys-utils/rfkill.c @@ -585,7 +585,7 @@ static void __attribute__((__noreturn__)) usage(void) /* * TRANSLATORS: command names should not be translated, explaining - * them as additional field after identifer is fine, for example + * them as additional field after identifier is fine, for example * * list [identifier] (lista [tarkenne]) */ diff --git a/sys-utils/rtcwake.8.in b/sys-utils/rtcwake.8.in index 72eb0e34f..52287d85b 100644 --- a/sys-utils/rtcwake.8.in +++ b/sys-utils/rtcwake.8.in @@ -66,7 +66,7 @@ stores that information. This is the default. .TP .BR \-\-date " \fItimestamp" Set the wakeup time to the value of the timestamp. Format of the -timestmap can be any of the following: +timestamp can be any of the following: .TS tab(|); left l2 l. diff --git a/term-utils/agetty.8 b/term-utils/agetty.8 index 96d94bb48..fcb1fd5fe 100644 --- a/term-utils/agetty.8 +++ b/term-utils/agetty.8 @@ -348,7 +348,7 @@ directory is ignored. All files with .issue extension from the directory are printed in version-sort order. The directory allow to maintain 3rd-party messages independently on the primary system \fI/etc/issue\fP file. -The default path maybe overrided by \fB\-\-issue\-file\fP option. In this case +The default path maybe overridden by \fB\-\-issue\-file\fP option. In this case specified path has to be file or directory and the default \fI/etc/issue\fP as well as \fI/etc/issue.d\fP are ignored. diff --git a/tests/expected/getopt/options-longopts b/tests/expected/getopt/options-longopts index 379b5abc1..8ee99533c 100644 --- a/tests/expected/getopt/options-longopts +++ b/tests/expected/getopt/options-longopts @@ -1,2 +1,2 @@ - --long1 --thirdlong 'ARGUMENT' --secondlong 'ARG' --abbriviation 'ABBRARG' -a -- 'EXTRA1' + --long1 --thirdlong 'ARGUMENT' --secondlong 'ARG' --abbreviation 'ABBRARG' -a -- 'EXTRA1' exit value: 0 diff --git a/tests/ts/getopt/options b/tests/ts/getopt/options index c9ac53dd3..fee51195e 100755 --- a/tests/ts/getopt/options +++ b/tests/ts/getopt/options @@ -90,7 +90,7 @@ gnu_getopt_clean ts_finalize_subtest ts_init_subtest longopts -$TS_CMD_GETOPT -o a -l long1,secondlong:,thirdlong::,abbriviation: -- --long1 EXTRA1 --thirdlong=ARGUMENT --secondlong=ARG --abbr ABBRARG -a >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -o a -l long1,secondlong:,thirdlong::,abbreviation: -- --long1 EXTRA1 --thirdlong=ARGUMENT --secondlong=ARG --abbr ABBRARG -a >> $TS_OUTPUT 2>&1 echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest diff --git a/tests/ts/libmount/lock b/tests/ts/libmount/lock index 816612484..7ba678baf 100755 --- a/tests/ts/libmount/lock +++ b/tests/ts/libmount/lock @@ -21,7 +21,7 @@ TESTPROG="$TS_HELPER_LIBMOUNT_LOCK" # # Note: the original version (< 2.13) of util-linux is completely useless for # this test (maximum for this old version is NLOOPS=10 and NPROCESSES=5 (2-way -# 2GHz machine)). It has terrible performance due a bad timeouts implemntation +# 2GHz machine)). It has terrible performance due a bad timeouts implementation # in lock_mtab(). # NLOOPS=1000 |