summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/releases/v2.15-ReleaseNotes2
-rw-r--r--Documentation/releases/v2.23-ReleaseNotes2
-rw-r--r--Documentation/releases/v2.24-ReleaseNotes4
-rw-r--r--Documentation/releases/v2.25-ReleaseNotes6
-rw-r--r--Documentation/releases/v2.26-ReleaseNotes6
-rw-r--r--Documentation/releases/v2.27-ReleaseNotes2
-rw-r--r--NEWS2
-rw-r--r--disk-utils/fdisk-list.c2
-rw-r--r--lib/loopdev.c2
-rw-r--r--lib/monotonic.c2
-rw-r--r--libblkid/src/probe.c4
-rw-r--r--libfdisk/src/gpt.c2
-rw-r--r--libmount/src/context_mount.c2
-rw-r--r--libsmartcols/src/table.c2
-rw-r--r--login-utils/login.c2
-rw-r--r--login-utils/sulogin-consoles.c2
-rw-r--r--misc-utils/lsblk.c2
-rw-r--r--misc-utils/uuidd.c2
-rw-r--r--term-utils/script.c2
-rw-r--r--tests/expected/fdisk/oddinput2
-rwxr-xr-xtests/ts/fdisk/bsd2
-rwxr-xr-xtests/ts/fdisk/oddinput2
22 files changed, 28 insertions, 28 deletions
diff --git a/Documentation/releases/v2.15-ReleaseNotes b/Documentation/releases/v2.15-ReleaseNotes
index 243f55c66..dd1516203 100644
--- a/Documentation/releases/v2.15-ReleaseNotes
+++ b/Documentation/releases/v2.15-ReleaseNotes
@@ -485,7 +485,7 @@ mkswap:
- remove v0 swap space support [Karel Zak]
- zap bootbits [Karel Zak]
more:
- - dont use a.out.h [Mike Frysinger]
+ - don't use a.out.h [Mike Frysinger]
- minor fixes to magic() [James Youngman]
mount:
- Add strictatime support [Matthew Garrett]
diff --git a/Documentation/releases/v2.23-ReleaseNotes b/Documentation/releases/v2.23-ReleaseNotes
index ce07ac18c..1db48ae6b 100644
--- a/Documentation/releases/v2.23-ReleaseNotes
+++ b/Documentation/releases/v2.23-ReleaseNotes
@@ -1123,7 +1123,7 @@ umount:
- add --all-targets [Karel Zak]
- add -R, --recursive option [Dave Reisner]
- add note about namespaces too --all-targets [Karel Zak]
- - allways return MOUNT_EX_* [Karel Zak]
+ - always return MOUNT_EX_* [Karel Zak]
- clean --recursive [Karel Zak]
- improve --recursive docs [Karel Zak]
- make usage() translator friendly [Sami Kerola]
diff --git a/Documentation/releases/v2.24-ReleaseNotes b/Documentation/releases/v2.24-ReleaseNotes
index 132a5e30e..b1c7d281c 100644
--- a/Documentation/releases/v2.24-ReleaseNotes
+++ b/Documentation/releases/v2.24-ReleaseNotes
@@ -190,7 +190,7 @@ chfn:
- assigned value is never read [clang-analyzer] [Sami Kerola]
column:
- dereference of null pointer [clang-analyzer] [Sami Kerola]
- - use variable lenght printf field width to wprint blanks [Sami Kerola]
+ - use variable length printf field width to wprint blanks [Sami Kerola]
cytune:
- fix glush typo in cytune [Rafael Ferreira]
dmesg:
@@ -692,7 +692,7 @@ more:
- fix warning when compiled --without-ncurses [Karel Zak]
- guarantee space for multibyte [Karel Zak]
- make output redirection more efficient [Sami Kerola]
- - use variable lenght printf field width to print blanks [Sami Kerola]
+ - use variable length printf field width to print blanks [Sami Kerola]
mount:
- (deprecated) fix typo tailed->failed [Yuri Chornoivan]
- add notes about UUIDs to the man page [Karel Zak]
diff --git a/Documentation/releases/v2.25-ReleaseNotes b/Documentation/releases/v2.25-ReleaseNotes
index d9b9ce447..5db582f0b 100644
--- a/Documentation/releases/v2.25-ReleaseNotes
+++ b/Documentation/releases/v2.25-ReleaseNotes
@@ -618,7 +618,7 @@ libblkid:
- add extra checks to XFS prober [Karel Zak]
- cleanup internal return codes [Karel Zak]
- comparing an array to null is not useful [coverity scan] [Karel Zak]
- - convert GPT attributes to host endianess [Karel Zak]
+ - convert GPT attributes to host endianness [Karel Zak]
- correct the return values in squashfs probe [David Shea]
- detect alone PMBR [Karel Zak]
- detect squashfs 3 vs 4 [Ruediger Meier]
@@ -662,7 +662,7 @@ libfdisk:
- (gpt) add /home GUID [Karel Zak]
- (gpt) allow to work with hybrid GPT [Karel Zak]
- (gpt) fix last LBA code for S_ISREG [Karel Zak]
- - (gpt) implement 'fix order' commnad [Karel Zak]
+ - (gpt) implement 'fix order' command [Karel Zak]
- (gpt) improve and cleanup recovery code [Karel Zak]
- (gpt) initialize last_lba, cleanup pa->{start,size} usage [Karel Zak]
- (gpt) recover from corrupted primary/backup PT [Karel Zak]
@@ -1146,7 +1146,7 @@ tests:
- allow to add or override test suite options [Ruediger Meier]
- avoid executing dirname(1) command [Sami Kerola]
- cal do not let --week=<num> to adjust requested month [Sami Kerola]
- - cal take account week numbers when determing month lenght [Sami Kerola]
+ - cal take account week numbers when determing month length [Sami Kerola]
- cal(1) is year is limited to signed 32 bit value [Sami Kerola]
- call ts_init_env as early as possible [Ruediger Meier]
- check /proc availability, and go-around if it is incomplete [Sami Kerola]
diff --git a/Documentation/releases/v2.26-ReleaseNotes b/Documentation/releases/v2.26-ReleaseNotes
index 51a7959e5..ff81cc433 100644
--- a/Documentation/releases/v2.26-ReleaseNotes
+++ b/Documentation/releases/v2.26-ReleaseNotes
@@ -259,7 +259,7 @@ docs:
- fix two paths of the v2.20-ReleaseNotes [Benno Schulenberg]
- fix two spellings in man page of logger [Benno Schulenberg]
- fix typos [Karel Zak]
- - fix-up man-pages flaged by checkmans.sh [J William Piggott]
+ - fix-up man-pages flagged by checkmans.sh [J William Piggott]
- give the man page of utmpdump the proper User Commands header [Benno Schulenberg]
- improve some wordings in the man page of mount [Benno Schulenberg]
- improve some wordings on the man page of wipefs [Benno Schulenberg]
@@ -384,7 +384,7 @@ hwclock:
- persistent_clock_is_local [J William Piggott]
- persistent_clock_is_local MAN [J William Piggott]
- remove automatic ISA fallback [J William Piggott]
- - remove referal to deprecated keyboard interface [Sami Kerola]
+ - remove referral to deprecated keyboard interface [Sami Kerola]
- update man page for v2.26 rc [JWP]
- update man-page for directisa change [J William Piggott]
- use fabs() instead abs() when argument is double [Sami Kerola]
@@ -430,7 +430,7 @@ ldattach:
- GSM0710 support, add intro modem command [Karel Zak]
- add fallback for N_GSM0710 [Karel Zak]
lib:
- - fix crc32 and crc64 interger overflows [AddressSanitizer] [Sami Kerola]
+ - fix crc32 and crc64 integer overflows [AddressSanitizer] [Sami Kerola]
- remove xgetpass() [Sami Kerola]
lib/blkdev:
- report correct disk size on GNU/kFreeBSD. Thanks Tuco. [Robert Millan]
diff --git a/Documentation/releases/v2.27-ReleaseNotes b/Documentation/releases/v2.27-ReleaseNotes
index 6df1c897b..e3ed97fbe 100644
--- a/Documentation/releases/v2.27-ReleaseNotes
+++ b/Documentation/releases/v2.27-ReleaseNotes
@@ -336,7 +336,7 @@ libfdisk:
- (gpt) check header size before verify CRC [Karel Zak]
- (gpt) fix "MidnightBSD UFS" UUID [Karel Zak]
- (gpt) fix LE usage [Karel Zak]
- - (gpt) fix attributes endianess [Ruediger Meier]
+ - (gpt) fix attributes endianness [Ruediger Meier]
- (gpt) fix check for beginning of protective partition [Michael Marineau]
- (gpt) fix end sector calculation on resize [Karel Zak]
- (gpt) fix label pointer usage [smatch scan] [Karel Zak]
diff --git a/NEWS b/NEWS
index 9f0735377..089687d6d 100644
--- a/NEWS
+++ b/NEWS
@@ -328,7 +328,7 @@ util-linux 2.12i
* fdisk: fix default SGI volume header size (Eric Sandeen)
* fstab.c: use strsignal() instead of sys_siglist[]
* hwclock: use <sys/io.h> when available on i386
-* hwclock: dont try KDGHWCLK on archs other than __m68k__
+* hwclock: don't try KDGHWCLK on archs other than __m68k__
* sfdisk: correct typo in __attribute__used nonsense
* sfdisk: use PACKED on __arm__ (Jeroen Dobbelaere)
* sfdisk: fix warning printout
diff --git a/disk-utils/fdisk-list.c b/disk-utils/fdisk-list.c
index 604d94391..82216f09e 100644
--- a/disk-utils/fdisk-list.c
+++ b/disk-utils/fdisk-list.c
@@ -141,7 +141,7 @@ void list_disklabel(struct fdisk_context *cxt)
if (!co)
goto done;
- /* set colum header color */
+ /* set column header color */
if (bold)
scols_cell_set_color(scols_column_get_header(co), bold);
}
diff --git a/lib/loopdev.c b/lib/loopdev.c
index 54c620048..5f3c3a246 100644
--- a/lib/loopdev.c
+++ b/lib/loopdev.c
@@ -135,7 +135,7 @@ int loopcxt_has_device(struct loopdev_cxt *lc)
* @lc: context
* @flags: LOOPDEV_FL_* flags
*
- * Initilize loop handler.
+ * Initialize loop handler.
*
* We have two sets of the flags:
*
diff --git a/lib/monotonic.c b/lib/monotonic.c
index f2aa0de0d..372cc9c5a 100644
--- a/lib/monotonic.c
+++ b/lib/monotonic.c
@@ -51,7 +51,7 @@ int gettime_monotonic(struct timeval *tv)
struct timespec ts;
# ifdef CLOCK_MONOTONIC_RAW
- /* Linux specific, cant slew */
+ /* Linux specific, can't slew */
if (!(ret = clock_gettime(CLOCK_MONOTONIC_RAW, &ts))) {
# else
if (!(ret = clock_gettime(CLOCK_MONOTONIC, &ts))) {
diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 4efa2bacd..5f15b0981 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -1476,8 +1476,8 @@ static struct blkid_prval *blkid_probe_new_value(void)
}
/* Note that value data is always terminated by zero to keep things robust,
- * this extra zero is not count to the value lenght. It's caller responsibility
- * to set proper value lenght (for strings we count terminator to the lenght,
+ * this extra zero is not count to the value length. It's caller responsibility
+ * to set proper value length (for strings we count terminator to the length,
* for binary data it's without terminator).
*/
int blkid_probe_value_set_data(struct blkid_prval *v,
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index f02d0de02..6bc0e3f07 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -2263,7 +2263,7 @@ static int gpt_add_partition(
goto done;
}
- /* Be paranoid and check agains on-disk setting rather than against libfdisk cxt */
+ /* Be paranoid and check against on-disk setting rather than against libfdisk cxt */
if (user_l > le64_to_cpu(pheader->last_usable_lba)) {
fdisk_warnx(cxt, _("The last usable GPT sector is %ju, but %ju is requested."),
le64_to_cpu(pheader->last_usable_lba), user_l);
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index 9dadadf8e..e0d316021 100644
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -112,7 +112,7 @@ static int init_propagation(struct libmnt_context *cxt)
*
* Note that we don't remove "ro" from the first syscall (kernel silently
* ignores this flags for bind operation) -- maybe one day kernel will support
- * read-only binds in one step and then all will be done by the firts mount(2) and the
+ * read-only binds in one step and then all will be done by the first mount(2) and the
* second remount will be noop...
*/
static int init_robind(struct libmnt_context *cxt)
diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c
index d5b5e3e3a..23fc2bc1f 100644
--- a/libsmartcols/src/table.c
+++ b/libsmartcols/src/table.c
@@ -309,7 +309,7 @@ int scols_table_remove_columns(struct libscols_table *tb)
*
* @whint = 0..1 : relative width, percent of terminal width
*
- * @whint = 1..N : absolute width, empty colum will be truncated to
+ * @whint = 1..N : absolute width, empty column will be truncated to
* the column header width
*
* @whint = 1..N
diff --git a/login-utils/login.c b/login-utils/login.c
index 2551631d3..6f5103909 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -407,7 +407,7 @@ static void init_tty(struct login_context *cxt)
close(STDOUT_FILENO);
close(STDERR_FILENO);
- signal(SIGHUP, SIG_IGN); /* so vhangup() wont kill us */
+ signal(SIGHUP, SIG_IGN); /* so vhangup() won't kill us */
vhangup();
signal(SIGHUP, SIG_DFL);
diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
index 1b05b3800..bc55e9cb6 100644
--- a/login-utils/sulogin-consoles.c
+++ b/login-utils/sulogin-consoles.c
@@ -225,7 +225,7 @@ dev_t devattr(const char *tty)
#endif /* __linux__ */
/*
- * Search below /dev for the characer device in `dev_t comparedev' variable.
+ * Search below /dev for the character device in `dev_t comparedev' variable.
*/
static
#ifdef __GNUC__
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index dd0f0241f..1162d0778 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -205,7 +205,7 @@ static struct colinfo infos[] = {
struct lsblk {
struct libscols_table *table; /* output table */
- struct libscols_column *sort_col;/* sort output by this colum */
+ struct libscols_column *sort_col;/* sort output by this column */
int sort_id;
unsigned int all_devices:1; /* print all devices, including empty */
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 4b5bf00e9..208c36126 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -229,7 +229,7 @@ static int create_pidfile(struct uuidd_cxt_t *cxt, const char *pidfile_path)
* Create AF_UNIX, SOCK_STREAM socket and bind to @socket_path
*
* If @will_fork is true, then make sure the descriptor
- * of the socket is >2, so that it wont be later closed
+ * of the socket is >2, so that it won't be later closed
* during create_daemon().
*
* Return file descriptor corresponding to created socket.
diff --git a/term-utils/script.c b/term-utils/script.c
index e247c83cf..f5b2300be 100644
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -289,7 +289,7 @@ static void wait_for_empty_fd(int fd)
/*
* The script(1) is usually faster than shell, so it's good idea to wait until
* the previous message is has been already read by shell from slave before we
- * wrate to master. This is necessary expecially for EOF situation when we can
+ * wrate to master. This is necessary especially for EOF situation when we can
* send EOF to master before shell is fully initialized, to workaround this
* problem we wait until slave is empty. For example:
*
diff --git a/tests/expected/fdisk/oddinput b/tests/expected/fdisk/oddinput
index d336d55a5..2fccc6cd5 100644
--- a/tests/expected/fdisk/oddinput
+++ b/tests/expected/fdisk/oddinput
@@ -5,7 +5,7 @@ Disk testimage: 10 MiB, 10485760 bytes, 20480 sectors
Units: cylinders of 16065 * 512 = 8225280 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
-Nonexistant file
+Nonexistent file
fdisk: cannot open _a_file_that_does_not_exist_: No such file or directory
Too small file
fdisk: cannot open oddinput.toosmall: Inappropriate ioctl for device
diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index b76852c66..cd7a6c6f2 100755
--- a/tests/ts/fdisk/bsd
+++ b/tests/ts/fdisk/bsd
@@ -40,7 +40,7 @@ FDISK_CMD_BSD_LIST_TYPES="b\nl\nq\n" # list supported PT types and quit
#set -x
-# BSD disklabel depends on sector/offset and endianess. We convert the md5sums
+# BSD disklabel depends on sector/offset and endianness. We convert the md5sums
# into the most common values (little endian, BSD_LABELSECTOR = 1,
# BSD_LABELOFFSET = 0) so that they can be easily compared to the expected
# ones.
diff --git a/tests/ts/fdisk/oddinput b/tests/ts/fdisk/oddinput
index 8d512200d..6625d2583 100755
--- a/tests/ts/fdisk/oddinput
+++ b/tests/ts/fdisk/oddinput
@@ -36,7 +36,7 @@ ts_log "Empty image listing" # this should report empty partition table
# TEST_IMAGE_NAME has absolute path, and is by definition different on each computer, we need to sed it away
$TS_CMD_FDISK -c=dos -u=cylinders -l ${TEST_IMAGE_NAME} 2>&1 | sed -e "s/${TEST_IMAGE_NAME//\//\\/}/testimage/" >> $TS_OUTPUT
-ts_log "Nonexistant file" # this originally does absolutely nothing
+ts_log "Nonexistent file" # this originally does absolutely nothing
$TS_CMD_FDISK -c=dos -u=cylinders -l _a_file_that_does_not_exist_ >> $TS_OUTPUT 2>&1
ts_log "Too small file" # same here