misc: Fix various typos

Fix various typos in error messages, warnings, debug strings,
comments and names of static functions.

Signed-off-by: Sebastian Rasmussen <sebras@gmail.com>

130 files changed, 329 insertions, 329 deletions

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index c96d9a523..acea6d8ff 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -529,7 +529,7 @@ static int is_freespace(struct cfdisk *cf, size_t i)
 }
 
 /* converts libfdisk FDISK_ASKTYPE_MENU to cfdisk menu and returns user's
- * responseback to libfdisk
+ * response back to libfdisk
  */
 static int ask_menu(struct fdisk_ask *ask, struct cfdisk *cf)
 {
diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c
index ce3422c69..6b61d32b1 100644
--- a/disk-utils/fdisk-menu.c
+++ b/disk-utils/fdisk-menu.c
@@ -681,7 +681,7 @@ static int generic_menu_cb(struct fdisk_context **cxt0,
 
 /*
  * This is fdisk frontend for GPT specific libfdisk functions that
- * are not expported by generic libfdisk API.
+ * are not exported by generic libfdisk API.
  */
 static int gpt_menu_cb(struct fdisk_context **cxt0,
 		       const struct menu *menu __attribute__((__unused__)),
@@ -777,7 +777,7 @@ static int gpt_menu_cb(struct fdisk_context **cxt0,
 
 /*
  * This is fdisk frontend for MBR specific libfdisk functions that
- * are not expported by generic libfdisk API.
+ * are not exported by generic libfdisk API.
  */
 static int dos_menu_cb(struct fdisk_context **cxt0,
 		       const struct menu *menu __attribute__((__unused__)),
@@ -942,7 +942,7 @@ static int sgi_menu_cb(struct fdisk_context **cxt0,
 
 /*
  * This is fdisk frontend for BSD specific libfdisk functions that
- * are not expported by generic libfdisk API.
+ * are not exported by generic libfdisk API.
  */
 static int bsd_menu_cb(struct fdisk_context **cxt0,
 		       const struct menu *menu __attribute__((__unused__)),
diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index 1f1f9ba6b..9dbecf989 100644
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -736,7 +736,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
 	fputs(_(" -L, --color[=<when>]          colorize output (auto, always or never)\n"), out);
 	fprintf(out,
 	        "                                 %s\n", USAGE_COLORS_DEFAULT);
-	fputs(_(" -l, --list                    display partitions end exit\n"), out);
+	fputs(_(" -l, --list                    display partitions and exit\n"), out);
 	fputs(_(" -o, --output <list>           output columns\n"), out);
 	fputs(_(" -t, --type <type>             recognize specified partition table type only\n"), out);
 	fputs(_(" -u, --units[=<unit>]          display units: 'cylinders' or 'sectors' (default)\n"), out);
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 84d2dcc3d..eede03810 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -89,7 +89,7 @@ static const char *really_wanted[] = {
 };
 
 /*
- * Internal structure for mount tabel entries.
+ * Internal structure for mount table entries.
  */
 struct fsck_fs_data
 {
@@ -490,7 +490,7 @@ static void load_fs_info(void)
 	errno = 0;
 
 	/*
-	 * Let's follow libmount defauls if $FSTAB_FILE is not specified
+	 * Let's follow libmount defaults if $FSTAB_FILE is not specified
 	 */
 	path = getenv("FSTAB_FILE");
 
@@ -1279,7 +1279,7 @@ static int check_all(void)
 
 	/*
 	 * This is for the bone-headed user who enters the root
-	 * filesystem twice.  Skip root will skep all root entries.
+	 * filesystem twice.  Skip root will skip all root entries.
 	 */
 	if (skip_root) {
 		mnt_reset_iter(itr, MNT_ITER_FORWARD);
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index be74f81a0..467f9dfc8 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -6,7 +6,7 @@
  */
 
 /*
- * 09.11.91  -  made the first rudimetary functions
+ * 09.11.91  -  made the first rudimentary functions
  *
  * 10.11.91  -  updated, does checking, no repairs yet.
  *		Sent out to the mailing-list for testing.
@@ -22,7 +22,7 @@
  *
  *
  * 19.04.92  -	Had to start over again from this old version, as a
- *		kernel bug ate my enhanced fsck in february.
+ *		kernel bug ate my enhanced fsck in February.
  *
  * 28.02.93  -	added support for different directory entry sizes..
  *
@@ -106,7 +106,7 @@
 #define ROOT_INO 1
 #define YESNO_LENGTH 64
 
-/* Global variables used in minix_programs.h inline fuctions */
+/* Global variables used in minix_programs.h inline functions */
 int fs_version = 1;
 char *super_block_buffer;
 
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 0096cd444..65ad356b0 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -20,7 +20,7 @@
 
 /*
  * Old version would die on largish filesystems. Change to mmap the
- * files one by one instaed of all simultaneously. - aeb, 2002-11-01
+ * files one by one instead of all simultaneously. - aeb, 2002-11-01
  */
 
 #include <sys/types.h>
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index a4118f175..d4a576f83 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -90,7 +90,7 @@
 #define DEFAULT_FS_VERSION 1
 
 /*
- * Global variables used in minix_programs.h inline fuctions
+ * Global variables used in minix_programs.h inline functions
  */
 int fs_version = DEFAULT_FS_VERSION;
 char *super_block_buffer;
@@ -571,7 +571,7 @@ static void setup_tables(const struct fs_control *ctl) {
 
 /*
  * Perform a test of a block; return the number of
- * blocks readable/writeable.
+ * blocks readable/writable.
  */
 static size_t do_check(const struct fs_control *ctl, char * buffer, int try, unsigned int current_block) {
 	ssize_t got;
@@ -767,7 +767,7 @@ int main(int argc, char ** argv)
 		case '1':
 			fs_version = 1;
 			break;
-		case 'v': /* kept for backwards compatiblitly */
+		case 'v': /* kept for backwards compatibility */
 			warnx(_("-v is ambiguous, use '-2' instead"));
 			/* fallthrough */
 		case '2':
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index e44d039e1..93a15deac 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -124,7 +124,7 @@ static void set_uuid_and_label(const struct mkswap_control *ctl)
 			warnx(_("Label was truncated."));
 	}
 
-	/* report resuls */
+	/* report results */
 	if (ctl->uuid || ctl->opt_label) {
 		if (ctl->opt_label)
 			printf("LABEL=%s, ", ctl->hdr->volume_name);
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 2f97bb48a..0f329ed39 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -101,7 +101,7 @@ struct sfdisk {
 	struct fdisk_partition  *orig_pa;	/* -N <partno> before the change */
 
 	unsigned int verify : 1,	/* call fdisk_verify_disklabel() */
-		     quiet  : 1,	/* suppres extra messages */
+		     quiet  : 1,	/* suppress extra messages */
 		     interactive : 1,	/* running on tty */
 		     noreread : 1,	/* don't check device is in use */
 		     force  : 1,	/* do also stupid things */
@@ -866,7 +866,7 @@ static int command_delete(struct sfdisk *sf, int argc, char **argv)
 	if (sf->backup)
 		backup_partition_table(sf, devname);
 
-	/* delate all */
+	/* delete all */
 	if (argc == 1) {
 		size_t nparts = fdisk_get_npartitions(sf->cxt);
 		for (i = 0; i < nparts; i++) {
@@ -907,7 +907,7 @@ static int command_reorder(struct sfdisk *sf, int argc, char **argv)
 	if (sf->backup)
 		backup_partition_table(sf, devname);
 
-	if (fdisk_reorder_partitions(sf->cxt) == 1)	/* unchnaged */
+	if (fdisk_reorder_partitions(sf->cxt) == 1)	/* unchanged */
 		rc = fdisk_deassign_device(sf->cxt, 1);
 	else
 		rc = write_changes(sf);
@@ -1782,7 +1782,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
 	fputs(_(" -J, --json <dev>                  dump partition table in JSON format\n"), out);
 	fputs(_(" -g, --show-geometry [<dev> ...]   list geometry of all or specified devices\n"), out);
 	fputs(_(" -l, --list [<dev> ...]            list partitions of each device\n"), out);
-	fputs(_(" -F, --list-free [<dev> ...]       list unpartitions free areas of each device\n"), out);
+	fputs(_(" -F, --list-free [<dev> ...]       list unpartitioned free areas of each device\n"), out);
 	fputs(_(" -r, --reorder <dev>               fix partitions order (by start offset)\n"), out);
 	fputs(_(" -s, --show-size [<dev> ...]       list sizes of all or specified devices\n"), out);
 	fputs(_(" -T, --list-types                  print the recognized types (see -X)\n"), out);
@@ -1816,7 +1816,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
 	fputs(_(" -o, --output <list>       output columns\n"), out);
 	fputs(_(" -q, --quiet               suppress extra info messages\n"), out);
 	fputs(_(" -w, --wipe <mode>         wipe signatures (auto, always or never)\n"), out);
-	fputs(_(" -W, --wipe-partitons <mode>  wipe signatures from new partitions (auto, always or never)\n"), out);
+	fputs(_(" -W, --wipe-partitions <mode>  wipe signatures from new partitions (auto, always or never)\n"), out);
 	fputs(_(" -X, --label <name>        specify label type (dos, gpt, ...)\n"), out);
 	fputs(_(" -Y, --label-nested <name> specify nested label type (dos, bsd)\n"), out);
 	fputs(USAGE_SEPARATOR, out);
diff --git a/include/color-names.h b/include/color-names.h
index f21a0ee1b..42f6f8f6e 100644
--- a/include/color-names.h
+++ b/include/color-names.h
@@ -36,7 +36,7 @@
 #define UL_COLOR_WHITE		"\033[1;37m"
 
 
-/* maximal lenght of human readable name of ESC seq. */
+/* maximal length of human readable name of ESC seq. */
 #define UL_COLORNAME_MAXSZ	32
 
 extern const char *color_sequence_from_colorname(const char *str);
diff --git a/include/cpuset.h b/include/cpuset.h
index f8948a984..5a531bf00 100644
--- a/include/cpuset.h
+++ b/include/cpuset.h
@@ -66,7 +66,7 @@ extern int __cpuset_count_s(size_t setsize, const cpu_set_t *set);
 #define cpuset_nbits(setsize)	(8 * (setsize))
 
 /*
- * The @idx parametr returns an index of the first mask from @ary array where
+ * The @idx parameter returns an index of the first mask from @ary array where
  * the @cpu is set.
  *
  * Returns: 0 if found, otherwise 1.
diff --git a/include/debug.h b/include/debug.h
index 0229ab329..45c1caade 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -29,7 +29,7 @@
  * subsystem names (e.g. "LIBMOUNT_DEBUG=options,tab"). In this case is
  * necessary to define mask names array. This functionality is optional.
  *
- * It's stringly recommended to use UL_* macros to define/declare/use
+ * It's strongly recommended to use UL_* macros to define/declare/use
  * the debug stuff.
  *
  * See disk-utils/cfdisk.c: cfdisk_init_debug()  for programs debug
diff --git a/include/plymouth-ctrl.h b/include/plymouth-ctrl.h
index e1df363eb..50eaf0c7a 100644
--- a/include/plymouth-ctrl.h
+++ b/include/plymouth-ctrl.h
@@ -1,5 +1,5 @@
 /*
- * plymouth-ctrl.h	Header file for communcations with plymouthd
+ * plymouth-ctrl.h	Header file for communications with plymouthd
  *
  * Copyright (c) 2016 SUSE Linux GmbH, All rights reserved.
  * Copyright (c) 2016 Werner Fink <werner@suse.de>
diff --git a/include/statfs_magic.h b/include/statfs_magic.h
index 7adce8af1..b6b0225e8 100644
--- a/include/statfs_magic.h
+++ b/include/statfs_magic.h
@@ -13,7 +13,7 @@
 #endif
 
 /*
- *  Unfortunately, Linux kernel hedeader file <linux/magic.h> is incomplete
+ *  Unfortunately, Linux kernel header file <linux/magic.h> is incomplete
  *  mess and kernel returns by statfs f_type many numbers that are nowhere
  *  specified (in API).
  *
diff --git a/include/sysfs.h b/include/sysfs.h
index 55213780c..664359243 100644
--- a/include/sysfs.h
+++ b/include/sysfs.h
@@ -97,7 +97,7 @@ extern int sysfs_scsi_path_contains(struct sysfs_cxt *cxt, const char *pattern);
  *
  * Linux kernel linux/drivers/base/core.c: device_get_devnode()
  * defines a replacement of '!' in the /sys device name by '/' in the
- * /dev device name. This helper replaces all ocurrences of '!' in
+ * /dev device name. This helper replaces all occurrences of '!' in
  * @name by '/' to convert from /sys to /dev.
  */
 static inline void sysfs_devname_sys_to_dev(char *name)
diff --git a/lib/blkdev.c b/lib/blkdev.c
index 8a5a52dfa..fa42b86be 100644
--- a/lib/blkdev.c
+++ b/lib/blkdev.c
@@ -253,7 +253,7 @@ int blkdev_is_misaligned(int fd)
 	if (ioctl(fd, BLKALIGNOFF, &aligned) < 0)
 		return 0;			/* probably kernel < 2.6.32 */
 	/*
-	 * Note that kernel returns -1 as alignement offset if no compatible
+	 * Note that kernel returns -1 as alignment offset if no compatible
 	 * sizes and alignments exist for stacked devices
 	 */
 	return aligned != 0 ? 1 : 0;
diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index 93782e894..b600248c7 100644
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -67,7 +67,7 @@ static int is_dm_devname(char *canonical, char **name)
 }
 
 /*
- * This function does not cannonicalize the path! It just prepends CWD before a
+ * This function does not canonicalize the path! It just prepends CWD before a
  * relative path. If the path is no relative than returns NULL. The path does
  * not have to exist.
  */
diff --git a/lib/colors.c b/lib/colors.c
index 933bb810a..e5a27ba25 100644
--- a/lib/colors.c
+++ b/lib/colors.c
@@ -265,7 +265,7 @@ static int colors_readdir(struct ul_color_ctl *cc, const char *dirname)
 				       &tk_term, &tk_termsz, &type) != 0)
 			continue;
 
-		/* count teoretical score before we check names to avoid
+		/* count theoretical score before we check names to avoid
 		 * unnecessary strcmp() */
 		if (tk_name)
 			score += 20;
@@ -400,7 +400,7 @@ static int cn_sequence(const char *str, char **seq)
 			*out++ = '#';	/* Hash mark */
 			break;
 		case '?':
-			*out++ = '?';	/* Qestion mark */
+			*out++ = '?';	/* Question mark */
 			break;
 		default:
 			*out++ = *in;
diff --git a/lib/crc32.c b/lib/crc32.c
index 0c986288d..a5e3216b8 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -19,7 +19,7 @@
  *  order from highest-order term to lowest-order term.  UARTs transmit
  *  characters in order from LSB to MSB.  By storing the CRC this way,
  *  we hand it to the UART in the order low-byte to high-byte; the UART
- *  sends each low-bit to hight-bit; and the result is transmission bit
+ *  sends each low-bit to high-bit; and the result is transmission bit
  *  by bit from highest- to lowest-order term without requiring any bit
  *  shuffling on our part.  Reception works similarly.
  *
diff --git a/lib/langinfo.c b/lib/langinfo.c
index deeab9b11..2aa0a3bbd 100644
--- a/lib/langinfo.c
+++ b/lib/langinfo.c
@@ -1,6 +1,6 @@
 /*
  * This is callback solution for systems without nl_langinfo(), this function
- * returns hardcoded and on locale setting independed value.
+ * returns hardcoded and on locale setting indepndent value.
  *
  * See langinfo.h man page for more details.
  *
diff --git a/lib/loopdev.c b/lib/loopdev.c
index 26c183e8d..73bbf8ba4 100644
--- a/lib/loopdev.c
+++ b/lib/loopdev.c
@@ -857,7 +857,7 @@ int loopcxt_get_backing_inode(struct loopdev_cxt *lc, ino_t *ino)
  *
  * Notes:
  *   - kernels < 3.2 support partitioned loop devices and PT scanning
- *     only if max_part= module paremeter is non-zero
+ *     only if max_part= module parameter is non-zero
  *
  *   - kernels >= 3.2 always support partitioned loop devices
  *
@@ -889,7 +889,7 @@ int loopmod_supports_partscan(void)
  * @lc: context
  *
  * Returns: 1 if the partscan flags is set *or* (for old kernels) partitions
- * scannig is enabled for all loop devices.
+ * scanning is enabled for all loop devices.
  */
 int loopcxt_is_partscan(struct loopdev_cxt *lc)
 {
@@ -1168,7 +1168,7 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd)
 
 	if (expected_size != size) {
 		DBG(CXT, ul_debugobj(lc, "warning: loopdev and expected "
-				      "size dismatch (%ju/%ju)",
+				      "size mismatch (%ju/%ju)",
 				      size, expected_size));
 
 		if (loopcxt_set_capacity(lc)) {
diff --git a/lib/plymouth-ctrl.c b/lib/plymouth-ctrl.c
index 2a1b2ce3e..6cda7c80f 100644
--- a/lib/plymouth-ctrl.c
+++ b/lib/plymouth-ctrl.c
@@ -1,8 +1,8 @@
 /*
- * plymouth-ctrl.c	Simply communcations with plymouthd
+ * plymouth-ctrl.c	Simply communications with plymouthd
  *			to avoid forked sub processes and/or
- *			misssed plymouth send commands tool
- *			due a plymouthd replacment.
+ *			missed plymouth send commands tool
+ *			due a plymouthd replacement.
  *
  * Copyright (c) 2016 SUSE Linux GmbH, All rights reserved.
  * Copyright (c) 2016 Werner Fink <werner@suse.de>
diff --git a/lib/strutils.c b/lib/strutils.c
index d5bb2db13..8c47c819f 100644
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -44,7 +44,7 @@ static int do_scale_by_power (uintmax_t *x, int base, int power)
  * for example:
  *		10KB	= 10000
  *
- * The optinal 'power' variable returns number associated with used suffix
+ * The optional 'power' variable returns number associated with used suffix
  * {K,M,G,T,P,E,Z,Y}  = {1,2,3,4,5,6,7,8}.
  *
  * The function also supports decimal point, for example:
diff --git a/lib/sysfs.c b/lib/sysfs.c
index 9e973a4f7..b6501291c 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -623,7 +623,7 @@ static char *get_subsystem(char *chain, char *buf, size_t bufsz)
 }
 
 /*
- * Returns complete path to the device, the patch contains all all sybsystems
+ * Returns complete path to the device, the patch contains all all subsystems
  * used for the device.
  */
 char *sysfs_get_devchain(struct sysfs_cxt *cxt, char *buf, size_t bufsz)
@@ -741,7 +741,7 @@ static int get_dm_wholedisk(struct sysfs_cxt *cxt, char *diskname,
 }
 
 /*
- * Returns by @diskdevno whole disk device devno and (optionaly) by
+ * Returns by @diskdevno whole disk device devno and (optionally) by
  * @diskname the whole disk device name.
  */
 int sysfs_devno_to_wholedisk(dev_t dev, char *diskname,
@@ -758,7 +758,7 @@ int sysfs_devno_to_wholedisk(dev_t dev, char *diskname,
         /*
          * Extra case for partitions mapped by device-mapper.
          *
-         * All regualar partitions (added by BLKPG ioctl or kernel PT
+         * All regular partitions (added by BLKPG ioctl or kernel PT
          * parser) have the /sys/.../partition file. The partitions
          * mapped by DM don't have such file, but they have "part"
          * prefix in DM UUID.
diff --git a/libblkid/samples/mkfs.c b/libblkid/samples/mkfs.c
index 5c3ebe79e..5423f91dc 100644
--- a/libblkid/samples/mkfs.c
+++ b/libblkid/samples/mkfs.c
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
 	devname = argv[1];
 	pr = blkid_new_probe_from_filename(devname);
 	if (!pr)
-		err(EXIT_FAILURE, "%s: faild to create a new libblkid probe",
+		err(EXIT_FAILURE, "%s: failed to create a new libblkid probe",
 				devname);
 
 	/*
diff --git a/libblkid/samples/partitions.c b/libblkid/samples/partitions.c
index 318e9dbad..c5830e657 100644
--- a/libblkid/samples/partitions.c
+++ b/libblkid/samples/partitions.c
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
 	devname = argv[1];
 	pr = blkid_new_probe_from_filename(devname);
 	if (!pr)
-		err(EXIT_FAILURE, "%s: faild to create a new libblkid probe",
+		err(EXIT_FAILURE, "%s: failed to create a new libblkid probe",
 				devname);
 	/* Binary interface */
 	ls = blkid_probe_get_partitions(pr);
diff --git a/libblkid/samples/superblocks.c b/libblkid/samples/superblocks.c
index 20e39c97e..7d9555771 100644
--- a/libblkid/samples/superblocks.c
+++ b/libblkid/samples/superblocks.c
@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
 	devname = argv[1];
 	pr = blkid_new_probe_from_filename(devname);
 	if (!pr)
-		err(EXIT_FAILURE, "%s: faild to create a new libblkid probe",
+		err(EXIT_FAILURE, "%s: failed to create a new libblkid probe",
 				devname);
 
 	/* enable topology probing */
diff --git a/libblkid/samples/topology.c b/libblkid/samples/topology.c
index de1c3a5e3..4112ba36e 100644
--- a/libblkid/samples/topology.c
+++ b/libblkid/samples/topology.c
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
 	devname = argv[1];
 	pr = blkid_new_probe_from_filename(devname);
 	if (!pr)
-		err(EXIT_FAILURE, "%s: faild to create a new libblkid probe",
+		err(EXIT_FAILURE, "%s: failed to create a new libblkid probe",
 				devname);
 	/*
 	 * Binary interface
diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h
index 68204233d..289bb07aa 100644
--- a/libblkid/src/blkidP.h
+++ b/libblkid/src/blkidP.h
@@ -42,7 +42,7 @@ struct blkid_struct_dev
 	struct list_head	bid_devs;	/* All devices in the cache */
 	struct list_head	bid_tags;	/* All tags for this device */
 	blkid_cache		bid_cache;	/* Dev belongs to this cache */
-	char			*bid_name;	/* Device real pathn (as used in cache) */
+	char			*bid_name;	/* Device real path (as used in cache) */
 	char			*bid_xname;	/* Device path as used by application (maybe symlink..) */
 	char			*bid_type;	/* Preferred device TYPE */
 	int			bid_pri;	/* Device priority */
@@ -187,7 +187,7 @@ struct blkid_struct_probe
 	unsigned int		blkssz;		/* sector size (BLKSSZGET ioctl) */
 	mode_t			mode;		/* struct stat.sb_mode */
 
-	int			flags;		/* private libray flags */
+	int			flags;		/* private library flags */
 	int			prob_flags;	/* always zeroized by blkid_do_*() */
 
 	uint64_t		wipe_off;	/* begin of the wiped area */
@@ -405,7 +405,7 @@ extern int blkid_probe_get_idmag(blkid_probe pr, const struct blkid_idinfo *id,
 			uint64_t *offset, const struct blkid_idmag **res)
 			__attribute__((nonnull(1)));
 
-/* returns superblok according to 'struct blkid_idmag' */
+/* returns superblock according to 'struct blkid_idmag' */
 #define blkid_probe_get_sb(_pr, _mag, type) \
 			((type *) blkid_probe_get_buffer((_pr),\
 					(_mag)->kboff << 10, sizeof(type)))
diff --git a/libblkid/src/cache.c b/libblkid/src/cache.c
index fd0257cd7..c199b919e 100644
--- a/libblkid/src/cache.c
+++ b/libblkid/src/cache.c
@@ -86,7 +86,7 @@ char *blkid_get_cache_filename(struct blkid_config *conf)
  * @cache: pointer to return cache handler
  * @filename: path to the cache file or NULL for the default path
  *
- * Allocates and initialize librray cache handler.
+ * Allocates and initialize library cache handler.
  *
  * Returns: 0 on success or number less than zero in case of error.
  */
diff --git a/libblkid/src/dev.c b/libblkid/src/dev.c
index b5ad0f115..fddc7354c 100644
--- a/libblkid/src/dev.c
+++ b/libblkid/src/dev.c
@@ -107,10 +107,10 @@ void blkid_debug_dump_dev(blkid_dev dev)
  *
  * These routines do not expose the list.h implementation, which are a
  * contamination of the namespace, and which force us to reveal far, far
- * too much of our internal implemenation.  I'm not convinced I want
+ * too much of our internal implementation.  I'm not convinced I want
  * to keep list.h in the long term, anyway.  It's fine for kernel
  * programming, but performance is not the #1 priority for this
- * library, and I really don't like the tradeoff of type-safety for
+ * library, and I really don't like the trade-off of type-safety for
  * performance for this application.  [tytso:20030125.2007EST]
  */
 
diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c
index 2e5f4f151..2dd6067af 100644
--- a/libblkid/src/devname.c
+++ b/libblkid/src/devname.c
@@ -67,7 +67,7 @@ blkid_dev blkid_get_dev(blkid_cache cache, const char *devname, int flags)
 	/* try canonicalize the name */
 	if (!dev && (cn = canonicalize_path(devname))) {
 		if (strcmp(cn, devname) != 0) {
-			DBG(DEVNAME, ul_debug("search cannonical %s", cn));
+			DBG(DEVNAME, ul_debug("search canonical %s", cn));
 			list_for_each(p, &cache->bic_devs) {
 				tmp = list_entry(p, struct blkid_struct_dev, bid_devs);
 				if (strcmp(tmp->bid_name, cn))
diff --git a/libblkid/src/evaluate.c b/libblkid/src/evaluate.c
index ffbe097e4..9568451e7 100644
--- a/libblkid/src/evaluate.c
+++ b/libblkid/src/evaluate.c
@@ -128,7 +128,7 @@ int blkid_send_uevent(const char *devname, const char *action)
 			DBG(EVALUATE, ul_debug("write failed: %s", uevent));
 	}
 	DBG(EVALUATE, ul_debug("%s: send uevent %s",
-			uevent, rc == 0 ? "SUCCES" : "FAILED"));
+			uevent, rc == 0 ? "SUCCESS" : "FAILED"));
 	return rc;
 }
 
diff --git a/libblkid/src/init.c b/libblkid/src/init.c
index cb0d4eb02..a73b7fd07 100644
--- a/libblkid/src/init.c
+++ b/libblkid/src/init.c
@@ -8,7 +8,7 @@
 /**
  * SECTION: init
  * @title: Library initialization
- * @short_description: initialize debuging
+ * @short_description: initialize debugging
  */
 
 #include <stdarg.h>
@@ -23,7 +23,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libblkid) =
 	{ "config", BLKID_DEBUG_CONFIG, "config file utils" },
 	{ "dev", BLKID_DEBUG_DEV,       "device utils" },
 	{ "devname", BLKID_DEBUG_DEVNAME, "/proc/partitions evaluation" },
-	{ "devno", BLKID_DEBUG_DEVNO,	"convertions to device name" },
+	{ "devno", BLKID_DEBUG_DEVNO,	"conversions to device name" },
 	{ "evaluate", BLKID_DEBUG_EVALUATE, "tags resolving" },
 	{ "help", BLKID_DEBUG_HELP,	"this help" },
 	{ "lowprobe", BLKID_DEBUG_LOWPROBE, "superblock/raids/partitions probing" },
@@ -37,7 +37,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libblkid) =
 
 /**
  * blkid_init_debug:
- * @mask: debug mask (0xffff to enable full debuging)
+ * @mask: debug mask (0xffff to enable full debugging)
  *
  * If the @mask is not specified then this function reads
  * LIBBLKID_DEBUG environment variable to get the mask.
diff --git a/libblkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c
index 44e49dc3d..9bba32f3b 100644
--- a/libblkid/src/partitions/dos.c
+++ b/libblkid/src/partitions/dos.c
@@ -191,11 +191,11 @@ static int probe_dos_pt(blkid_probe pr,
 		snprintf(idstr, sizeof(idstr), "%08x", id);
 
 	/*
-	 * Well, all checks pass, it's MS-DOS partiton table
+	 * Well, all checks pass, it's MS-DOS partition table
 	 */
 	if (blkid_partitions_need_typeonly(pr)) {
 		/* Non-binary interface -- caller does not ask for details
-		 * about partitions, just set generic varibles only. */
+		 * about partitions, just set generic variables only. */
 		if (id)
 			blkid_partitions_strcpy_ptuuid(pr, idstr);
 		return 0;
diff --git a/libblkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c
index 01b739f52..dcc04e617 100644
--- a/libblkid/src/partitions/gpt.c
+++ b/libblkid/src/partitions/gpt.c
@@ -55,7 +55,7 @@ struct gpt_header {
 
 	uint64_t	my_lba;			/* location of this header copy */
 	uint64_t	alternate_lba;		/* location of the other header copy */
-	uint64_t	first_usable_lba;	/* lirst usable LBA for partitions */
+	uint64_t	first_usable_lba;	/* first usable LBA for partitions */
 	uint64_t	last_usable_lba;	/* last usable LBA for partitions */
 
 	efi_guid_t	disk_guid;		/* disk UUID */
@@ -155,7 +155,7 @@ static int last_lba(blkid_probe pr, uint64_t *lba)
  * (due DOS PT limitations).
  *
  * Note that the PMBR detection is optional (enabled by default) and could be
- * disabled by BLKID_PARTS_FOPCE_GPT flag (see also blkid_paertitions_set_flags()).
+ * disabled by BLKID_PARTS_FOPCE_GPT flag (see also blkid_partitions_set_flags()).
  */
 static int is_pmbr_valid(blkid_probe pr, int *has)
 {
@@ -343,7 +343,7 @@ static int probe_gpt_pt(blkid_probe pr,
 
 	if (blkid_partitions_need_typeonly(pr)) {
 		/* Non-binary interface -- caller does not ask for details
-		 * about partitions, just set generic varibles only. */
+		 * about partitions, just set generic variables only. */
 		blkid_partitions_set_ptuuid(pr, (unsigned char *) &guid);
 		return BLKID_PROBE_OK;
 	}
@@ -423,7 +423,7 @@ const struct blkid_idinfo gpt_pt_idinfo =
 
 	/*
 	 * It would be possible to check for DOS signature (0xAA55), but
-	 * unfortunately almost all EFI GPT implemenations allow to optionaly
+	 * unfortunately almost all EFI GPT implementations allow to optionally
 	 * skip the legacy MBR. We follows this behavior and MBR is optional.
 	 * See is_valid_pmbr().
 	 *
diff --git a/libblkid/src/partitions/mac.c b/libblkid/src/partitions/mac.c
index bbc2fb3c2..4713d6042 100644
--- a/libblkid/src/partitions/mac.c
+++ b/libblkid/src/partitions/mac.c
@@ -139,7 +139,7 @@ static int probe_mac_pt(blkid_probe pr,
 
 		if (be32_to_cpu(p->map_count) != nblks) {
 			DBG(LOWPROBE, ul_debug(
-				"mac: inconsisten map_count in partition map, "
+				"mac: inconsistent map_count in partition map, "
 				"entry[0]: %d, entry[%d]: %d",
 				nblks, i - 1,
 				be32_to_cpu(p->map_count)));
diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
index bc67e80e8..10d6e9182 100644
--- a/libblkid/src/partitions/partitions.c
+++ b/libblkid/src/partitions/partitions.c
@@ -66,7 +66,7 @@
  *
  * pr = blkid_new_probe_from_filename(devname);
  * if (!pr)
- *	err("%s: faild to open device", devname);
+ *	err("%s: failed to open device", devname);
  *
  * blkid_probe_enable_partitions(pr, TRUE);
  * blkid_do_fullprobe(pr);
@@ -90,7 +90,7 @@
  *
  * pr = blkid_new_probe_from_filename(devname);
  * if (!pr)
- *	err("%s: faild to open device", devname);
+ *	err("%s: failed to open device", devname);
  *
  * ls = blkid_probe_get_partitions(pr);
  * nparts = blkid_partlist_numof_partitions(ls);
@@ -183,7 +183,7 @@ struct blkid_struct_partition {
 
 	int		partno;		/* partition number */
 	char		uuid[37];	/* UUID (when supported by PT), e.g GPT */
-	unsigned char	name[128];	/* Partition in UTF8 name (when supporte by PT), e.g. Mac */
+	unsigned char	name[128];	/* Partition in UTF8 name (when supported by PT), e.g. Mac */
 
 	blkid_parttable	tab;		/* partition table */
 };
@@ -429,7 +429,7 @@ static blkid_partition new_partition(blkid_partlist ls, blkid_parttable tab)
 
 	if (ls->nparts + 1 > ls->nparts_max) {
 		/* Linux kernel has DISK_MAX_PARTS=256, but it's too much for
-		 * generic Linux machine -- let start with 32 partititions.
+		 * generic Linux machine -- let start with 32 partitions.
 		 */
 		void *tmp = realloc(ls->parts, (ls->nparts_max + 32) *
 					sizeof(struct blkid_struct_partition));
@@ -871,7 +871,7 @@ done:
 
 /**
  * blkid_known_pttype:
- * @pttype: partiton name
+ * @pttype: partition name
  *
  * Returns: 1 for known or 0 for unknown partition type.
  */
@@ -990,7 +990,7 @@ blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno
 	if (!ls)
 		return NULL;
 
-	DBG(LOWPROBE, ul_debug("triyng to convert devno 0x%llx to partition",
+	DBG(LOWPROBE, ul_debug("trying to convert devno 0x%llx to partition",
 			(long long) devno));
 
 	if (sysfs_init(&sysfs, devno, NULL)) {
@@ -1031,7 +1031,7 @@ blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno
 		/*
 		 * Partition mapped by kpartx does not provide "start" offset
 		 * in /sys, but if we know partno and size of the partition
-		 * that we can probably make the releation bettween the device
+		 * that we can probably make the relation between the device
 		 * and an entry in partition table.
 		 */
 		 for (i = 0; i < ls->nparts; i++) {
@@ -1163,7 +1163,7 @@ const char *blkid_parttable_get_type(blkid_parttable tab)
  * blkid_parttable_get_parent:
  * @tab: partition table
  *
- * Returns: parent for nexted partitition tables or NULL.
+ * Returns: parent for nested partition tables or NULL.
  */
 blkid_partition blkid_parttable_get_parent(blkid_parttable tab)
 {
@@ -1176,7 +1176,7 @@ blkid_partition blkid_parttable_get_parent(blkid_parttable tab)
  *
  * Note the position is relative to begin of the device as defined by
  * blkid_probe_set_device() for primary partition table, and relative
- * to parental partition for nested patition tables.
+ * to parental partition for nested partition tables.
  *
  * <informalexample>
  *   <programlisting>
@@ -1379,8 +1379,8 @@ const char *blkid_partition_get_uuid(blkid_partition par)
  * blkid_partition_get_partno:
  * @par: partition
  *
- * Returns: proposed partitin number (e.g. 'N' from sda'N') or -1 in case of
- * error. Note that the number is generate by library independenly on your OS.
+ * Returns: proposed partition number (e.g. 'N' from sda'N') or -1 in case of
+ * error. Note that the number is generate by library independently on your OS.
  */
 int blkid_partition_get_partno(blkid_partition par)
 {
@@ -1393,14 +1393,14 @@ int blkid_partition_get_partno(blkid_partition par)
  *
  * Be careful if you _not_ probe whole disk:
  *
- * 1) the offset is usully relative to begin of the disk -- but if you probe a
+ * 1) the offset is usually relative to begin of the disk -- but if you probe a
  *    fragment of the disk only -- then the offset could be still relative to
  *    the begin of the disk rather that relative to the fragment.
  *
- * 2) the offset for nested partitions could be releative to parent (e.g. Solaris)
+ * 2) the offset for nested partitions could be relative to parent (e.g. Solaris)
  *    _or_ relative to the begin of the whole disk (e.g. bsd).
  *
- * You don't have to care about such details if you proble whole disk. In such
+ * You don't have to care about such details if you probe whole disk. In such
  * a case libblkid always returns the offset relative to the begin of the disk.
  *
  * Returns: start of the partition (in 512-sectors).
@@ -1418,7 +1418,7 @@ blkid_loff_t blkid_partition_get_start(blkid_partition par)
  *          library always returns full size of the partition. If you want add
  *          the partition to the Linux system (BLKPG_ADD_PARTITION ioctl) you
  *          need to reduce the size of the partition to 1 or 2 blocks. The
- *          rest of the partition has to be unaccessible for mkfs or mkswap
+ *          rest of the partition has to be inaccessible for mkfs or mkswap
  *          programs, we need a small space for boot loaders only.
  *
  *          For some unknown reason this (safe) practice is not to used for
diff --git a/libblkid/src/partitions/solaris_x86.c b/libblkid/src/partitions/solaris_x86.c
index 4ac9be5fe..1eb27a97e 100644
--- a/libblkid/src/partitions/solaris_x86.c
+++ b/libblkid/src/partitions/solaris_x86.c
@@ -19,7 +19,7 @@
  * offset (start) of the slice is always relatively to the primary dos
  * partition.
  *
- * Note that Solaris-SPARC uses entire disk with a different partitionning
+ * Note that Solaris-SPARC uses entire disk with a different partitioning
  * scheme.
  */
 
@@ -61,7 +61,7 @@ static int probe_solaris_pt(blkid_probe pr,
 		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	struct solaris_vtoc *l;	/* disk label */
-	struct solaris_slice *p;	/* partitsion */
+	struct solaris_slice *p;	/* partition */
 	blkid_parttable tab = NULL;
 	blkid_partition parent;
 	blkid_partlist ls;
diff --git a/libblkid/src/partitions/sun.c b/libblkid/src/partitions/sun.c
index 5c202f76e..c0dddc862 100644
--- a/libblkid/src/partitions/sun.c
+++ b/libblkid/src/partitions/sun.c
@@ -69,7 +69,7 @@ static int probe_sun_pt(blkid_probe pr,
 
 	/*
 	 * So that old Linux-Sun partitions continue to work,
-	 * alow the VTOC to be used under the additional condition ...
+	 * allow the VTOC to be used under the additional condition ...
 	 */
 	use_vtoc = use_vtoc || !(l->vtoc.sanity || l->vtoc.version || l->vtoc.nparts);
 
diff --git a/libblkid/src/partitions/unixware.c b/libblkid/src/partitions/unixware.c
index 6742bcf36..845924e48 100644
--- a/libblkid/src/partitions/unixware.c
+++ b/libblkid/src/partitions/unixware.c
@@ -7,7 +7,7 @@
  * GNU Lesser General Public License.
  *
  *
- * The intersting information about unixware PT:
+ * The interesting information about unixware PT:
  *   - Linux kernel / partx
  *   - vtoc(7) SCO UNIX command man page
  *   - evms source code (http://evms.sourceforge.net/)
diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 5d9f701f7..72a27f410 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -165,7 +165,7 @@ blkid_probe blkid_new_probe(void)
  * Clone @parent, the new clone shares all, but except:
  *
  *	- probing result
- *	- bufferes if another device (or offset) is set to the prober
+ *	- buffers if another device (or offset) is set to the prober
  */
 blkid_probe blkid_clone_probe(blkid_probe parent)
 {
@@ -292,7 +292,7 @@ void blkid_probe_chain_reset_values(blkid_probe pr, struct blkid_chain *chn)
 	if (!pr || list_empty(&pr->values))
 		return;
 
-	DBG(LOWPROBE, ul_debug("reseting %s values", chn->driver->name));
+	DBG(LOWPROBE, ul_debug("Resetting %s values", chn->driver->name));
 
 	list_for_each_safe(p, pnext, &pr->values) {
 		struct blkid_prval *v = list_entry(p,
@@ -667,7 +667,7 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, uint64_t off, uint64_t len
 				pr->off + off - pr->parent->off, len);
 	}
 
-	/* try buffers we already have in memmory */
+	/* try buffers we already have in memory */
 	list_for_each(p, &pr->buffers) {
 		struct blkid_bufinfo *x =
 				list_entry(p, struct blkid_bufinfo, bufs);
@@ -703,7 +703,7 @@ static void blkid_probe_reset_buffer(blkid_probe pr)
 	if (!pr || list_empty(&pr->buffers))
 		return;
 
-	DBG(BUFFER, ul_debug("reseting probing buffers pr=%p", pr));
+	DBG(BUFFER, ul_debug("Resetting probing buffers pr=%p", pr));
 
 	while (!list_empty(&pr->buffers)) {
 		struct blkid_bufinfo *bf = list_entry(pr->buffers.next,
@@ -1112,7 +1112,7 @@ int blkid_do_probe(blkid_probe pr)
  *
  * This function erases the current signature detected by @pr. The @pr has to
  * be open in O_RDWR mode, BLKID_SUBLKS_MAGIC or/and BLKID_PARTS_MAGIC flags
- * has to be enabled (if you want to errase also superblock with broken check
+ * has to be enabled (if you want to erase also superblock with broken check
  * sums then use BLKID_SUBLKS_BADCSUM too).
  *
  * After successful signature removing the @pr prober will be moved one step
@@ -1238,7 +1238,7 @@ int blkid_do_wipe(blkid_probe pr, int dryrun)
  *			continue;
  *
  *		// convert ostr to the real offset by off = strtoll(ostr, NULL, 10);
- *              // use your stuff to errase @len bytes at the @off
+ *              // use your stuff to erase @len bytes at the @off
  *              ....
  *
  *		// retry the last probing to check for backup superblocks ..etc.
@@ -1296,13 +1296,13 @@ int blkid_probe_step_back(blkid_probe pr)
  *
  * This is string-based NAME=value interface only.
  *
- * Note about suberblocks chain -- the function does not check for filesystems
+ * Note about superblocks chain -- the function does not check for filesystems
  * when a RAID signature is detected.  The function also does not check for
  * collision between RAIDs. The first detected RAID is returned. The function
  * checks for collision between partition table and RAID signature -- it's
  * recommended to enable partitions chain together with superblocks chain.
  *
- * Returns: 0 on success, 1 if nothing is detected, -2 if ambivalen result is
+ * Returns: 0 on success, 1 if nothing is detected, -2 if ambivalent result is
  * detected and -1 on case of error.
  */
 int blkid_do_safeprobe(blkid_probe pr)
@@ -1988,7 +1988,7 @@ int blkid_probe_is_wiped(blkid_probe pr, struct blkid_chain **chn, uint64_t off,
 
 /*
  *  Try to use any area -- if the area has been previously wiped then the
- *  previous probing result should be ignored (reseted).
+ *  previous probing result should be ignored (reset).
  */
 void blkid_probe_use_wiper(blkid_probe pr, uint64_t off, uint64_t size)
 {
diff --git a/libblkid/src/superblocks/gfs.c b/libblkid/src/superblocks/gfs.c
index 1b265581d..ea6036cb7 100644
--- a/libblkid/src/superblocks/gfs.c
+++ b/libblkid/src/superblocks/gfs.c
@@ -54,7 +54,7 @@ struct gfs2_sb {
 	char sb_locktable[GFS_LOCKNAME_LEN];
 
 	struct gfs2_inum __pad3; /* Was quota inode in gfs1 */
-	struct gfs2_inum __pad4; /* Was licence inode in gfs1 */
+	struct gfs2_inum __pad4; /* Was license inode in gfs1 */
 	uint8_t sb_uuid[16]; /* The UUID maybe 0 for backwards compat */
 } __attribute__((packed));
 
diff --git a/libblkid/src/superblocks/highpoint_raid.c b/libblkid/src/superblocks/highpoint_raid.c
index ad3b538cd..24879302c 100644
--- a/libblkid/src/superblocks/highpoint_raid.c
+++ b/libblkid/src/superblocks/highpoint_raid.c
@@ -72,7 +72,7 @@ const struct blkid_idinfo highpoint37x_idinfo = {
 	.probefunc	= probe_highpoint37x,
 	.magics		= {
 		/*
-		 * Superblok offset:                      4608 bytes  (9 sectors)
+		 * Superblock offset:                     4608 bytes  (9 sectors)
 		 * Magic string offset within superblock:   32 bytes
 		 *
 		 * kboff = (4608 + 32) / 1024
diff --git a/libblkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c
index 8991c6b9f..4d56a3803 100644
--- a/libblkid/src/superblocks/iso9660.c
+++ b/libblkid/src/superblocks/iso9660.c
@@ -221,7 +221,7 @@ int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
 			continue;
 		}
 
-		/* Not a Boot record, lets see if its supplemntary volume descriptor */
+		/* Not a Boot record, lets see if its supplementary volume descriptor */
 		iso = (struct iso_volume_descriptor *) boot;
 
 		if (iso->vd_type != ISO_VD_SUPPLEMENTARY) {
@@ -236,8 +236,8 @@ int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
 			blkid_probe_set_version(pr, "Joliet Extension");
 
 			/* Is the Joliet (UTF16BE) label equal to the label in
-			 * the PVD? If yes, use PVD label.  The Jolied version
-			 * of the label could be trimed (because UTF16..).
+			 * the PVD? If yes, use PVD label.  The Joliet version
+			 * of the label could be trimmed (because UTF16..).
 			 */
 			if (ascii_eq_utf16be(label, iso->volume_id, 32))
 				break;
diff --git a/libblkid/src/superblocks/linux_raid.c b/libblkid/src/superblocks/linux_raid.c
index e6b496a35..4388e5650 100644
--- a/libblkid/src/superblocks/linux_raid.c
+++ b/libblkid/src/superblocks/linux_raid.c
@@ -79,7 +79,7 @@ struct mdp1_super_block {
 	uint8_t		pad2[64-57];	/* set to 0 when writing */
 
 	/* array state information - 64 bytes */
-	uint64_t	utime;		/* 40 bits second, 24 btes microseconds */
+	uint64_t	utime;		/* 40 bits second, 24 bits microseconds */
 	uint64_t	events;		/* incremented when superblock updated */
 	uint64_t	resync_offset;	/* data before this offset (from data_offset) known to be in sync */
 	uint32_t	sb_csum;	/* checksum up to dev_roles[max_dev] */
diff --git a/libblkid/src/superblocks/lvm.c b/libblkid/src/superblocks/lvm.c
index 3c6df743d..b94d7b5d8 100644
--- a/libblkid/src/superblocks/lvm.c
+++ b/libblkid/src/superblocks/lvm.c
@@ -113,7 +113,7 @@ static int probe_lvm2(blkid_probe pr, const struct blkid_idmag *mag)
 	blkid_probe_set_version(pr, mag->magic);
 
 	/* LVM (pvcreate) wipes begin of the device -- let's remember this
-	 * to resolve conflicts bettween LVM and partition tables, ...
+	 * to resolve conflicts between LVM and partition tables, ...
 	 */
 	blkid_probe_set_wiper(pr, 0, 8 * 1024);
 
diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index 987a647d5..4aeebf32e 100644
--- a/libblkid/src/superblocks/superblocks.c
+++ b/libblkid/src/superblocks/superblocks.c
@@ -65,7 +65,7 @@
  *
  * @SBMAGIC_OFFSET: offset of SBMAGIC
  *
- * @FSSIZE: size of filessystem [not-implemented yet]
+ * @FSSIZE: size of filesystem [not-implemented yet]
  *
  * @SYSTEM_ID: ISO9660 system identifier
  *
@@ -294,7 +294,7 @@ int blkid_probe_filter_superblocks_usage(blkid_probe pr, int flag, int usage)
  * blkid_known_fstype:
  * @fstype: filesystem name
  *
- * Returns: 1 for known filesytems, or 0 for unknown filesystem.
+ * Returns: 1 for known filesystems, or 0 for unknown filesystem.
  */
 int blkid_known_fstype(const char *fstype)
 {
@@ -410,7 +410,7 @@ static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn)
 			}
 		}
 
-		/* all cheks passed */
+		/* all checks passed */
 		if (chn->flags & BLKID_SUBLKS_TYPE)
 			rc = blkid_probe_set_value(pr, "TYPE",
 				(unsigned char *) id->name,
@@ -440,7 +440,7 @@ static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn)
 
 /*
  * This is the same function as blkid_do_probe(), but returns only one result
- * (cannot be used in while()) and checks for ambivalen results (more
+ * (cannot be used in while()) and checks for ambivalent results (more
  * filesystems on the device) -- in such case returns -2.
  *
  * The function does not check for filesystems when a RAID or crypto signature
@@ -509,7 +509,7 @@ static int superblocks_safeprobe(blkid_probe pr, struct blkid_chain *chn)
 
 	/*
 	 * The RAID device could be partitioned. The problem are RAID1 devices
-	 * where the partition table is visible from underlaying devices. We
+	 * where the partition table is visible from underlying devices. We
 	 * have to ignore such partition tables.
 	 */
 	if (chn->idx >= 0 && idinfos[chn->idx]->usage & BLKID_USAGE_RAID)
@@ -713,7 +713,7 @@ int blkid_probe_sprintf_uuid(blkid_probe pr, unsigned char *uuid,
 	return rc;
 }
 
-/* function to set UUIDs that are in suberblocks stored as strings */
+/* function to set UUIDs that are in superblocks stored as strings */
 int blkid_probe_strncpy_uuid(blkid_probe pr, unsigned char *str, size_t len)
 {
 	struct blkid_chain *chn = blkid_probe_get_chain(pr);
diff --git a/libblkid/src/superblocks/sysv.c b/libblkid/src/superblocks/sysv.c
index 4b345910e..421660e55 100644
--- a/libblkid/src/superblocks/sysv.c
+++ b/libblkid/src/superblocks/sysv.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
  *
- * This is written from sratch according to Linux kernel fs/sysv/super.c file.
+ * This is written from scratch according to Linux kernel fs/sysv/super.c file.
  * It seems that sysv probing code in libvolume_id and also in the original
  * blkid is useless.
  *
diff --git a/libblkid/src/tag.c b/libblkid/src/tag.c
index 40cac0166..2c0aa9b64 100644
--- a/libblkid/src/tag.c
+++ b/libblkid/src/tag.c
@@ -107,7 +107,7 @@ static blkid_tag blkid_find_head_cache(blkid_cache cache, const char *type)
 /*
  * Set a tag on an existing device.
  *
- * If value is NULL, then delete the tagsfrom the device.
+ * If value is NULL, then delete the tags from the device.
  */
 int blkid_set_tag(blkid_dev dev, const char *name,
 		  const char *value, const int vlength)
@@ -252,10 +252,10 @@ errout:
  *
  * These routines do not expose the list.h implementation, which are a
  * contamination of the namespace, and which force us to reveal far, far
- * too much of our internal implemenation.  I'm not convinced I want
+ * too much of our internal implementation.  I'm not convinced I want
  * to keep list.h in the long term, anyway.  It's fine for kernel
  * programming, but performance is not the #1 priority for this
- * library, and I really don't like the tradeoff of type-safety for
+ * library, and I really don't like the trade-off of type-safety for
  * performance for this application.  [tytso:20030125.2007EST]
  */
 
diff --git a/libblkid/src/topology/evms.c b/libblkid/src/topology/evms.c
index 7a4fd554d..eed41d8b4 100644
--- a/libblkid/src/topology/evms.c
+++ b/libblkid/src/topology/evms.c
@@ -1,6 +1,6 @@
 /*
  * Evms topology
- * -- this is fallback for old systems where the toplogy information is not
+ * -- this is fallback for old systems where the topology information is not
  *    exported by sysfs
  *
  * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
diff --git a/libblkid/src/topology/sysfs.c b/libblkid/src/topology/sysfs.c
index a04b20a37..710e4b676 100644
--- a/libblkid/src/topology/sysfs.c
+++ b/libblkid/src/topology/sysfs.c
@@ -28,7 +28,7 @@ static struct topology_val {
 	/* /sys/dev/block/<maj>:<min>/<ATTR> */
 	const char *attr;
 
-	/* functions to set probing resut */
+	/* functions to set probing result */
 	int (*set_ulong)(blkid_probe, unsigned long);
 	int (*set_int)(blkid_probe, int);
 
@@ -63,7 +63,7 @@ static int probe_sysfs_tp(blkid_probe pr,
 		if (!ok) {
 			if (!disk) {
 				/*
-				 * Read atrributes from "disk" if the current
+				 * Read attributes from "disk" if the current
 				 * device is a partition.
 				 */
 				disk = blkid_probe_get_wholedisk_devno(pr);
diff --git a/libblkid/src/topology/topology.c b/libblkid/src/topology/topology.c
index f434aebc6..105f386c9 100644
--- a/libblkid/src/topology/topology.c
+++ b/libblkid/src/topology/topology.c
@@ -128,10 +128,10 @@ int blkid_probe_enable_topology(blkid_probe pr, int enable)
  *
  * WARNING: the returned object will be overwritten by the next
  *          blkid_probe_get_topology() call for the same @pr. If you want to
- *          use more blkid_topopogy objects in the same time you have to create
+ *          use more blkid_topology objects in the same time you have to create
  *          more blkid_probe handlers (see blkid_new_probe()).
  *
- * Returns: blkid_topopogy, or NULL in case of error.
+ * Returns: blkid_topology, or NULL in case of error.
  */
 blkid_topology blkid_probe_get_topology(blkid_probe pr)
 {
diff --git a/libblkid/src/version.c b/libblkid/src/version.c
index 7f7763179..ed92db960 100644
--- a/libblkid/src/version.c
+++ b/libblkid/src/version.c
@@ -45,7 +45,7 @@ int blkid_parse_version_string(const char *ver_string)
 
 /**
  * blkid_get_library_version:
- * @ver_string: returns relese version (!= SONAME version)
+ * @ver_string: returns release version (!= SONAME version)
  * @date_string: returns date
  *
  * Returns: release version code.
diff --git a/libfdisk/src/alignment.c b/libfdisk/src/alignment.c
index aa082e189..58acefb89 100644
--- a/libfdisk/src/alignment.c
+++ b/libfdisk/src/alignment.c
@@ -215,7 +215,7 @@ static void recount_geometry(struct fdisk_context *cxt)
  *
  * The difference between fdisk_override_geometry() and fdisk_save_user_geometry()
  * is that saved user geometry is persistent setting and it's applied always
- * when device is assigned to the context or device properties are reseted.
+ * when device is assigned to the context or device properties are reset.
  *
  * Returns: 0 on success, < 0 on error.
  */
@@ -287,7 +287,7 @@ int fdisk_save_user_geometry(struct fdisk_context *cxt,
  * fdisk_save_user_sector_size:
  * @cxt: context
  * @phy: physical sector size
- * @log: logicla sector size
+ * @log: logical sector size
  *
  * Save user defined sector sizes to use it for partitioning.
  *
@@ -331,7 +331,7 @@ int fdisk_apply_user_device_properties(struct fdisk_context *cxt)
 	if (!cxt)
 		return -EINVAL;
 
-	DBG(CXT, ul_debugobj(cxt, "appling user device properties"));
+	DBG(CXT, ul_debugobj(cxt, "applying user device properties"));
 
 	if (cxt->user_pyh_sector)
 		cxt->phy_sector_size = cxt->user_pyh_sector;
@@ -403,7 +403,7 @@ int fdisk_reset_device_properties(struct fdisk_context *cxt)
 	if (!cxt)
 		return -EINVAL;
 
-	DBG(CXT, ul_debugobj(cxt, "*** reseting device properties"));
+	DBG(CXT, ul_debugobj(cxt, "*** resetting device properties"));
 
 	fdisk_zeroize_device_properties(cxt);
 	fdisk_discover_topology(cxt);
@@ -546,7 +546,7 @@ static fdisk_sector_t topology_get_first_lba(struct fdisk_context *cxt)
 	 *  a2) alignment offset
 	 *  a1) or physical sector (minimal_io_size, aka "grain")
 	 *
-	 * b) or default to 1MiB (2048 sectrors, Windows Vista default)
+	 * b) or default to 1MiB (2048 sectors, Windows Vista default)
 	 *
 	 * c) or for very small devices use 1 phy.sector
 	 */
@@ -608,7 +608,7 @@ int fdisk_reset_alignment(struct fdisk_context *cxt)
 	if (!cxt)
 		return -EINVAL;
 
-	DBG(CXT, ul_debugobj(cxt, "reseting alignment..."));
+	DBG(CXT, ul_debugobj(cxt, "resetting alignment..."));
 
 	/* default */
 	cxt->grain = topology_get_grain(cxt);
@@ -619,7 +619,7 @@ int fdisk_reset_alignment(struct fdisk_context *cxt)
 	if (cxt->label && cxt->label->op->reset_alignment)
 		rc = cxt->label->op->reset_alignment(cxt);
 
-	DBG(CXT, ul_debugobj(cxt, "alignment reseted to: "
+	DBG(CXT, ul_debugobj(cxt, "alignment reset to: "
 			    "first LBA=%ju, last LBA=%ju, grain=%lu [rc=%d]",
 			    (uintmax_t) cxt->first_lba, (uintmax_t) cxt->last_lba,
 			    cxt->grain,	rc));
diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c
index cbf5e9738..5a0952271 100644
--- a/libfdisk/src/ask.c
+++ b/libfdisk/src/ask.c
@@ -62,7 +62,7 @@ void fdisk_reset_ask(struct fdisk_ask *ask)
  * fdisk_ref_ask:
  * @ask: ask instance
  *
- * Incremparts reference counter.
+ * Increments reference counter.
  */
 void fdisk_ref_ask(struct fdisk_ask *ask)
 {
@@ -75,7 +75,7 @@ void fdisk_ref_ask(struct fdisk_ask *ask)
  * fdisk_unref_ask:
  * @ask: ask instance
  *
- * De-incremparts reference counter, on zero the @ask is automatically
+ * Decrements reference counter, on zero the @ask is automatically
  * deallocated.
  */
 void fdisk_unref_ask(struct fdisk_ask *ask)
@@ -318,7 +318,7 @@ int fdisk_ask_number_is_relative(struct fdisk_ask *ask)
  *
  * Inform libfdisk that user specified number in relative notation rather than
  * by explicit number. This info allows to fdisk do some optimization (e.g.
- * align end of partiton, etc.)
+ * align end of partition, etc.)
  *
  * Returns: 0 on success, <0 on error
  */
@@ -467,7 +467,7 @@ int fdisk_ask_partnum(struct fdisk_context *cxt, size_t *partnum, int wantnew)
 
 	if (!rc && !wantnew && num->low == num->hig) {
 		if (num->low > 0) {
-			/* only one existing partiton, don't ask, return the number */
+			/* only one existing partition, don't ask, return the number */
 			fdisk_ask_number_set_result(ask, num->low);
 			fdisk_info(cxt, _("Selected partition %ju"), num->low);
 
@@ -627,7 +627,7 @@ int fdisk_ask_string(struct fdisk_context *cxt,
  * @query: question string
  * @result: returns 0 (no) or 1 (yes)
  *
- * Hight-level API to ask Yes/No questions
+ * High-level API to ask Yes/No questions
  *
  * Returns: 0 on success, <0 on error
  */
@@ -919,7 +919,7 @@ static int do_vprint(struct fdisk_context *cxt, int errnum, int type,
  * fdisk_info:
  * @cxt: context
  * @fmt: printf-like formatted string
- * @...: variable parametrs
+ * @...: variable parameters
  *
  * High-level API to print info messages,
  *
@@ -941,7 +941,7 @@ int fdisk_info(struct fdisk_context *cxt, const char *fmt, ...)
  * fdisk_info:
  * @cxt: context
  * @fmt: printf-like formatted string
- * @...: variable parametrs
+ * @...: variable parameters
  *
  * High-level API to print warning message (errno expected)
  *
diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
index 099a8cc13..ad0a54f6f 100644
--- a/libfdisk/src/bsd.c
+++ b/libfdisk/src/bsd.c
@@ -191,7 +191,7 @@ static int bsd_probe_label(struct fdisk_context *cxt)
 	int rc = 0;
 
 	if (cxt->parent)
-		rc = bsd_assign_dos_partition(cxt);	/* nested BSD partiotn table */
+		rc = bsd_assign_dos_partition(cxt);	/* nested BSD partition table */
 	if (!rc)
 		rc = bsd_readlabel(cxt);
 	if (!rc)
@@ -524,7 +524,7 @@ static int bsd_get_disklabel_item(struct fdisk_context *cxt, struct fdisk_labeli
 		break;
 	default:
 		if (item->id < __FDISK_NLABELITEMS)
-			rc = 1;	/* unssupported generic item */
+			rc = 1;	/* unsupported generic item */
 		else
 			rc = 2;	/* out of range */
 		break;
diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
index ab4709c4a..1c949432e 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
@@ -206,7 +206,7 @@ void fdisk_ref_context(struct fdisk_context *cxt)
  * If no @name specified then returns the current context label.
  *
  * The label is allocated and maintained within the context #cxt. There is
- * nothing like reference counting for labels, you cannot delallocate the
+ * nothing like reference counting for labels, you cannot deallocate the
  * label.
  *
  * Returns: label struct or NULL in case of error.
@@ -613,7 +613,7 @@ int fdisk_assign_device(struct fdisk_context *cxt,
 	if (fdisk_read_firstsector(cxt) < 0)
 		goto fail;
 
-	/* detect labels and apply labes specific stuff (e.g geomery)
+	/* detect labels and apply labels specific stuff (e.g geometry)
 	 * to the context */
 	fdisk_probe_labels(cxt);
 
@@ -732,7 +732,7 @@ void fdisk_unref_context(struct fdisk_context *cxt)
 /**
  * fdisk_enable_details:
  * @cxt: context
- * @enable: true/flase
+ * @enable: true/false
  *
  * Enables or disables "details" display mode. This function has effect to
  * fdisk_partition_to_string() function.
@@ -761,7 +761,7 @@ int fdisk_is_details(struct fdisk_context *cxt)
 /**
  * fdisk_enable_listonly:
  * @cxt: context
- * @enable: true/flase
+ * @enable: true/false
  *
  * Just list partition only, don't care about another details, mistakes, ...
  *
@@ -795,7 +795,7 @@ int fdisk_is_listonly(struct fdisk_context *cxt)
  * This is pure shit, unfortunately for example Sun addresses begin of the
  * partition by cylinders...
  *
- * Returns: 0 on succes, <0 on error.
+ * Returns: 0 on success, <0 on error.
  */
 int fdisk_set_unit(struct fdisk_context *cxt, const char *str)
 {
@@ -961,7 +961,7 @@ fdisk_sector_t fdisk_get_first_lba(struct fdisk_context *cxt)
  * @lba: first possible logical sector for data
  *
  * It's strongly recommended to use the default library setting. The first LBA
- * is always reseted by fdisk_assign_device(), fdisk_override_geometry()
+ * is always reset by fdisk_assign_device(), fdisk_override_geometry()
  * and fdisk_reset_alignment(). This is very low level function and library
  * does not check if your setting makes any sense.
  *
@@ -999,7 +999,7 @@ fdisk_sector_t fdisk_get_last_lba(struct fdisk_context *cxt)
  * @lba: last possible logical sector
  *
  * It's strongly recommended to use the default library setting. The last LBA
- * is always reseted by fdisk_assign_device(), fdisk_override_geometry() and
+ * is always reset by fdisk_assign_device(), fdisk_override_geometry() and
  * fdisk_reset_alignment().
  *
  * The default is number of sectors on the device, but maybe modified by the
@@ -1076,7 +1076,7 @@ const char *fdisk_get_devname(struct fdisk_context *cxt)
  * fdisk_get_devfd:
  * @cxt: context
  *
- * Retruns: device file descriptor.
+ * Returns: device file descriptor.
  */
 int fdisk_get_devfd(struct fdisk_context *cxt)
 {
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index 68cadcdd7..b2e1c6038 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -404,7 +404,7 @@ static int dos_delete_partition(struct fdisk_context *cxt, size_t partnum)
 	if (!pe)
 		return -EINVAL;
 
-	DBG(LABEL, ul_debug("DOS: delete partiton %zu (max=%zu)", partnum,
+	DBG(LABEL, ul_debug("DOS: delete partition %zu (max=%zu)", partnum,
 				cxt->label->nparts_max));
 
 	l = self_label(cxt);
@@ -743,7 +743,7 @@ static int dos_reset_alignment(struct fdisk_context *cxt)
 
 	/* overwrite necessary stuff by DOS deprecated stuff */
 	if (is_dos_compatible(cxt)) {
-		DBG(LABEL, ul_debug("DOS: reseting alignemnt for DOS-comaptiblem PT"));
+		DBG(LABEL, ul_debug("DOS: resetting alignment for DOS-compatible PT"));
 		if (cxt->geom.sectors)
 			cxt->first_lba = cxt->geom.sectors;	/* usually 63 */
 
@@ -908,7 +908,7 @@ static int get_start_from_user(	struct fdisk_context *cxt,
 {
 	assert(start);
 
-	/* try to use tepmlate from 'pa' */
+	/* try to use template from 'pa' */
 	if (pa && pa->start_follow_default)
 		*start = dflt;
 
@@ -1529,7 +1529,7 @@ static int dos_add_partition(struct fdisk_context *cxt,
 
 	/* pa specifies that extended partition is wanted */
 	} else if (pa && pa->type && IS_EXTENDED(pa->type->code)) {
-		DBG(LABEL, ul_debug("DOS: pa template %p: add extened", pa));
+		DBG(LABEL, ul_debug("DOS: pa template %p: add extended", pa));
 		if (l->ext_offset) {
 			fdisk_warnx(cxt, _("Extended partition already exists."));
 			return -EINVAL;
@@ -1703,7 +1703,7 @@ static int write_sector(struct fdisk_context *cxt, fdisk_sector_t secno,
 		return rc;
 	}
 
-	DBG(LABEL, ul_debug("DOS: writting to sector %ju", (uintmax_t) secno));
+	DBG(LABEL, ul_debug("DOS: writing to sector %ju", (uintmax_t) secno));
 
 	if (write(cxt->dev_fd, buf, cxt->sector_size) != (ssize_t) cxt->sector_size)
 		return -errno;
@@ -1734,7 +1734,7 @@ static int dos_write_disklabel(struct fdisk_context *cxt)
 		}
 	}
 	if (mbr_changed) {
-		DBG(LABEL, ul_debug("DOS: MBR changed, writting"));
+		DBG(LABEL, ul_debug("DOS: MBR changed, writing"));
 		mbr_set_magic(cxt->firstsector);
 		rc = write_sector(cxt, 0, cxt->firstsector);
 		if (rc)
@@ -1859,7 +1859,7 @@ static int dos_get_disklabel_item(struct fdisk_context *cxt, struct fdisk_labeli
 	}
 	default:
 		if (item->id < __FDISK_NLABELITEMS)
-			rc = 1;	/* unssupported generic item */
+			rc = 1;	/* unsupported generic item */
 		else
 			rc = 2;	/* out of range */
 		break;
@@ -2096,7 +2096,7 @@ again:
 			*nxt->pt_entry = tmp;
 
 			/* Recount starts according to EBR offsets, the absolute
-			 * address tas to be still the same! */
+			 * address still has to be the same! */
 			dos_partition_set_start(cur->pt_entry, nxt_start - cur->offset);
 			dos_partition_set_start(nxt->pt_entry, cur_start - nxt->offset);
 
diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h
index 82561297d..159823c45 100644
--- a/libfdisk/src/fdiskP.h
+++ b/libfdisk/src/fdiskP.h
@@ -20,7 +20,7 @@
 #include "c.h"
 #include "libfdisk.h"
 
-#include "nls.h"		/* temporary before dialog API will be implamented */
+#include "nls.h"		/* temporary before dialog API will be implemented */
 #include "list.h"
 #include "debug.h"
 #include <stdio.h>
@@ -246,7 +246,7 @@ struct fdisk_field {
 	int		flags;		/* FDISK_FIELDFL_* */
 };
 
-/* note that the defauls is to display a column always */
+/* note that the defaults is to display a column always */
 enum {
 	FDISK_FIELDFL_DETAIL	= (1 << 1),	/* only display if fdisk_is_details() */
 	FDISK_FIELDFL_EYECANDY	= (1 << 2),	/* don't display if fdisk_is_details() */
@@ -336,7 +336,7 @@ struct fdisk_ask {
 		} str;
 		/* FDISK_ASKTYPE_MENU */
 		struct ask_menu {
-			int		dfl;		/* default meni item */
+			int		dfl;		/* default menu item */
 			int		result;
 			struct ask_menuitem *first;
 		} menu;
@@ -362,7 +362,7 @@ struct fdisk_context {
 	unsigned int readonly : 1,		/* don't write to the device */
 		     display_in_cyl_units : 1,	/* for obscure labels */
 		     display_details : 1,	/* expert display mode */
-		     protect_bootbits : 1,	/* don't zeroize fll irst sector */
+		     protect_bootbits : 1,	/* don't zeroize first sector */
 		     listonly : 1;		/* list partition, nothing else */
 
 	char *collision;			/* name of already existing FS/PT */
@@ -373,7 +373,7 @@ struct fdisk_context {
 	/* alignment */
 	unsigned long grain;		/* alignment unit */
 	fdisk_sector_t first_lba;		/* recommended begin of the first partition */
-	fdisk_sector_t last_lba;		/* recomennded end of last partition */
+	fdisk_sector_t last_lba;		/* recommended end of last partition */
 
 	/* geometry */
 	fdisk_sector_t total_sectors;	/* in logical sectors */
diff --git a/libfdisk/src/field.c b/libfdisk/src/field.c
index b9c5930a7..e924cf81f 100644
--- a/libfdisk/src/field.c
+++ b/libfdisk/src/field.c
@@ -6,7 +6,7 @@
  * @title: Field
  * @short_description: description of the partition fields
  *
- * The fdisk fields are static user-freindly descriptions of the partition. The
+ * The fdisk fields are static user-friendly descriptions of the partition. The
  * fields are used to avoid label specific stuff in the functions that list disk
  * partitions (e.g. fdisk -l). The field Id is the same as Id for fdisk_partition_to_string().
  *
@@ -37,7 +37,7 @@
  * </informalexample>
  *
  * This example lists all information about the first partition. It will work
- * for MBR as well as for GPT because fields are not hardcoded in the execmple.
+ * for MBR as well as for GPT because fields are not hardcoded in the example.
  *
  * See also fdisk_label_get_field_by_name(), fdisk_label_get_fields_ids_all()
  * and fdisk_label_get_fields_ids().
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 3028a392f..6f163c070 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -674,7 +674,7 @@ static int gpt_mknew_header(struct fdisk_context *cxt,
 
 	/* According to EFI standard it's valid to count all the first
 	 * sector into header size, but some tools may have a problem
-	 * to accept it, so use the header without the zerozied area.
+	 * to accept it, so use the header without the zeroed area.
 	 * This does not have any impact to CRC, etc.   --kzak Jan-2015
 	 */
 	header->size = cpu_to_le32(sizeof(struct gpt_header)
@@ -712,7 +712,7 @@ static int gpt_mknew_header(struct fdisk_context *cxt,
 /*
  * Checks if there is a valid protective MBR partition table.
  * Returns 0 if it is invalid or failure. Otherwise, return
- * GPT_MBR_PROTECTIVE or GPT_MBR_HYBRID, depeding on the detection.
+ * GPT_MBR_PROTECTIVE or GPT_MBR_HYBRID, depending on the detection.
  */
 static int valid_pmbr(struct fdisk_context *cxt)
 {
@@ -876,7 +876,7 @@ static inline uint32_t gpt_entryarr_count_crc32(struct gpt_header *header, struc
 /*
  * Recompute header and partition array 32bit CRC checksums.
  * This function does not fail - if there's corruption, then it
- * will be reported when checksuming it again (ie: probing or verify).
+ * will be reported when checksumming it again (ie: probing or verify).
  */
 static void gpt_recompute_crc(struct gpt_header *header, struct gpt_entry *ents)
 {
@@ -1121,7 +1121,7 @@ static int gpt_get_disklabel_item(struct fdisk_context *cxt, struct fdisk_labeli
 		break;
 	default:
 		if (item->id < __FDISK_NLABELITEMS)
-			rc = 1;	/* unssupported generic item */
+			rc = 1;	/* unsupported generic item */
 		else
 			rc = 2;	/* out of range */
 		break;
@@ -1171,7 +1171,7 @@ static uint32_t check_too_big_partitions(struct gpt_header *header,
  * Check if a partition ends before it begins
  * Returns the faulting partition number, otherwise 0.
  */
-static uint32_t check_start_after_end_paritions(struct gpt_header *header,
+static uint32_t check_start_after_end_partitions(struct gpt_header *header,
 						struct gpt_entry *ents)
 {
 	uint32_t i;
@@ -1930,7 +1930,7 @@ err1:
 /*
  * Verify data integrity and report any found problems for:
  *   - primary and backup header validations
- *   - paritition validations
+ *   - partition validations
  */
 static int gpt_verify_disklabel(struct fdisk_context *cxt)
 {
@@ -2012,7 +2012,7 @@ static int gpt_verify_disklabel(struct fdisk_context *cxt)
 				ptnum);
 	}
 
-	ptnum = check_start_after_end_paritions(gpt->pheader, gpt->ents);
+	ptnum = check_start_after_end_partitions(gpt->pheader, gpt->ents);
 	if (ptnum) {
 		nerror++;
 		fdisk_warnx(cxt, _("Partition %u ends before it starts."),
diff --git a/libfdisk/src/init.c b/libfdisk/src/init.c
index 2bb25c700..438deb7e6 100644
--- a/libfdisk/src/init.c
+++ b/libfdisk/src/init.c
@@ -28,7 +28,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libfdisk) =
 
 /**
  * fdisk_init_debug:
- * @mask: debug mask (0xffff to enable full debuging)
+ * @mask: debug mask (0xffff to enable full debugging)
  *
  * If the @mask is not specified then this function reads
  * LIBFDISK_DEBUG environment variable to get the mask.
diff --git a/libfdisk/src/item.c b/libfdisk/src/item.c
index 6da00796d..bdeba2962 100644
--- a/libfdisk/src/item.c
+++ b/libfdisk/src/item.c
@@ -48,7 +48,7 @@ struct fdisk_labelitem *fdisk_new_labelitem(void)
  * fdisk_ref_labelitem:
  * @li: label item
  *
- * Incremparts reference counter.
+ * Increments reference counter.
  *
  * Since: v2.29
  */
@@ -85,7 +85,7 @@ int fdisk_reset_labelitem(struct fdisk_labelitem *li)
  * fdisk_unref_labelitem:
  * @li: label item
  *
- * De-incremparts reference counter, on zero the @li is automatically
+ * Decrements reference counter, on zero the @li is automatically
  * deallocated.
  *
  * Since: v2.29
@@ -215,7 +215,7 @@ static int test_listitems(struct fdisk_test *ts, int argc, char *argv[])
 				printf("%s: %ju\n", name, num);
 			break;
 		}
-		case 1: /* item unssuported by label -- ignore */
+		case 1: /* item unsuported by label -- ignore */
 			rc = 0;
 			break;
 		case 2:	/* end (out of range) */
diff --git a/libfdisk/src/label.c b/libfdisk/src/label.c
index 78fc5e78c..5cbbe422e 100644
--- a/libfdisk/src/label.c
+++ b/libfdisk/src/label.c
@@ -15,7 +15,7 @@
  * fdisk_unref_context() only.
  *
  * Anyway, all label drives share in-memory first sector. The function
- * fdisk_create_disklabel() overwrites thi in-memory sector. But it's possible that
+ * fdisk_create_disklabel() overwrites this in-memory sector. But it's possible that
  * label driver also uses another buffers, for example GPT reads more sectors
  * from the device.
  *
@@ -293,7 +293,7 @@ int fdisk_verify_disklabel(struct fdisk_context *cxt)
  * The function requires enabled "details" by fdisk_enable_details().
  *
  * It's recommended to use fdisk_get_disklabel_item() if you need better
- * control on output and formmatting.
+ * control on output and formatting.
  *
  * Returns: 0 on success, otherwise, a corresponding error.
  */
@@ -336,7 +336,7 @@ int fdisk_list_disklabel(struct fdisk_context *cxt)
  *
  * Creates a new disk label of type @name. If @name is NULL, then it will
  * create a default system label type, either SUN or DOS. The function
- * automaticaly switches the current label driver to @name. The function
+ * automatically switches the current label driver to @name. The function
  * fdisk_get_label() returns the current label driver.
  *
  * The function modifies in-memory data only.
@@ -392,7 +392,7 @@ int fdisk_create_disklabel(struct fdisk_context *cxt, const char *name)
  * GPT is composed from two items, PMBR and GPT, n=0 return offset to PMBR and n=1
  * return offset to GPT. For more details see 'D' expert fdisk command.
  *
- * Returns: 0 on succes, <0 on error, 1 no more items.
+ * Returns: 0 on success, <0 on error, 1 no more items.
  */
 int fdisk_locate_disklabel(struct fdisk_context *cxt, int n, const char **name,
 			   uint64_t *offset, size_t *size)
@@ -445,7 +445,7 @@ int fdisk_get_disklabel_id(struct fdisk_context *cxt, char **id)
  * until it returns error or 2, the result in @item should be ignored when
  * function returns 1. Don't forget to use fdisk_reset_labelitem() or fdisk_unref_labelitem().
  *
- * Returns: 0 on success, < 0 on error, 1 on unssupported item, 2 @id out of range
+ * Returns: 0 on success, < 0 on error, 1 on unsupported item, 2 @id out of range
  */
 int fdisk_get_disklabel_item(struct fdisk_context *cxt, int id, struct fdisk_labelitem *item)
 {
@@ -574,7 +574,7 @@ void fdisk_deinit_label(struct fdisk_label *lb)
  * @changed: 0/1
  *
  * Marks in-memory data as changed, to force fdisk_write_disklabel() to write
- * to device. This should be unnecessar by default, the library keeps track
+ * to device. This should be unnecessary by default, the library keeps track
  * about changes.
  */
 void fdisk_label_set_changed(struct fdisk_label *lb, int changed)
diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c
index a98620b04..5e2de76ee 100644
--- a/libfdisk/src/partition.c
+++ b/libfdisk/src/partition.c
@@ -106,7 +106,7 @@ static struct fdisk_partition *__copy_partition(struct fdisk_partition *o)
  * fdisk_ref_partition:
  * @pa: partition pointer
  *
- * Incremparts reference counter.
+ * Increments reference counter.
  */
 void fdisk_ref_partition(struct fdisk_partition *pa)
 {
@@ -118,7 +118,7 @@ void fdisk_ref_partition(struct fdisk_partition *pa)
  * fdisk_unref_partition:
  * @pa: partition pointer
  *
- * De-incremparts reference counter, on zero the @pa is automatically
+ * Decrements reference counter, on zero the @pa is automatically
  * deallocated.
  */
 void fdisk_unref_partition(struct fdisk_partition *pa)
@@ -345,7 +345,7 @@ int fdisk_partition_size_explicit(struct fdisk_partition *pa, int enable)
 /**
  * fdisk_partition_set_partno:
  * @pa: partition
- * @num: partitin number (0 is the first partition, maximal is SIZE_MAX-1)
+ * @num: partition number (0 is the first partition, maximal is SIZE_MAX-1)
  *
  * Note that zero is valid partno too. Use fdisk_partition_unset_partno() to
  * undefine the partno.
@@ -444,7 +444,7 @@ int fdisk_partition_partno_follow_default(struct fdisk_partition *pa, int enable
  * @pa: partition
  * @type: partition type
  *
- * Sets parititon type.
+ * Sets partition type.
  *
  * Returns: 0 on success, <0 on error.
  */
@@ -808,7 +808,7 @@ done:
  * For example
  * <informalexample>
  *   <programlisting>
- *      struct fdisk_parition *pa;
+ *      struct fdisk_partition *pa;
  *
  *      fdisk_get_partition(cxt, 0, &pa);
  *	fdisk_partition_to_string(pa, FDISK_FIELD_UUID, &data);
@@ -1310,7 +1310,7 @@ int fdisk_wipe_partition(struct fdisk_context *cxt, size_t partno, int enable)
  * @pa: template for the partition (or NULL)
  * @partno: NULL or returns new partition number
  *
- * If @pa is not specified or any @pa item is missiong the libfdisk will ask by
+ * If @pa is not specified or any @pa item is missing the libfdisk will ask by
  * fdisk_ask_ API.
  *
  * Adds a new partition to disklabel.
diff --git a/libfdisk/src/parttype.c b/libfdisk/src/parttype.c
index 712994efb..8c36fdf3b 100644
--- a/libfdisk/src/parttype.c
+++ b/libfdisk/src/parttype.c
@@ -36,7 +36,7 @@ struct fdisk_parttype *fdisk_new_parttype(void)
  * fdisk_ref_parttype:
  * @t: partition type
  *
- * Incremparts reference counter for allocated types
+ * Increments reference counter for allocated types
  */
 void fdisk_ref_parttype(struct fdisk_parttype *t)
 {
@@ -48,7 +48,7 @@ void fdisk_ref_parttype(struct fdisk_parttype *t)
  * fdisk_unref_parttype
  * @t: partition pointer
  *
- * De-incremparts reference counter, on zero the @t is automatically
+ * Decrements reference counter, on zero the @t is automatically
  * deallocated.
  */
 void fdisk_unref_parttype(struct fdisk_parttype *t)
@@ -95,7 +95,7 @@ int fdisk_parttype_set_name(struct fdisk_parttype *t, const char *str)
 /**
  * fdisk_parttype_set_typestr:
  * @t: partition type
- * @str: type identificator (e.g. GUID for GPT)
+ * @str: type identifier (e.g. GUID for GPT)
  *
  * Sets type string to allocated partition type, for static types
  * it returns -EINVAL. Don't use this function for MBR, see
@@ -123,7 +123,7 @@ int fdisk_parttype_set_typestr(struct fdisk_parttype *t, const char *str)
 /**
  * fdisk_parttype_set_code:
  * @t: partition type
- * @code: type identificator (e.g. MBR type codes)
+ * @code: type identifier (e.g. MBR type codes)
  *
  * Sets type code to allocated partition type, for static types it returns
  * -EINVAL. Don't use this function for GPT, see fdisk_parttype_set_typestr().
@@ -291,7 +291,7 @@ struct fdisk_parttype *fdisk_copy_parttype(const struct fdisk_parttype *type)
  * @lb: label
  * @str: string to parse from
  *
- * Parses partition type from @str according to the label. Thefunction returns
+ * Parses partition type from @str according to the label. The function returns
  * a pointer to static table of the partition types, or newly allocated
  * partition type for unknown types (see fdisk_parttype_is_unknown(). It's
  * safe to call fdisk_unref_parttype() for all results.
@@ -397,7 +397,7 @@ const char *fdisk_parttype_get_name(const struct fdisk_parttype *t)
  *
  * Checks for example result from fdisk_label_parse_parttype().
  *
- * Returns: 1 is type is "unknonw" or 0.
+ * Returns: 1 is type is "unknown" or 0.
  */
 int fdisk_parttype_is_unknown(const struct fdisk_parttype *t)
 {
diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c
index 956d4f52e..0d89fdaf1 100644
--- a/libfdisk/src/script.c
+++ b/libfdisk/src/script.c
@@ -133,7 +133,7 @@ done:
  * fdisk_ref_script:
  * @dp: script pointer
  *
- * Incremparts reference counter.
+ * Increments reference counter.
  */
 void fdisk_ref_script(struct fdisk_script *dp)
 {
@@ -161,7 +161,7 @@ static void fdisk_reset_script(struct fdisk_script *dp)
  * fdisk_unref_script:
  * @dp: script pointer
  *
- * De-incremparts reference counter, on zero the @dp is automatically
+ * Decrements reference counter, on zero the @dp is automatically
  * deallocated.
  */
 void fdisk_unref_script(struct fdisk_script *dp)
@@ -656,7 +656,7 @@ static int write_file_sfdisk(struct fdisk_script *dp, FILE *f)
  * @dp: script
  * @f: output file
  *
- * Writes script @dp to the ile @f.
+ * Writes script @dp to the file @f.
  *
  * Returns: 0 on success, <0 on error.
  */
@@ -714,7 +714,7 @@ static int parse_line_header(struct fdisk_script *dp, char *s)
 		   || strcmp(name, "first-lba") == 0
 		   || strcmp(name, "last-lba") == 0
 		   || strcmp(name, "table-length") == 0) {
-		;					/* whatever is posssible */
+		;					/* whatever is possible */
 	} else
 		goto done;				/* unknown header */
 
@@ -905,7 +905,7 @@ static int parse_line_nameval(struct fdisk_script *dp, char *s)
 
 		} else if (!strncasecmp(p, "type=", 5) ||
 
-			   !strncasecmp(p, "Id=", 3)) {		/* backward compatiility */
+			   !strncasecmp(p, "Id=", 3)) {		/* backward compatibility */
 			char *type;
 
 			p += (*p == 'I' ? 3 : 5);		/* "Id=" or "type=" */
@@ -1059,7 +1059,7 @@ static int parse_line_valcommas(struct fdisk_script *dp, char *s)
 			if (*p == ',' || *p == ';' || alone_sign(sign, p)) {
 				fdisk_partition_end_follow_default(pa, 1);
 				if (sign == TK_PLUS)
-					/* alone '+' means use all possible space, elone '-' means nothing */
+					/* '+' alone means use all possible space, '-' alone means nothing */
 					pa->resize = FDISK_RESIZE_ENLARGE;
 			} else {
 				int pow = 0;
@@ -1174,7 +1174,7 @@ static int fdisk_script_read_buffer(struct fdisk_script *dp, char *s)
  * @fn_fgets: callback function
  *
  * The library uses fgets() function to read the next line from the script.
- * This default maybe overrided to another function. Note that the function has
+ * This default maybe overridden by another function. Note that the function has
  * to return the line terminated by \n (for example readline(3) removes \n).
  *
  * Return: 0 on success, <0 on error
@@ -1327,7 +1327,7 @@ struct fdisk_script *fdisk_get_script(struct fdisk_context *cxt)
  * @cxt: context
  * @dp: script
  *
- * Associte context @cxt with script @dp and creates a new empty disklabel.
+ * Associate context @cxt with script @dp and creates a new empty disklabel.
  *
  * Returns: 0 on success, <0 on error.
  */
diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
index c77724aa2..73f9049f7 100644
--- a/libfdisk/src/sgi.c
+++ b/libfdisk/src/sgi.c
@@ -300,7 +300,7 @@ static int sgi_get_disklabel_item(struct fdisk_context *cxt, struct fdisk_labeli
 		break;
 	default:
 		if (item->id < __FDISK_NLABELITEMS)
-			rc = 1;	/* unssupported generic item */
+			rc = 1;	/* unsupported generic item */
 		else
 			rc = 2;	/* out of range */
 		break;
diff --git a/libfdisk/src/sun.c b/libfdisk/src/sun.c
index a97ecac0a..55ec8773c 100644
--- a/libfdisk/src/sun.c
+++ b/libfdisk/src/sun.c
@@ -56,7 +56,7 @@ static struct fdisk_parttype sun_parttypes[] = {
 	{ 0, NULL }
 };
 
-/* return poiter buffer with on-disk data */
+/* return pointer buffer with on-disk data */
 static inline struct sun_disklabel *self_disklabel(struct fdisk_context *cxt)
 {
 	assert(cxt);
@@ -783,7 +783,7 @@ static int sun_get_disklabel_item(struct fdisk_context *cxt, struct fdisk_labeli
 		break;
 	default:
 		if (item->id < __FDISK_NLABELITEMS)
-			rc = 1;	/* unssupported generic item */
+			rc = 1;	/* unsupported generic item */
 		else
 			rc = 2;	/* out of range */
 		break;
diff --git a/libfdisk/src/table.c b/libfdisk/src/table.c
index 6d8cbc25a..755c6c286 100644
--- a/libfdisk/src/table.c
+++ b/libfdisk/src/table.c
@@ -38,7 +38,7 @@ struct fdisk_table *fdisk_new_table(void)
  * fdisk_reset_table:
  * @tb: tab pointer
  *
- * Removes all entries (partitions) from the table. The parititons with zero
+ * Removes all entries (partitions) from the table. The partitions with zero
  * reference count will be deallocated. This function does not modify partition
  * table.
  *
@@ -65,7 +65,7 @@ int fdisk_reset_table(struct fdisk_table *tb)
  * fdisk_ref_table:
  * @tb: table pointer
  *
- * Incremparts reference counter.
+ * Increments reference counter.
  */
 void fdisk_ref_table(struct fdisk_table *tb)
 {
@@ -77,7 +77,7 @@ void fdisk_ref_table(struct fdisk_table *tb)
  * fdisk_unref_table:
  * @tb: table pointer
  *
- * De-incremparts reference counter, on zero the @tb is automatically
+ * Descrements reference counter, on zero the @tb is automatically
  * deallocated.
  */
 void fdisk_unref_table(struct fdisk_table *tb)
@@ -682,7 +682,7 @@ int fdisk_table_wrong_order(struct fdisk_table *tb)
  * Add partitions from table @tb to the in-memory disk label. See
  * fdisk_add_partition(), fdisk_delete_all_partitions(). The partitions
  * that does not define start (or does not follow the default start)
- * are ingored.
+ * are ignored.
  *
  * Returns: 0 on success, <0 on error.
  */
diff --git a/libmount/python/context.c b/libmount/python/context.c
index 623239436..8256e87c9 100644
--- a/libmount/python/context.c
+++ b/libmount/python/context.c
@@ -311,10 +311,10 @@ static PyObject *Context_enable_fork(ContextObjext *self, PyObject *args, PyObje
 
 #define Context_disable_canonicalize_HELP "disable_canonicalize(disable)\n\n" \
 	"Enable/disable paths canonicalization and tags evaluation. The libmount context\n" \
-	"canonicalies paths when search in fstab and when prepare source and target paths\n" \
+	"canonicalizes paths when searching fstab and when preparing source and target paths\n" \
 	"for mount(2) syscall.\n" \
 	"\n" \
-	"This fuction has effect to the private (within context) fstab instance only\n" \
+	"This function has effect to the private (within context) fstab instance only\n" \
 	"(see Cxt.fstab).\n" \
 	"Returns self or raises an exception in case of an error."
 static PyObject *Context_disable_canonicalize(ContextObjext *self, PyObject *args, PyObject *kwds)
@@ -1074,11 +1074,11 @@ static PyObject *Context_helper_setopt(ContextObjext *self, PyObject *args, PyOb
 }
 
 #define Context_init_helper_HELP "init_helper(action, flags)\n\n" \
-	"This function infors libmount that used from [u]mount.type helper.\n" \
+	"This function informs libmount that it is used from [u]mount.type helper.\n" \
 	"\n" \
-	"The function also calls Cxt.disable_helpers() to avoid recursive\n" \
-	"mount.type helpers calling. It you really want to call another\n" \
-	"mount.type helper from your helper than you have to explicitly enable this\n" \
+	"The function also calls Cxt.disable_helpers() to avoid calling\n" \
+	"mount.type helpers recursively. If you really want to call another\n" \
+	"mount.type helper from your helper then you have to explicitly enable this\n" \
 	"feature by:\n" \
 	"\n" \
 	"Cxt.disable_helpers(False);\n" \
diff --git a/libmount/python/fs.c b/libmount/python/fs.c
index 0789d3797..ca1ce2ada 100644
--- a/libmount/python/fs.c
+++ b/libmount/python/fs.c
@@ -609,7 +609,7 @@ static PyMethodDef Fs_methods[] = {
 
 static void Fs_destructor(FsObject *self)
 {
-	DBG(FS, pymnt_debug_h(self->fs, "destrutor py-obj: %p, py-refcnt=%d",
+	DBG(FS, pymnt_debug_h(self->fs, "destructor py-obj: %p, py-refcnt=%d",
 				self, (int) ((PyObject *) self)->ob_refcnt));
 	mnt_unref_fs(self->fs);
 	PyFree(self);
@@ -748,7 +748,7 @@ PyObject *PyObjectResultFs(struct libmnt_fs *fs)
 		return (PyObject *) result;
 	}
 
-	/* Creating an encapsualing object: increment the refcount, so that code
+	/* Creating an encapsulating object: increment the refcount, so that code
 	 * such as tab.next_fs() doesn't call the destructor, which would free
 	 * our fs struct as well
 	 */
diff --git a/libmount/python/pylibmount.c b/libmount/python/pylibmount.c
index 54d7dfa70..61dace7d4 100644
--- a/libmount/python/pylibmount.c
+++ b/libmount/python/pylibmount.c
@@ -130,7 +130,7 @@ char *pystos(PyObject *pys)
 	"Please note that none of the classes' attributes may be deleted.\n" \
 	"This is not a complete mapping to the libmount C API, nor is it\n" \
 	"attempting to be one.\n" "Iterator functions only allow forward\n" \
-	"iteration for now. Contex.get_{user_,}mflags() differs from the C API\n" \
+	"iteration for now. Context.get_{user_,}mflags() differs from the C API\n" \
 	"and returns the flags directly. Fs.get_tag() differs from the C API\n" \
 	"and returns a (tag, value) tuple. Every attribute is \"filtered\"" \
 	"through appropriate getters/setters, no values are set directly."
diff --git a/libmount/python/tab.c b/libmount/python/tab.c
index 6f255aef7..a77c5cb0c 100644
--- a/libmount/python/tab.c
+++ b/libmount/python/tab.c
@@ -546,7 +546,7 @@ void Table_unref(struct libmnt_table *tab)
 
 static void Table_destructor(TableObject *self)
 {
-	DBG(TAB, pymnt_debug_h(self->tab, "destrutor py-obj: %p, py-refcnt=%d",
+	DBG(TAB, pymnt_debug_h(self->tab, "destructor py-obj: %p, py-refcnt=%d",
 				self, (int) ((PyObject *) self)->ob_refcnt));
 	Table_unref(self->tab);
 	self->tab = NULL;
@@ -686,7 +686,7 @@ PyObject *PyObjectResultTab(struct libmnt_table *tab)
 		return (PyObject *) result;
 	}
 
-	/* Creating an encapsualing object: increment the refcount, so that
+	/* Creating an encapsulating object: increment the refcount, so that
 	 * code such as: cxt.get_fstab() doesn't call the destructor, which
 	 * would free our tab struct as well
 	 */
diff --git a/libmount/src/btrfs.c b/libmount/src/btrfs.c
index 9f48bf4a4..be4d144bf 100644
--- a/libmount/src/btrfs.c
+++ b/libmount/src/btrfs.c
@@ -37,7 +37,7 @@
 
 /*
  * the key defines the order in the tree, and so it also defines (optimal)
- * block layout.  objectid corresonds to the inode number.  The flags
+ * block layout.  objectid corresponds with the inode number.  The flags
  * tells us things about the object, and is a kind of stream selector.
  * so for a given inode, keys with flags of 1 might refer to the inode
  * data, flags of 2 may point to file data in the btree and flags == 3
diff --git a/libmount/src/context.c b/libmount/src/context.c
index d9bda4375..c53a63954 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -214,7 +214,7 @@ static int context_init_paths(struct libmnt_context *cxt, int writable)
 	if (!writable)
 		return 0;		/* only paths wanted */
 	if (mnt_context_is_nomtab(cxt))
-		return 0;		/* write mode overrided by mount -n */
+		return 0;		/* write mode overridden by mount -n */
 	if (cxt->flags & MNT_FL_TABPATHS_CHECKED)
 		return 0;
 
@@ -349,7 +349,7 @@ int mnt_context_get_optsmode(struct libmnt_context *cxt)
  * canonicalizes paths when searching in fstab and when preparing source and target paths
  * for mount(2) syscall.
  *
- * This fuction has an effect on the private (within context) fstab instance only
+ * This function has an effect on the private (within context) fstab instance only
  * (see mnt_context_set_fstab()). If you want to use an external fstab then you
  * need to manage your private struct libmnt_cache (see mnt_table_set_cache(fstab,
  * NULL).
@@ -686,7 +686,7 @@ int mnt_context_is_loopdel(struct libmnt_context *cxt)
  *
  * The mount context uses private @fs by default. This function allows to
  * overwrite the private @fs with an external instance. This function
- * increments @fs reference counter (and deincrement reference counter of the
+ * increments @fs reference counter (and decrement reference counter of the
  * old fs).
  *
  * The @fs will be modified by mnt_context_set_{source,target,options,fstype}
@@ -766,7 +766,7 @@ void *mnt_context_get_mtab_userdata(struct libmnt_context *cxt)
  * Note that libmount does not interpret "nofail" (MNT_MS_NOFAIL)
  * mount option. The real return code is always returned, when
  * the device does not exist then it's usually MNT_ERR_NOSOURCE
- * from libmount or ENOENT, ENOTDIR, ENOTBLK, ENXIO from moun(2).
+ * from libmount or ENOENT, ENOTDIR, ENOTBLK, ENXIO from mount(2).
  *
  * Returns: 0 on success, negative number in case of error.
  */
@@ -1191,7 +1191,7 @@ int mnt_context_set_tables_errcb(struct libmnt_context *cxt,
 /**
  * mnt_context_set_cache:
  * @cxt: mount context
- * @cache: cache instance or nULL
+ * @cache: cache instance or NULL
  *
  * The mount context maintains a private struct libmnt_cache by default. This
  * function allows to overwrite the private cache with an external instance.
@@ -1248,7 +1248,7 @@ struct libmnt_cache *mnt_context_get_cache(struct libmnt_context *cxt)
  * mnt_context_set_passwd_cb:
  * @cxt: mount context
  * @get: callback to get password
- * @release: callback to release (delallocate) password
+ * @release: callback to release (deallocate) password
  *
  * Sets callbacks for encryption password (e.g encrypted loopdev). This
  * function is deprecated (encrypted loops are no longer supported).
@@ -1275,7 +1275,7 @@ int mnt_context_set_passwd_cb(struct libmnt_context *cxt,
  * interrupted by signal or signals have to be ignored when the lock is locked.
  *
  * The default behavior is to ignore all signals (except SIGALRM and
- * SIGTRAP for mtab udate) when the lock is locked. If this behavior
+ * SIGTRAP for mtab update) when the lock is locked. If this behavior
  * is unacceptable, then use:
  *
  *	lc = mnt_context_get_lock(cxt);
@@ -1349,7 +1349,7 @@ int mnt_context_set_mflags(struct libmnt_context *cxt, unsigned long flags)
  * @cxt: mount context
  * @flags: returns MS_* mount flags
  *
- * Converts mount options string to MS_* flags and bitewise-OR the result with
+ * Converts mount options string to MS_* flags and bitwise-OR the result with
  * the already defined flags (see mnt_context_set_mflags()).
  *
  * Returns: 0 on success, negative number in case of error.
@@ -1406,7 +1406,7 @@ int mnt_context_set_user_mflags(struct libmnt_context *cxt, unsigned long flags)
  * @cxt: mount context
  * @flags: returns mount flags
  *
- * Converts mount options string to MNT_MS_* flags and bitewise-OR the result
+ * Converts mount options string to MNT_MS_* flags and bitwise-OR the result
  * with the already defined flags (see mnt_context_set_user_mflags()).
  *
  * Returns: 0 on success, negative number in case of error.
@@ -2440,7 +2440,7 @@ static int test_mount(struct libmnt_test *ts, int argc, char *argv[])
 	}
 
 	if (argc == idx + 1)
-		/* mount <mountpont>|<device> */
+		/* mount <mountpoint>|<device> */
 		mnt_context_set_target(cxt, argv[idx++]);
 
 	else if (argc == idx + 2) {
@@ -2500,7 +2500,7 @@ static int test_umount(struct libmnt_test *ts, int argc, char *argv[])
 	}
 
 	if (argc == idx + 1) {
-		/* mount <mountpont>|<device> */
+		/* mount <mountpoint>|<device> */
 		mnt_context_set_target(cxt, argv[idx++]);
 	} else {
 		rc = -EINVAL;
@@ -2542,7 +2542,7 @@ static int test_flags(struct libmnt_test *ts, int argc, char *argv[])
 	}
 
 	if (argc == idx + 1)
-		/* mount <mountpont>|<device> */
+		/* mount <mountpoint>|<device> */
 		mnt_context_set_target(cxt, argv[idx++]);
 
 	rc = mnt_context_prepare_mount(cxt);
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index e0d316021..7e5128b79 100644
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -378,7 +378,7 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
 		 * However, if you call mount.<type> as root, then the helper follows
 		 * the command line. If there is (for example) "user,exec" in fstab,
 		 * then we have to manually append the "exec" back to the options
-		 * string, bacause there is nothing like MS_EXEC (we only have
+		 * string, because there is nothing like MS_EXEC (we only have
 		 * MS_NOEXEC in mount flags and we don't care about the original
 		 * mount string in libmount for VFS options).
 		 */
diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index 9a37901b5..707665db4 100644
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -164,7 +164,7 @@ err:
  * stored in context->utab and deallocated by mnt_free_context().
  *
  * This function exists to avoid (if possible) /proc/self/mountinfo usage, so
- * don't use thigs like mnt_resolve_target(), mnt_context_get_mtab() etc here.
+ * don't use things like mnt_resolve_target(), mnt_context_get_mtab() etc here.
  * See lookup_umount_fs() for more details.
  */
 static int has_utab_entry(struct libmnt_context *cxt, const char *target)
diff --git a/libmount/src/fs.c b/libmount/src/fs.c
index df00504ba..9cb329345 100644
--- a/libmount/src/fs.c
+++ b/libmount/src/fs.c
@@ -731,7 +731,7 @@ static char *merge_optstr(const char *vfs, const char *fs)
  * @fs: fstab/mtab/mountinfo entry pointer
  *
  * Merges all mount options (VFS, FS and userspace) to one options string
- * and returns the result. This function does not modigy @fs.
+ * and returns the result. This function does not modify @fs.
  *
  * Returns: pointer to string (can be freed by free(3)) or NULL in case of error.
  */
diff --git a/libmount/src/init.c b/libmount/src/init.c
index 9d3e4b539..c927fb7f6 100644
--- a/libmount/src/init.c
+++ b/libmount/src/init.c
@@ -27,7 +27,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libmount) =
 	{ "locks", MNT_DEBUG_LOCKS,	"mtab and utab locking" },
 	{ "loop", MNT_DEBUG_LOOP,	"loop devices routines" },
 	{ "options", MNT_DEBUG_OPTIONS,	"mount options parsing" },
-	{ "tab", MNT_DEBUG_TAB,		"fstab, mtab, mounninfo routines" },
+	{ "tab", MNT_DEBUG_TAB,		"fstab, mtab, mountinfo routines" },
 	{ "update", MNT_DEBUG_UPDATE,	"mtab, utab updates" },
 	{ "utils", MNT_DEBUG_UTILS,	"misc library utils" },
 	{ "monitor", MNT_DEBUG_MONITOR,	"mount tables monitor" },
diff --git a/libmount/src/lock.c b/libmount/src/lock.c
index 4076a23f2..c3cd226f4 100644
--- a/libmount/src/lock.c
+++ b/libmount/src/lock.c
@@ -508,11 +508,11 @@ failed:
  *
  *   1. create linkfile (e.g. /etc/mtab~.$PID)
  *   2. link linkfile --> lockfile (e.g. /etc/mtab~.$PID --> /etc/mtab~)
- *   3. a) link() success: setups F_SETLK lock (see fcnlt(2))
+ *   3. a) link() success: setups F_SETLK lock (see fcntl(2))
  *      b) link() failed:  wait (max 30s) on F_SETLKW lock, goto 2.
  *
  * Note that when the lock is used by mnt_update_table() interface then libmount
- * uses flock() for private library file /run/mount/utab. The fcnlt(2) is used only
+ * uses flock() for private library file /run/mount/utab. The fcntl(2) is used only
  * for backwardly compatible stuff like /etc/mtab.
  *
  * Returns: 0 on success or negative number in case of error (-ETIMEOUT is case
diff --git a/libmount/src/optmap.c b/libmount/src/optmap.c
index 3ad77273e..f827e04f5 100644
--- a/libmount/src/optmap.c
+++ b/libmount/src/optmap.c
@@ -14,7 +14,7 @@
  *
  *	@mountflags: (see MS_* macros in linux/fs.h)
  *
- *	@mountdata: (usully a comma separated string of options)
+ *	@mountdata: (usually a comma separated string of options)
  *
  * The libmount uses options-map(s) to describe mount options.
  *
@@ -182,7 +182,7 @@ static const struct libmnt_optmap userspace_opts_map[] =
  * MNT_LINUX_MAP - Linux kernel fs-independent mount options
  *                 (usually MS_* flags, see linux/fs.h)
  *
- * MNT_USERSPACE_MAP - userpace mount(8) specific mount options
+ * MNT_USERSPACE_MAP - userspace mount(8) specific mount options
  *                     (e.g user=, _netdev, ...)
  *
  * Returns: static built-in libmount map.
diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index b09c79f0d..155c65ee3 100644
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -152,7 +152,7 @@ void mnt_unref_table(struct libmnt_table *tb)
  * Deallocates the table. This function does not care about reference count. Don't
  * use this function directly -- it's better to use use mnt_unref_table().
  *
- * The table entries (filesystems) are unrefrenced by mnt_reset_table() and
+ * The table entries (filesystems) are unreferenced by mnt_reset_table() and
  * cache by mnt_unref_cache().
  */
 void mnt_free_table(struct libmnt_table *tb)
@@ -359,7 +359,7 @@ int mnt_table_append_trailing_comment(struct libmnt_table *tb, const char *comm)
  * same cache between more threads -- currently the cache does not provide any
  * locking method.
  *
- * This function increments cache reference counter. It's recomented to use
+ * This function increments cache reference counter. It's recommended to use
  * mnt_unref_cache() after mnt_table_set_cache() if you want to keep the cache
  * referenced by @tb only.
  *
@@ -690,7 +690,7 @@ static int mnt_table_move_parent(struct libmnt_table *tb, int oldid, int newid)
  * backward mode iterator).
  *
  * @MNT_UNIQ_FORWARD:  remove later mounted filesystems
- * @MNT_UNIQ_KEEPTREE: keep parent->id relation ship stil valid
+ * @MNT_UNIQ_KEEPTREE: keep parent->id relationship still valid
  *
  * Returns: negative number in case of error, or 0 o success.
  */
@@ -871,7 +871,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat
 			return fs;
 	}
 
-	/* non-canonicaled path in struct libmnt_table
+	/* non-canonical path in struct libmnt_table
 	 * -- note that mountpoint in /proc/self/mountinfo is already
 	 *    canonicalized by the kernel
 	 */
diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index 3f5e14abb..b17a22913 100644
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -591,7 +591,7 @@ static int kernel_fs_postparse(struct libmnt_table *tb,
 			rc = __mnt_fs_set_source_ptr(fs, real);
 
 		} else if (rc == 1) {
-			/* mnt_guess_system_root() returns 1 if not able to conver to
+			/* mnt_guess_system_root() returns 1 if not able to convert to
 			 * the real devname; ignore this problem */
 			rc = 0;
 		}
@@ -1069,7 +1069,7 @@ int __mnt_table_parse_mtab(struct libmnt_table *tb, const char *filename,
 	assert(tb);
 
 	if (filename)
-		DBG(TAB, ul_debugobj(tb, "%s reuested as mtab", filename));
+		DBG(TAB, ul_debugobj(tb, "%s requested as mtab", filename));
 
 #ifdef USE_LIBMOUNT_SUPPORT_MTAB
 	if (mnt_has_regular_mtab(&filename, NULL)) {
diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index 8b80609e9..733a03330 100644
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -1013,7 +1013,7 @@ err:
 }
 
 /*
- * Search for @name kernel command parametr.
+ * Search for @name kernel command parameter.
  *
  * Returns newly allocated string with a parameter argument if the @name is
  * specified as "name=" or returns pointer to @name or returns NULL if not
diff --git a/libsmartcols/samples/continuous.c b/libsmartcols/samples/continuous.c
index 02efd5de9..6cd8b489c 100644
--- a/libsmartcols/samples/continuous.c
+++ b/libsmartcols/samples/continuous.c
@@ -40,7 +40,7 @@ static void setup_columns(struct libscols_table *tb)
 	return;
 fail:
 	scols_unref_table(tb);
-	err(EXIT_FAILURE, "faild to create output columns");
+	err(EXIT_FAILURE, "failed to create output columns");
 }
 
 static struct libscols_line *add_line(struct libscols_table *tb, size_t i)
@@ -62,7 +62,7 @@ static struct libscols_line *add_line(struct libscols_table *tb, size_t i)
 	return ln;
 fail:
 	scols_unref_table(tb);
-	err(EXIT_FAILURE, "faild to create output line");
+	err(EXIT_FAILURE, "failed to create output line");
 }
 
 int main(int argc, char *argv[])
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 
 	tb = scols_new_table();
 	if (!tb)
-		err(EXIT_FAILURE, "faild to create output table");
+		err(EXIT_FAILURE, "failed to create output table");
 
 	setup_columns(tb);
 	gettimeofday(&last, NULL);
diff --git a/libsmartcols/samples/title.c b/libsmartcols/samples/title.c
index ec72093cc..2cf4f8aba 100644
--- a/libsmartcols/samples/title.c
+++ b/libsmartcols/samples/title.c
@@ -33,7 +33,7 @@ static void setup_columns(struct libscols_table *tb)
 	return;
 fail:
 	scols_unref_table(tb);
-	err(EXIT_FAILURE, "faild to create output columns");
+	err(EXIT_FAILURE, "failed to create output columns");
 }
 
 static void add_line(struct libscols_table *tb, const char *name, const char *data)
@@ -49,7 +49,7 @@ static void add_line(struct libscols_table *tb, const char *name, const char *da
 	return;
 fail:
 	scols_unref_table(tb);
-	err(EXIT_FAILURE, "faild to create output line");
+	err(EXIT_FAILURE, "failed to create output line");
 }
 
 int main(int argc, char *argv[])
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
 	tb = scols_new_table();
 	if (!tb)
-		err(EXIT_FAILURE, "faild to create output table");
+		err(EXIT_FAILURE, "failed to create output table");
 
 	scols_table_enable_colors(tb, 1);
 	setup_columns(tb);
diff --git a/libsmartcols/samples/tree.c b/libsmartcols/samples/tree.c
index d2afc4717..868c456e4 100644
--- a/libsmartcols/samples/tree.c
+++ b/libsmartcols/samples/tree.c
@@ -39,7 +39,7 @@ static void setup_columns(struct libscols_table *tb, int notree)
 	return;
 fail:
 	scols_unref_table(tb);
-	err(EXIT_FAILURE, "faild to create output columns");
+	err(EXIT_FAILURE, "failed to create output columns");
 }
 
 /* add a new line to @tb, the content is based on @st */
@@ -104,7 +104,7 @@ fail:
 	return -1;
 }
 
-/* read all entrines from directory addressed by @fd */
+/* read all entries from directory addressed by @fd */
 static int add_children(struct libscols_table *tb,
 			struct libscols_line *ln,
 			int fd)
@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
 
 	tb = scols_new_table();
 	if (!tb)
-		err(EXIT_FAILURE, "faild to create output table");
+		err(EXIT_FAILURE, "failed to create output table");
 
 	while((c = getopt_long(argc, argv, "ciJlnprS:E:", longopts, NULL)) != -1) {
 		switch(c) {
diff --git a/libsmartcols/samples/wrap.c b/libsmartcols/samples/wrap.c
index 96cdff31c..1da4c011b 100644
--- a/libsmartcols/samples/wrap.c
+++ b/libsmartcols/samples/wrap.c
@@ -39,7 +39,7 @@ static void setup_columns(struct libscols_table *tb)
 	return;
 fail:
 	scols_unref_table(tb);
-	err(EXIT_FAILURE, "faild to create output columns");
+	err(EXIT_FAILURE, "failed to create output columns");
 }
 
 static char *gen_text(const char *prefix, const char *sub_prefix, char *buf, size_t sz)
@@ -76,7 +76,7 @@ static struct libscols_line * add_line(	struct libscols_table *tb,
 	return ln;
 fail:
 	scols_unref_table(tb);
-	err(EXIT_FAILURE, "faild to create output line");
+	err(EXIT_FAILURE, "failed to create output line");
 }
 
 int main(int argc, char *argv[])
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 
 	tb = scols_new_table();
 	if (!tb)
-		err(EXIT_FAILURE, "faild to create output table");
+		err(EXIT_FAILURE, "failed to create output table");
 
 	scols_table_enable_colors(tb, 1);
 	setup_columns(tb);
diff --git a/libsmartcols/src/smartcolsP.h b/libsmartcols/src/smartcolsP.h
index e29ec7d93..b3c8e7cfa 100644
--- a/libsmartcols/src/smartcolsP.h
+++ b/libsmartcols/src/smartcolsP.h
@@ -156,7 +156,7 @@ struct libscols_table {
 	unsigned int	ascii		:1,	/* don't use unicode */
 			colors_wanted	:1,	/* enable colors */
 			is_term		:1,	/* isatty() */
-			maxout		:1,	/* maximalize output */
+			maxout		:1,	/* maximize output */
 			header_printed  :1,	/* header already printed */
 			no_headings	:1,	/* don't print header */
 			no_linesep	:1,	/* don't print line separator */
diff --git a/libsmartcols/src/symbols.c b/libsmartcols/src/symbols.c
index 947e32c83..df31f454c 100644
--- a/libsmartcols/src/symbols.c
+++ b/libsmartcols/src/symbols.c
@@ -108,7 +108,7 @@ int scols_symbols_set_right(struct libscols_symbols *sb, const char *str)
  * @sb: a pointer to a struct libscols_symbols instance
  * @str: a string which will represent the symbols which wraps title output
  *
- * The current implemetation uses only the first byte from the padding string.
+ * The current implementation uses only the first byte from the padding string.
  * A multibyte chars are not supported yet.
  *
  * Returns: 0, a negative value in case of an error.
@@ -124,7 +124,7 @@ int scols_symbols_set_title_padding(struct libscols_symbols *sb, const char *str
  * scols_copy_symbols:
  * @sb: a pointer to a struct libscols_symbols instance
  *
- * Returns: a newly allocated copy of the @sb symbol group or NULL in caes of an error.
+ * Returns: a newly allocated copy of the @sb symbol group or NULL in case of an error.
  */
 struct libscols_symbols *scols_copy_symbols(const struct libscols_symbols *sb)
 {
diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c
index 809ad8200..f61d6b492 100644
--- a/libsmartcols/src/table.c
+++ b/libsmartcols/src/table.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2010-2014 Karel Zak <kzak@redhat.com>
  * Copyright (C) 2014 Ondrej Oprala <ooprala@redhat.com>
- * Copytight (C) 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com>
+ * Copyright (C) 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com>
  *
  * This file may be redistributed under the terms of the
  * GNU Lesser General Public License.
@@ -375,7 +375,7 @@ FILE *scols_table_get_stream(struct libscols_table *tb)
  * If necessary then libsmartcols use all terminal width, the @reduce setting
  * provides extra space (for example for borders in ncurses applications).
  *
- * The @reduce must be smaller than terminal width, otherwise it's sillently
+ * The @reduce must be smaller than terminal width, otherwise it's silently
  * ignored. The reduction is not applied when STDOUT_FILENO is not terminal.
  *
  * Returns: 0, a negative value in case of an error.
@@ -702,7 +702,7 @@ int scols_table_set_symbols(struct libscols_table *tb,
  * @tb: table
  * @enable: 1 or 0
  *
- * Enable/disable line separator printing. This is usefull if you want to
+ * Enable/disable line separator printing. This is useful if you want to
  * re-printing the same line more than once (e.g. progress bar). Don't use it
  * if you're not sure.
  *
diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c
index d86b06841..20b015344 100644
--- a/libsmartcols/src/table_print.c
+++ b/libsmartcols/src/table_print.c
@@ -210,7 +210,7 @@ static int has_pending_data(struct libscols_table *tb)
 	return 0;
 }
 
-/* print padding or asci-art instead of data of @cl */
+/* print padding or ASCII-art instead of data of @cl */
 static void print_empty_cell(struct libscols_table *tb,
 			  struct libscols_column *cl,
 			  struct libscols_line *ln,	/* optional */
@@ -218,7 +218,7 @@ static void print_empty_cell(struct libscols_table *tb,
 {
 	size_t len_pad = 0;		/* in screen cells as opposed to bytes */
 
-	/* generate tree asci-art rather than padding */
+	/* generate tree ASCII-art rather than padding */
 	if (ln && scols_column_is_tree(cl)) {
 		if (!ln->parent) {
 			/* only print symbols->vert if followed by child */
@@ -1017,7 +1017,7 @@ done:
 }
 
 /*
- * This is core of the scols_* voodo...
+ * This is core of the scols_* voodoo...
  */
 static int recount_widths(struct libscols_table *tb, struct libscols_buffer *buf)
 {
@@ -1096,7 +1096,7 @@ static int recount_widths(struct libscols_table *tb, struct libscols_buffer *buf
 				if (!cl->is_extreme)
 					continue;
 
-				/* this column is tooo large, ignore?
+				/* this column is too large, ignore?
 				if (cl->width_max - cl->width >
 						(tb->termwidth - width))
 					continue;
@@ -1171,7 +1171,7 @@ static int recount_widths(struct libscols_table *tb, struct libscols_buffer *buf
 			if (cl->width == cl->width_min)
 				continue;
 
-			DBG(TAB, ul_debugobj(tb, "  tring to reduce: %s (width=%zu)", cl->header.data, cl->width));
+			DBG(TAB, ul_debugobj(tb, "  trying to reduce: %s (width=%zu)", cl->header.data, cl->width));
 
 			/* truncate column with relative sizes */
 			if (cl->width_hint < 1 && cl->width > 0 && width > 0 &&
@@ -1238,14 +1238,14 @@ static size_t strlen_line(struct libscols_line *ln)
 	return sz;
 }
 
-static int initialize_printting(struct libscols_table *tb, struct libscols_buffer **buf)
+static int initialize_printing(struct libscols_table *tb, struct libscols_buffer **buf)
 {
 	size_t bufsz, extra_bufsz = 0;
 	struct libscols_line *ln;
 	struct libscols_iter itr;
 	int rc;
 
-	DBG(TAB, ul_debugobj(tb, "initialize printting"));
+	DBG(TAB, ul_debugobj(tb, "initialize printing"));
 
 	if (!tb->symbols)
 		scols_table_set_symbols(tb, NULL);	/* use default */
@@ -1324,7 +1324,7 @@ err:
 /**
  * scola_table_print_range:
  * @tb: table
- * @start: first printed line or NULL to print from the beggin of the table
+ * @start: first printed line or NULL to print from the begin of the table
  * @end: last printed line or NULL to print all from start.
  *
  * If the start is the first line in the table than prints table header too.
@@ -1345,7 +1345,7 @@ int scols_table_print_range(	struct libscols_table *tb,
 
 	DBG(TAB, ul_debugobj(tb, "printing range"));
 
-	rc = initialize_printting(tb, &buf);
+	rc = initialize_printing(tb, &buf);
 	if (rc)
 		return rc;
 
@@ -1431,12 +1431,12 @@ int scols_print_table(struct libscols_table *tb)
 	DBG(TAB, ul_debugobj(tb, "printing"));
 
 	if (list_empty(&tb->tb_lines)) {
-		DBG(TAB, ul_debugobj(tb, "ignore -- epmty table"));
+		DBG(TAB, ul_debugobj(tb, "ignore -- empty table"));
 		return 0;
 	}
 
 	tb->header_printed = 0;
-	rc = initialize_printting(tb, &buf);
+	rc = initialize_printing(tb, &buf);
 	if (rc)
 		return rc;
 
diff --git a/login-utils/last.c b/login-utils/last.c
index 1ffd226a0..0c234f5e4 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -635,7 +635,7 @@ static int is_phantom(const struct last_control *ctl, struct utmp *ut)
 static void process_wtmp_file(const struct last_control *ctl,
 			      const char *filename)
 {
-	FILE *fp;		/* Filepointer of wtmp file */
+	FILE *fp;		/* File pointer of wtmp file */
 
 	struct utmp ut;		/* Current utmp entry */
 	struct utmplist *ulist = NULL;	/* All entries */
@@ -858,7 +858,7 @@ static void process_wtmp_file(const struct last_control *ctl,
 			break;
 
 		default:
-			warnx("unrecogized ut_type: %d", ut.ut_type);
+			warnx("unrecognized ut_type: %d", ut.ut_type);
 		}
 
 		/*
diff --git a/login-utils/login.c b/login-utils/login.c
index 64326937a..4d71f5424 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -347,7 +347,7 @@ static void chown_tty(struct login_context *cxt)
 }
 
 /*
- * Reads the currect terminal path and initializes cxt->tty_* variables.
+ * Reads the current terminal path and initializes cxt->tty_* variables.
  */
 static void init_tty(struct login_context *cxt)
 {
@@ -398,7 +398,7 @@ static void init_tty(struct login_context *cxt)
 	tcsetattr(0, TCSANOW, &ttt);
 
 	/*
-	 * Let's close file decriptors before vhangup
+	 * Let's close file descriptors before vhangup
 	 * https://lkml.org/lkml/2012/6/5/145
 	 */
 	close(STDIN_FILENO);
diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index 55406ac6d..3ff772515 100644
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -822,7 +822,7 @@ static int get_ulist(struct lslogins_control *ctl, char *logins, char *groups)
 	}
 
 	if (groups) {
-		/* FIXME: this might lead to duplicit entries, although not visible
+		/* FIXME: this might lead to duplicate entries, although not visible
 		 * in output, crunching a user's info multiple times is very redundant */
 		while ((g = strtok(groups, ","))) {
 			n = 0;
diff --git a/login-utils/su-common.c b/login-utils/su-common.c
index fe6d0c8c3..78a734c67 100644
--- a/login-utils/su-common.c
+++ b/login-utils/su-common.c
@@ -35,7 +35,7 @@
    (setting argv[0] to "-su", passing -c only to certain shells, etc.).
    I don't see the point in doing that, and it's ugly.
 
-   Based on an implemenation by David MacKenzie <djm@gnu.ai.mit.edu>.  */
+   Based on an implementation by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
 enum
 {
diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
index 4dcc77c43..1644da5ce 100644
--- a/login-utils/sulogin-consoles.c
+++ b/login-utils/sulogin-consoles.c
@@ -718,7 +718,7 @@ int detect_consoles(const char *device, int fallback, struct list_head *consoles
 #ifdef __linux__
 console:
 	/*
-	 * Detection of devices used for Linux system consolei using
+	 * Detection of devices used for Linux system console using
 	 * the /proc/consoles API with kernel 2.6.38 and higher.
 	 */
 	rc = detect_consoles_from_proc(consoles);
diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 1f4e468f8..38ea161c3 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -498,7 +498,7 @@ static struct passwd *getrootpwent(int try_manually)
 		warnx(_("%s: no entry for root"), _PATH_SHADOW_PASSWD);
 		*pwd.pw_passwd = '\0';
 	}
-	/* locked accont passwords are valid too */
+	/* locked account passwords are valid too */
 	if (!locked_account_password(pwd.pw_passwd) && !valid(pwd.pw_passwd)) {
 		warnx(_("%s: root password garbled"), _PATH_SHADOW_PASSWD);
 		*pwd.pw_passwd = '\0';
@@ -911,7 +911,7 @@ int main(int argc, char **argv)
 	reconnect = detect_consoles(tty, STDIN_FILENO, &consoles);
 
 	/*
-	 * If previous stdin was not the speified tty and therefore reconnected
+	 * If previous stdin was not the specified tty and therefore reconnected
 	 * to the specified tty also reconnect stdout and stderr.
 	 */
 	if (reconnect) {
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 4ecbb5d3d..774634240 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -449,7 +449,7 @@ static int lowprobe_superblocks(blkid_probe pr)
 
 		rc = blkid_do_fullprobe(pr);
 		if (rc < 0)
-			return rc;	/* -1 = error, 1 = nothing, 0 = succes */
+			return rc;	/* -1 = error, 1 = nothing, 0 = success */
 
 		if (blkid_probe_lookup_value(pr, "PTTYPE", NULL, NULL) == 0)
 			return 0;	/* partition table detected */
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 13d8b44be..8405cd15f 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -41,7 +41,7 @@
  *
  * 2000-09-01  Michael Charles Pruznick <dummy@netwiz.net>
  *             Added "-3" option to print prev/next month with current.
- *             Added over-ridable default MONTHS_IN_ROW and "-1" option to
+ *             Added overridable default MONTHS_IN_ROW and "-1" option to
  *             get traditional output when -3 is the default.  I hope that
  *             enough people will like -3 as the default that one day the
  *             product can be shipped that way.
@@ -196,7 +196,7 @@ struct cal_request {
 struct cal_control {
 	const char *full_month[MONTHS_IN_YEAR];	/* month names */
 	int colormode;			/* day and week number highlight */
-	int num_months;			/* number of requested mounths */
+	int num_months;			/* number of requested monts */
 	int span_months;		/* span the date */
 	int months_in_row;		/* number of months horizontally in print out */
 	int weekstart;			/* day the week starts, often Sun or Mon */
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 904a09d2d..b2ff04e8f 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -987,7 +987,7 @@ static struct libmnt_fs *get_next_fs(struct libmnt_table *tb,
 
 	} else if (is_mount_compatible_mode()) {
 		/*
-		 * Look up for FS in the same way how mount(8) searchs in fstab
+		 * Look up for FS in the same way how mount(8) searches in fstab
 		 *
 		 *   findmnt -f <spec>
 		 */
@@ -1175,7 +1175,7 @@ static int poll_table(struct libmnt_table *tb, const char *tabfile,
 		tb = tb_new;
 		tb_new = tmp;
 
-		/* remove allredy printed lines to reduce memory usage */
+		/* remove already printed lines to reduce memory usage */
 		scols_table_remove_lines(table);
 		mnt_reset_table(tb_new);
 
@@ -1622,7 +1622,7 @@ int main(int argc, char *argv[])
 		/* whole tree */
 		rc = create_treenode(table, tb, NULL, NULL);
 	} else {
-		/* whole lits of sub-tree */
+		/* whole list of sub-tree */
 		rc = add_matching_lines(tb, table, direction);
 
 		if (rc != 0
diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 92b2ae9cb..34b948797 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -38,7 +38,7 @@
  *  1999-02-22 Arkadiusz Miśkiewicz <misiek@pld.ORG.PL>
  *  - added Native Language Support
  *
- *  1999-11-13 aeb Accept signal numers 128+s.
+ *  1999-11-13 aeb Accept signal numbers 128+s.
  *
  * Copyright (C) 2014 Sami Kerola <kerolasa@iki.fi>
  * Copyright (C) 2014 Karel Zak <kzak@redhat.com>
@@ -272,7 +272,7 @@ static int signame_to_signum(char *sig)
 	if (!strncasecmp(sig, "rt", 2))
 		return rtsig_to_signum(sig + 2);
 #endif
-	/* Normal sugnals */
+	/* Normal signals */
 	for (n = 0; n < ARRAY_SIZE(sys_signame); n++) {
 		if (!strcasecmp(sys_signame[n].name, sig))
 			return sys_signame[n].val;
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index b7b08eb84..b01538b65 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -130,7 +130,7 @@ struct logger_ctl {
 	unsigned int
 			unix_socket_errors:1,	/* whether to report or not errors */
 			noact:1,		/* do not write to sockets */
-			prio_prefix:1,		/* read priority from intput */
+			prio_prefix:1,		/* read priority from input */
 			stderr_printout:1,	/* output message to stderr */
 			rfc5424_time:1,		/* include time stamp */
 			rfc5424_tq:1,		/* include time quality markup */
@@ -768,7 +768,7 @@ static void syslog_rfc5424_header(struct logger_ctl *const ctl)
 
 	sd = get_reserved_structured_data(ctl);
 
-	/* time quality structured data (maybe overwriten by --sd-id timeQuality) */
+	/* time quality structured data (maybe overwritten by --sd-id timeQuality) */
 	if (ctl->rfc5424_tq && !has_structured_data_id(sd, "timeQuality")) {
 
 		add_structured_data_id(sd, "timeQuality");
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 5b239f183..752783af1 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -269,9 +269,9 @@ struct blkdev_cxt {
 	char *fstype;		/* detected fs, NULL or "?" if cannot detect */
 	char *uuid;		/* filesystem UUID (or stack uuid) */
 	char *label;		/* filesystem label */
-	char *parttype;		/* partiton type UUID */
+	char *parttype;		/* partition type UUID */
 	char *partuuid;		/* partition UUID */
-	char *partlabel;	/* partiton label */
+	char *partlabel;	/* partition label */
 	char *partflags;	/* partition flags */
 	char *wwn;		/* storage WWN */
 	char *serial;		/* disk serial number */
@@ -298,7 +298,7 @@ static int is_maj_excluded(int maj)
 	assert(ARRAY_SIZE(excludes) > nexcludes);
 
 	if (!nexcludes)
-		return 0;	/* filter not enabled, device not exluded */
+		return 0;	/* filter not enabled, device not excluded */
 
 	for (i = 0; i < nexcludes; i++) {
 		if (excludes[i] == maj) {
@@ -471,7 +471,7 @@ static char *get_device_mountpoint(struct blkdev_cxt *cxt)
 		mnt_table_parse_mtab(mtab, NULL);
 	}
 
-	/* Note that maj:min in /proc/self/mouninfo does not have to match with
+	/* Note that maj:min in /proc/self/mountinfo does not have to match with
 	 * devno as returned by stat(), so we have to try devname too
 	 */
 	fs = mnt_table_find_devno(mtab, makedev(cxt->maj, cxt->min), MNT_ITER_BACKWARD);
@@ -1390,7 +1390,7 @@ static int list_deps(struct blkdev_cxt *cxt)
 			DBG(CXT, ul_debugobj(cxt, "%s: %s: dependence is whole-disk",
 								cxt->name, d->d_name));
 			/* For inverse tree we don't want to show partitions
-			 * if the dependence is pn whle-disk */
+			 * if the dependence is on whole-disk */
 			process_blkdev(&dep, cxt, lsblk->inverse ? 0 : 1, NULL);
 		}
 		reset_blkdev_cxt(&dep);
@@ -1405,7 +1405,7 @@ static int process_blkdev(struct blkdev_cxt *cxt, struct blkdev_cxt *parent,
 			  int do_partitions, const char *part_name)
 {
 	if (do_partitions && cxt->npartitions)
-		list_partitions(cxt, parent, part_name);		/* partitoins + whole-disk */
+		list_partitions(cxt, parent, part_name);		/* partitions + whole-disk */
 	else
 		fill_table_line(cxt, parent ? parent->scols_line : NULL); /* whole-disk only */
 
diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index a47c1d0ad..1f33dfde9 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2012 Davidlohr Bueso <dave@gnu.org>
  *
  * Very generally based on lslk(8) by Victor A. Abell <abe@purdue.edu>
- * Since it stopped being maingained over a decade ago, this
+ * Since it stopped being maintained over a decade ago, this
  * program should be considered its replacement.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
index 36f3b3db2..4a2daf936 100644
--- a/misc-utils/test_uuidd.c
+++ b/misc-utils/test_uuidd.c
@@ -188,7 +188,7 @@ static void create_nthreads(process_t *proc, size_t index)
 	}
 
 	if (ncreated != nthreads)
-		fprintf(stderr, "%d: %zu threads not craeted and ~%zu objects will be ignored\n",
+		fprintf(stderr, "%d: %zu threads not created and ~%zu objects will be ignored\n",
 				proc->pid, nthreads - ncreated,
 				(nthreads - ncreated) * nobjects);
 
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index feb0a0a66..4b1782ae1 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -421,7 +421,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 			warn(_("poll failed"));
 				all_done(uuidd_cxt, EXIT_FAILURE);
 		}
-		if (ret == 0) {		/* truen when poll() times out */
+		if (ret == 0) {		/* true when poll() times out */
 			if (uuidd_cxt->debug)
 				fprintf(stderr, _("timeout [%d sec]\n"), uuidd_cxt->timeout),
 			all_done(uuidd_cxt, EXIT_SUCCESS);
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index b351595fc..36c966f6a 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -119,7 +119,7 @@ static const struct dmesg_name level_names[] =
 
 /*
  * sys/syslog.h uses (f << 3) for all facility codes.
- * We want to use the codes as array idexes, so shift back...
+ * We want to use the codes as array indexes, so shift back...
  *
  * Note that libc LOG_FAC() macro returns the base codes, not the
  * shifted code :-)
@@ -244,7 +244,7 @@ static int set_level_color(int log_level, const char *mesg, size_t mesgsz)
 		break;
 	}
 
-	/* well, sometimes the messges contains important keywords, but in
+	/* well, sometimes the messages contains important keywords, but in
 	 * non-warning/error messages
 	 */
 	if (id < 0 && memmem(mesg, mesgsz, "segfault at", 11))
@@ -320,7 +320,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
  *  <name>   ::= case-insensitive text
  *
  *  Note that @len argument is not set when parsing "-n <level>" command line
- *  option. The console_level is intepreted as "log level less than the value".
+ *  option. The console_level is interpreted as "log level less than the value".
  *
  *  For example "dmesg -n 8" or "dmesg -n debug" enables debug console log
  *  level by klogctl(SYSLOG_ACTION_CONSOLE_LEVEL, NULL, 8). The @str argument
@@ -1066,7 +1066,7 @@ static int init_kmsg(struct dmesg_control *ctl)
 /*
  * /dev/kmsg record format:
  *
- *     faclev,seqnum,timestamp[optional, ...];messgage\n
+ *     faclev,seqnum,timestamp[optional, ...];message\n
  *      TAGNAME=value
  *      ...
  *
@@ -1130,7 +1130,7 @@ mesg:
 	rec->mesg_size = p - rec->mesg;
 
 	/*
-	 * Kernel escapes non-printable characters, unfortuately kernel
+	 * Kernel escapes non-printable characters, unfortunately kernel
 	 * definition of "non-printable" is too strict. On UTF8 console we can
 	 * print many chars, so let's decode from kernel.
 	 */
diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index 6bbf1c99f..b764b0b33 100644
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -121,7 +121,7 @@ static int has_discard(const char *devname, struct sysfs_cxt *wholedisk)
 		return 1;
 	/*
 	 * This is tricky to read the info from sys/, because the queue
-	 * atrributes are provided for whole devices (disk) only. We're trying
+	 * attributes are provided for whole devices (disk) only. We're trying
 	 * to reuse the whole-disk sysfs context to optimize this stuff (as
 	 * system usually have just one disk only).
 	 */
@@ -220,7 +220,7 @@ static int fstrim_all(struct fstrim_range *rangetpl, int verbose)
 			continue;
 
 		/* Is it really accessible mountpoint? Not all mountpoints are
-		 * accessible (maybe over mounted by another fylesystem) */
+		 * accessible (maybe over mounted by another filesystem) */
 		path = mnt_get_mountpoint(tgt);
 		if (path && strcmp(path, tgt) == 0)
 			rc = 0;
diff --git a/sys-utils/hwclock-cmos.c b/sys-utils/hwclock-cmos.c
index 7f564e70e..9103b7343 100644
--- a/sys-utils/hwclock-cmos.c
+++ b/sys-utils/hwclock-cmos.c
@@ -342,7 +342,7 @@ static inline unsigned long cmos_read(unsigned long reg)
 		 *  outb (0x0d, 0x70);  // 0x0d: random read-only location
 		 *
 		 * Other docs state that "any write to 0x70 should be
-		 * followed by an action to 0x71 or the RTC wil be left in
+		 * followed by an action to 0x71 or the RTC will be left in
 		 * an unknown state". Most docs say that it doesn't matter at
 		 * all what one does.
 		 */
diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c
index 3c0fba3e0..51fce7b44 100644
--- a/sys-utils/ipcutils.c
+++ b/sys-utils/ipcutils.c
@@ -136,7 +136,7 @@ int ipc_shm_get_info(int id, struct shm_data **shmds)
 			   &p->shm_ctim,
 			   &p->shm_rss,
 			   &p->shm_swp) < 14)
-			continue; /* ivalid line, skipped */
+			continue; /* invalid line, skipped */
 
 		if (id > -1) {
 			/* ID specified */
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 0df8af92b..267e728e1 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -250,7 +250,7 @@ struct lscpu_desc {
 	int		nsockets;	/* number of all online sockets */
 	cpu_set_t	**socketmaps;	/* unique core_siblings */
 
-	/* cores -- based on thread_siblings (internel kernel map of cpuX's
+	/* cores -- based on thread_siblings (internal kernel map of cpuX's
 	 * hardware threads within the same core as cpuX) */
 	int		ncores;		/* number of all online cores */
 	cpu_set_t	**coremaps;	/* unique thread_siblings */
diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
index ad9c1da2e..070d02478 100644
--- a/sys-utils/mountpoint.c
+++ b/sys-utils/mountpoint.c
@@ -1,7 +1,7 @@
 /*
  * mountpoint(1) - see if a directory is a mountpoint
  *
- * This is libmount based reimplementation of the mountpoit(1)
+ * This is libmount based reimplementation of the mountpoint(1)
  * from sysvinit project.
  *
  *
diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index 8dbd22b2e..f85ace9fc 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -359,7 +359,7 @@ int main(int argc, char *argv[])
 	 * them.  Do this in two passes, not entering the user
 	 * namespace on the first pass.  So if we're deprivileging the
 	 * container we'll enter the user namespace last and if we're
-	 * privileging it then we enter the usernamespace first
+	 * privileging it then we enter the user namespace first
 	 * (because the initial setns will fail).
 	 */
 	for (pass = 0; pass < 2; pass ++) {
diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index 7c748dcc5..72894eab8 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -474,7 +474,7 @@ int main(int argc, char **argv)
 			seconds = strtou32_or_err(optarg, _("invalid seconds argument"));
 			break;
 		case 't':
-			/* alarm time, time_t (absolute, seconds since epoc) */
+			/* alarm time, time_t (absolute, seconds since epoch) */
 			alarm = strtou32_or_err(optarg, _("invalid time argument"));
 			break;
 		case OPT_DATE:
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index cf29cf770..da29e2c01 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -274,7 +274,7 @@ int main(int argc, char *argv[])
 		OPT_LIST
 	};
 
-	/* Options --3gb and --4gb are for compatibitity with an old
+	/* Options --3gb and --4gb are for compatibility with an old
 	 * Debian setarch implementation.  */
 	static const struct option longopts[] = {
 		{"help",		no_argument,	NULL,	'h'},
diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c
index 168d10f3f..562b24f33 100644
--- a/sys-utils/swapoff.c
+++ b/sys-utils/swapoff.c
@@ -27,7 +27,7 @@ static int all;
 #define CANONIC	1
 
 /*
- * This function works like mnt_resolve_tag(), but it's able to read UUiD/LABEL
+ * This function works like mnt_resolve_tag(), but it's able to read UUID/LABEL
  * from regular swap files too (according to entries in /proc/swaps). Note that
  * mnt_resolve_tag() and mnt_resolve_spec() works with system visible block
  * devices only.
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 97acf1ea9..62a776d40 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -767,7 +767,7 @@ static int swapon_all(struct swapon_ctl *ctl)
 
 		if (prop.no_fail && access(device, R_OK) != 0) {
 			if (ctl->verbose)
-				warnx(_("%s: unaccessible -- ignored"), device);
+				warnx(_("%s: inaccessible -- ignored"), device);
 			continue;
 		}
 
diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index 8e3ef4e52..0c81970c7 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -344,7 +344,7 @@ static int umount_one_if_mounted(struct libmnt_context *cxt, const char *spec)
 
 	rc = mnt_context_find_umount_fs(cxt, spec, &fs);
 	if (rc == 1) {
-		rc = MOUNT_EX_SUCCESS;		/* alredy unmounted */
+		rc = MOUNT_EX_SUCCESS;		/* already unmounted */
 		mnt_reset_context(cxt);
 	} else if (rc < 0) {
 		rc = mk_exit_code(cxt, rc);	/* error */
@@ -365,7 +365,7 @@ static int umount_do_recurse(struct libmnt_context *cxt,
 	if (!itr)
 		err(MOUNT_EX_SYSERR, _("libmount iterator allocation failed"));
 
-	/* umount all childern */
+	/* umount all children */
 	for (;;) {
 		rc = mnt_table_next_child_fs(tb, itr, fs, &child);
 		if (rc < 0) {
@@ -452,7 +452,7 @@ static int umount_alltargets(struct libmnt_context *cxt, const char *spec, int r
 		goto done;
 	}
 
-	/* Note that @fs is from mount context and the context will be reseted
+	/* Note that @fs is from mount context and the context will be reset
 	 * after each umount() call */
 	devno = mnt_fs_get_devno(fs);
 	fs = NULL;
diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index 171380556..853401caf 100644
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -216,7 +216,7 @@ static struct sysfs_cxt *zram_get_sysfs(struct zram *z)
 		if (sysfs_init(&z->sysfs, devno, NULL))
 			return NULL;
 		if (*z->devname != '/') {
-			/* cannonicalize the device name according to /sys */
+			/* canonicalize the device name according to /sys */
 			char name[PATH_MAX];
 			if (sysfs_get_devname(&z->sysfs, name, sizeof(name)))
 				snprintf(z->devname, sizeof(z->devname), "/dev/%s", name);
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index d12a3f1c7..090ef9180 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -389,7 +389,7 @@ int main(int argc, char **argv)
 
 	tcsetpgrp(STDIN_FILENO, getpid());
 
-	/* Default is to follow the current line speend and then default to 9600 */
+	/* Default is to follow the current line speed and then default to 9600 */
 	if ((options.flags & F_VCONSOLE) == 0 && options.numspeed == 0) {
 		options.speeds[options.numspeed++] = bcode("9600");
 		options.flags |= F_KEEPSPEED;
@@ -559,7 +559,7 @@ static char *replace_u(char *str, char *username)
 			log_err(_("failed to allocate memory: %m"));
 
 		if (p != str) {
-			/* copy chars befor \u */
+			/* copy chars before \u */
 			memcpy(tp, str, p - str);
 			tp += p - str;
 		}
@@ -1043,7 +1043,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op)
 				debug("TIOCNOTTY ioctl failed\n");
 
 			/*
-			 * Let's close all file decriptors before vhangup
+			 * Let's close all file descriptors before vhangup
 			 * https://lkml.org/lkml/2012/6/5/145
 			 */
 			close(fd);
@@ -1268,7 +1268,7 @@ static void termio_init(struct options *op, struct termios *tp)
 
 	/*
 	 * Note that the speed is stored in the c_cflag termios field, so we have
-	 * set the speed always when the cflag se reseted.
+	 * set the speed always when the cflag is reset.
 	 */
 	cfsetispeed(tp, ispeed);
 	cfsetospeed(tp, ospeed);
diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 232f38948..13836e99a 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -166,10 +166,10 @@ struct setterm_control {
 	int opt_bl_min;		/* blank screen */
 	int opt_blength_l;	/* bell duration in milliseconds */
 	int opt_bfreq_f;	/* bell frequency in Hz */
-	int opt_sn_num;		/* console number to be snapshoted */
+	int opt_sn_num;		/* console number to be snapshot */
 	char *opt_sn_name;	/* path to write snap */
 	char *in_device;	/* device to snapshot */
-	int opt_msglevel_num;	/* printk() loging level */
+	int opt_msglevel_num;	/* printk() logging level */
 	int opt_ps_mode;	/* powersave mode */
 	int opt_pd_min;		/* powerdown time */
 	int opt_rt_len;		/* regular tab length */
diff --git a/term-utils/wall.c b/term-utils/wall.c
index 1253d32cd..4ad94d808 100644
--- a/term-utils/wall.c
+++ b/term-utils/wall.c
@@ -217,7 +217,7 @@ static void buf_printf(struct buffer *bs, const char *fmt, ...)
 	rc = vsnprintf(bs->data + bs->used, limit, fmt, ap);
 	va_end(ap);
 
-	if (rc >= 0 && (size_t) rc >= limit) {	/* not enoght, enlarge */
+	if (rc >= 0 && (size_t) rc >= limit) {	/* not enough, enlarge */
 		buf_enlarge(bs, (size_t)rc + 1);
 		limit = bs->sz - bs->used;
 		va_start(ap, fmt);
diff --git a/term-utils/write.c b/term-utils/write.c
index 14594f5d9..7c1523136 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -37,7 +37,7 @@
  * Wed Jun 22 21:41:56 1994, faith@cs.unc.edu:
  *      Added fix from Mike Grupenhoff (kashmir@umiacs.umd.edu)
  * Mon Jul  1 17:01:39 MET DST 1996, janl@math.uio.no:
- *      - Added fix from David.Chapell@mail.trincoll.edu enabeling daemons
+ *      - Added fix from David.Chapell@mail.trincoll.edu enabling daemons
  *	  to use write.
  *      - ANSIed it since I was working on it anyway.
  * 1999-02-22 Arkadiusz Miśkiewicz <misiek@pld.ORG.PL>
diff --git a/tests/expected/ipcs/limits b/tests/expected/ipcs/limits
index 7eaeff723..a0ff45728 100644
--- a/tests/expected/ipcs/limits
+++ b/tests/expected/ipcs/limits
@@ -1,5 +1,5 @@
 load original values
-maximalize kernel setting
+maximize kernel setting
 check for difference between kernel and IPC
 /proc/sys/kernel/shmmni OK
 /proc/sys/kernel/shmall OK
diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits
index e860724d4..f038b6cd0 100755
--- a/tests/ts/ipcs/limits
+++ b/tests/ts/ipcs/limits
@@ -34,7 +34,7 @@ for i in $IPCS_IDX; do
 	SHM_ORG[$i]=$(cat ${IPCS_PROCFILES[$i]})
 done >> $TS_OUTPUT
 
-ts_log "maximalize kernel setting"
+ts_log "maximize kernel setting"
 for i in $IPCS_IDX; do
 	echo ${IPCS_LIMITS[$i]} >> ${IPCS_PROCFILES[$i]}
 done >> $TS_OUTPUT
diff --git a/text-utils/pg.c b/text-utils/pg.c
index 9ef00f034..142e3f1e9 100644
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -805,7 +805,7 @@ static char *colb(char *s)
 }
 
 #ifdef HAVE_WIDECHAR
-/* Convert nonprintable characters to spaces in case MB_CUR_MAX > 1.  */
+/* Convert non-printable characters to spaces in case MB_CUR_MAX > 1.  */
 static void makeprint_for_mb(char *s, size_t l)
 {
 	char *t = s;
@@ -825,7 +825,7 @@ static void makeprint_for_mb(char *s, size_t l)
 }
 #endif
 
-/* Convert nonprintable characters to spaces. */
+/* Convert non-printable characters to spaces. */
 static void makeprint(char *s, size_t l)
 {
 #ifdef HAVE_WIDECHAR
@@ -938,7 +938,7 @@ static void pgfile(FILE *f, const char *name)
 	}
 	find = tmpfile();
 	if (fbuf == NULL || find == NULL) {
-		warn(_("Cannot create tempfile"));
+		warn(_("Cannot create temporary file"));
 		quit(++exitstatus);
 	}
 	if (searchfor) {
diff --git a/text-utils/ul.c b/text-utils/ul.c
index 115b88232..6721974de 100644
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -536,7 +536,7 @@ static void initinfo(void)
 
 	/*
 	 * Note that we use REVERSE for the alternate character set,
-	 * not the as/ae capabilities.  This is because we are modelling
+	 * not the as/ae capabilities.  This is because we are modeling
 	 * the model 37 teletype (since that's what nroff outputs) and
 	 * the typical as/ae is more of a graphics set, not the greek
 	 * letters the 37 has.