Merge branch 'maint' into next

105 files changed, 447 insertions, 447 deletions

diff --git a/INSTALL b/INSTALL
index b5afd2f5..2dd08f53 100644
--- a/INSTALL
+++ b/INSTALL
@@ -56,7 +56,7 @@ frequency, and the fsck pass number, respectively.  The problem with
 this is that the getmntent() library routine interprets those missing
 fields as "0", and a pass number of 0 is documented as meaning that
 fsck should not check that particular filesystem.  If your entries in
-your /etc/fstab file look liks this:
+your /etc/fstab file look like this:
 
 /dev/hda4       /        ext2        defaults
 
diff --git a/INSTALL.elfbin b/INSTALL.elfbin
index 3f54aa10..9c2c6006 100644
--- a/INSTALL.elfbin
+++ b/INSTALL.elfbin
@@ -35,7 +35,7 @@ frequency, and the fsck pass number, respectively.  The problem with
 this is that the getmntent() library routine interprets those missing
 fields as "0", and a pass number of 0 is documented as meaning that
 fsck should not check that particular filesystem.  If your entries in
-your /etc/fstab file look liks this:
+your /etc/fstab file look like this:
 
 /dev/hda4       /        ext2        defaults
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1fc54134..5baae60d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -35,7 +35,7 @@ inode size is < 256 bytes.
 The tune2fs program will not allow the project feature or project
 quotas to be enabled in the inode size is 128 bytes.
 
-The tune2fs progam now prints a more understandable message explaining
+The tune2fs program now prints a more understandable message explaining
 that the file system needs to be checked using e2fsck -f before
 running certain complex tune2fs operations.  (Addresses Debian Bug:
 #857336)
@@ -123,7 +123,7 @@ Fix libext2fs to correctly handle accounting for an external xattr
 block on bigalloc file systems.
 
 Fix e2fsck to correctly handle quota accounting when deleting files
-that have mnultiply-claimed blocks pass 1b.
+that have multiply-claimed blocks pass 1b.
 
 Fix potential buffer overrun bug in e2fsck when using 128 byte inodes.
 (Addresses Google Bug 37326362).
@@ -145,7 +145,7 @@ to speed up opening very large file systems with the meta_bg option.
 If e2fsck logging is enabled, e2fsck will report the exit code in the
 last line of the log file.
 
-Debugfs can now open file systems with a bad sueprblock checksum, and
+Debugfs can now open file systems with a bad superblock checksum, and
 the show_super_stats command will print the expected checksum.
 
 Fix a regression introduced in e2fsprogs 1.43.4 where tune2fs was not
@@ -285,7 +285,7 @@ E2fsck will now check, and if necessary repair the extra isize fields
 in the inode and superblock.
 
 Fix crashes on architectures such as sparc64 that are sensitive to
-unaligned pointer derferences in the journal recovery code when
+unaligned pointer dereferences in the journal recovery code when
 journal checksums are enabled.
 
 Programming notes
@@ -308,7 +308,7 @@ E2fsprogs 1.43.2 (September 1, 2016)
 ====================================
 
 Fix resize2fs so it will not crash if there is an extended attribute
-block but it doesn't need to migate any blocks during an off-line
+block but it doesn't need to migrate any blocks during an off-line
 resize
 
 Fix a crash when mke2fs or debugfs tries to copy in a directory
@@ -348,7 +348,7 @@ Avoid installing the man page for fuse2fs if it has not been built.
 
 Update the Catalan, Chinese, Danish, Dutch, French, German, Polish,
 Swedish, Ukrainian translations and added new translations for
-Hugarian and Serbian.
+Hungarian and Serbian.
 
 
 Programming notes
@@ -415,7 +415,7 @@ Debugfs's rdump command now works correctly when dumping the root
 directory of a file system.  (Addresses Debian Bug: #766125)
 
 Fixed a bug in debugfs so it would correctly calculate a block group's
-checksum field field on 64-bit ssystems.
+checksum field field on 64-bit systems.
 
 E2fsck now has a much more understandable error message when the
 journal superblock is corrupt and the user declines to fix it.
@@ -444,11 +444,11 @@ whether the creator OS is *not* EXT2_OS_HURD which is the one
 operating system where there has been extensive abuse of the
 s_creator_os flag.
 
-The libmagic libary has been suppressed when running the regression
+The libmagic library has been suppressed when running the regression
 test suite to avoid false test failures caused by differences between
 versions of libmagic (and/or the magic number database).
 
-The tests/test_script progam now accepts the --failed option, which
+The tests/test_script program now accepts the --failed option, which
 will run those tests that had previously failed.
 
 Fixed tests build on those systems which require LDFLAGS to be set.
@@ -590,7 +590,7 @@ when trying grow a file system and we need to allocate blocks to grow
 the block group descriptors.
 
 Fixed a bug in resize2fs which could cause it to get fooled trying to
-determinthe the RAID array's stride when flex_bg is enabled.
+determine the RAID array's stride when flex_bg is enabled.
 
 Fix resize2fs bug that could leave block allocation bitmaps
 uninitialized.
@@ -644,9 +644,9 @@ Android source tree.
 
 Reduce the use of libc functions in libext2fs that may not be present
 in the boot loader environment, at least for those functions that are
-needed by boot loadsers such as yaboot.
+needed by boot loaders such as yaboot.
 
-Developers can now overide the debugging and optimization flags by
+Developers can now override the debugging and optimization flags by
 redefining the CFLAGS makefile macro.
 
 The libext2fs library now has support for fallocate.
@@ -743,7 +743,7 @@ translation.
 Programmer's Notes
 ------------------
 
-Fixed coverity, sparce gcc -Wall, and clang warnings/nits.
+Fixed coverity, sparc gcc -Wall, and clang warnings/nits.
 
 Clean up some build system problems (build failures with various
 configure options, fix Posix portability issues, etc.)
@@ -828,7 +828,7 @@ Dumpe2fs will now complain if extra arguments are given to it.
 
 Updated/fixed various man pages.  (Addresses-Debian-Bug: #726760)
 
-Update Czech, Dutch, French, Polish, Spanish, Sweedish, Ukrainian, and
+Update Czech, Dutch, French, Polish, Spanish, Swedish, Ukrainian, and
 Vietnamese translations.
 
 Programmer's Notes
@@ -875,7 +875,7 @@ pessimal metadata layouts.
 The mke2fs program will provide a better metadata layout for
 moderately large (but believable) flex_bg counts, such as 133,072.
 
-The mke2fs progam will also check the kernel version number to
+The mke2fs program will also check the kernel version number to
 determine whether the lazy_itable_init option is supported, so that
 lazy inode table initialization can be used even if the ext4 is
 compiled as a module which isn't loaded at the time that mke2fs is
@@ -896,13 +896,13 @@ unsupported revision number will not be accepted by any of the other
 file system tools, and this command line option is rarely used, so
 let's try to help the user not shoot their own foot off.
 
-The debugfs progam can now set the error count and associated
+The debugfs program can now set the error count and associated
 first_error and last_error fields in the superblock using the
 set_super_value command.
 
 Resize2fs will not try to calculate the minimum size of a file system
 if it contains errors.  Otherwise a very badly corrupted file system
-image can cause the minimum size calculation to loop forwever.  Since
+image can cause the minimum size calculation to loop forever.  Since
 resize2fs will not allow a file system marked as containing errors to
 be resized.  It's pointless to calculate the minimum size, so just
 skip it.
@@ -910,7 +910,7 @@ skip it.
 Fixed a typo in one of mke2fs's error message.
 
 If filefrag runs into an error, it will continue processing the rest
-of the files specified on thec ommand line, but then exit with an
+of the files specified on the command line, but then exit with an
 error code.
 
 Filefrag now prints some additional new flags (such as
@@ -925,8 +925,8 @@ Fixed a regression introduced in 1.42.10 which caused mke2fs to fail
 to create file systems larger than 2GB on 32-bit platforms.
 (Addresses Red Hat Bugzilla: #1099892, Debian Bug: #752107)
 
-Add Esparanto and Ukrainian translations, and update Czech, Dutch,
-French, German, Italian, Polish, Sweedish, and Vietnamese
+Add Esperanto and Ukrainian translations, and update Czech, Dutch,
+French, German, Italian, Polish, Swedish, and Vietnamese
 translations.
 
 Fixed various compiler warnings.
@@ -998,7 +998,7 @@ be useful when creating a disk image for virtual machines (Addresses
 Debian Bug: #497984)
 
 Previously, e2fsck had a number of very serious bugs when checking a
-file system wich used the new the quota file system option (where the
+file system which used the new the quota file system option (where the
 quota inodes were stored in hidden inodes) and the quota inode was
 inconsistent with the actual usage data.  This problem was documented
 in https://ext4.wiki.kernel.org/index.php/Quota.  These problems have
@@ -1017,11 +1017,11 @@ few megabytes in a single resize2fs -M operation.
 E2fsck will now force a full file system check if there are any file
 system inconsistencies detected in the super block.
 
-The filefrag program will now display hte shared extent flag, which is
+The filefrag program will now display the shared extent flag, which is
 used by file systems such as btrfs.
 
 If the number of inodes in the file systems is larger than the time
-that file sytem was created (as measured by the number of seconds
+that file system was created (as measured by the number of seconds
 since January 1, 1970) e2fsck would print a scary (but otherwise
 harmless) warning of file system corruption for each inode in the
 orphan list.  This false positive has been fixed.
@@ -1029,7 +1029,7 @@ orphan list.  This false positive has been fixed.
 The e4defrag program has been fixed so it will no longer refuse with
 filesystem with the 64-bit or the bigalloc feature enabled.
 
-The logsave progam will print a much less scary message which could
+The logsave program will print a much less scary message which could
 lead users to believe something has gone very wrong with e2fsck exits
 with a non-zero exit status (since this is normal after e2fsck has
 automatically fixed a file system corruption during a preen
@@ -1077,7 +1077,7 @@ A bug introduced in 1.42.9 would cause debugfs to print two error
 messages if it found an error while parsing a user-supplied block
 number.  This has been fixed in 1.42.10.
 
-Update Czech, Dutch, French, German, Polish, Spanish, Sweedish, and
+Update Czech, Dutch, French, German, Polish, Spanish, Swedish, and
 Vietnamese translations.  (Addresses Debian Bug: #703048)
 
 Updated/fixed various man pages.  (Addresses Debian Bugs: #719189,
@@ -1089,7 +1089,7 @@ Fixed various Debian Packaging Issues.  (Addresses Debian Bug: #718725)
 Programmer's Notes
 ------------------
 
-Fixed a lot of coverity, sparce gcc -Wall, and clang warnings/nits.
+Fixed a lot of coverity, sparc gcc -Wall, and clang warnings/nits.
 
 Allow the location of pkg-config files to be specified independent of
 the libdir location via a makefile variable.
@@ -1104,7 +1104,7 @@ not have the "truncate" or "mksawp" programs.
 Allow e2fsck to build correctly on systems (such as Android) that do
 not have the signal.h file.
 
-E2fsprogs now has code coverage testing which can be enbled using
+E2fsprogs now has code coverage testing which can be enabled using
 "configure --enable-gcov".
 
 The libe2p.h header file can now be used included by C++ programs.
@@ -1321,7 +1321,7 @@ E2fsprogs 1.42.8 (June 20, 2013)
 ================================
 
 As a part of mke2fs's option parsing cleanup, the use of the -R option
-will give a warning that it is depreated (it has been so documented
+will give a warning that it is deprecated (it has been so documented
 since 2005) and -E should be used instead.
 
 Mke2fs will not give warnings about the bigalloc and quota options in
@@ -1497,7 +1497,7 @@ version which we checked into the e2fsprogs source tree.  These
 enhancements include thread safety, support for readdir64_r(), and
 safe_getenv() support in case spd_readdir.so is used for setuid binaries.
 
-Update Czech, Dutch, French, German, Polish, Sweedish, and Vietnamese
+Update Czech, Dutch, French, German, Polish, Swedish, and Vietnamese
 translations
 
 Add a command to debugfs to create symlinks.
@@ -1605,7 +1605,7 @@ Programmer's Notes
 
 The configure option --enable-relative-symlink was broken so that it
 needed to be --enable-symlink-relative-symlinks.  We will support both
-for at least two years, but then the worng configure option will be
+for at least two years, but then the wrong configure option will be
 removed.
 
 Fixed a regression introduced in 1.42.5 so the link order for
@@ -1713,7 +1713,7 @@ replayed, and if the journal *was* being replayed, the "error bit"
 wasn't getting flushed out to disk.
 
 Fixed a false positive complaint by e2fsck if all of the extents in
-the last extent tree block are uninitalized and located after the end
+the last extent tree block are uninitialized and located after the end
 of the file as defined by i_size.
 
 The dumpe2fs will now display the journal's s_errno field if it is
@@ -1811,7 +1811,7 @@ Fix a bug which would cause mke2fs to fail creating the journal if
     
 Updated/fixed various man pages.
 
-Update Czech, Dutch, French, German, Polish, Sweedish, and Vietnamese
+Update Czech, Dutch, French, German, Polish, Swedish, and Vietnamese
 translations
 
 Fixed various Debian Packaging issues.
@@ -1910,7 +1910,7 @@ during the block group descriptor checks.  (Addresses Google Bug:
 If there are incorrect block group checks, e2fsck will now report the
 incorrect and corrected checksum values.
 
-The e2fsck progam can now write log files containing the details of
+The e2fsck program can now write log files containing the details of
 the problems that were found and fixed directly, via configuration
 parameters in /etc/e2fsck.conf.
 
@@ -1927,7 +1927,7 @@ if it is incorrect.  This helps to diagnose problems caused by
 incorrect block group checksums.
 
 E2fsck now checks for extents with a zero length, since the kernel
-will oops if it comes accross such a corrupted data structure.  (See
+will oops if it comes across such a corrupted data structure.  (See
 https://bugzilla.kernel.org/show_bug.cgi?id=42859)
 
 E2fsck has a number of bugs relating to discard that have been fixed.
@@ -1973,7 +1973,7 @@ Fixed the debian rules file so that the calls to dpkg-buildflags works
 when the shell is dash.
 
 The debian package build now uses V=1 so that there is more
-information about potential build failures in debian buildd logs.
+information about potential build failures in debian build logs.
 
 If the uninit flags get cleared by functions such as
 ext2fs_new_inode() or ext2fs_new_block2(), we now make sure the
@@ -1981,7 +1981,7 @@ superblock is marked dirty and the block group descriptor checksum is
 updated if necessary.
 
 The debian rules file will now try to load debian/rules.custom of it
-exists.  This flie can skip various builds for speed reasons if there
+exists.  This file can skip various builds for speed reasons if there
 is no need for the e2fsck-static or udeb packages.  Available
 customizations in the rules file includes SKIP_STATIC=yes,
 SKIP_BF=yes, and SKIP_DIETLIBC=yes.
@@ -2021,7 +2021,7 @@ ext2fs_open2() function clears the UNINIT bits to ensure all of the
 inodes in the file systems get scanned.  However, the code which reset
 the UNINIT flags did not also recalculate the checksum, which produced
 many spurious (and scary) e2fsck messages.  This has been fixed by
-resetting cheksums when the UNINIT bits are cleared.
+resetting checksums when the UNINIT bits are cleared.
 
 Relax a check in e2fsck which required that the block bitmap to be
 initialized when the inode bitmap is in use.  This will allow us to
@@ -2053,7 +2053,7 @@ calculate the minimum file system size for use with the -M option.
 Fixed the badblocks program to honor the -s flag when in read-only -t
 mode.  (Addresses Debian Bug #646629)
 
-Update Czech, Dutch, French, Polish, and Sweedish translation from the
+Update Czech, Dutch, French, Polish, and Swedish translation from the
 Translation Project.
 
 Fixed various Debian Packaging issues so that dpkg-buildflags is used
@@ -2132,7 +2132,7 @@ a false positive.  (Addresses Debian Bug: #619859)
 E2fsck now uses less cpu time in pass 5 when large portions of the
 bitmaps are uninitialized.
 
-E2fsck will no longer segault when a corrupted file system has a bad
+E2fsck will no longer segfault when a corrupted file system has a bad
 extent, and removing it leads to a block needing to be deallocated.
 (Addresses SourceForge Bug: #2971800)
 
@@ -2147,7 +2147,7 @@ to get confused and do more harm than good.
 
 If e2fsck modifies certain superblock fields which the kernel doesn't
 look at, it will now mark the superblock as dirty without marking the
-file system as changed.  This avoids signalling the init scripts that
+file system as changed.  This avoids signaling the init scripts that
 a reboot is necessary, since the kernel isn't going to look at those
 fields, so it won't care if they have been changed.
 
@@ -2190,7 +2190,7 @@ lost+found directories.
 Mke2fs will skip zero'ing the journal if the extended option
 "lazy_journal_init" is specified.  This can save a lot of time, but it
 does add a small amount of risk if the system crashes before the
-journal is overwritten entirely once.  It is epsecially useful for
+journal is overwritten entirely once.  It is especially useful for
 testing.
 
 Mke2fs will now create file systems that enable user namespace
@@ -2340,7 +2340,7 @@ Reserved file system code points for new 1st class quota feature.
 Shortened the compilation lines by moving the autoconf defines to
 a config.h header file.
 
-Fixed a potential free of an unitialized pointer in
+Fixed a potential free of an uninitialized pointer in
 ext2fs_update_bb_inode().
 
 Fixed miscellaneous gcc -Wall and coverity warnings.
@@ -2371,7 +2371,7 @@ The i_e2image test was fixed so it works with valgrind.
 Tests that rely on debugfs are now skipped if debugfs wasn't built.
 
 Fixed the dependencies for "make check" so all required dependencies
-are built before running the gression tests.
+are built before running the regression tests.
 
 A link to com_err.h is installed in $(includedir) during a "make install".
 
@@ -2467,7 +2467,7 @@ fields which track where and when the first and most recent file
 system errors occurred.  These fields are displayed by dumpe2fs and
 cleared by e2fsck.  These new superblock fields were added in 2.6.36.
 
-Debugfs now uses a more concicse format for listing extents in its
+Debugfs now uses a more concise format for listing extents in its
 stat command.  This format also includes the interior extent tree
 blocks, which previously was missing from stat's output for
 extent-based files.
@@ -2507,7 +2507,7 @@ complaining about an invalid inode ratio specified by the user.
 
 Mke2fs now understands the extended option "discard" and "nodiscard",
 and the older option -K is deprecated.  The default of whether
-discards are enabled by default can be controled by the mke2fs.conf
+discards are enabled by default can be controlled by the mke2fs.conf
 file.
 
 Mke2fs's handling of logical and physical sector sizes has been
@@ -2600,7 +2600,7 @@ altogether.
 
 E2fsck could potentially remove directory entries for inodes found in
 the unused region of the inode table; this would generally happen on
-ext4 file systems that do not use journaling.  This bug has been fixed
+ext4 file systems that do not use journalling.  This bug has been fixed
 by not clearing these directory entries once it has been established
 that bg_unused_inodes may not be trustworthy; once pass #2 has been
 completed, e2fsck will restart the file system check from the
@@ -2659,7 +2659,7 @@ needed for a particular build.  Given that install floppies are going
 
 Add configure options --enable-symlink-build and
 --enable-symlink-install, which allow e2fsprogs be built using
-symlinks instad of hard links, and to be installed using symlinks
+symlinks instead of hard links, and to be installed using symlinks
 instead of hard links, respectively.  It is useful when the file
 system where the build is taking place, or the file system where
 e2fsprogs is installed, can't handle hard links for some reason.
@@ -2912,7 +2912,7 @@ Enhance dumpe2fs to dump the extent information via the 'stat'
 command, and more detailed extent information via the new command
 'dump_extents'.
     
-Update French, Polish, Czech, and Sweedish translation from the
+Update French, Polish, Czech, and Swedish translation from the
 Translation Project.
 
 Fixed various Debian packaging issues --- see debian/changelog for
@@ -2967,7 +2967,7 @@ contrib directory.
 
 Fix filefrag program for files that have more than 144 extents.
 
-Update French, Polish, Czech, Indonsian, and Sweedish translation from
+Update French, Polish, Czech, Indonesian, and Swedish translation from
 the Translation Project.
 
 Fixed various Debian packaging issues --- see debian/changelog for
@@ -3000,7 +3000,7 @@ E2fsprogs 1.41.7 (June 29, 2009)
 ================================
 
 Fix a bug in libext2fs which can cause e2fsck and resize2fs to write
-uninitalized data into the portion of the inode beyond the first 128
+uninitialized data into the portion of the inode beyond the first 128
 bytes when operating on inodes mapped via extents; potentially
 corrupting filesystems.
 
@@ -3028,7 +3028,7 @@ filesystems as the kernel when encoding rec_len >= 64k.  For 64k
 filesystems (currently all that is supported by e2fsprogs, this is
 only a minor corner case).
 
-Resize2fs will now update the journal backup fileds in the sup0erblock
+Resize2fs will now update the journal backup fields in the superblock
 if the journal is moved; this avoids an unnecessary full fsck after
 resizing the filesystem.  (Addresses RedHat Bugzilla: #505339)
     
@@ -3037,7 +3037,7 @@ journal and resize inodes.
 
 Change badblocks to allow block sizes larger than 4k.
 
-Fix filefrag progam so it correctly checks for errors from the fiemap ioctl.
+Fix filefrag program so it correctly checks for errors from the fiemap ioctl.
 
 Update Chinese and Czech translation from the Translation Project.
 
@@ -3082,7 +3082,7 @@ Bug: #527859)
     
 Fix e2fsck so that if the primary group descriptors are corrupted, but
 the backup superblock is entirely invalid, to go back to using (and
-fixing) the priary group descriptors instead of completely giving up
+fixing) the primary group descriptors instead of completely giving up
 on the filesystem.  (Addresses Debian Bug: #516820)
     
 Change e2fsck to not abort a preen pass if an inode is found to have
@@ -3103,7 +3103,7 @@ Add support to chattr to migrate inodes from using direct/indirect
 blocks to extents.
 
 Avoid corrupting the filesystem if there is an attempt to shrink a
-filesystem using resize2fs smaller than posible by making
+filesystem using resize2fs smaller than possible by making
 ext2fs_set_bmap() more careful not to delete the old block until the
 new block can be inserted.  In addition, fix a bug in how the minimum
 size of the filesystem (plus a safety margin) is calculated, and
@@ -3113,9 +3113,9 @@ size without the force flag.
 Teach blkid to try to figure out DM device names using take advantage
 of information in sysfs when running on kernels (2.6.29 and later)
 which provide this information in /sys/block/dm-<N>/dm/name; this is
-much faster than scanning for the devncie number in /dev/mapper.
+much faster than scanning for the device number in /dev/mapper.
 
-Fix blkid to prefer /dev/mapper/<name> device names instad of the
+Fix blkid to prefer /dev/mapper/<name> device names instead of the
 private /dev/dm-X names.
 
 Add an -a option to debugfs's close_filesys command which writes any
@@ -3146,7 +3146,7 @@ Clean up e2fsck by removing #ifdef RESOURCE_TRACK by adding an empty
 function declaration for init_resource_track() and
 print_resource_track() when RESOURCE_TRACK is not defined.
 
-The test code which is used to build the tst_csum progam has been
+The test code which is used to build the tst_csum program has been
 moved from from tst_csum.c into csum.c under an #ifdef DEBUG to to
 avoid compile problems caused by not having a prototype for
 ext2fs_group_desc_csum().  (Addresses Sourceforge Bug #2484331)
@@ -3181,7 +3181,7 @@ blocks so they are read using a single read operation.
 The libuuid library will now close all file descriptors before running
 uuidd.  This avoids problems when the calling program has open sockets
 which then never get closed because uuidd is a long-running helper
-daeomn.  (Addresses Launchpad bug: #305057)
+daemon.  (Addresses Launchpad bug: #305057)
 
 In order to avoid unnecessary full filesystem checks by e2fsck after
 an on-line resize, e2fsck will ignore the NEEDS_RECOVERY flag set on
@@ -3212,7 +3212,7 @@ used to support filesystems without a journal.  Update the blkid
 library so it understands this.
 
 The blkid library will remove an entry from the blkid cache
-representing the entire disk if partitions are found, since presuambly
+representing the entire disk if partitions are found, since presumably
 the device previously had no partition table, but has now transitioned
 to using a partition table.
 
@@ -3224,7 +3224,7 @@ Add support for tracking the number kilobytes written to the
 filesystem via the superblock field s_kbytes_written.  It will be
 updated by the kernel as well as by e2fsprogs programs which write to
 the filesystem.  This is useful for tracking the wear to filesystems
-on Solid Sstate Drives.
+on Solid State Drives.
 
 Fix compatibility issue in the libext2fs info file and makeinfo
 version 4.12.  (Addresses Red Hat Bugzilla: #481620)
@@ -3311,7 +3311,7 @@ INODE_UNINIT flag.
 E2fsck now distinguishes between fragmented directories and fragmented
 files in verbose mode statistics and in the fragcheck report.
 
-Fix a bug in e2fsck which casued it double count non-contiguous
+Fix a bug in e2fsck which caused it double count non-contiguous
 extent-based inodes.
 
 E2fsck will leave some slack space when repacking directories to allow
@@ -3358,7 +3358,7 @@ number to avoid overrunning an array boundary.
 Various signed/unsigned errors for variables containing block numbers
 have been fixed.
 
-Accomodations for gcc's stupidity in not realizing that constant
+Accommodations for gcc's stupidity in not realizing that constant
 strings that do not contain a '%' character are safe to use in format
 strings have been made so that distributions that want to compile
 e2fsprogs with -Werror=format-security have an easier time doing so.
@@ -3432,7 +3432,7 @@ from e2fsprogs 1.40.7 which caused e2fsck to fail if the user
 specifies a block number using the -b option if the blocksize option
 isn't also specified using -B.  Unfortunately, users very commonly
 invoke e2fsck using "e2fsck -b 32768 /dev/hdXXX" to use the backup
-superblock; in fack e2fsck will often suggest this kind of command
+superblock; in fact e2fsck will often suggest this kind of command
 line.  Oops.
 
 Enhance the debugfs's "ncheck" command so it will print all of the
@@ -3468,7 +3468,7 @@ Fix the usage message for debugfs's logdump command to be consistent
 with its man manpage.
 
 Update Polish, French, Vietnamese, Dutch, Indonesian, German, Czech,
-and Sweedish translation from the Translation Project.
+and Swedish translation from the Translation Project.
 
 Add documentation for the file I/O functions to the libext2fs.texinfo
 file.  (Addresses Debian Bug: #484877)
@@ -3482,7 +3482,7 @@ details. (Addresses Debian Bug: #497619)
 Programmer's Notes
 ------------------
 
-Fix a potential file descriptor leack in libcom_err by setting the
+Fix a potential file descriptor leak in libcom_err by setting the
 close-on-exec flag for a fd used for debugging.  (Addresses Red Hat
 Bugzilla #464689)
 
@@ -3560,7 +3560,7 @@ Mke2fs will correctly enforce the prohibition against features
 (specifically read-only features) in revision 0 filesystems.  (Thanks
 to Benno Schulenberg for noticing this problem.)
 
-Mke2fs previously would occasionaly create some slightly non-optimally
+Mke2fs previously would occasionally create some slightly non-optimally
 placed inode tables; this bug has been fixed.
 
 The mke2fs and tune2fs programs now print the correct usage message
@@ -3607,7 +3607,7 @@ Add support for on-line resizing ext4 filesystem with the flex_bg
 filesystem feature.  The method for doing so is not optimal, but to do
 a better job will require kernel support.
 
-E2fsprogs 1.41.0 intrduced a bug in libext2fs which casued e2image and
+E2fsprogs 1.41.0 introduced a bug in libext2fs which caused e2image and
 debugfs programs to not be able to read e2image files; the signed
 vs. unsigned bug in the code which read bitmaps from the e2image has
 been fixed.   (Addresses Debian Bug: #495830)
@@ -3683,7 +3683,7 @@ errors in the libext2fs texinfo file.
 Fixed various Debian packaging issues --- see debian/changelog for
 details.
 
-Add Indonesian and update French, Polish, Dutch, German, Sweedish,
+Add Indonesian and update French, Polish, Dutch, German, Swedish,
 Czech, and Vietnamese Translations.  (Addresses Debian Bugs: #313697,
 #401092)
 
@@ -3698,7 +3698,7 @@ LD_LIBRARY_PATH before running the various e2fsck internal library
 regression tests.
 
 The crc32 regression test in the e2fsck library is now portable to
-greater varienty of environments, including big-endian systems and
+greater variety of environments, including big-endian systems and
 when cross-building e2fsprogs for embedded systems.  (Addresses
 Sourceforge Bug: #2019287)
 
@@ -3746,7 +3746,7 @@ Disable a very annoying automatic "%.sh -> %" GNU make rule in the
 top-level Makefile.  That automatic rule is used to better support
 SCCS, but it caused problems for a particular niche distribution which
 likes to use configure.sh files to store the configure options used to
-build a package.  Unfortuntaely GNU make will use the configure.sh to
+build a package.  Unfortunately GNU make will use the configure.sh to
 replace the configure script, resulting in a self-inflicted fork bomb
 leading to an out-of-memory crash.
 
@@ -3776,9 +3776,9 @@ The io_channel_read_blk64() and io_channel_write_blk64() functions are
 now functions instead of C preprocessor macros to provide better
 forward compatibility.
 
-The e2fpsrogs translation template now expands the @x abbrevation.
+The e2fpsrogs translation template now expands the @x abbreviation.
 
-Various namespace leackages in libblkid, libe2p, and libext2fs have
+Various namespace leakages in libblkid, libe2p, and libext2fs have
 been fixed.
 
 Fix a parallel build problem in e2fsprogs.
@@ -3791,7 +3791,7 @@ E2fsprogs is now more portable to Solaris.
   * Flush stdio handles before calling setbuf(), since Solaris will
     discard any pending output to the stream.
   * Define _XOPEN_SOURCE to 600 since Solaris's header files are very
-    picky about which C compiler can beused for SUSv3 conformance.
+    picky about which C compiler can be used for SUSv3 conformance.
     Use of C99 is not compatible with SUSv2 (_XOPEN_SOURCE=500),
     and C89 is not compatible with SUSv3 (_XOPEN_SOURCE=600).
     Since we need some SUSv3 functions, consistently use SUSv3 so
@@ -3801,9 +3801,9 @@ E2fsprogs is now more portable to Solaris.
     is included, which conflicts with e2fsprogs' use of the kmem_cache_t
     typedef.
   * Solaris ships with a pathetically ancient shell in /bin/sh so we
-    avoid the use of various more avanced shell constructs such as $().
+    avoid the use of various more advanced shell constructs such as $().
 
-The "make rpm" command will now take some extra configure optiosn from
+The "make rpm" command will now take some extra configure options from
 the build environment without needing to patch the source tree.
 
 The ext2fs_add_dir_block() function will now grow the dblist more
@@ -3904,7 +3904,7 @@ it to quote the filenames so that spaces or tabs in directory entries
 are easily visible.  (Addresses Red Hat Bugzilla: #149480; Addresses
 Sourceforge Feature Request: #1201667)
 
-Fix a potential off-by-one buffer oveflow in the fs_device_name in an
+Fix a potential off-by-one buffer overflow in the fs_device_name in an
 e2image file.
 
 The chattr program will return a non-zero exit code in case of
@@ -3943,7 +3943,7 @@ bitmaps.
 
 Fix gcc -Wall warnings
 
-Fix the pkg-config files so that private librares are specified in
+Fix the pkg-config files so that private libraries are specified in
 "Libs.private:".
 
 Fix the libext2fs.texinfo manual so it builds with modern versions of
@@ -4020,9 +4020,9 @@ which has been journalled starts with the first four bytes 0xc03b3998,
 when e2fsck replays the journal, those four bytes will be replaced
 with zero's.  Fortunately, it is highly, highly unlikely for e2fsck
 metadata to begin with those fatal 4 byte sequence, and unless
-data=ordered mode is in use, data blocks are never journaled.
+data=ordered mode is in use, data blocks are never journalled.
 
-Updated German, Dutch, Sweedish, and Vietnamese translations.
+Updated German, Dutch, Swedish, and Vietnamese translations.
 
 Programmer's notes:
 -------------------
@@ -4045,7 +4045,7 @@ directory, but it's good to get them fixed.
 One additional fix in ext2fs_swap_inode_full() needed for resize2fs to
 work correctly with in-inode extended attributes.
 
-Updated German, Czech, Dutch, French, Polish, Sweedish, and Vietnamese
+Updated German, Czech, Dutch, French, Polish, Swedish, and Vietnamese
 translations.
 
 Debugfs will avoid using a pager if the standard output is not a tty.
@@ -4077,9 +4077,9 @@ s_first_data_block setting.
 Fix bug in blkid when run by an unprivileged user; most devices were
 not reported correctly.  9Addresses Launchpad Bug: #220275)
 
-Mke2fs will not allow the logically incorect combination of
+Mke2fs will not allow the logically incorrect combination of
 resize_inode and meta_bg, which had previously caused mke2fs to create
-a corrupt fileystem.
+a corrupt filesystem.
 
 Fix fsck in German locales so that a 'j' means yes.
 (Addresses Sourceforge Bug: #1947683)
@@ -4130,7 +4130,7 @@ completely on big-endian systems such as PowerPC.  The bug should be
 completely fixed now.  Yay for regression test suites.  (Addresses Red
 Hat Bugzilla: #434893)
     
-Updated German, Czech, Dutch, Polish, Sweedish, and Vietnamese
+Updated German, Czech, Dutch, Polish, Swedish, and Vietnamese
 translations.  Many thanks to Philipp Thomas from Novell for stepping
 up to become the new German translation maintainer!  (Addresses Debian
 Bugs: #302512, #370247, #401092, #412882).
@@ -4202,13 +4202,13 @@ Fix bug which could cause libblkid to seg fault if a device mapper
 volume disappears while it is being probed.  (Addresses RedHat
 Bugzilla: #433857)
     
-Inhance e2fsck's reporting of unsupported filesystem feature flags.
+Enhance e2fsck's reporting of unsupported filesystem feature flags.
 (Addresses Sourceforge Feature Request: #1175808)
     
 Fix option syntax in dumpe2fs for explicit superblock and blocksize
 parameters.  What was currently documented in the man page has been
 broken for some time, due to getopt() implementation changes.  The
-option sytax has been changed to one which is can be more portable
+option syntax has been changed to one which is can be more portable
 supported and which is consistent with the format for extended options
 in mke2fs and tune2fs.  (Addresses Sourceforge Bug: #1830994)
     
@@ -4235,7 +4235,7 @@ Fix uuidd so that it creates the pid file with the correct pid number.
 
 Fix various gcc -Wall warnings.
 
-Update Czech, Dutch, Polish, Sweedish, and Vietnamese translations
+Update Czech, Dutch, Polish, Swedish, and Vietnamese translations
 
 Fixed spelling mistakes, typos, and otherwise clarified man pages.  
 (Addresses Sourceforge Patch: #1399325)
@@ -4324,7 +4324,7 @@ long.
 
 Mke2fs will now create new filesystems with 256 byte inodes and the
 ext_attr feature flag by default.  This allows for much better future
-compatibity with ext4 and speeds up extended attributes even on ext3
+compatibility with ext4 and speeds up extended attributes even on ext3
 filesystems.
 
 Teach e2fsck to ignore certain "safe" filesystem features which are
@@ -4352,7 +4352,7 @@ skip calling ftruncate in that case.
 
 Add support for detecting HFS+ filesystems in the blkid library.
 
-Add supprt in the blkid library for ext4/ext4dev filesystems.
+Add support in the blkid library for ext4/ext4dev filesystems.
 
 Fix a bug in blkid where it could die on a floating point exception
 when presented with a corrupt reiserfs image.
@@ -4474,7 +4474,7 @@ root in the dom0 host environment, thus allowing the untrusted user to
 gain privileged access in the host OS.  Thanks to the McAfee AVERT
 Research group for reporting this issue.  (Addresses CVE-2007-5497.)
 
-Fix hueristics in blkid which could cause a disk without partitions to
+Fix heuristics in blkid which could cause a disk without partitions to
 be incorrectly skipped when a loopback device is present.  (Addresses
 Red Hat Bugzilla #400321.)
 
@@ -4550,11 +4550,11 @@ Fix mke2fs tests to avoid needing any significant ^M (CR) characters
 
 Add "make check" to the RPM spec file
 
-Fix "make install" and 'make unstall" in misc/Makefile.in so that it
+Fix "make install" and 'make uninstall" in misc/Makefile.in so that it
 works correctly when the prefix is not the root directory.
 
 Fix the resize2fs tests, r_move_itable and r_resize_inode, so they
-clena up after themselves by deleting the test.img temporary file
+clean up after themselves by deleting the test.img temporary file
 after completing the test.
 
 Fixed a corner case bug ext2fs_unlink() when trying to delete the
@@ -4563,7 +4563,7 @@ entry in the previous directory block is not in use.  Fortunately
 ext2fs_unlink() is only used by debugfs and e2fsck, and in e2fsck in
 places where it is extremely unlikely to run into this corner case.
 
-Fix missing dependency which would cuase parallel builds to fail.
+Fix missing dependency which would cause parallel builds to fail.
 (Addresses Sourceforge Bug #1842331.)
 
 Fix a build error on newer gcc caused by lib/ext2fs/ismounted.c
@@ -4587,7 +4587,7 @@ Since we normally can very accurately predict how big the the dirinfo
 array needs to be, this bug only got triggered on very badly corrupted
 filesystems.
 
-Fix a bug in e2fsck which caused it to incorrectly salvange
+Fix a bug in e2fsck which caused it to incorrectly salvage
 directories when the last entry's rec_len is bogusly too big.  This
 resulted in a nonsense filesystem corruption to be reported, and
 required a second run of e2fsck to fully fix up the directory.
@@ -4650,7 +4650,7 @@ e2fsprogs-1.32-mk_cmds-cosmetic.patch)
     
 Fix the test suite to use LC_ALL instead of LANG.  LC_ALL is the "high
 priority" environment variable that overrides all others, where as
-LANG is the lowest priorty environment variable.  If LC_ALL is set, it
+LANG is the lowest priority environment variable.  If LC_ALL is set, it
 doesn't matter whether LANG, LANGUAGE, LC_COLLATE, LC_MESSAGES, and
 the all the rest are set.  This will assure that the locale when
 running the test suites is the "C" locale.  (Obviates Gentoo patch:
@@ -4767,7 +4767,7 @@ error case.
 
 Add libreadline.so.5 support to libss.
 
-Impove badblocks -n/-w exclusive usage message.
+Improve badblocks -n/-w exclusive usage message.
 
 Fix dump_unused segfault in debugfs when a filesystem is not open
 
@@ -4816,7 +4816,7 @@ Add explanatory message to badblocks that -n and -w are mutually exclusive
 Allow debugfs and dumpe2fs to support fs features under development.
 
 Add support for the new flag EXT2_FLAG_SOFTSUPP_FEATURES flag to
-ext2fs_open() , which allows application to open filesystes with features
+ext2fs_open() , which allows application to open filesystems with features
 which are currently only partially supported by e2fsprogs.
 
 Allow unix_io to support offsets greater than 2G (Addresses
@@ -4890,7 +4890,7 @@ determining a partition's size, since binary searching to determine
 the device doesn't work on FreeBSD.
 
 Documentation about UUID's is available in enough places, and it's
-awkward to deal with debian-legal's insanities.  So I'm caving in the
+awkward to deal with debian-legal's inanities.  So I'm caving in the
 "more-lunatic-than-RMS" wing of Debian by removing RFC-4122 so we
 don't have do the dfsg tarball.  Also remove the rule that only tried
 to install RFC-4122 on Ubuntu, since Ubuntu seems to want to fetch
@@ -4970,7 +4970,7 @@ reruns any failed tests
 Update draft-leach-uuids-guids-01.txt with rfc4122.txt
 
 Fix miscellaneous bugs reported by Coverity: Dead code, potential nul
-pointer dereferences, memory leaks, etc.  None were security-criticial
+pointer dereferences, memory leaks, etc.  None were security-critical
 problems.
 
 Fix up usage and decrement error messages in the test_icount program
@@ -5046,7 +5046,7 @@ resize inode for large filesystems.  (Addresses Debian Bug #346580)
 When allocating space for the RAID filesystems with the stride
 parameter, mke2fs will now place each portion of the group's inode
 table right up after the superblock (if present) in order to minimize
-fragmentation of the freespace.
+fragmentation of the free space.
 
 Speed up mke2fs and e2fsck by writing inode and block bitmaps more
 efficiently by writing the inode and block bitmaps in one pass, thus
@@ -5166,7 +5166,7 @@ filesystems.
 Fix a compile_et bug which miscount the number of error messages if
 continuations are used in the .et file.
 
-Add extra sanity checks to protect users from unusual cirucmstances
+Add extra sanity checks to protect users from unusual circumstances
 where /etc/mtab may not be sane, by checking to see if the device is
 reported busy (works on Linux 2.6) kernels.  (Addresses Debian Bug
 #319002)
@@ -5230,7 +5230,7 @@ Sourceforge Bug #1261547)
 
 Clean up the blkid library by making the superblock and generic i/o
 functions to be more generic.  Clean up interface to the probe
-function, and fix memory leak.  Finallly, remove an unneeded reference
+function, and fix memory leak.  Finally, remove an unneeded reference
 to probe.h in the lib/blkid/resolve.c
 
 Add an ext2fs_read_bb_FILE regression test to confirm proper detection
@@ -5283,7 +5283,7 @@ Bugzilla ##161183.)
 
 Fix com_err library to make it more compatible with recent changes
 made to the com_err library in MIT Kerberos V5 version 1.4.
-(Addresses Sourcefroge Bug #1150146)
+(Addresses Sourceforge Bug #1150146)
 
 General cleanup of messages printed by e2fsprogs programs for grammar,
 consistency, and to make life easier for translators.  Fixed a few
@@ -5341,7 +5341,7 @@ filesystems.  (Addresses Debian Bug: #303509)
 If the superblock last mount time indicates that the system clock may
 not be accurate, then e2fsck will omit checking inodes' deletion time
 field for indications of a potential corrupted orphaned inode list.
-(Previously e2fsck only ommited these LOW_DTIME checks when the
+(Previously e2fsck only omitted these LOW_DTIME checks when the
 superblock's last write time looked insane.)
 
 Fixed a IA64 core dump bug in the e2p library which affected dumpe2fs.
@@ -5383,7 +5383,7 @@ are searched before searching all devices in the system.
 Added new functions to the blkid library, blkid_dev_set_search() and
 blkid_dev_has_tag().
 
-E2fsck's problem strings can now use @m and @n as abbrevations for
+E2fsck's problem strings can now use @m and @n as abbreviations for
 "multiply-claimed" and "invalid", respectively.
 
 The e2fsprog.pot file now has an explanation of how the @-expansion
@@ -5394,10 +5394,10 @@ make life easier for translators.
 Fixed missing return values in the ext2fs library which could cause it
 to return random garbage in certain error conditions.
 
-Allow the current time to be overriden via the E2FSCK_TIME environment
+Allow the current time to be overridden via the E2FSCK_TIME environment
 variable for use in regression tests.
 
-The test scrpit driver program now exits with a non-zero status if
+The test script driver program now exits with a non-zero status if
 there any of its test that it ran failed.
 
 Fixed problems with parabuilds on SMP systems.  (Addresses Sourceforge
@@ -5469,7 +5469,7 @@ Cleaned up the lib/ext2fs Makefile slightly.
 E2fsprogs 1.36 (February 4, 2005)
 =================================
 
-All of the patches that were applied to Fedore Core 3's
+All of the patches that were applied to Fedora Core 3's
 e2fsprogs-1.35-11.2 have been integrated, although sometimes with a
 lot of bug fixes first.  Users of Fedora Core 3 are strongly
 encouraged to upgrade to e2fsprogs 1.36 as soon as possible.
@@ -5536,7 +5536,7 @@ too big to be expressed using a 1k blocksize.  (Addresses Sourceforge
 bug #1106631)
 
 Change blkid to test for NTFS first because Windows sometimes doesn't
-clear enough of the parition to confuse the probing routines into
+clear enough of the partition to confuse the probing routines into
 thinking the old filesystem type is still valid.  (Addresses Debian
 Bug #291990)
 
@@ -5571,7 +5571,7 @@ Mke2fs will now accept a size in megabytes, gigabytes, and other units
 convenient than specifying a block count.
 
 Fix an obscure, hard-to find bug in "e2fsck -S" caused by an inode
-cache conherency problem.
+cache coherency problem.
 
 Debugfs now supports a new command, set_inode_field, which allows a
 user to manually set a specific inode field more conveniently, as well
@@ -5579,7 +5579,7 @@ as set entries in the indirect block map.
 
 Debugfs's set_super_value command has been enhanced so that the user
 can set most superblock fields, including the date/time fields and
-some of the more newsly added superblock fields.
+some of the more newly added superblock fields.
 
 E2fsprogs programs now accept an offset to be passed to the file
 specifiers, via the syntax: "/tmp/test.img?offset=1024".
@@ -5622,7 +5622,7 @@ Change e2fsck to accept directories greater than 32MB.
 Fix e2fsck so that a checkinterval of zero disables a time-based check
 of the filesystem.
 
-Debugfs will check the DEBUGFS_PAGER enviroment variable in preference
+Debugfs will check the DEBUGFS_PAGER environment variable in preference
 to the PAGER environment variable.  (Addresses Debian Bug #239547)
 
 Tune2fs will not mark rewrite the superblock if the feature bitmasks 
@@ -5638,7 +5638,7 @@ Add e2image -I option which allows the e2image metadata to be
 installed into a filesystem.
 
 Fixed bug in the badblocks program which caused "done" to always
-appear in english even when a translation was available.  (Addresses
+appear in English even when a translation was available.  (Addresses
 Debian Bug #252836)
 
 The blkid program has a new option -o which controls the output format
@@ -5651,7 +5651,7 @@ of clock sequence when generating UUID's.
 Fix a Y8.8888K problem in the uuid library.
 
 Logsave now creates a new session id for itself to avoid getting
-killed by init whan transitioning between init levels.
+killed by init when transitioning between init levels.
 
 Change the licensing of the UUID library to be the 3-clause BSD-style
 license; this allows Apple to use the uuid library in Darwin.
@@ -5662,7 +5662,7 @@ Fix a memory and file descriptor leak in the blkid library.
 
 The blkid library will revalidate the device if the system time is
 earlier than last verification time of the device, since that
-indicates that the system time is probably nottrustworthy.
+indicates that the system time is probably not trustworthy.
 
 The blkid library will override the default location of the blkid.tab
 file by the BLKID_FILE environment variable, if it is available.
@@ -5697,7 +5697,7 @@ The uuid library now has new functions uuid_unparse_upper() and
 uuid_unparse_lower() which forces the case of the hex digits to be
 upper case, or lower case.
 
-The build process has been speeded up by enhancing the subst program
+The build process has been sped up by enhancing the subst program
 to update the modtime on the generated files even when the generated
 file hasn't changed.
 
@@ -5732,7 +5732,7 @@ __attribute__ ((unused)) if we are using GCC, so that UUID_DEFINE can
 be used in header files.
 
 Add support for the install-strip and install-shlibs-strip targets, as
-suggested by the GNU coding guielines.  "make install" no longer
+suggested by the GNU coding guidelines.  "make install" no longer
 strips the binaries which are installed.
 
 Remove support for the --enable-old-bitops configure option which was
@@ -5761,7 +5761,7 @@ Fix "make uninstall" to so that it removes everything that is installed.
 
 Add a configure --enable-maintainer-mode option which enables the
 makefile rules to rebuild the configure script from configure.in, and
-to reubuild the .gmo files in po directory.
+to rebuild the .gmo files in po directory.
 
 Drop the sparc assembly bitwise operations; it's less efficient
 than the GCC 3.4 compile code and triggers compiler warnings on
@@ -5781,7 +5781,7 @@ E2fsprogs will now deal correctly with symlinks that contain
 extended attribute information, which can be created using SE Linux.
 (Addresses Debian Bug #232328)
                                                                                
-Remove a double longjump into an invalid stack frame bug in e2fsck.
+Remove a double longjmp into an invalid stack frame bug in e2fsck.
 (This was during an abort sequence, which normally worked on Linux and
 caused a core dump on other operating systems.)
 
@@ -5952,7 +5952,7 @@ to be an even multiple of the VM pagesize in order to avoid a Linux
 kernel bug introduced when the storage of the buffer cache was moved
 into the page cache.
 
-Mke2fs will warn the user when creating a filesystem with journaling
+Mke2fs will warn the user when creating a filesystem with journalling
 and a blocksize greater than 4096.  (Addresses Debian bug #193773)
 
 Fixed a bug in resize2fs which caused it to fail on filesystems with a
@@ -5989,7 +5989,7 @@ Fixed a bug in the blkid library which caused it to not update its
 cache if a filesystem changes from having a label to not having a
 label.
 
-Fixed a bug in the blkid library wihch could avoid an infinite loop
+Fixed a bug in the blkid library which could avoid an infinite loop
 in blkid_find_dev_with_tag() if /proc is not mounted and there the
 /etc/blkid.tab file has not yet been created.
 
@@ -6000,10 +6000,10 @@ thrashing the system block buffer cache.
 Fixed various NLS issues.
  - Added Czech and Swedish translations
  - Removed testing NYC translation
- - Fixed NLS support for message abbrevations in e2fsck
+ - Fixed NLS support for message abbreviations in e2fsck
  - Remove de-utf.po, since we shouldn't have two versions using different
 	charset encodings.
- - Used ngettext() (abbreivated with the macro P_(str1, str2, n)) to 
+ - Used ngettext() (abbreviated with the macro P_(str1, str2, n)) to
 	simplify the statistics reporting in e2fsck.
 
 Changed configure.in so that its defaults for *BSD systems no longer
@@ -6025,7 +6025,7 @@ Updated gettext implementation used by e2fsprogs to 0.11.5, and enable
 NLS support by default.  (Added partial workaround for gettext/Darwin
 incompatibility problems.)
 
-Added full MIT KRB5 and Himdall compaibility support to the com_err
+Added full MIT KRB5 and Himdall compatibility support to the com_err
 library and the compile_et program.  (Addresses Debian bug #191900)
 
 Added the blkid_known_fstype() function to the blkid library, which
@@ -6209,8 +6209,8 @@ Updated config.guess and config.sub with newer versions from the FSF.
 Removed unnecessary libraries from being linked into the fsck, lsattr, 
 chattr, and blkid executables.
 
-E2fsprogs 1.32 (Nomvember 9, 2002)
-==================================
+E2fsprogs 1.32 (November 9, 2002)
+=================================
 
 Fixed a bug in the Unix I/O routines which caused needless writebacks
 of clean blocks from the unix_io cache (they were erroneously marked
@@ -6224,12 +6224,12 @@ small amount of CPU time.
 Updated internationalization files.
 
 
-E2fsprogs 1.31 (Nomvember 8, 2002)
-==================================
+E2fsprogs 1.31 (November 8, 2002)
+=================================
 
 Update EVMS ext2fsim plugin with EVMS 1.2.  (We still support
 compiling the fsim plugin with EVMS 1.0 and 1.1.)  Add better error
-handling for child process that die unexpectly.  Add a hack to force
+handling for child process that die unexpectedly.  Add a hack to force
 mkfs to create filesystems that won't cause problems with hardware
 that has 2k or 4k minimum blocksize requirements.  Read from child
 processes in non-blocking mode, so that the GUI continues to update.
@@ -6250,7 +6250,7 @@ Fix a bug where e2fsck could erroneously mark a filesystem as being
 clean if a check of dirty filesystem is interrupted with a ^C.  (Bug
 introduced in e2fsprogs 1.28.)
 
-If journal debuging is enabled using --enable-jbd-debug, the debugging
+If journal debugging is enabled using --enable-jbd-debug, the debugging
 level is now set via the E2FSCK_JBD_DEBUG environment variable.
 
 If byteswapping support is disabled using configure --disable-swapfs,
@@ -6258,7 +6258,7 @@ skip the tests which depend on byte-swapping, so that "make check"
 won't bomb out.
 
 Lshattr will now display the indexed directory flag.  Also, some of
-the more esoteric compression flags are supressed unless compression
+the more esoteric compression flags are suppressed unless compression
 support has been enabled.
 
 Update man pages.
@@ -6272,7 +6272,7 @@ update the inode's ctime field, and the mtime field of the containing
 directories, so that incremental backups using dump/restore will work
 correctly.
 
-In order to avoid spurious errors, e2fsck wil check the last
+In order to avoid spurious errors, e2fsck will check the last
 superblock write time to determine whether or not it can safely use
 the LOW_DTIME checks to determine if there are inodes on the orphan
 inode linked list that had somehow gotten disconnected.  (Addresses
@@ -6292,7 +6292,7 @@ mounted using the loopback interface.  (Addresses Sourceforge bug
 When flushing buffers (as is done by badblocks, for example) check to
 see if the BLKFLSBUF ioctl succeeds, and if so, avoid using the
 FDFLUSH ioctl which causes the MD device driver which causes confusing
-syslog messages about obselete ioctl messages.  (Addresses Sourceforge
+syslog messages about obsolete ioctl messages.  (Addresses Sourceforge
 bug #545832).
 
 Debugfs's write command now checks to see if the destination filename
@@ -6315,7 +6315,7 @@ the location of the block/inode bitmaps and inode table.
 
 Add support for the an alternative block group descriptor layout which
 allows for on-line resizing without needing to prepare the filesystem
-in advance.  (This is the incomat feature flag meta_bg.)
+in advance.  (This is the incompat feature flag meta_bg.)
 
 Add support for storing default mount options in the superblock, so
 that the filesystem can be mounted with specific mount options without
@@ -6326,7 +6326,7 @@ Add support for a new inode flag, which is to be used for indicating
 the top of directory hierarchies for the Orlov block allocator.
 
 Fix e2fsck so that if it creates the lost+found directory, it does so
-with the more apporpriate permissions of 0700.  Also change
+with the more appropriate permissions of 0700.  Also change
 mklost+found so that it also creates the directory 0700.
 
 Fixed format bug in e2fsck if NLS is in use.
@@ -6356,7 +6356,7 @@ block.
 E2fsck now performs additional consistency checks on indexed (HTREE)
 directories.
 
-Fix bug where efsck might get confused about whether a completely
+Fix bug where e2fsck might get confused about whether a completely
 empty directory block is an empty leaf block or an interior htree
 node.  This could cause e2fsck to get confused into think that a valid
 indexed directory was corrupted.
@@ -6391,7 +6391,7 @@ E2fsprogs 1.29 (September 24, 2002)
 ===================================
 
 Fixed a bug in e2fsck which could corrupt a directory when optimizing
-it (via the -D option) or rebuiliding the hash tree index with a 1 in
+it (via the -D option) or rebuilding the hash tree index with a 1 in
 512 probability, due to a fence post error.
 
 Fixed a bug in the LVM support code which caused LABEL='xxx' not to
@@ -6427,7 +6427,7 @@ for setting the htree flag is not included yet, although it can be
 manually turned on via the debugfs program.
 
 Clarified e2fsck error message which is printed when it cannot find
-sufficient contiguous block when relcating filesystem metadata.
+sufficient contiguous block when relocating filesystem metadata.
 
 Added support for building an EVMS plugin module for ext2/3.  This
 module is substantially the same as the EVMS module shipping with EVMS
@@ -6486,7 +6486,7 @@ SIGINT/SIGTERM to its child processes, and wait until they have all
 exited before it exits.
 
 The uuid parsing code in the uuid library now properly complains when
-an illegally formated uuid is presented to it.  (Addresses Debian bug
+an illegally formatted uuid is presented to it.  (Addresses Debian bug
 #152891)
 
 Restrict use of the 2.4 setrlimit ABI f*ckup to kernels between 2.4.10
@@ -6544,7 +6544,7 @@ e2fsck will not complain that the file is too small.
 Resize2fs will print the actual new size of the filesystem when it is
 finished resizing.
 
-Fixed a bug in debugfs where "ls -l" would report incorrectl file type
+Fixed a bug in debugfs where "ls -l" would report incorrectly file type
 information on big-endian systems.
 
 
@@ -6560,7 +6560,7 @@ limitations and bugs which make it unsuitable for production use.)
 
 The ext2fs_read_dir_block2 and ext2fs_write_dir_block now take a new
 flag, EXT2_DIRBLOCK_V2_STRUCT, which will will reverse when the
-name_len field is byte swampped on big-endian machines, since in the
+name_len field is byte swapped on big-endian machines, since in the
 V2 structure, name_len is a char field which is doesn't need to be
 byte swapped --- except if an old-style kernel had byte-swapped the
 name_len field as part of the V1 structure.
@@ -6612,7 +6612,7 @@ Programmer's notes:
 
 Fixed various gcc -Wall complaints.
 
-Fixed a few memory leaks in the e2fsck journaling code, and in the
+Fixed a few memory leaks in the e2fsck journalling code, and in the
 ismounted code checking for a swap device.
 
 Add new inode I/O abstraction interface which exports an inode as
@@ -6678,7 +6678,7 @@ automatically identify reiserfs filesystems.
 The number of processes spawned by fsck can now be limited using the
 FSCK_MAX_INST environment variable.
 
-Fsck now searchs the LVM proc hierarchy to find logical volumes which
+Fsck now searches the LVM proc hierarchy to find logical volumes which
 should be searched for  UUID and label information.
 
 Work around a bug in 2.4.10+ kernels by trying to unset the filesize
@@ -6693,7 +6693,7 @@ badblocks.
 
 Mke2fs now automatically clears the immutable attribute on a
 pre-existing .journal file left over from a previous failed attempt to
-add a journal to an alreadyy-mounted filesystem.
+add a journal to an already-mounted filesystem.
 
 Fixed mke2fs's exit codes to consistently indicate when the mke2fs
 operation failed.
@@ -6765,7 +6765,7 @@ Fix general gcc -Wall complaints.
 E2fsprogs (mostly) works with the dietlibc.
 
 The programming texinfo file has been expanded to include description
-of additional libext2fs functions.  (Still not compeltely done, but a
+of additional libext2fs functions.  (Still not completely done, but a
 lot of the more important functions have been documented.)
 
 Added a umask structure to struct_ext2_filsys, which currently only
@@ -6783,7 +6783,7 @@ information to the callback function (identical to the one used by
 ext2fs_dblist_dir_iterate).  The directory iterator functions take a
 new flag, DIRENT_FLAG_INCLUDE_REMOVED, which will return deleted
 directory entries.  If the directory entry is deleted, the callback
-function will be called with the entry paraemter set to
+function will be called with the entry parameter set to
 DIRENT_DELETED_FILE.
   
 Added new functions, ext2fs_inode_alloc_stats and
@@ -6796,7 +6796,7 @@ E2fsprogs 1.25 (September 20, 2001)
 ===================================
 
 This is primarily a bug-fix release; no new features were added, but
-there are a number of embarassing bug fixes and cleanups applied.
+there are a number of embarrassing bug fixes and cleanups applied.
 
 Fix a bug mke2fs which causes stack garbage to be written to disk when
 zapping disk sectors.  (This bug could cause mke2fs to core dump for
@@ -6856,7 +6856,7 @@ result.
 
 Mke2fs is now more careful about zapping swap space signatures and
 other filesystem/raid superblock magic values so that programs like
-mount who try to use hueristics to determine the filesystem type of a
+mount who try to use heuristics to determine the filesystem type of a
 partition are less likely to be confused.
 
 E2fsck will no longer complain if the the mode of EXT2_RESIZE_INO is a
@@ -6871,11 +6871,11 @@ E2fsprogs program no longer print the filesystem version number
 purpose.
 
 E2fsck will once again compile under libc5, since it will supply its
-own version of strnlen if necesssary.
+own version of strnlen if necessary.
 
 mke2fs and tune2fs will allow the use of UUID= or LABEL= specifiers
 when specifying the external journal device.  tune2fs will also search
-devices looking for the externla journal debice when removing.  
+devices looking for the external journal device when removing.
 
 E2fsprogs 1.23 (August 15, 2001)
 ================================
@@ -6970,7 +6970,7 @@ ioctls, and allow them to be defined for non-i386 platforms.
 The uuid.h header file is now protected against multiple inclusions.
 
 E2fsprogs is now being developed using BitKeeper.  Changed the test
-scripts to deal with BK's stripping CR characgters from text files,
+scripts to deal with BK's stripping CR characters from text files,
 and changed the top-level Makefile.in to avoid including BitKeeper
 files when generating the source tarball.
 
@@ -6979,7 +6979,7 @@ E2fsprogs 1.21 (June 15, 2001)
 ==============================
 
 Added new configure flags which allow a subset e2fsprogs to be built;
-this is most useful for boot floopies, since the resulting shared
+this is most useful for boot floppies, since the resulting shared
 libraries and programs are slimmed down by removing features that
 aren't necessary for a boot floppy.  The new flags that were added
 are: --disable-swapfs, which removes support for byte swapping old
@@ -7037,7 +7037,7 @@ directories correctly because the change modified the layout of struct
 dirent to be incompatible with the libe2p shared library.
 
 Cleaned up the mke2fs manual page and included a discussion about why
-it's good to periodically check the filesystem even when journaling is
+it's good to periodically check the filesystem even when journalling is
 enabled.
 
 Programmer's notes:
@@ -7060,7 +7060,7 @@ Fixed the d_loaddump test case to be more robust, and not depend on
 bash'isms.
 
 Removed debugfs's dependence on pread(), which was accidentally
-intrudced in e2fsprogs 1.20
+introduced in e2fsprogs 1.20
 
 Fixed a performance bug in the libext2fs's icount routine; the size
 estimate of the icount array was incorrectly being calculated.
@@ -7092,7 +7092,7 @@ Miscellaneous code cleanups:
 		their dependencies would be properly calculated.
 	* Removed redundant code
 	* Fixed comments in code
-	* Removed no-longer unneeded argsused #pragma.
+	* Removed no-longer unneeded args used #pragma.
 
 
 E2fsprogs 1.20 (May 20, 2001)
@@ -7128,7 +7128,7 @@ of the directory entry before using it.
 The ext2 library has been enhanced to make tune2fs safe to run on
 mounted filesystems.  (Users could usually get away with using tune2fs
 on mounted filesystems before, but with the advent of ext3 and
-journaling, it became important to make tune2fs was *really* safe for
+journalling, it became important to make tune2fs was *really* safe for
 use even when the filesystem being modified is mounted.)  E2label is
 now implemented by tune2fs using an argv[0] dispatch, so that e2label
 is also now safe for use on mounted filesystems.
@@ -7145,7 +7145,7 @@ large file when deciding whether or not the filesystem has large files.
 Fixed lsattr and chattr so that they work correctly on large files.
 (Fixes Debian bug #72690.)
 
-Removed limitation in get_device_size() which imposed a one terrabyte
+Removed limitation in get_device_size() which imposed a one terabyte
 filesystem limitation.  (Most 2.2 kernels still have a signed int
 problem which cause 1 TB block device limitation.  Fortunately, the
 kernel patches to fix this are much easier than fixing the 2TB
@@ -7315,11 +7315,11 @@ Added ext3 journalling support.  E2fsck will run the journal (if
 necessary) by temporarily mounting the filesystem.  /sbin/fsck.ext3 is
 installed as a symlink to e2fsck.  Fsck has been taught about ext3,
 and treats it the same as ext2 in terms of the progress bar logic.
-Dumpe2fs will display the superblock journaling information if the
+Dumpe2fs will display the superblock journalling information if the
 filesystem has a journal.  The ext2 library will now permit opening an
 ext3 filesystem with the recovery flag set.  This is necessary for
 on-line dump's to work correctly, but there may be issues with this
-working well since ext3 is much less agressive about syncing blocks to
+working well since ext3 is much less aggressive about syncing blocks to
 the filesystem, since they're safe on the journal.
 
 Tune2fs and e2fsck have been changed to allow the mount_count check to
@@ -7337,7 +7337,7 @@ kernel version changes.  Which include files are used by e2fsprogs
 have also been cleaned up to improve portability.
 
 Limit the number of times that e2fsck updates the progress bar so that
-people who are booting using a 9600 baud console don't get swampped by
+people who are booting using a 9600 baud console don't get swamped by
 too many updates.
 
 Improved the loop detection algorithm in e2sck's pass #3 so that it is
@@ -7383,7 +7383,7 @@ check filesystems if there were any LABEL= or UUID= entries in
 /etc/fstab.
 
 The Hurd doesn't support the filetype filesystem feature.  The mke2fs
-program now makes sure that for the Hurd, the filestype feature is
+program now makes sure that for the Hurd, the filetype feature is
 turned off.  E2fsck will check to see if the filetype feature is
 turned on for Hurd filesystems, and offer to turn off the feature.
 
@@ -7404,7 +7404,7 @@ which is used in catastrophic situations where the block group
 descriptors are corrupt.  If the -c option is specified, debugfs will
 skip trying to read in the block and inode bitmaps.
 
-Debufs's lsdel command was fixed to handle bad blocks in the inode
+Debugfs's lsdel command was fixed to handle bad blocks in the inode
 table.
 
 A Y2K bug in debugfs's "ls -l" handling was fixed by switching to use
@@ -7526,7 +7526,7 @@ The ext2fs_free() command now uses the new badblocks API to avoid
 using the compatibility layer.
 
 Added new regression test cases; the run_e2fsck test script now
-supports the ability for a test case to run a prepratory command
+supports the ability for a test case to run a preparatory command
 before running e2fsck.
 
 E2fsprogs 1.17 (October 26, 1999)
@@ -7582,7 +7582,7 @@ sparse_superblock features enabled by default, unless it is run on a
 pre-2.2 kernel.  These features are not supported by a pre-2.2 kernel,
 so there is now a new flag -O which allows the user to specify with
 which features she would like to create the filesystem; "mke2fs -O
-none" will create a filesystsem compatible with 2.0 kernels.
+none" will create a filesystem compatible with 2.0 kernels.
 
 The tune2fs program now has a -O option which allows the user to set
 and reset "safe" filesystem features.  Currently, the only ones which
@@ -7608,7 +7608,7 @@ expanded to the point where an indirect block needed to be allocated.
 
 E2fsck now makes some additional sanity checks on the superblock to
 avoid crashing or giving a memory allocation error if some of the
-values in the superblock are unresonable (but the superblock otherwise
+values in the superblock are unreasonable (but the superblock otherwise
 looks valid).
 
 Fixed a bug in e2fsck where a very badly corrupted filesystem might
@@ -7658,12 +7658,12 @@ Linux 2.3 kernels that have renamed i_version to i_generation.
 
 E2fsck now prints a progress/completion bar (and not just a simple
 spinner) if the -C0 option is requested or if it receives a SIGUSR1
-signal.  Fsck will automatically manage the (potentially muliple)
+signal.  Fsck will automatically manage the (potentially multiple)
 e2fsck processes to print completion bars if it is given a -C option,
 with the right thing happening if multiple filesystems are being
 checked in parallel.
 
-Mke2fs now has better automatic hueristics to determine the filesystem
+Mke2fs now has better automatic heuristics to determine the filesystem
 parameters to be used for a particular filesystem.  Added a new option
 -T which allows the user to specify how the filesystem is to be used,
 which helps mke2fs do a better job selecting the filesystem parameters.
@@ -7693,7 +7693,7 @@ caused the last block in the bitmap not to get cleared.
 Cleaned up a number of messages in e2fsck:
 	* The message "Group's #'s copy of the group descriptor..."
 		was fixed so that the correct number would be displayed.
-	* Added missing space in the "disk write-protected" error messsage
+	* Added missing space in the "disk write-protected" error message
 	* Cleaned up the error message printed when a non-interactive
 		e2fsck needs to abort a check because the filesystem
 		appears to be mounted.
@@ -7702,12 +7702,12 @@ Added a new command-line utility, uuidgen, which will create and print
 a UUID.
 
 Make debugfs's icheck command more robust by checking to make sure an
-inode has valid blocks before interarting over the inode's blocks.
+inode has valid blocks before interacting over the inode's blocks.
 
 UUID generation now uses a random-based scheme whenever possible to
 prevent potential privacy problems.
 
-Man pages for all of the UUID functions in the lirbary were added.
+Man pages for all of the UUID functions in the library were added.
 
 Fixed bug in fsck so it won't coredump if a filesystem not in
 /etc/fstab is given to it.
@@ -7745,7 +7745,7 @@ Cleaned up functions such as pass1_get_blocks, pass1_read_inode which
 in e2fsck's pass1.c really should have been static.
 
 The return value of the uuid_compare() function was changed to make it
-match with the convetions used by strcmp, memcmp, and Paul Leach's
+match with the conventions used by strcmp, memcmp, and Paul Leach's
 UUID sample document.
 
 The "make depend" process has now been made more automated; it now
@@ -7837,7 +7837,7 @@ one of the reasons is that it is uncleanly mounted, e2fsck will print
 that as the reason why the filesystem is being checked.
 
 Cleaned up the output routines of mke2fs so that it doesn't overflow
-an 80 column display when formating really big filesystems.
+an 80 column display when formatting really big filesystems.
 
 Added a sanity check to e2fsck to make sure that file descriptors 0,
 1, 2 are open before opening the hard disk.  This avoids a problem
@@ -7864,7 +7864,7 @@ to grow the bad blocks list.
 Fixed a bug in e2fsck which caused it to dereference a freed pointer
 just before exiting.
 
-Fixed the substition process for generating the mk_cmds and compile_et
+Fixed the substitution process for generating the mk_cmds and compile_et
 scripts so that they will work outside of the build tree.
 
 Add sanity check to e2fsck so that if an internal routine
@@ -7874,7 +7874,7 @@ and causing a core dump.  This should never happen, but...
 E2fsprogs 1.12 (July 9, 1998)
 ==================================
 
-E2fsprogs now works with glibc (at least with the version shipped wtih
+E2fsprogs now works with glibc (at least with the version shipped with
 RedHat 5.0).  The ext2fs_llseek() function should now work even with
 i386 ELF shared libraries and if llseek() is not present.  We also
 explicitly do a configure test to see if (a) llseek is in libc, and
@@ -7933,7 +7933,7 @@ Fixed a bug in e2fsck (really in libext2fs's dblist function) where if
 the block group descriptor table is corrupt, it was possible to try to
 allocate a huge array, fail, and then abort e2fsck.
 ext2fs_get_num_dirs() now sanity checks the block group descriptor,
-and subsitutes reasonable values if the descriptors are obviously bogus.
+and substitutes reasonable values if the descriptors are obviously bogus.
 
 If e2fsck finds a device file which has the immutable flag set and the
 i_blocks beyond the normal device number are non-zero, e2fsck will
@@ -7959,10 +7959,10 @@ Fixed a minor bug in e2fsck's pass1b's file cloning function, where
 certain errors would not be properly reported.
 
 Updated and expanded a few points in the man pages which users
-complained wheren't explicit enough.
+complained weren't explicit enough.
 
 Added special case byte-swapping code if compiling on the PowerPC, to
-accomodate the strange big-endian variant of the ext2 filesystem that
+accommodate the strange big-endian variant of the ext2 filesystem that
 was previously used on the PowerPC port.
 
 
@@ -7998,7 +7998,7 @@ instead of malloc, free, and resize.  This makes it easier for us to
 be ported to strange environments where malloc, et. al. aren't
 necessarily available.
 
-Change the libext2fs fucntion to return ext2-specific error codes
+Change the libext2fs function to return ext2-specific error codes
 (EXT2_DIR_EXISTS and EXT2_DB_NOT_FOUND, for example) instead of using
 and depending on the existence of system error codes (such as EEXIST
 and ENOENT).
@@ -8010,7 +8010,7 @@ Add protection against ext2_io.h and ext2fs.h being included multiple
 times.
 
 The types used for memory lengths, etc. have been made more portable.
-In generla, the code has been made 16-bit safe.  Added Mark
+In general, the code has been made 16-bit safe.  Added Mark
 Habersack's contributed DOS disk i/o routines.
 
 Miscellaneous portability fixes, including not depending on char's
@@ -8025,7 +8025,7 @@ EXT2_ET_CALLBACK_NOTHANDLED if it wishes ext2fs_check_directory() to
 really do the checking, despite the presence of the callback function.
 
 
-E2fsprosg 1.11 (June 17, 1997)
+E2fsprogs 1.11 (June 17, 1997)
 ==============================
 
 Fixed e2fsck to detect (previously ignored) conflicts between the
@@ -8059,7 +8059,7 @@ Fixed install rule in lib/ss so that ss_err.h is actually getting
 installed.
 
 Fixed bug in ext2fs_copy_bitmap; the destination bitmap wasn't getting
-bassed back to the caller.
+passed back to the caller.
 
 Fixed bug in ext2fs_inode_scan_goto_blockgroup; it had not been
 setting the current inode number (which meant this function wasn't
@@ -8117,7 +8117,7 @@ since that can't be assumed to be true --- RedHat doesn't install
 libc-static by default.
 
 Fixed bug in libext2's block iterator functions where under some
-cirmcustances, file with holes would cause the bcount parameter to the
+circumstances, file with holes would cause the bcount parameter to the
 callback function to be incorrect.  This bug didn't affect any of
 e2fsprogs programs, but it was discovered by Paul Mackerras, the
 author of the PPC boot loader.
@@ -8218,7 +8218,7 @@ helps to speed up e2fsck.
 Added a new function ext2fs_icount_validate() which checks the rep
 invariant for the icount structure.  This is used mostly for testing.
 
-The error mesasage given when a bad inode number is passed to
+The error message given when a bad inode number is passed to
 test_generic_bitmap to reflect EXT2FS_TEST_ERROR (instead of
 EXT2FS_UNMARK_ERROR).
 
@@ -8254,7 +8254,7 @@ E2fsck's pass 3 has been made more efficient; most noticeable on
 filesystems with a very large number of directories.
 
 Completely revamped e2fsck's system of printing problem reports.  It
-is now table driven, to make them more easily customizeable and
+is now table driven, to make them more easily customizable and
 extendable.  Error messages which can be printed out during preen mode
 are now one line long.
 
@@ -8271,7 +8271,7 @@ isn't).
 Added a check to e2fsck to make sure that a directory entry isn't a
 link to the root directory, since that isn't allowed.
 
-Added a check to e2fsk to now make sure the '.' and '..' directory
+Added a check to e2fsck to now make sure the '.' and '..' directory
 entries are null terminated, since the 2.0 kernel requires it.
 
 Added check to write_bitmaps() to make sure the superblock doesn't get
@@ -8299,7 +8299,7 @@ non-existent device.
 When badblocks is given the -vv option, it now updates the block that
 it is currently testing on every block.
 
-Fixed a bug in fsck where it wouldn't modify the PATH envirnoment
+Fixed a bug in fsck where it wouldn't modify the PATH environment
 currently correctly if PATH wasn't already set.
 
 Shared libraries now built with dependencies.  This allows the shared
@@ -8381,7 +8381,7 @@ the top level directory.  Users should manually run "make check" if
 they wish to run the test suite.
 
 Upon a preenhalt(), make the printed message more explicit that
-running e2fsck "MANAULLY" means without the -p or -a options.
+running e2fsck "MANUALLY" means without the -p or -a options.
 
 In e2fsck, if a disconnected inode is zero-length, offer to clear it
 instead of offering to connect it to lost+found.
@@ -8438,7 +8438,7 @@ confusing for users.  It now mentions that another reason for the
 "corrupt superblock" message might be that the partition might not be
 an ext2 filesystem at all (it might swap, msdos filesystem, ufs, etc.)
 
-Make the libext2 library more robuest so that e2fsck won't coredump on
+Make the libext2 library more robust so that e2fsck won't coredump on
 an illegal superblock where the blocksize is zero.  (f_crashdisk is
 the test case).
 
@@ -8458,7 +8458,7 @@ function is invoked by using the '-s' option to e2fsck.
 Debugfs's "dump" command has been enhanced so that it writes out the
 exact size of the file so that the nulls at the end of the file are
 eliminated.  The command also accept a new "-p" option which will
-attempt preserve to preserve the ownernship, permissions, and
+attempt preserve to preserve the ownership, permissions, and
 file modification/access times.
 
 Debugfs has two new options, -f and -R.  The -R option allows the user
@@ -8471,7 +8471,7 @@ printing the check interval as a number of seconds.
 
 Fix bugs in debugfs: the params command when no filesystem is opened
 no longer causes a core dump.  It is now possible to unlink a file
-when a pathame containing a '/' is specified.
+when a pathname containing a '/' is specified.
 
 Tune2fs has a new -C option which sets the number of times the
 filesystem has been mounted.
@@ -8551,8 +8551,8 @@ Lots of miscellaneous linking/installation cleanups:
   Programs such as fsck which didn't need to be linked against
   libext2fs (or mke2fs which didn't need to be linked against libe2p)
   only link against libraries they actually need.  Otherwise, those
-  programs would require the presense of libraries that otherwise
-  could be removed from a rescuse diskette.
+  programs would require the presence of libraries that otherwise
+  could be removed from a rescue diskette.
 
   The ss include files are now installed correctly so they can
   actually be used by another package.
@@ -8580,7 +8580,7 @@ openable in read/write mode in order to determine its size.  This
 caused e2fsck -n to require read/write access when it was not
 previously necessary.
 
-Fixed a bug in e2fsck which casued it to occasionally fail the test
+Fixed a bug in e2fsck which caused it to occasionally fail the test
 suite depending on which version of the floating point library it was
 using.
 
@@ -8589,7 +8589,7 @@ certain superblock consistency checks fail.  Previously it continued
 running e2fsck, with some potential confusing/damaging consequences.
 
 Added new flag to fsck which allows the root to be checked in parallel
-with other filesytems.  This is not the safest thing in the world to
+with other filesystems.  This is not the safest thing in the world to
 do, but some system administrators really wanted it.
 
 Fixed -Wall flames in lib/ss.
@@ -8607,7 +8607,7 @@ guaranteed to be non-contiguous.
 In mke2fs, print a warning message if a user tries to format a whole
 disk (/dev/hda versus /dev/hda1).  If a user really wants to format a
 whole disk, the -F (force) option forces mke2fs to format a whole disk
-as a filesytem.
+as a filesystem.
 
 Fix a bug in fsck where in some cases it might start checking
 partitions in the next pass before it finishes checking partitions in
diff --git a/TODO b/TODO
index d531d175..a622bec1 100644
--- a/TODO
+++ b/TODO
@@ -29,7 +29,7 @@ Date: Mon, 08 Mar 1999 21:46:14 +0100
 From: Sergio Polini <s.polini@mclink.it>
 
 
-I'm reading the sorce code of e2fsck 1.14.
+I'm reading the source code of e2fsck 1.14.
 In pass2.c, lines 352-357, I read:
 
 if ((dirent->name_len & 0xFF) > EXT2_NAME_LEN) {
@@ -72,7 +72,7 @@ directories by using debugfs to get the relevant block numbers, then
 using dd to get the actual data.
 
 If debugfs had a feature where it ignored the size of a directory reported by
-the inode and instead just dumped all the blocks, it would have facilited
+the inode and instead just dumped all the blocks, it would have facilitated
 things a bit. This seems like a very easy feature to add.
 
 Again, thanks for writing debugfs (and all the other Linux stuff you've written!).
diff --git a/aclocal.m4 b/aclocal.m4
index 4cf123a1..cfb42cd1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1884,7 +1884,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
     fi
 ])
   dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
+  dnl $LDFLAGS. Using breadth-first-search.
   LIB[]NAME=
   LTLIB[]NAME=
   INC[]NAME=
@@ -2912,7 +2912,7 @@ fi[]dnl
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
 # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
+# only at the first occurrence in configure.ac, so if the first place
 # it's called might be skipped (such as if it is within an "if", you
 # have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 1314c385..4ec46170 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,8 +124,8 @@ else
 fi
 AC_USE_SYSTEM_EXTENSIONS
 dnl
-dnl Set default values for library extentions.  Will be dealt with after
-dnl parsing configuration opions, which may modify these
+dnl Set default values for library extensions.  Will be dealt with after
+dnl parsing configuration options, which may modify these
 dnl
 LIB_EXT=.a
 STATIC_LIB_EXT=.a
@@ -977,7 +977,7 @@ AC_CHECK_HEADERS(net/if.h,,,
 ]])
 AC_FUNC_VPRINTF
 dnl Check to see if dirent has member d_reclen. On cygwin those d_reclen
-dnl is not decleared.
+dnl is not declared.
 AC_CHECK_MEMBER(struct dirent.d_reclen,[AC_DEFINE(HAVE_RECLEN_DIRENT, 1,
 		       [Define to 1 if dirent has d_reclen])],,
 		[#include <dirent.h>])
diff --git a/contrib/add_ext4_encrypt.c b/contrib/add_ext4_encrypt.c
index d4e7c8c5..133fe253 100644
--- a/contrib/add_ext4_encrypt.c
+++ b/contrib/add_ext4_encrypt.c
@@ -1,5 +1,5 @@
 /*
- * Basic progam to add ext4 encryption to a file system
+ * Basic program to add ext4 encryption to a file system
  *
  * Copyright 2015, Google, Inc.
  *
diff --git a/debian/changelog b/debian/changelog
index e29b7338..74e22cd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ e2fsprogs (1.43.6-1) unstable; urgency=medium
     platforms.  Also fixed a bug which caused project quota problems to be
     labelled as group quota problems.
   * Fixed a UI problem with yes/no questions when there are fuzzy
-    translation enties which caused some messages to be printed in English
+    translation entries which caused some messages to be printed in English
     and some in the language specified by the locale.  (Closes: #856586)
   * Fix some out-of-bounds memory accesses in e2fsck caused by (usually
     maliciously) corrupted file systems.  (Closes: #871539, 871540)
@@ -66,7 +66,7 @@ e2fsprogs (1.43.5-1) unstable; urgency=medium
   * Fix libext2fs to correctly handle accounting for an external xattr
     block on bigalloc file systems.
   * Fix e2fsck to correctly handle quota accounting when deleting files
-    that have mnultiply-claimed blocks pass 1b.
+    that have multiply-claimed blocks pass 1b.
   * Fix potential buffer overrun bug in e2fsck when using 128 byte inodes.
   * E2fsck's extent tree optimization can now be disabled via an
     command-line extended option or via an e2fsck.conf configuration
@@ -79,7 +79,7 @@ e2fsprogs (1.43.5-1) unstable; urgency=medium
     to speed up opening very large file systems with the meta_bg option.
   * If e2fsck logging is enabled, e2fsck will report the exit code in the
     last line of the log file.
-  * Debugfs can now open file systems with a bad sueprblock checksum, and
+  * Debugfs can now open file systems with a bad superblock checksum, and
     the show_super_stats command will print the expected checksum.
   * Fix a regression introduced in e2fsprogs 1.43.4 where tune2fs was not
     able to correctly enable the quota feature.  (Closes: #855417)
@@ -155,7 +155,7 @@ e2fsprogs (1.43.3-1) unstable; urgency=medium
   * E2fsck will sanity check and repair the extra isize fields in inodes
     and the superblock.
   * Fix sparc64 crashes when dereferencing unaligned integers in journal
-    blocks when metdata checksums are enabled.
+    blocks when metadata checksums are enabled.
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 04 Sep 2016 20:41:21 -0400
 
@@ -182,7 +182,7 @@ e2fsprogs (1.43.2-1) unstable; urgency=medium
   * Add a command to debugfs to copy the inode structure from one inode
     to another
   * Fix resize2fs so it will not crash if there is an extended
-    attribute block but it doesn't need to migate any blocks during
+    attribute block but it doesn't need to migrate any blocks during
     an off-line resize
   * Fix a crash when mke2fs or debugfs tries to copy in a directory
     hierarchy containing an empty directory
@@ -193,7 +193,7 @@ e2fsprogs (1.43.2-1) unstable; urgency=medium
   * Fix big endian bugs in the e2undo program
   * Fix debugfs's logdump so command so it can correctly handle journals
     which are larger than 2GB
-  * Add new translations: Hugarian and Serbian
+  * Add new translations: Hungarian and Serbian
   * Update the Catalan, Chinese, Danish, Dutch, French, German, Polish,
     Swedish, Ukrainian translations
 
@@ -331,7 +331,7 @@ e2fsprogs (1.43~WIP.2015.05.18-1) unstable; urgency=low
     enabled by default.
   * The resize2fs command can now convert file systems between 64-bit
     and 32-bit mode.
-  * The new undo file format is much faster/efficent than before
+  * The new undo file format is much faster/efficient than before
   * E2fsck now has readahead support to speed up its behavior on RAID
     arrays.
   * E2fsck can now rebuild/optimize inode extent trees
@@ -432,7 +432,7 @@ e2fsprogs (1.42.12-1) unstable; urgency=low
   * Dumpe2fs will now complain if extra arguments are given to it.
     (Closes: #758074)
   * Update/clarify various man pages (Closes: #726760)
-  * Update Czech, Dutch, French, Polish, Spanish, Sweedish, Ukrainian,
+  * Update Czech, Dutch, French, Polish, Spanish, Swedish, Ukrainian,
     and Vietnamese translations
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Fri, 29 Aug 2014 08:50:48 -0400
@@ -460,21 +460,21 @@ e2fsprogs (1.42.11-1) unstable; urgency=medium
   * Mke2fs will check the kernel version number and not just the sysfs
     feature flag to determine whether it is safe to enable lazy
     inode table initialization, so it won't get faked out if the ext4 is
-    compiled as a mdoule which hasn't happened to be loaded yet.
+    compiled as a module which hasn't happened to be loaded yet.
   * E2fsck will now automatically fix a last mount time or last write time
     which is in the future in preen mode.
   * Mke2fs will now check the file system revision number requested by the
     command line, and reject it if it is too large.
   * If filefrag runs into an error, it will continue processing the rest
-    of the files specified on thec ommand line, but then exit with an
+    of the files specified on the command line, but then exit with an
     error code.
   * Filefrag now prints some additional new flags (such as
     FIEMAP_EXTENT_ENCODED), and print unknown flags as hex values.
   * Fixed support in filefrag for files with > 2**32 blocks on 32-bit
     platforms.
   * Fixed a file descriptor leak in debugfs when copying files.
-  * Add Esparanto and Ukrainian translations, and update Czech, Dutch,
-    French, German, Italian, Polish, Sweedish, and Vietnamese translations.
+  * Add Esperanto and Ukrainian translations, and update Czech, Dutch,
+    French, German, Italian, Polish, Swedish, and Vietnamese translations.
   * Fixed cross-compilation support.  (Closes: #753375)
   * Update/fix various man pages
 
@@ -523,7 +523,7 @@ e2fsprogs (1.42.10-1) unstable; urgency=medium
     when the file system has more inodes than the number of seconds
     since January 1, 1970.
   * E2fsck will now check the whole file system if file system problems
-    are detected durings its initial "pass 0" sanity check
+    are detected during its initial "pass 0" sanity check
   * Filefrag now prints the "shared extent" flag which is used by some
     file systems such as btrfs
   * The mke2fs program would previously correctly omit the resize_inode
@@ -532,7 +532,7 @@ e2fsprogs (1.42.10-1) unstable; urgency=medium
     the user explicitly specifies the file system size.
   * The message printed by logsave is now much less scary (Closes: #468821)
   * Fix spelling typo in the package descriptions
-  * Update Czech, Dutch, French, German, Polish, Spanish, Sweedish, and
+  * Update Czech, Dutch, French, German, Polish, Spanish, Swedish, and
     Vietnamese translations (Closes: #703048)
   * Update/fix various man pages
   * Fix debian/rules compatibility problem with GNU make 4.0
@@ -582,7 +582,7 @@ e2fsprogs (1.42.9-1) unstable; urgency=low
     system with the uninit_bg feature enabled.
   * E2fsck will properly allocate a new extent tree block in the rare
     case where one is needed when rehashing an extent-mapped directory.
-  * Mke2fs wil now properly set the LARGE_FILE feature when creating a
+  * Mke2fs will now properly set the LARGE_FILE feature when creating a
     journal > 2GB.
   * Debugfs will now correctly handle free a range of inodes using the
     freei command.
@@ -711,7 +711,7 @@ e2fsprogs (1.42.7-1) unstable; urgency=low
     statistics
   * Document the bigalloc feature in the mke2fs man page.
     (Closes: #669730)
-  * Update Czech, Dutch, French, German, Polish, Sweedish, and
+  * Update Czech, Dutch, French, German, Polish, Swedish, and
     Vietnamese translations
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Tue, 21 Jan 2013 21:52:58 -0500
@@ -837,7 +837,7 @@ e2fsprogs (1.42.3-1) unstable; urgency=low
     particular, don't rewrite the quota inode unless the quotas are
     inconsistent
   * Optimized reading and writing bitmaps if direct I/O was enabled
-  * Update Czech, Dutch, French, German, Polish, Sweedish, and
+  * Update Czech, Dutch, French, German, Polish, Swedish, and
     Vietnamese translations
   * Fixed incorrect indentation in tune2fs man page
   * Update debian policy compliance to 3.9.3
@@ -962,7 +962,7 @@ e2fsprogs (1.42~WIP-2011-10-16-1) unstable; urgency=low
   * Don't look at the high 16 bits of i_file_acl if the 64-bit feature
     is not enabled; this fixes a Hurd compatibility field since this is
     used for the high 16 bits of i_mode on Hurd.
-  * Update Sweedish, Polish, French, German, and Czech translations
+  * Update Swedish, Polish, French, German, and Czech translations
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 16 Oct 2011 22:07:03 -0400
 
@@ -974,7 +974,7 @@ e2fsprogs (1.42~WIP-2011-10-09-1) unstable; urgency=low
   * Fixed various man pages
   * Fixed 64-bit block numbers in e2fsck's journal replay
   * Fixed mipsel FTBFS that was fixed for mips
-  * Update Sweedish, French, and Czech translations
+  * Update Swedish, French, and Czech translations
   * Convert to debian source 3.0 (quilt) format
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 09 Oct 2011 22:24:31 -0400
@@ -1090,7 +1090,7 @@ e2fsprogs (1.42~WIP-2011-07-02-1) unstable; urgency=low
       if the file system is mounted, so that an escape sequence won't
       cause a false positive.  (Closes: #619859)
   * E2fsck now uses less cpu time in pass 5
-  * E2fsck will no longer segault when a corrupted file system has a bad
+  * E2fsck will no longer segfault when a corrupted file system has a bad
     extent, and removing it leads to a block needing to be deallocated.
   * E2fsck now supports an extended "discard" option which will cause
       e2fsck to attempt discard all unused blocks after a full check
@@ -1106,7 +1106,7 @@ e2fsprogs (1.42~WIP-2011-07-02-1) unstable; urgency=low
       extended attributes and with time- and mount count-based file
       system checks disabled.
    * Mke2fs will not set a stride or strip size of one block based on
-       block bevice attributes obtained from sysfs.
+       block device attributes obtained from sysfs.
    * Mke2fs now displays a progress report during the discard process.
    * Mke2fs now handles extreme file system parameters correctly which
        previously caused the inodes per group to drop below 8, leading
@@ -1227,7 +1227,7 @@ e2fsprogs (1.41.12-1) unstable; urgency=low
   * Fixed e2fsck not to ask permission from the user to abort if it's
     going to abort regardless of what the user is going to say...
   * E2fsck can now continue even if it fails to recreate the resize inode
-  * E2fsck will now avoid removing directory entries for inods found in
+  * E2fsck will now avoid removing directory entries for inodes found in
     the unused region of the inode table until after it restarts the fs
     check to avoid removing valid data.
   * E2fsck will now longer try to set the block group checksums if it
@@ -1235,7 +1235,7 @@ e2fsprogs (1.41.12-1) unstable; urgency=low
   * Mke2fs will check both the physical and logical blocksizes of a
     device to better support 4k sector drives.
   * Mke2fs will accept the valid (but rarely useful) flex_bg size of 1
-  * E2fsck will check for cases where the EOFBLOCKS_FL is set whe nit is
+  * E2fsck will check for cases where the EOFBLOCKS_FL is set when it is
     not needed, and offer to clear it.
   * The com_err library will now only output a CR character if the
     stderr is connected to a tty in raw mode.
@@ -1288,7 +1288,7 @@ e2fsprogs (1.41.10-1) unstable; urgency=low
     clocks.  (Closes: #559776)
   * Fix flex_bg inode table placement algorithm used by mke2fs for
     certain specific file system sizes
-  * Add source lintian overrids for weak-library-dev-dependency
+  * Add source lintian overrides for weak-library-dev-dependency
   * Fix FTBFS problem caused by texi2html changing (again) its output
     location.  (Closes: #552934)
   * Make e2fsck to avoid rehashing directories which can fit in a
@@ -1335,7 +1335,7 @@ e2fsprogs (1.41.10-1) unstable; urgency=low
   * Fix resize2fs to correctly calculate the minimum size needed, when
     flex_bg is enabled, to prevent resize2fs -M from failing.
   * Dumpe2fs now displays more information about the contents of the journal
-  * Make sure the libblkid1 and libblkid1-dbg packags have changelogs
+  * Make sure the libblkid1 and libblkid1-dbg packages have changelogs
   * On low memory systems, e2fsck can print some very scary looking
     error messages.  Clean up them up to avoid user panic.  (Closes: #509529)
   * Enhance blkid to support .ko.gz files in the modules.dep parser
@@ -1364,14 +1364,14 @@ e2fsprogs (1.41.9-1) unstable; urgency=low
     files when using FIBMAP.  (Closes: #540376)
   * Add a filefrag -B option to make it easier to debug the FIBMAP
     support.
-  * Allow e2fsprogs programs to allocate from uninitalized block groups.
+  * Allow e2fsprogs programs to allocate from uninitialized block groups.
   * Add a new program, e2freefrag, which displays information about the
     free space fragmentation in an ext2/3/4 filesystem.
   * E2fsck will now print much fuller information when the last mount
     time or last written time is in the future, since most people can't
     seem to believe their distribution has buggy init scripts, or they
     have a failed CMOS/RTS clock battery.
-  * Update French, Polish, Czech, and Sweedish translation from the
+  * Update French, Polish, Czech, and Swedish translation from the
     Translation Project.
   * Enhance debugfs's 'stat' command to print basic extent information
     for extent-mapped inodes, and add a new command, 'dump_extents'
@@ -1385,7 +1385,7 @@ e2fsprogs (1.41.8-2) unstable; urgency=low
     to fail on ext4 filesystems if the directory needs to shrink by more
     than a block (Closes: #537510)
   * Fixed filefrag for non-extent based files
-  * Fix use of apostrohe's in package descriptions
+  * Fix use of apostrophe's in package descriptions
   * Don't use dietlibc when building for mips and mipsel architectures
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 20 Jul 2009 09:38:21 -0400
@@ -1395,9 +1395,9 @@ e2fsprogs (1.41.8-1) unstable; urgency=low
   * New upstream release
   * Fix resize2fs bugs when shrinking ext4 filesystems
   * Update debian policy compliance to 3.8.2
-  * Update package descriptions to mention ext3 and ext4 filesytems
+  * Update package descriptions to mention ext3 and ext4 filesystems
       (Closes: #535530)
-  * Update French, Polish, Czech, Indonesian, and Sweedish translation
+  * Update French, Polish, Czech, Indonesian, and Swedish translation
       from the Translation Project.
   * If the resize2fs operation fails, the user will be told to fix up
     the filesystem using e2fsck -fy.
@@ -1421,7 +1421,7 @@ e2fsprogs (1.41.7-1) unstable; urgency=low
     which can cause e2fsck to run out of memory when checking very large
     filesystems using extents.
   * Fix a bug in libext2fs which can cause e2fsck and resize2fs to write
-    uninitalized data into the portion of the inode beyond the first 128
+    uninitialized data into the portion of the inode beyond the first 128
     bytes when operating on extents; potentially corrupting filesystems.
   * The logsave program will now filter out the ^A and ^B characters when
     writing to the console.
@@ -1431,7 +1431,7 @@ e2fsprogs (1.41.7-1) unstable; urgency=low
   * Change badblocks to allow block sizes larger than 4k.
   * Fix libext2fs to properly initialize i_extra_size when creating the
     journal and resize inodes.
-  * Resize2fs will now update the journal backup fileds in the
+  * Resize2fs will now update the journal backup fields in the
     superblock if the journal is moved; this avoids an unnecessary full
     fsck after resizing the filesystem.
   * Use the same encoding as the kernel for rec_len == 64k in 64k block
@@ -1699,7 +1699,7 @@ e2fsprogs (1.41.1-1) unstable; urgency=low
     environment variables are set.
   * Fix filefrag's ideal extent calculation (Closes: #458306)
   * Fix postinstall scripts when the user/group is in LDAP (Closes: #497010)
-  * Add Indonesian and update French, Polish, Dutch, German, Sweedish,
+  * Add Indonesian and update French, Polish, Dutch, German, Swedish,
        Czech, and Vietnamese Translations.  (Closes: #313697, #401092)
   * Update/clarified man pages
   * Add dpkg-gensymbols support to track ABI changes to the libraries
@@ -1776,7 +1776,7 @@ e2fsprogs (1.41.0-1) unstable; urgency=medium
     descriptors first.
   * Fix resize2fs to clean up the resize_inode if all of the reserved
     gdt blocks are consumed during an off-line resize.
-  * Enable huge_file, dir_nlink, extra_isize feautres for mke2fs and tune2fs.
+  * Enable huge_file, dir_nlink, extra_isize features for mke2fs and tune2fs.
   * Enable huge_file, dir_nlink, extra_isize, and uninit_bg by default
     in mke2fs.conf.
   * Fix badblocks terminology in man page and program output.
@@ -1866,7 +1866,7 @@ e2fsprogs (1.40.10-1) unstable; urgency=low
 
   * Fix a very rare potential data corruption bug in e2fsck's journal
     replay.
-  * Updated German, Dutch, Sweedish, and Vietnamese translations.
+  * Updated German, Dutch, Swedish, and Vietnamese translations.
   * Force blkid to revalidate a device if its mtime is newer than the
     last validation time in the cache.
 
@@ -1888,7 +1888,7 @@ e2fsprogs (1.40.9-1) unstable; urgency=low
       and meta_bg filesystem features.
   * Use UID/GID ranges from adduser.conf if present, even though we
       don't use adduser to add users/groups.  (Closes: #473179)
-  * Updated German, Czech, Dutch, French, Polish, Sweedish, and
+  * Updated German, Czech, Dutch, French, Polish, Swedish, and
       Vietnamese translations.
   * Update/clarified the mke2fs man page
 
@@ -1910,7 +1910,7 @@ e2fsprogs (1.40.8-1) unstable; urgency=low
   * Fix e2fsck's handling of directory inodes with a corrupt size field.
   * Fully fix a resize2fs bug where extended attributes in large inodes
       could get dropped on big-endian systems.
-  * Update Czech, Dutch, Polish, Sweedish, and Vietnamese translations.
+  * Update Czech, Dutch, Polish, Swedish, and Vietnamese translations.
   * Significantly updated German translation!  Thanks to Philipp Thomas
     from Novell for stepping up to be our new German translation
     maintainer!  (Closes: #302512, #370247, #401092, #412882)
@@ -1924,7 +1924,7 @@ e2fsprogs (1.40.7-1) unstable; urgency=low
   * tune2fs no longer will remove the sparse_super feature, as it is dangerous
   * Update/clarified various man pages
   * Fix bug where large nodes were not getting fully copied when
-      shrinking a fileystem using resize2fs.
+      shrinking a filesystem using resize2fs.
   * Allow mke2fs and tune2fs to manipulate the large_file feature flag
   * Suppress fsck's warning message about an old-style fstab if the
       fstab file is empty.  (Closes: #468176)
@@ -1947,7 +1947,7 @@ e2fsprogs (1.40.7-1) unstable; urgency=low
       used by SELinux.
   * Add support in fsck to ignore mounted filesystems when given the -M option
   * Fix uuidd so it creates the pid file with the correct pid number
-  * Update Czech, Dutch, Polish, Sweedish, and Vietnamese translations
+  * Update Czech, Dutch, Polish, Swedish, and Vietnamese translations
       from the Translation Project.
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Thu, 28 Feb 2008 22:27:39 -0500
@@ -1987,7 +1987,7 @@ e2fsprogs (1.40.5-1) unstable; urgency=low
   * New upstream release.
   * Mke2fs will now create new filesystems with 256 byte inodes and the
       ext_attr feature flag by default.  This allows for much better
-      future compatibity with ext4 and speeds up extended attributes
+      future compatibility with ext4 and speeds up extended attributes
       even on ext3 filesystems.
   * Teach mke2fs and tune2fs to set a "test_fs" flag, which indicates
       that it is ok to use the filesystem on in-development kernel
@@ -1996,7 +1996,7 @@ e2fsprogs (1.40.5-1) unstable; urgency=low
       number.
   * Add support for detecting HFS+ and ext4/ext4dev filesystems in blkid
   * Fix blkid's ntfs UUID handling so it is compatible with vol_id
-  * Avoid a floating point exception when blkid tries to probe a corrpt
+  * Avoid a floating point exception when blkid tries to probe a corrupt
       reiserfs filesystem.
   * Fix potential overflow problem in e2image if the device name is
       too long.
@@ -2126,8 +2126,8 @@ e2fsprogs (1.40-1) unstable; urgency=low
   * Fix divide-by-zero error in blkid's NTFS proving logic
   * Add new blkid -g option which causes the blkid cache to be garbage
       collected
-  * libblkid: Fix bug which could cuase bid_type to be corrupted
-  * mke2fs: Add santy check to make sure inode_size * num_inodes isn't too big
+  * libblkid: Fix bug which could cause bid_type to be corrupted
+  * mke2fs: Add sanity check to make sure inode_size * num_inodes isn't too big
   * Fix additional Coverity bugs in mke2fs and e2fsck
   * Improve sanity check in e2fsck's algorithm for finding a backup superblock
   * Fix e2fsck get_size logic so that it will work with the Linux floppy
@@ -2161,7 +2161,7 @@ e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-2) unstable; urgency=low
       systems
   * Fix blkid library to report the correct UUID from MD superblocks
   * Fix signed vs. unsigned problem in debugfs' setb/testb/freeb commands
-  * Enhance debugfs's date parser so it acccepts integer values
+  * Enhance debugfs's date parser so it accepts integer values
   * Fix e2fsck's pass1c accounting so it doesn't terminate too early
       if a file with multiply claimed blocks is hard linked. or not at
       all if the root directory contains shared blocks
@@ -2191,7 +2191,7 @@ e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-2) unstable; urgency=low
 e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-1) unstable; urgency=low
 
   * Add libreadline.so.5 support to libss.
-  * Impove badblocks -n/-w exclusive usage message.
+  * Improve badblocks -n/-w exclusive usage message.
   * Add debugging code (via the COMERR_DEBUG env. variable) to the
       com_err library
   * Fix dump_unused segfault in debugfs when a filesystem is not open
@@ -2199,7 +2199,7 @@ e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-1) unstable; urgency=low
       (Closes: #413208)
   * Fix memory leak in blkid library.  (Closes: #413661)
   * Let the debugfs lcd command work even if a filesystem is not open
-  * Fix large number of miscellaneous Coveriy bugs.  (None were
+  * Fix large number of miscellaneous Coverity bugs.  (None were
       security-security).
   * Fix e2fsck to clear i_size for special devices with a bogus i_blocks
       field on the first pass.
@@ -2352,10 +2352,10 @@ e2fsprogs (1.38+1.39-WIP-2006.03.29-1) unstable; urgency=low
 
   * Add udeb: lines to the Debian's shlibs files (Closes: #356293)
   * Enhance dumpe2fs to print the size of the journal
-  * Fix e2sprogs so that it is 32-bit clean on x86 platorms.
+  * Fix e2sprogs so that it is 32-bit clean on x86 platforms.
   * Fix mklost+ound so that it creates a full-sized directory on 4k and
     larger block sizes.
-  * Add mke2fs.conf coniguration file to conigure mke2fs's defaults
+  * Add mke2fs.conf configuration file to configure mke2fs's defaults
   * Add devmapper support to the blkid library.
   * E2fsck, resize2fs and mke2fs will now open the filesystem device in
     exclusive mode
@@ -2372,7 +2372,7 @@ e2fsprogs (1.38+1.39-WIP-2006.03.29-1) unstable; urgency=low
   * Enhance e2fsck so it will fix the external journal hint in the
     superblock if it is out of date.
   * Fix debugfs's icheck to correctly report the owner of an EA block
-  * Update Sweedish translation
+  * Update Swedish translation
   * Add a configuration parameter to e2fsck.conf to control whether or not
     filesystem checks are done when the system is running on battery power.
   * Print an explanation when skipping a check due being on battery
@@ -2415,7 +2415,7 @@ e2fsprogs (1.38+1.39-WIP-2005.12.10-2) unstable; urgency=low
     this as a fatal error.  (Closes: #343662, #343645)
   * Move the blkid and uuidgen binaries out of libblkid1 and libuuid1 and
     into the e2fsprogs package to support soname transitions and
-    simulaneous installs of multiarch flavors to coexist.  (It's not worth
+    simultaneous installs of multiarch flavors to coexist.  (It's not worth
     creating two whole new packages for two separate binaries, so we just
     fold them into e2fsprogs.)  (Closes: #330737, #330736)
   * Optionally allow the user to interrupt e2fsck "safely" during a boot
@@ -2431,7 +2431,7 @@ e2fsprogs (1.38+1.39-WIP-2005.12.10-1) unstable; urgency=low
   * Detect if the superblock's last mount time or last write time is in
     the future, and offer to fix it if this is the case (Closes: #327580)
   * Add new debugfs command, set_current_time which sets the time used to
-    update the filesystems's time fields.
+    update the filesystem's time fields.
   * Fix display bug in badblocks -sw when printing the "done" message.
     (Closes: #322231)
   * Improve blkid's FAT/VFAT filesystem detection code so that it can find
@@ -2464,7 +2464,7 @@ e2fsprogs (1.38-2) unstable; urgency=low
   * Fix a compile_et bug which miscount the number of error messages if
     continuations are used in the .et file, and fix compatibility problems
     with MIT Kerberos 1.4
-  * Add extra sanity checks to protect users from unusual cirucmstances
+  * Add extra sanity checks to protect users from unusual circumstances
     where /etc/mtab may not be sane, by checking to see if the device is
     reported busy (works on Linux 2.6) kernels.  (Closes: #319002)
   * Fix use-after-free bug in e2fsck when finishing up the use of the
@@ -2474,7 +2474,7 @@ e2fsprogs (1.38-2) unstable; urgency=low
 
 e2fsprogs (1.38-1.1) unstable; urgency=low
 
-  * NMU for RC bug durring bug squishing party
+  * NMU for RC bug during bug squishing party
   * Fix for changes to texi2html, patch by Matt Kraai
     (Closes: #317862, #320389)
   * version build-depend on texi2html, won't work with older one anymore
@@ -2517,7 +2517,7 @@ e2fsprogs (1.37+1.38-WIP-0509-1) unstable; urgency=low
   * Make the blkid library much more efficient when a new device is added
     on systems with a huge number of disks.
   * Fix handling of the PAGER and SS_READLINE_PATH environment variables
-    in the ss library, and the TEST_IO_* environemnt vaiables for the
+    in the ss library, and the TEST_IO_* environment variables for the
     test_io io_manager, which was accidentally broken in 1.37-1.
   * Fix libblkid's recognition of cramfs filesystems, and add support for
     cramfs labels.
@@ -2675,13 +2675,13 @@ e2fsprogs (1.36rc1-1) unstable; urgency=low
         "4g" on the command line) if the user finds this more convenient
         than specifying a block count.
   * Fix an obscure, hard-to find bug in "e2fsck -S" caused by an inode
-        cache conherency problem.
+        cache coherency problem.
   * Debugfs now supports a new command, set_inode_field, which allows a
         user to manually set a specific inode field more conveniently, as
         well as set entries in the indirect block map.
   * Debugfs's set_super_value command has been enhanced so that the user
         can set most superblock fields, including the date/time fields and
-        some of the more newsly added superblock fields.
+        some of the more newly added superblock fields.
   * E2fsprogs programs now accept an offset to be passed to the file
         specifiers, via the syntax: "/tmp/test.img?offset=1024"
   * E2fsprogs will now accept blocksizes up to 65536; kernel support on
@@ -2759,7 +2759,7 @@ e2fsprogs (1.35-6) unstable; urgency=low
     we need an explict Conflict: sysvinit (<< 2.85-4) header. (Closes: #243829)
   * Update the UUID library man pages
   * Fix a Y8.8888K potential problem with the uuid library
-  * Minor updates to the german translation
+  * Minor updates to the German translation
   * Clarified/corrected the copyright statements of the UUID and blkid
     libraries in the Debian copyright files.
   * Added sanity check to the blkid library so that if current time is
@@ -2785,7 +2785,7 @@ e2fsprogs (1.35-5) unstable; urgency=low
   * Use the DEBUGFS_PAGER environment variable in preference to PAGER
     (Closes: #239547)
   * Added French translation
-  * Be flexible about the name of the ACPI device that cooresponds to
+  * Be flexible about the name of the ACPI device that corresponds to
     the AC adapter (Closes: #242136)
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 12 Apr 2004 12:38:34 -0400
@@ -2864,7 +2864,7 @@ e2fsprogs (1.34+1.35-WIP-2004.01.31-1) unstable; urgency=medium
     for debugfs (unfortunately, Debian policy says we must use
     /usr/bin/pager even if it results in very annoying behaviour for
     the user since 'less' is used in preference to 'more' unless it is
-    globally overriden via update-alternatives(8).  Oh, well.  Debian
+    globally overridden via update-alternatives(8).  Oh, well.  Debian
     users are encouraged to set DEBUGFS_PAGER to be "more" in their
     dot files to avoid this brain damage).
   * Fix libuuid1-udeb so that it provides libuuid1.  (Closes: #229633)
@@ -2908,7 +2908,7 @@ e2fsprogs (1.34+1.35-WIP-2003.12.07-1) unstable; urgency=medium
   * Fix handling of corrupted indirect blocks in the bad block inode.
   * If the number of mounts until the next forced filesystem check is less
     than 6, mention this to the user.  (Closes: #157194)
-  * E2fsck will try to avoid doing a forced filesystem chcek if a system
+  * E2fsck will try to avoid doing a forced filesystem check if a system
     is running on batteries according to APM or ACPI.  (Closes: #205177)
   * Fix problems in the German translation.  (Closes: #2000086)
   * Updated Swedish translation and added Polish translation.
@@ -2974,7 +2974,7 @@ e2fsprogs (1.34-2) unstable; urgency=low
   * Fix erroneous reference to /usr/share/doc/e2fsprogs/html-info in
     /usr/share/doc-base/libext2fs (Closes: #203157)
   * Explicitly specify the version of libblkid1 needed in
-    e2fsprogs.shlibs.local in order to avoid picking up the wrong depedency.
+    e2fsprogs.shlibs.local in order to avoid picking up the wrong dependency.
     (Closes: #203157)
   * Changed priority of libblkid1-udeb to be standard, not required.
 
@@ -3054,7 +3054,7 @@ e2fsprogs (1.33+1.34-WIP-2003.05.21-1) unstable; urgency=low
 e2fsprogs (1.33-5) unstable; urgency=low
 
   * Clarify blocksize units when displaying messages in resize2fs, and
-    support using suffixes (sectors, kilobytes, megabites, gigabytes)
+    support using suffixes (sectors, kilobytes, megabytes, gigabytes)
     to the size parameter to indicate units.  (Closes: #189814)
   * Fix debugfs core-dumping problem caused by getopt.  (Works around: #192834)
   * Add package dependency to shlibs for comerr to indicate support
@@ -3122,11 +3122,11 @@ e2fsprogs (1.32+1.33-WIP-2003.03.30-3) unstable; urgency=low
 
   * Provide /usr/include/com_err.h, which was previously provided by the
     libkrb5-dev package
-  * Change the sectoin of com_err-dev, ss-dev, uuid-dev, libblkid-dev,
+  * Change the section of com_err-dev, ss-dev, uuid-dev, libblkid-dev,
     e2fslibs-dev to libdevel
   * Add libblkid1-udeb package for the Debian Installer.
   * Use the SS_READLINE_PATH environment variable to control the search
-    for a suitable readine library.
+    for a suitable readline library.
   * Fix bug in mke2fs, which was was incorrectly checking the argument
     to the -g option if the default block size is used.  (Closes: #188319)
   * Update man pages.  (Closes: #188318)
@@ -3149,7 +3149,7 @@ e2fsprogs (1.32+1.33-WIP-2003.03.30-2) unstable; urgency=low
     the block group specific counters quietly.  This is needed for an
     experimental kernel patch which improves SMP scalability by not
     locking the entire filesystem during block or inode allocation; if
-    the filesystem is not unmoutned cleanly, the global counts may not
+    the filesystem is not unmounted cleanly, the global counts may not
     be accurate.
   * Fix a bug in fsck which can cause it to hang trying to access the
     floppy disk if there the floppy drive has filesystem type of
@@ -3212,7 +3212,7 @@ e2fsprogs (1.29-1) unstable; urgency=low
   * Generate udeb package for debian-installer (Martin Sjoegren, Closes:
     #162212).
   * Fixed installation of mkinitrd script (don't use dh_install).  Remove
-    it from the wrong location where it was, in preinst.  Hopefully noone
+    it from the wrong location where it was, in preinst.  Hopefully no one
     noticed.
   * Also have old scripts/e2fsprogs.mkinitrd removed.
   * Bumped Standards-Version to 3.5.6, no change.  3.5.7 will need a bit
@@ -3249,7 +3249,7 @@ e2fsprogs (1.28-3) unstable; urgency=low
 
 e2fsprogs (1.28-2) unstable; urgency=low
 
-  * Fixed my adapation of the mips non-pic build (Closes: #159757).
+  * Fixed my adaption of the mips non-pic build (Closes: #159757).
 
  -- Yann Dirson <dirson@debian.org>  Fri,  6 Sep 2002 00:03:45 +0200
 
@@ -3337,7 +3337,7 @@ e2fsprogs (1.26-2) unstable; urgency=low
 e2fsprogs (1.26-1) unstable; urgency=low
 
   * This uploads fixes 10 bugs, including data-corruption problems, and
-    adds much to the ease of maintainance and problem tracking.  Good
+    adds much to the ease of maintenance and problem tracking.  Good
     choice for woody.
 
   * New upstream release (Closes: #106622, #116975, #118443, #119624,
@@ -3346,7 +3346,7 @@ e2fsprogs (1.26-1) unstable; urgency=low
     trashed external journals needing to be replayed, e2fsck now hides
     visible journal files (data corruption problems when not excluded from
     a backup and then restored) (Closes: #132654).
-  ** Other noticable bugs fixed include: e2fsck null pointer
+  ** Other noticeable bugs fixed include: e2fsck null pointer
     dereferencing, fsck did not finds LVM volumes by UUID or by label,
     largefile support (ie. dealing with filesystems inside 2GB+ files) was
     broken in several programs.
@@ -3531,14 +3531,14 @@ e2fsprogs (1.19+1.20-WIP-0514-1) unstable; urgency=low
     tune2fs.
   * New binary package with statically linked e2fsck, recommending a
     statically linked shell (Closes: #62611).
-  * All deps against e2fsprogs itself now versionned (lintian).
+  * All deps against e2fsprogs itself now versioned (lintian).
   * Updated copyright file (upstream location, packaging copyright notice
     for previous maintainers and for Alcove).
-  * Remove call to dh_testversion, use versionned build-dep instead
+  * Remove call to dh_testversion, use versioned build-dep instead
     (lintian).
   * Support for DEB_BUILD_OPTIONS debug/nostrip for policy 3.2
     compliance.
-  * Use dh_shlibdeps -l instead of setting LD_LIBRARY_PATH explicitely -
+  * Use dh_shlibdeps -l instead of setting LD_LIBRARY_PATH explicitly -
     necessary for new versions of fakeroot, and requires debhelper 3.0.23
     for a fix.  Well finally 3.0.23 is buggy, leave this for later.
   * Avoid to call ldconfig at "make install" time, too costly.
@@ -3570,7 +3570,7 @@ e2fsprogs (1.19-2) unstable; urgency=low
 
   * Clarified libuuid copyright to LGPL-2, excluding LGPL-2.1.
   * Added build-dependency on debhelper (Closes: #67532).
-  * Don't paralelize fsck runs on same drive for hd[efgh] (Closes:
+  * Don't parallelize fsck runs on same drive for hd[efgh] (Closes:
     #59103).
   * Upload pristine source, -1 was erroneously uploaded as a
     debian-specific package.
@@ -3694,7 +3694,7 @@ e2fsprogs (1.14-3) unstable; urgency=low
   * Fail with error message when /dev/null cannot be opened (Fixes:
     Bug#35595).
   * Fixed typo in e2fsck/unix.c (Fixes: Bug#36960).
-  * Added "emeregency help" options summary to e2fsck (Fixes: Bug#11372).
+  * Added "emergency help" options summary to e2fsck (Fixes: Bug#11372).
   * Prepared debian/rules for usr/share/man/.
 
  -- Yann Dirson <dirson@debian.org>  Tue,  1 Jun 1999 23:37:12 +0200
@@ -3719,7 +3719,7 @@ e2fsprogs (1.14-1) unstable; urgency=low
   * Incorporated patches from Gordon Matzigkeit for hurd cross-compilation:
   * - configure.in: Change cross-compile default for sizeof (long
       long) to 8, so that __s64 and __u64 get defined in ext2fs.h.
-      (BUILD_CC): Discover a native compiler if we are cross-compling
+      (BUILD_CC): Discover a native compiler if we are cross-compiling
       (used for util/subst).
     - Include linux/types.h instead of asm/types.h, so that
       non-Linux platforms use the stubbed version provided with this
@@ -4049,7 +4049,7 @@ e2fsprogs (1.02-1) unstable; urgency=low
   * copied "configure" usr_prefix change (see below), into configure.in
   * updated debian.control file, added Pre-Depends field
     created preinst script to check dpkg --assert-predepends
-    tidyed and fixed debian.rules
+    tidied and fixed debian.rules
   * set e2fsck to link shared, as suggested by Bruce Perens in Bug#2332
   * corrected problem in e2fsck error message, Bug#2534
   * added Architecture field
@@ -4078,7 +4078,7 @@ e2fsprogs (0.5b-2) unstable; urgency=low
 e2fsprogs (0.5b-1) unstable; urgency=low
 
   * Made "fsck -t <filesystem-type> <device>" work correctly. Formerly
-    the -t argument was overriden by the filesystem type listed for the
+    the -t argument was overridden by the filesystem type listed for the
     device in /etc/fstab.
   * added Debian GNU/Linux package maintenance system files
 
diff --git a/debian/rules b/debian/rules
index 81eafc31..94fe7069 100755
--- a/debian/rules
+++ b/debian/rules
@@ -304,7 +304,7 @@ install: cleanup install-std
 
 # This rule allows to factorize the dh_clean between the 2 install rules
 # This must be launched before install-* (if launching them by hand, for
-# exemple) or results are unpredictable
+# example) or results are unpredictable
 cleanup:
 	dh_testdir
 	dh_testroot
diff --git a/debian/uuid-dev.README.Debian b/debian/uuid-dev.README.Debian
index 3d8cc89c..a4f047e3 100644
--- a/debian/uuid-dev.README.Debian
+++ b/debian/uuid-dev.README.Debian
@@ -1,5 +1,5 @@
 
-In order to santize e2fsprogs to be DFSG free, the file
+In order to sanitize e2fsprogs to be DFSG free, the file
 draft-leach-uuids-guids-01.txt has been removed.  It can be obtained
 by downloading e2fsprogs from the upstream sources.  It may also be
 available from other sites on the network, if you do a quick web
@@ -16,7 +16,7 @@ the documentation which has been removed for Debian's DFSG license
 purity shouldn't be denied to Ubuntu users.
 
 					Theodore Ts'o
-					Ocotober 3, 2006
+					October 3, 2006
 
 
 
diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index 408a3236..57940cde 100644
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -46,7 +46,7 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBSS) \
 		$(DEPSTATIC_LIBCOM_ERR) $(DEPSTATIC_LIBUUID) \
 		$(DEPSTATIC_LIBE2P)
 
-# This nastyness is needed because of jfs_user.h hackery; when we finally
+# This nastiness is needed because of jfs_user.h hackery; when we finally
 # clean up this mess, we should be able to drop it
 LOCAL_CFLAGS = -I$(srcdir)/../e2fsck -DDEBUGFS
 DEPEND_CFLAGS = -I$(srcdir)
diff --git a/debugfs/debugfs.8.in b/debugfs/debugfs.8.in
index 87d487e7..55abd718 100644
--- a/debugfs/debugfs.8.in
+++ b/debugfs/debugfs.8.in
@@ -226,7 +226,7 @@ Clear the contents of the inode
 .IR filespec .
 .TP
 .BI copy_inode " source_inode destination_inode"
-Copy the conents of the inode structure in
+Copy the contents of the inode structure in
 .I source_inode
 and use it to overwrite the inode structure at
 .IR destination_inode .
diff --git a/debugfs/htree.c b/debugfs/htree.c
index 8c18666d..cf7d78aa 100644
--- a/debugfs/htree.c
+++ b/debugfs/htree.c
@@ -340,7 +340,7 @@ void do_dx_hash(int argc, char *argv[])
 	err = ext2fs_dirhash(hash_version, argv[optind], strlen(argv[optind]),
 			     hash_seed, &hash, &minor_hash);
 	if (err) {
-		com_err(argv[0], err, "while caclulating hash");
+		com_err(argv[0], err, "while calculating hash");
 		return;
 	}
 	printf("Hash of %s is 0x%0x (minor 0x%0x)\n", argv[optind],
diff --git a/debugfs/logdump.c b/debugfs/logdump.c
index 6ff5ad1f..864f234c 100644
--- a/debugfs/logdump.c
+++ b/debugfs/logdump.c
@@ -1,7 +1,7 @@
 /*
  * logdump.c --- dump the contents of the journal out to a file
  *
- * Authro: Stephen C. Tweedie, 2001  <sct@redhat.com>
+ * Author: Stephen C. Tweedie, 2001  <sct@redhat.com>
  * Copyright (C) 2001 Red Hat, Inc.
  * Based on portions  Copyright (C) 1994 Theodore Ts'o.
  *
diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c
index ca688622..8dfbba9c 100644
--- a/debugfs/set_fields.c
+++ b/debugfs/set_fields.c
@@ -429,7 +429,7 @@ static struct field_set_info *find_field(struct field_set_info *fields,
 
 /*
  * Note: info->size == 6 is special; this means a base size 4 bytes,
- * and secondiory (high) size of 2 bytes.  This is needed for the
+ * and secondary (high) size of 2 bytes.  This is needed for the
  * special case of i_blocks_high and i_file_acl_high.
  */
 static errcode_t parse_uint(struct field_set_info *info, char *field,
diff --git a/debugfs/util.c b/debugfs/util.c
index 5f101f48..452de749 100644
--- a/debugfs/util.c
+++ b/debugfs/util.c
@@ -210,7 +210,7 @@ char *time_to_string(__s64 cl)
 	const char	*tz;
 
 	if (do_gmt == -1) {
-		/* The diet libc doesn't respect the TZ environemnt variable */
+		/* The diet libc doesn't respect the TZ environment variable */
 		tz = ss_safe_getenv("TZ");
 		if (!tz)
 			tz = "";
diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index 8f046510..c645d82a 100644
--- a/doc/libext2fs.texinfo
+++ b/doc/libext2fs.texinfo
@@ -146,7 +146,7 @@ There are two functions which create a filesystem handle,
 @code{ext2fs_open} and @code{ext2fs_initialize}.  
 
 The filesystem can also be closed using @code{ext2fs_close}, and any
-changes to the superblock and group descripts can be written out to disk
+changes to the superblock and group descriptors can be written out to disk
 using @code{ext2fs_flush}.
 
 @menu
@@ -183,7 +183,7 @@ image.
 
 The @var{block_size} parameter specifies the block size used by the
 filesystem.  Normally this is determined automatically from the
-filesystem uperblock.  If @var{block_size} is non-zero, it must match
+filesystem superblock.  If @var{block_size} is non-zero, it must match
 the block size found in the superblock, or the error
 @code{EXT2_ET_UNEXPECTED_BLOCK_SIZE} will be returned.  The
 @var{block_size} parameter is also used to help fund the superblock when
@@ -625,7 +625,7 @@ The @var{flags} parameter controls how the iterator will function:
 @table @samp
 
 @item BLOCK_FLAG_HOLE
-This flag indiciates that the interator function should be called on
+This flag indicates that the interator function should be called on
 blocks where the block number is zero (also known as ``holes''.)  It is
 also known as BLOCK_FLAG_APPEND, since it is also used by functions
 such as ext2fs_expand_dir() to add a new block to an inode.
@@ -633,7 +633,7 @@ such as ext2fs_expand_dir() to add a new block to an inode.
 @item BLOCK_FLAG_DEPTH_TRAVERSE
 This flag indicates that the iterator function for the
 indirect, doubly indirect, etc. blocks should be called after all
-of the blocks containined in the indirect blocks are processed.
+of the blocks contained in the indirect blocks are processed.
 This is useful if you are going to be deallocating blocks from an
 inode.
 
@@ -1175,7 +1175,7 @@ in block @var{blk}.
 @deftypefun errcode_t ext2fs_set_dir_block (ext2_dblist @var{dblist}, ext2_ino_t @var{ino}, blk_t @var{blk}, int @var{blockcnt})
 
 Change an entry in the dblist data structure; this changes the location
-of block number @var{blockcnt} of directory indoe @var{ino} to be block
+of block number @var{blockcnt} of directory inode @var{ino} to be block
 @var{blk}. 
 @end deftypefun
 
@@ -1208,12 +1208,12 @@ the inode is referenced according to the inode structure.
 This abstraction is designed to be extremely efficient for storing this
 sort of information, by taking advantage of the following properties of
 inode counts, namely (1) inode counts are very often zero (because
-the inode is currrently not in use), and (2) many files have a inode
+the inode is currently not in use), and (2) many files have a inode
 count of 1 (because they are a file which has no additional hard links).
 
 @deftypefun errcode_t ext2fs_create_icount2 (ext2_filsys @var{fs}, int @var{flags}, int @var{size}, ext2_icount_t @var{hint}, ext2_icount_t *@var{ret})
 
-Creates an icount stucture for a filesystem @var{fs}, with initial space
+Creates an icount structure for a filesystem @var{fs}, with initial space
 for @var{size} inodes whose count is greater than 1.  The @var{flags}
 parameter is either 0 or @code{EXT2_ICOUNT_OPT_INCREMENT}, which
 indicates that icount structure should be able to increment inode counts
diff --git a/e2fsck/CHANGES b/e2fsck/CHANGES
index fa135b6d..eb4cfded 100644
--- a/e2fsck/CHANGES
+++ b/e2fsck/CHANGES
@@ -15,7 +15,7 @@ Deleted inodes from old ext2fs code (inodes with dtime set but
 non-zero link count) are detected, and the user is given the
 opportunity to clear them.
 
-The last bit in the last group of the block bitmap badding was not
+The last bit in the last group of the block bitmap padding was not
 being checked; now fixed.
 
 The free_blocks and free_inodes count in the last group weren't being
diff --git a/e2fsck/e2fsck.conf.5.in b/e2fsck/e2fsck.conf.5.in
index d8205bcf..a727932b 100644
--- a/e2fsck/e2fsck.conf.5.in
+++ b/e2fsck/e2fsck.conf.5.in
@@ -178,17 +178,17 @@ relation.
 This relation contains an alternate directory that will be used if the
 directory specified by
 .I log_dir
-is not available or is not writeable.
+is not available or is not writable.
 .TP
 .I log_dir_wait
 If this boolean relation is true, them if the directories specified by
 .I log_dir
 or
 .I log_dir_fallback
-are not available or are not yet writeable, e2fsck will save the output
+are not available or are not yet writable, e2fsck will save the output
 in a memory buffer, and a child process will periodically test to see if
 the log directory has become available after the boot sequence has
-mounted the requiste file system for reading/writing.  This implements the
+mounted the requested file system for reading/writing.  This implements the
 functionality provided by
 .BR logsave (8)
 for e2fsck log files.
@@ -413,7 +413,7 @@ The name of the user running e2fsck.
 .B %U
 This percent expression does not expand to anything, but it signals that
 any following date or time expressions should be expressed in UTC time
-instead of the local timzeone.
+instead of the local timezone.
 .TP
 .B %y
 The last two digits of the current year (00..99)
diff --git a/e2fsck/message.c b/e2fsck/message.c
index 0d47a3a4..727f71d5 100644
--- a/e2fsck/message.c
+++ b/e2fsck/message.c
@@ -224,7 +224,7 @@ static void print_time(FILE *f, time_t t)
 	static int		do_gmt = -1;
 
 #ifdef __dietlibc__
-		/* The diet libc doesn't respect the TZ environemnt variable */
+		/* The diet libc doesn't respect the TZ environment variable */
 		if (do_gmt == -1) {
 			time_str = getenv("TZ");
 			if (!time_str)
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index f7593ff0..5015d938 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -30,7 +30,7 @@
  *
  * Pass 1 is designed to stash away enough information so that the
  * other passes should not need to read in the inode information
- * during the normal course of a filesystem check.  (Althogh if an
+ * during the normal course of a filesystem check.  (Although if an
  * inconsistency is detected, other passes may need to read in an
  * inode to fix it.)
  *
@@ -1688,7 +1688,7 @@ void e2fsck_pass1(e2fsck_t ctx)
 			/*
 			 * Make sure the root inode is a directory; if
 			 * not, offer to clear it.  It will be
-			 * regnerated in pass #3.
+			 * regenerated in pass #3.
 			 */
 			if (!LINUX_S_ISDIR(inode->i_mode)) {
 				if (fix_problem(ctx, PR_1_ROOT_NO_DIR, &pctx))
@@ -4156,7 +4156,7 @@ static void mark_table_blocks(e2fsck_t ctx)
 }
 
 /*
- * Thes subroutines short circuits ext2fs_get_blocks and
+ * These subroutines short circuits ext2fs_get_blocks and
  * ext2fs_check_directory; we use them since we already have the inode
  * structure, so there's no point in letting the ext2fs library read
  * the inode again.
diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
index d22cffd3..392ff2c6 100644
--- a/e2fsck/pass1b.c
+++ b/e2fsck/pass1b.c
@@ -919,7 +919,7 @@ static errcode_t clone_file(e2fsck_t ctx, ext2_ino_t ino,
 					sizeof(dp->inode), "clone file EA");
 		/*
 		 * If we cloned the EA block, find all other inodes
-		 * which refered to that EA block, and modify
+		 * which referred to that EA block, and modify
 		 * them to point to the new EA block.
 		 */
 		n = dict_lookup(&clstr_dict,
diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index 09b79c3b..09c16179 100644
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -1635,7 +1635,7 @@ static int deallocate_inode_block(ext2_filsys fs,
 }
 
 /*
- * This fuction deallocates an inode
+ * This function deallocates an inode
  */
 static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf)
 {
@@ -1705,7 +1705,7 @@ clear_inode:
 }
 
 /*
- * This fuction clears the htree flag on an inode
+ * This function clears the htree flag on an inode
  */
 static void clear_htree(e2fsck_t ctx, ext2_ino_t ino)
 {
diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c
index 4d9430bb..6a975b36 100644
--- a/e2fsck/pass3.c
+++ b/e2fsck/pass3.c
@@ -15,7 +15,7 @@
  * not, e2fsck will offer to create a new one.  It is then marked as
  * "done".
  *
- * Then, pass3 interates over all directory inodes; for each directory
+ * Then, pass3 iterates over all directory inodes; for each directory
  * it attempts to trace up the filesystem tree, using dirinfo.parent
  * until it reaches a directory which has been marked "done".  If it
  * can not do so, then the directory must be disconnected, and e2fsck
diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
index ab736496..7803e8b8 100644
--- a/e2fsck/pass5.c
+++ b/e2fsck/pass5.c
@@ -300,7 +300,7 @@ static void print_bitmap_problem(e2fsck_t ctx, problem_t problem,
 	pctx->ino = pctx->ino2 = 0;
 }
 
-/* Just to be more succint */
+/* Just to be more succinct */
 #define B2C(x)	EXT2FS_B2C(fs, (x))
 #define EQ_CLSTR(x, y) (B2C(x) == B2C(y))
 #define LE_CLSTR(x, y) (B2C(x) <= B2C(y))
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 2bb8d4e2..edc9d51f 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -174,7 +174,7 @@ static struct e2fsck_problem problem_table[] = {
 	  N_("Corruption found in @S.  (%s = %N).\n"),
 	  PROMPT_NONE, PR_AFTER_CODE, PR_0_SB_CORRUPT },
 
-	/* Error determing physical device size of filesystem */
+	/* Error determining physical device size of filesystem */
 	{ PR_0_GETSIZE_ERROR,
 	  N_("Error determining size of the physical @v: %m\n"),
 	  PROMPT_NONE, PR_FATAL },
@@ -1328,7 +1328,7 @@ static struct e2fsck_problem problem_table[] = {
 	  N_("@E has @D/unused @i %Di.  "),
 	  PROMPT_CLEAR, PR_PREEN_OK },
 
-	/* Directry entry is link to '.' */
+	/* Directory entry is link to '.' */
 	{ PR_2_LINK_DOT,
 	  N_("@E @L to '.'  "),
 	  PROMPT_CLEAR, 0 },
@@ -1343,7 +1343,7 @@ static struct e2fsck_problem problem_table[] = {
 	  N_("@E @L to @d %P (%Di).\n"),
 	  PROMPT_CLEAR, 0 },
 
-	/* Directory entry contains a link to the root directry */
+	/* Directory entry contains a link to the root directory */
 	{ PR_2_LINK_ROOT,
 	  N_("@E @L to the @r.\n"),
 	  PROMPT_CLEAR, 0 },
diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index 49a8c3ad..482d111a 100644
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -91,7 +91,7 @@ struct problem_context {
 /* Miscellaneous superblock corruption */
 #define PR_0_MISC_CORRUPT_SUPER			0x00000B
 
-/* Error determing physical device size of filesystem */
+/* Error determining physical device size of filesystem */
 #define PR_0_GETSIZE_ERROR			0x00000C
 
 /* Inode count in the superblock incorrect */
@@ -794,7 +794,7 @@ struct problem_context {
 /* Directory entry has deleted or unused inode */
 #define PR_2_UNUSED_INODE	0x020003
 
-/* Directry entry is link to '.' */
+/* Directory entry is link to '.' */
 #define PR_2_LINK_DOT		0x020004
 
 /* Directory entry points to inode now located in a bad block */
@@ -803,7 +803,7 @@ struct problem_context {
 /* Directory entry contains a link to a directory */
 #define PR_2_LINK_DIR		0x020006
 
-/* Directory entry contains a link to the root directry */
+/* Directory entry contains a link to the root directory */
 #define PR_2_LINK_ROOT		0x020007
 
 /* Directory entry has illegal characters in its name */
@@ -1093,7 +1093,7 @@ struct problem_context {
 #define PR_3_LPF_ENCRYPTED		0x03001B
 
 /*
- * Pass 3a --- rehashing diretories
+ * Pass 3a --- rehashing directories
  */
 /* Pass 3a: Reindexing directories */
 #define PR_3A_PASS_HEADER		0x031000
@@ -1210,7 +1210,7 @@ struct problem_context {
 /* Inode range not used, but marked in bitmap */
 #define PR_5_INODE_RANGE_UNUSED		0x050016
 
-/* Inode rangeused, but not marked used in bitmap */
+/* Inode range used, but not marked used in bitmap */
 #define PR_5_INODE_RANGE_USED		0x050017
 
 /* Block in use but group is marked BLOCK_UNINIT */
diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c
index 4c457b39..81110e4d 100644
--- a/e2fsck/recovery.c
+++ b/e2fsck/recovery.c
@@ -325,7 +325,7 @@ int journal_recover(journal_t *journal)
  * Locate any valid recovery information from the journal and set up the
  * journal structures in memory to ignore it (presumably because the
  * caller has evidence that it is out of date).
- * This function does'nt appear to be exorted..
+ * This function doesn't appear to be exported..
  *
  * We perform one pass over the journal to allow us to tell the user how
  * much recovery information is being erased, and to let us initialise
@@ -689,7 +689,7 @@ static int do_one_pass(journal_t *journal,
 			 *		| GO TO NEXT    "Journal Corruption"
 			 *		| TRANSACTION
 			 *		|
-			 * {(n+1)th transanction}
+			 * {(n+1)th transaction}
 			 *		|
 			 * 	 _______|______________
 			 * 	|	 	      |
diff --git a/e2fsck/region.c b/e2fsck/region.c
index 95d23be4..d5b37df8 100644
--- a/e2fsck/region.c
+++ b/e2fsck/region.c
@@ -84,7 +84,7 @@ int region_allocate(region_t region, region_addr_t start, int n)
 
 	/*
 	 * Search through the linked list.  If we find that it
-	 * conflicts witih something that's already allocated, return
+	 * conflicts with something that's already allocated, return
 	 * 1; if we can find an existing region which we can grow, do
 	 * so.  Otherwise, stop when we find the appropriate place
 	 * insert a new region element into the linked list.
diff --git a/e2fsck/revoke.c b/e2fsck/revoke.c
index 64b897a7..f7254713 100644
--- a/e2fsck/revoke.c
+++ b/e2fsck/revoke.c
@@ -427,7 +427,7 @@ int journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
 	int did_revoke = 0;	/* akpm: debug */
 	struct buffer_head *bh = jh2bh(jh);
 
-	jbd_debug(4, "journal_head %p, cancelling revoke\n", jh);
+	jbd_debug(4, "journal_head %p, canceling revoke\n", jh);
 
 	/* Is the existing Revoke bit valid?  If so, we trust it, and
 	 * only perform the full cancel if the revoke bit is set.  If
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 939862f1..b46dcb2d 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1214,7 +1214,7 @@ static errcode_t e2fsck_check_mmp(ext2_filsys fs, e2fsck_t ctx)
 	if (retval)
 		goto check_error;
 
-	/* Print warning if e2fck will wait for more than 20 secs. */
+	/* Print warning if e2fsck will wait for more than 20 secs. */
 	if (verbose || wait_time > EXT4_MMP_MIN_CHECK_INTERVAL * 4) {
 		log_out(ctx, _("MMP interval is %u seconds and total wait "
 			       "time is %u seconds. Please wait...\n"),
diff --git a/e2fsck/util.c b/e2fsck/util.c
index a297e58f..ed947025 100644
--- a/e2fsck/util.c
+++ b/e2fsck/util.c
@@ -735,7 +735,7 @@ int check_for_modules(const char *fs_name)
 
 /*
  * Helper function that does the right thing if write returns a
- * partial write, or an EGAIN/EINTR error.
+ * partial write, or an EAGAIN/EINTR error.
  */
 int write_all(int fd, char *buf, size_t count)
 {
diff --git a/ext2ed/README b/ext2ed/README
index fda4b87c..1f473cf4 100644
--- a/ext2ed/README
+++ b/ext2ed/README
@@ -48,10 +48,10 @@ This is version 0.2 of ext2ed - The extended-2 filesystem editor.
 Modifications on Apr 5 2001
 This is minor bug fixes to ext2ed, as of April 2001.
 It supports modern ext2 version that has file type in directory structure
-and fixes the missunderstanding between ncurses and
+and fixes the misunderstanding between ncurses and
 readline.
 
-I first applied patches from Redhat except the one for readline that 
+I first applied patches from Red Hat except the one for readline that 
 rewrote a readline behavior.
 
 Globals diffs between version 0.1 and 0.2 is stored in file :
@@ -114,7 +114,7 @@ that ncurses will be properly installed on your system:
 	set your TERM environment variable to 'linux' or link
 	l/linux to c/console in the terminfo database.
 
-4.	The percompiled binary was linked with ncurses 1.9.4 and will search
+4.	The precompiled binary was linked with ncurses 1.9.4 and will search
 	for the terminfo database on /usr/local/lib/terminfo. If you are
 	using it, and your 1.9.4 compatible terminfo database is not on the
 	directory above, use the TERMINFO environment variable to specify
diff --git a/ext2ed/dir_com.c b/ext2ed/dir_com.c
index ba852676..67bb4b57 100644
--- a/ext2ed/dir_com.c
+++ b/ext2ed/dir_com.c
@@ -539,7 +539,7 @@ void type_dir___remember (char *command_line)
 
 /*
 
-This is overrided here because we don't remember a directory - It is too complicated. Instead, we remember the
+This is overridden here because we don't remember a directory - It is too complicated. Instead, we remember the
 inode of the current directory.
 
 */
diff --git a/ext2ed/disk.c b/ext2ed/disk.c
index 5c243127..4612d00d 100644
--- a/ext2ed/disk.c
+++ b/ext2ed/disk.c
@@ -14,7 +14,7 @@ double check the various permissions and possible errors here.
 The major update which needs to be done here is switching to the use of the llseek system call, so that we will
 be able to support ext2 filesystems up to 4 TB. Currently, due to the standard fseek usage, we can't handle
 filesystems bigger than 4 GB. The limit is actually 2 GB because I used long rather than unsigned long long at too
-many places in the program. To conclude - This upgrade needs to be done carefuly; There are many places to change.
+many places in the program. To conclude - This upgrade needs to be done carefully; There are many places to change.
 
 First written on: April 9 1995
 
@@ -86,7 +86,7 @@ If logging is enabled, we log the change before writing it to the device.
 	char temp [80];
 
 	if (!write_access) {
-		wprintw (command_win,"Error - Write access not aviable (use enablewrite)\n");
+		wprintw (command_win,"Error - Write access not available (use enablewrite)\n");
 		return (0);
 	}
 
diff --git a/ext2ed/doc/ext2ed-design.sgml b/ext2ed/doc/ext2ed-design.sgml
index 7841358a..e8052a90 100644
--- a/ext2ed/doc/ext2ed-design.sgml
+++ b/ext2ed/doc/ext2ed-design.sgml
@@ -83,7 +83,7 @@ subjects. I can think of two ways in which I could have made my project:
 <Para>
 	The "Engineer" way
 
-Learn the subject throughly before I get to the programming itself.
+Learn the subject thoroughly before I get to the programming itself.
 Then, I could easily see the entire picture and select the best
 course of action, taking all the factors into account.
 </Para>
@@ -94,7 +94,7 @@ course of action, taking all the factors into account.
 	The "Explorer - Progressive" way.
 
 Jump immediately into the cold water - Start programming and
-learning the material parallelly.
+learning the material in parallel.
 </Para>
 </ListItem>
 
@@ -418,7 +418,7 @@ superblock was set exactly to the above value.
 <Para>
 It seems that starting with the <Literal remap="tt">superblock</Literal> was a good bet - Just from
 the list of variables, one can learn a lot. I didn't understand all of them
-at the time, but it seemed that the following keywords were repeating themself
+at the time, but it seemed that the following keywords were repeating themselves
 in various variables:
 
 <ItemizedList>
@@ -710,8 +710,8 @@ int dispatch (char *command_line)
 <Title>Source files in EXT2ED</Title>
 
 <Para>
-The project was getting large enough to be splitted into several source
-files. I splitted the source as much as I could into self-contained
+The project was getting large enough to be split into several source
+files. I split the source as much as I could into self-contained
 source files. The source files consist of the following blocks:
 
 <ItemizedList>
@@ -1156,7 +1156,7 @@ according to the source division outlined above, in inode_com.c) will
 store the necessary information about the inode in a specific structure
 of type struct_file_info which will be available for use by the file_com.c
 functions. Only then it will set the type to file. This is also the reason
-that a direct asynchronic set of the object type to a file through a settype
+that a direct asynchronous set of the object type to a file through a settype
 command will fail - The above data structure will not be initialized
 properly because the user never was at the inode of the file. 
 
diff --git a/ext2ed/doc/ext2fs-overview.sgml b/ext2ed/doc/ext2fs-overview.sgml
index 900c3930..0d54f07c 100644
--- a/ext2ed/doc/ext2fs-overview.sgml
+++ b/ext2ed/doc/ext2fs-overview.sgml
@@ -533,7 +533,7 @@ allocated blocks.
 </Para>
 
 <Para>
-It was found experimently that many of the files in the filesystem are
+It was found experimentally that many of the files in the filesystem are
 actually quite small. To take advantage of this effect, the kernel provides
 storage of up to 12 block numbers in the inode itself. Those blocks are
 called <Literal remap="tt">direct blocks</Literal>. The advantage is that once the kernel has the
@@ -692,7 +692,7 @@ options. They determine the type of the "file" to which the inode belongs:
 <Title>Time and date</Title>
 
 <Para>
-Linux records the last time in which various operations occured with the
+Linux records the last time in which various operations occurred with the
 file. The time and date are saved in the standard C library format - The
 number of seconds which passed since 00:00:00 GMT, January 1, 1970. The
 following times are recorded:
@@ -1087,7 +1087,7 @@ the length of the file name.
 <Para>
 The variable <Literal remap="tt">rec&lowbar;len</Literal> is provided because the directory entries are
 padded with zeroes so that the next entry will be in an offset which is
-a multiplition of 4. The resulting directory entry size is stored in
+a multiplication of 4. The resulting directory entry size is stored in
 <Literal remap="tt">rec&lowbar;len</Literal>. If the directory entry is the last in the block, it is
 padded with zeroes till the end of the block, and rec&lowbar;len is updated
 accordingly.
@@ -1402,7 +1402,7 @@ then zero s&lowbar;mnt&lowbar;count. <Literal remap="tt">s&lowbar;max&lowbar;mnt
 E2fsck also records the last time in which the file system was checked in
 the <Literal remap="tt">s&lowbar;lastcheck</Literal> variable. The user tunable parameter
 <Literal remap="tt">s&lowbar;checkinterval</Literal> will contain the number of seconds which are allowed
-to pass since <Literal remap="tt">s&lowbar;lastcheck</Literal> until a check is reforced. A value of
+to pass since <Literal remap="tt">s&lowbar;lastcheck</Literal> until a check is forced. A value of
 <Literal remap="tt">0</Literal> disables time-based check.
 </Para>
 
diff --git a/ext2ed/doc/user-guide.sgml b/ext2ed/doc/user-guide.sgml
index 42887eff..1e8f3cdf 100644
--- a/ext2ed/doc/user-guide.sgml
+++ b/ext2ed/doc/user-guide.sgml
@@ -506,8 +506,8 @@ itself the direct blocks, indirect blocks, ..., while still preserving the
 actual view of the exact block usage of the file.
 </Screen>
 
-The point is that the "tour" of the filesystem will now be synchronic rather
-than asynchronic - Each object has the "links" to pass between connected
+The point is that the "tour" of the filesystem will now be synchronous rather
+than asynchronous - Each object has the "links" to pass between connected
 logical structures, and special fine-tuned functions to deal with it.
 </Para>
 
@@ -855,7 +855,7 @@ The <Command>setdevice</Command> command is described at section <XRef LinkEnd="
 Syntax: setoffset [block || type] [+|-]offset
 </Screen>
 
-The <Command>setoffset</Command> command is used to move asynchronically inside the file
+The <Command>setoffset</Command> command is used to move asynchronously inside the file
 system. It is considered a low level command, and usually should not be used
 when editing an ext2 filesystem, simply because movement is better
 utilized through the specific ext2 commands.
diff --git a/ext2ed/ext2.descriptors b/ext2ed/ext2.descriptors
index b1ac4c4b..e356f4cd 100644
--- a/ext2ed/ext2.descriptors
+++ b/ext2ed/ext2.descriptors
@@ -5,7 +5,7 @@ Most of this file is just copied from the ext2 main include file.
 My parser is very primitive - It only searches for the struct keywords,
 and uses the variables in there. The rest of the file is just ignored.
 
-You will find at the end a few additional types which are not aviable in
+You will find at the end a few additional types which are not available in
 the original include file, such as the types "file" and "dir". They have
 no variables, but are necessary due to the way ext2ed binds C commands
 to specific types.
diff --git a/ext2ed/ext2ed.conf.in b/ext2ed/ext2ed.conf.in
index 7e2a9255..c0796234 100644
--- a/ext2ed/ext2ed.conf.in
+++ b/ext2ed/ext2ed.conf.in
@@ -52,8 +52,8 @@ AllowMountedRead	on
 
 # When ForceExt2 is set to on, the filesystem is assumed to be ext2
 # filesystem, despite the possibly corrupt superblock magic number reading.
-# All the ext2 specific commands will be aviable despite the possible
-# autodetection failture.
+# All the ext2 specific commands will be available despite the possible
+# autodetection failure.
 
 ForceExt2		off
 
diff --git a/ext2ed/ext2ed.h b/ext2ed/ext2ed.h
index b9b43b47..0ac77b7a 100644
--- a/ext2ed/ext2ed.h
+++ b/ext2ed/ext2ed.h
@@ -249,7 +249,7 @@ void signal_SIGSEGV_handler (int sig_num);
 
 /* general_com.c */
 
-/* General commands which are aviable always */
+/* General commands which are available always */
 
 extern void help (char *command_line);
 extern void set (char *command_line);
@@ -275,7 +275,7 @@ void detailed_help (char *text);
 
 /* ext2_com.c */
 
-/* Extended2 filesystem genereal commands - Aviable only when editing an
+/* Extended2 filesystem general commands - Available only when editing an
    ext2 filesystem */
 
 extern void type_ext2___super (char *command_line);
diff --git a/ext2ed/general_com.c b/ext2ed/general_com.c
index c9b2ffc4..aa274e33 100644
--- a/ext2ed/general_com.c
+++ b/ext2ed/general_com.c
@@ -90,7 +90,7 @@ void help (char *command_line)
 	wprintw (show_pad,"EXT2ED ver %s (%s)\n",E2FSPROGS_VERSION, E2FSPROGS_DATE);
 	wprintw (show_pad,"Copyright (C) 1995 Gadi Oxman\n");
 	wprintw (show_pad,"Reviewed 2001 Christian Bac\n");
-	wprintw (show_pad,"Modified and enchanced by Theodore Ts'o, 2002\n");
+	wprintw (show_pad,"Modified and enhanced by Theodore Ts'o, 2002\n");
 	wprintw (show_pad,"EXT2ED is hereby placed under the terms of the GNU General Public License.\n\n");
 	wprintw (show_pad,"EXT2ED was programmed as a student project in the software laboratory\n");
 	wprintw (show_pad,"of the faculty of electrical engineering in the\n");
@@ -140,7 +140,7 @@ void detailed_help (char *text)
 		refresh_show_pad ();return;
 	}
 
-	wprintw (show_pad,"Error - Command %s not aviable now\n",text);
+	wprintw (show_pad,"Error - Command %s not available now\n",text);
 	refresh_show_pad ();return;
 }
 
diff --git a/ext2ed/init.c b/ext2ed/init.c
index 7d9b526f..4e584317 100644
--- a/ext2ed/init.c
+++ b/ext2ed/init.c
@@ -57,7 +57,7 @@ int init (void)
 
 	general_commands.last_command=-1;	/* No commands whatsoever meanwhile */
 	ext2_commands.last_command=-1;
-	add_general_commands ();		/* Add the general commands, aviable always */
+	add_general_commands ();		/* Add the general commands, available always */
 	device_handle=NULL;			/* Notice that our device is still not set up */
 	device_offset=-1;
 	current_type=NULL;			/* No filesystem specific types yet */
@@ -80,8 +80,8 @@ void add_general_commands (void)
 	add_user_command (&general_commands,"help","EXT2ED help system",help);
 	add_user_command (&general_commands,"set","Changes a variable in the current object",set);
 	add_user_command (&general_commands,"setdevice","Selects the filesystem block device (e.g. /dev/hda1)",set_device);
-	add_user_command (&general_commands,"setoffset","Moves asynchronicly in the filesystem",set_offset);
-	add_user_command (&general_commands,"settype","Tells EXT2ED how to interpert the current object",set_type);
+	add_user_command (&general_commands,"setoffset","Moves asynchronously in the filesystem",set_offset);
+	add_user_command (&general_commands,"settype","Tells EXT2ED how to interpret the current object",set_type);
 	add_user_command (&general_commands,"show","Displays the current object",show);
 	add_user_command (&general_commands,"pgup","Scrolls data one page up",pgup);
 	add_user_command (&general_commands,"pgdn","Scrolls data one page down",pgdn);
@@ -316,7 +316,7 @@ Set specific type user commands.
 	}
 
 	if (strcmp ((ptr->name),"ext2_group_desc")==0) {
-		add_user_command (&ptr->type_commands,"next","Pass to the next block group decriptor",type_ext2_group_desc___next);
+		add_user_command (&ptr->type_commands,"next","Pass to the next block group descriptor",type_ext2_group_desc___next);
 		add_user_command (&ptr->type_commands,"prev","Pass to the previous group descriptor",type_ext2_group_desc___prev);
 		add_user_command (&ptr->type_commands,"entry","Pass to a specific group descriptor",type_ext2_group_desc___entry);
 		add_user_command (&ptr->type_commands,"show","Shows the current group descriptor",type_ext2_group_desc___show);
diff --git a/ext2ed/main.c b/ext2ed/main.c
index 4a29979b..f7e7d7df 100644
--- a/ext2ed/main.c
+++ b/ext2ed/main.c
@@ -14,7 +14,7 @@ This file mostly contains:
 2.	The parser, which asks the command line from the user.
 3.	The dispatcher, which analyzes the command line and calls the appropriate handler function.
 4.	A command pattern matcher which is used along with the readline completion feature.
-5.	A function which tells the user that an internal error has occured.
+5.	A function which tells the user that an internal error has occurred.
 
 First written on: March 30 1995
 
@@ -57,7 +57,7 @@ They are initialized below to some logical defaults.
 char Ext2Descriptors [200]="ext2.descriptors";	/* The location of the ext2 filesystem object definition */
 char AlternateDescriptors [200]="";		/* We allow the user to define additional structures */
 char LogFile [200]="ext2ed.log";		/* The location of the log file - Each write will be logged there */
-int LogChanges=1;				/* 1 enables logging, 0 diables logging */
+int LogChanges=1;				/* 1 enables logging, 0 disables logging */
 int AllowChanges=0;				/* When set, the enablewrite command will fail */
 int AllowMountedRead=0;				/* Behavior when trying to open a mounted filesystem read-only */
 int ForceExt2=0;				/* When set, ext2 autodetection is overridden */
@@ -334,7 +334,7 @@ void parser (void)
 
 
 /*
- * This is a very important function. Its task is to recieve a command
+ * This is a very important function. Its task is to receive a command
  * name and link it to a C function.  There are three types of commands:
  *
  * 1.	General commands - Always available and accessed through
@@ -354,7 +354,7 @@ void parser (void)
  *
  * When an handling function is found, it is called along with the
  * command line that was passed to us. The handling function is then
- * free to interpert the arguments in its own style.
+ * free to interpret the arguments in its own style.
  */
 int dispatch (char *command_line)
 {
@@ -480,7 +480,7 @@ char *complete_command (char *text,int state)
 			}
 		}
 
-	/* No, pehaps ext2 specific command then ? */
+	/* No, perhaps ext2 specific command then ? */
 
 	for (i=0;i<=ext2_commands.last_command;i++) {
 		if (strncmp (ext2_commands.names [i],text,len)==0) {
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 79678cf8..f5a99b50 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -602,7 +602,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 	  /* When this is a SUID binary we must not allow accessing files
 	     outside the dedicated directories.  */
 	  if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
-	    /* Ingore this entry.  */
+	    /* Ignore this entry.  */
 	    continue;
 	}
 
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 3393ecb5..c13d36da 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -242,7 +242,7 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
     }
   if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
     {
-      /* This component can be part of both syntaces but has different
+      /* This component can be part of both syntaxes but has different
 	 leading characters.  For CEN we use `+', else `@'.  */
       *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
       cp = stpcpy (cp, modifier);
diff --git a/intl/libgettext.h b/intl/libgettext.h
index 3a92960a..c069fbd5 100644
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -84,7 +84,7 @@ extern int _msg_tbl_length;
 #endif
 
 
-/* For automatical extraction of messages sometimes no real
+/* For automatic extraction of messages sometimes no real
    translation is needed.  Instead the string itself is the result.  */
 #define gettext_noop(Str) (Str)
 
diff --git a/intl/xsize.h b/intl/xsize.h
index 362e24b7..e3707fa1 100644
--- a/intl/xsize.h
+++ b/intl/xsize.h
@@ -95,7 +95,7 @@ xmax (size_t size1, size_t size2)
 /* Multiplication of a count with an element size, with overflow check.
    The count must be >= 0 and the element size must be > 0.
    This is a macro, not an inline function, so that it works correctly even
-   when N is of a wider tupe and N > SIZE_MAX.  */
+   when N is of a wider type and N > SIZE_MAX.  */
 #define xtimes(N, ELSIZE) \
   ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
 
diff --git a/lib/blkid/dev.c b/lib/blkid/dev.c
index 6d8eaeac..d35513e4 100644
--- a/lib/blkid/dev.c
+++ b/lib/blkid/dev.c
@@ -91,7 +91,7 @@ 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
diff --git a/lib/blkid/libblkid.3.in b/lib/blkid/libblkid.3.in
index bd24cb1a..2fea3a9b 100644
--- a/lib/blkid/libblkid.3.in
+++ b/lib/blkid/libblkid.3.in
@@ -47,7 +47,7 @@ so the use of the cache file is
 in this situation.
 .SH AUTHOR
 .B libblkid
-was written by Andreas Dilger for the ext2 filesystem utilties, with input
+was written by Andreas Dilger for the ext2 filesystem utilities, with input
 from Ted Ts'o.  The library was subsequently heavily modified by Ted Ts'o.
 .SH FILES
 .TP
diff --git a/lib/blkid/probe.h b/lib/blkid/probe.h
index c46a3325..dea4081d 100644
--- a/lib/blkid/probe.h
+++ b/lib/blkid/probe.h
@@ -663,7 +663,7 @@ struct btrfs_dev_item {
 
 	/*
 	 * starting byte of this partition on the device,
-	 * to allowr for stripe alignment in the future
+	 * to allow for stripe alignment in the future
 	 */
 	__u64 start_offset;
 
diff --git a/lib/blkid/tag.c b/lib/blkid/tag.c
index 1eae7df7..e88ebc46 100644
--- a/lib/blkid/tag.c
+++ b/lib/blkid/tag.c
@@ -261,7 +261,7 @@ 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
diff --git a/lib/e2p/e2p.pc.in b/lib/e2p/e2p.pc.in
index c171ae67..150b089a 100644
--- a/lib/e2p/e2p.pc.in
+++ b/lib/e2p/e2p.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: e2p
-Description: Ext2fs userpace programs utility library
+Description: Ext2fs userspace programs utility library
 Version: @E2FSPROGS_VERSION@
 Requires: 
 Cflags: -I${includedir}/e2p -I${includedir}
diff --git a/lib/et/com_err.texinfo b/lib/et/com_err.texinfo
index c9d3fcaf..3e7ae32c 100644
--- a/lib/et/com_err.texinfo
+++ b/lib/et/com_err.texinfo
@@ -394,7 +394,7 @@ any event, any invariant which the library assumes must be maintained.
 In general, it is not in the domain of non user-interface library
 routines to write error messages to the user's terminal, or halt the
 process.  Such forms of ``error handling'' should be reserved for
-failures of internal invariants and consistancy checks only, as it
+failures of internal invariants and consistency checks only, as it
 provides the user of the library no way to clean up for himself in the
 event of total failure.
 
@@ -441,7 +441,7 @@ available, try again later,'' or it may try a different server.
 
 Cleanup which is typically necessary may include, but not be limited
 to, freeing allocated memory which will not be needed any more,
-unlocking concurrancy locks, dropping reference counts, closing file
+unlocking concurrency locks, dropping reference counts, closing file
 descriptors, or otherwise undoing anything which the procedure did up
 to this point.  When there are a lot of things which can go wrong, it
 is generally good to write one block of error-handling code which is
diff --git a/lib/et/com_right.c b/lib/et/com_right.c
index 2cceb54c..a4ed5354 100644
--- a/lib/et/com_right.c
+++ b/lib/et/com_right.c
@@ -1,6 +1,6 @@
 /*
  * com_right.c -- provide Heimdall / Kerberos4kth com_err interfaces
- * 	for backwards compatbility
+ * 	for backwards compatibility
  *
  * Copyright (c) 2003 by Theodore Ts'o
  *
diff --git a/lib/et/test_cases/heimdal2.c b/lib/et/test_cases/heimdal2.c
index a8d4c111..d2ad5726 100644
--- a/lib/et/test_cases/heimdal2.c
+++ b/lib/et/test_cases/heimdal2.c
@@ -14,7 +14,7 @@ static const char * const text[] = {
 	N_("Bad key supplied"),
 	N_("Can't encrypt data"),
 	N_("Cannot encode/decode authentication info"),
-	N_("Principal attemping change is in wrong realm"),
+	N_("Principal attempting change is in wrong realm"),
 	N_("Packet is too large"),
 	N_("Version number is incorrect"),
 	N_("Checksum does not match"),
diff --git a/lib/et/test_cases/heimdal2.et b/lib/et/test_cases/heimdal2.et
index 7a247c55..703600c5 100644
--- a/lib/et/test_cases/heimdal2.et
+++ b/lib/et/test_cases/heimdal2.et
@@ -18,7 +18,7 @@ ec KADM_NO_CRED,	"Unable to fetch credentials"
 ec KADM_BAD_KEY,	"Bad key supplied"
 ec KADM_NO_ENCRYPT,	"Can't encrypt data"
 ec KADM_NO_AUTH,	"Cannot encode/decode authentication info"
-ec KADM_WRONG_REALM,	"Principal attemping change is in wrong realm"
+ec KADM_WRONG_REALM,	"Principal attempting change is in wrong realm"
 ec KADM_NO_ROOM,	"Packet is too large"
 ec KADM_BAD_VER,	"Version number is incorrect"
 ec KADM_BAD_CHK,	"Checksum does not match"
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index b729f619..946cae16 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -5,7 +5,7 @@ top_builddir = ../..
 my_dir = lib/ext2fs
 INSTALL = @INSTALL@
 DEPEND_CFLAGS = -I$(top_srcdir)/debugfs -I$(srcdir)/../../e2fsck -DDEBUGFS
-# This nastyness is needed because of jfs_user.h hackery; when we finally
+# This nastiness is needed because of jfs_user.h hackery; when we finally
 # clean up this mess, we should be able to drop it
 DEBUGFS_CFLAGS = -I$(srcdir)/../../e2fsck $(ALL_CFLAGS) -DDEBUGFS
 
diff --git a/lib/ext2fs/alloc_tables.c b/lib/ext2fs/alloc_tables.c
index 0a366304..971a6ceb 100644
--- a/lib/ext2fs/alloc_tables.c
+++ b/lib/ext2fs/alloc_tables.c
@@ -33,7 +33,7 @@
  * This routine searches for free blocks that can allocate a full
  * group of bitmaps or inode tables for a flexbg group.  Returns the
  * block number with a correct offset were the bitmaps and inode
- * tables can be allocated continously and in order.
+ * tables can be allocated continuously and in order.
  */
 static blk64_t flexbg_offset(ext2_filsys fs, dgrp_t group, blk64_t start_blk,
 			     ext2fs_block_bitmap bmap, int rem_grp,
diff --git a/lib/ext2fs/bb_inode.c b/lib/ext2fs/bb_inode.c
index b0e114bb..11f10ebc 100644
--- a/lib/ext2fs/bb_inode.c
+++ b/lib/ext2fs/bb_inode.c
@@ -96,7 +96,7 @@ errcode_t ext2fs_update_bb_inode(ext2_filsys fs, ext2_badblocks_list bb_list)
 	 * Now set the bad blocks!
 	 *
 	 * First, mark the bad blocks as used.  This prevents a bad
-	 * block from being used as an indirecto block for the bad
+	 * block from being used as an indirect block for the bad
 	 * block inode (!).
 	 */
 	if (bb_list) {
diff --git a/lib/ext2fs/bitops.c b/lib/ext2fs/bitops.c
index 833d1e97..c4a1d4e0 100644
--- a/lib/ext2fs/bitops.c
+++ b/lib/ext2fs/bitops.c
@@ -24,7 +24,7 @@
 /*
  * For the benefit of those who are trying to port Linux to another
  * architecture, here are some C-language equivalents.  You should
- * recode these in the native assmebly language, if at all possible.
+ * recode these in the native assembly language, if at all possible.
  *
  * C language equivalents written by Theodore Ts'o, 9/26/92.
  * Modified by Pete A. Zaitcev 7/14/95 to be portable to big endian
diff --git a/lib/ext2fs/blkmap64_rb.c b/lib/ext2fs/blkmap64_rb.c
index 8d5ddd3f..55704774 100644
--- a/lib/ext2fs/blkmap64_rb.c
+++ b/lib/ext2fs/blkmap64_rb.c
@@ -555,7 +555,7 @@ static int rb_remove_extent(__u64 start, __u64 count,
 			retval = 1;
 			continue;
 		} else {
-			/* modify the last extent in reigon to be removed */
+			/* modify the last extent in region to be removed */
 			ext->count -= ((start + count) - ext->start);
 			ext->start = start + count;
 			retval = 1;
diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h
index 3b55000e..2496d16d 100644
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -970,7 +970,7 @@ struct ext2_dir_entry {
  * bigger than 255 chars, it's safe to reclaim the extra byte for the
  * file_type field.
  *
- * This structure is deprecated due to endianity issues. Please use struct
+ * This structure is deprecated due to endian issues. Please use struct
  * ext2_dir_entry and accessor functions
  *   ext2fs_dirent_name_len
  *   ext2fs_dirent_set_name_len
@@ -1048,7 +1048,7 @@ struct ext2_dir_entry_tail {
  * regardless of how old the timestamp is.
  *
  * The timestamp in the MMP structure will be updated by e2fsck at some
- * arbitary intervals (start of passes, after every few groups of inodes
+ * arbitrary intervals (start of passes, after every few groups of inodes
  * in pass1 and pass1b).  There is no guarantee that e2fsck is updating
  * the MMP block in a timely manner, and the updates it does are purely
  * for the convenience of the sysadmin and not for automatic validation.
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index a4feaccc..6774e32c 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -329,7 +329,7 @@ struct struct_ext2_filsys {
  *
  * BLOCK_FLAG_DEPTH_TRAVERSE indicates that the iterator function for
  * the indirect, doubly indirect, etc. blocks should be called after
- * all of the blocks containined in the indirect blocks are processed.
+ * all of the blocks contained in the indirect blocks are processed.
  * This is useful if you are going to be deallocating blocks from an
  * inode.
  *
@@ -423,7 +423,7 @@ typedef struct ext2_extent_path *ext2_extent_path_t;
 /*
  * Flags used by ext2fs_extent_delete()
  */
-#define EXT2_EXTENT_DELETE_KEEP_EMPTY	0x001 /* keep node if last extnt gone */
+#define EXT2_EXTENT_DELETE_KEEP_EMPTY	0x001 /* keep node if last extent gone */
 
 /*
  * Flags used by ext2fs_extent_set_bmap()
diff --git a/lib/ext2fs/ext3_extents.h b/lib/ext2fs/ext3_extents.h
index f73a3321..309fbc8c 100644
--- a/lib/ext2fs/ext3_extents.h
+++ b/lib/ext2fs/ext3_extents.h
@@ -59,7 +59,7 @@ struct ext3_extent_header {
 	__le16	eh_magic;	/* probably will support different formats */
 	__le16	eh_entries;	/* number of valid entries */
 	__le16	eh_max;		/* capacity of store in entries */
-	__le16	eh_depth;	/* has tree real underlaying blocks? */
+	__le16	eh_depth;	/* has tree real underlying blocks? */
 	__le32	eh_generation;	/* generation of the tree */
 };
 
diff --git a/lib/ext2fs/get_pathname.c b/lib/ext2fs/get_pathname.c
index 4c9c7655..8cfaf6e6 100644
--- a/lib/ext2fs/get_pathname.c
+++ b/lib/ext2fs/get_pathname.c
@@ -1,5 +1,5 @@
 /*
- * get_pathname.c --- do directry/inode -> name translation
+ * get_pathname.c --- do directory/inode -> name translation
  *
  * Copyright (C) 1993, 1994, 1995 Theodore Ts'o.
  *
diff --git a/lib/ext2fs/inline_data.c b/lib/ext2fs/inline_data.c
index 0c1eef6c..7215c517 100644
--- a/lib/ext2fs/inline_data.c
+++ b/lib/ext2fs/inline_data.c
@@ -311,7 +311,7 @@ static errcode_t ext2fs_inline_data_convert_dir(ext2_filsys fs, ext2_ino_t ino,
 	dir->name[1] = '.';
 
 	/*
-	 * Ajust the last rec_len
+	 * Adjust the last rec_len
 	 */
 	offset = EXT2_DIR_REC_LEN(1) + EXT2_DIR_REC_LEN(2);
 	dir = (struct ext2_dir_entry *) (bbuf + offset);
@@ -603,7 +603,7 @@ static errcode_t file_test(ext2_filsys fs)
 	/* create a new file */
 	retval = ext2fs_new_inode(fs, 2, 010755, 0, &newfile);
 	if (retval) {
-		com_err("file_test", retval, "while allocaing a new inode");
+		com_err("file_test", retval, "while allocating a new inode");
 		return 1;
 	}
 
@@ -613,7 +613,7 @@ static errcode_t file_test(ext2_filsys fs)
 	inode.i_mode = LINUX_S_IFREG;
 	retval = ext2fs_write_new_inode(fs, newfile, &inode);
 	if (retval) {
-		com_err("file_test", retval, "while writting a new inode");
+		com_err("file_test", retval, "while writing a new inode");
 		return 1;
 	}
 
@@ -801,7 +801,7 @@ int main(int argc, char *argv[])
 	retval = ext2fs_allocate_tables(fs);
 	if (retval) {
 		com_err("setup", retval,
-			"while allocating tables for test filesysmte");
+			"while allocating tables for test filesystem");
 		exit(1);
 	}
 
diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c
index 8dc9ac0d..ad01a9fc 100644
--- a/lib/ext2fs/inode.c
+++ b/lib/ext2fs/inode.c
@@ -151,7 +151,7 @@ errcode_t ext2fs_open_inode_scan(ext2_filsys fs, int buffer_blocks,
 	 */
 	if (fs->badblocks == 0) {
 		/*
-		 * Temporarly save fs->get_blocks and set it to zero,
+		 * Temporarily save fs->get_blocks and set it to zero,
 		 * for compatibility with old e2fsck's.
 		 */
 		save_get_blocks = fs->get_blocks;
diff --git a/lib/ext2fs/nt_io.c b/lib/ext2fs/nt_io.c
index f0d16ae0..234f6b17 100644
--- a/lib/ext2fs/nt_io.c
+++ b/lib/ext2fs/nt_io.c
@@ -378,7 +378,7 @@ _MapNtStatus(
 
 
 //
-// Helper functions to make things easyer
+// Helper functions to make things easier
 //
 
 static
@@ -398,7 +398,7 @@ _OpenNtName(
 	IO_STATUS_BLOCK IoStatusBlock;
 
 	//
-	// Make Unicode name from inlut string
+	// Make Unicode name from input string
 	//
 
 	UnicodeString.Buffer = &Buffer[0];
@@ -411,7 +411,7 @@ _OpenNtName(
 
 	if(!NT_SUCCESS(Status))
 	{
-		return Status; // Unpappable character?
+		return Status; // Unmappable character?
 	}
 
 	//
@@ -673,7 +673,7 @@ _NormalizeDeviceName(
 	else if('f' == *Device)
 	{
 		//
-		// 3-d letted should be a digit.
+		// 3-d letter should be a digit.
 		//
 
 		if((*(Device + 3) != '\0') ||
diff --git a/lib/ext2fs/rbtree.h b/lib/ext2fs/rbtree.h
index b767a90b..1973b820 100644
--- a/lib/ext2fs/rbtree.h
+++ b/lib/ext2fs/rbtree.h
@@ -19,7 +19,7 @@
   linux/include/linux/rbtree.h
 
   To use rbtrees you'll have to implement your own insert and search cores.
-  This will avoid us to use callbacks and to drop drammatically performances.
+  This will avoid us to use callbacks and to drop dramatically performances.
   I know it's not the cleaner way,  but in C (not in C++) to get
   performances and genericity...
 
diff --git a/lib/ext2fs/res_gdt.c b/lib/ext2fs/res_gdt.c
index eaa9cf87..6bcf01e1 100644
--- a/lib/ext2fs/res_gdt.c
+++ b/lib/ext2fs/res_gdt.c
@@ -104,7 +104,7 @@ errcode_t ext2fs_create_resize_inode(ext2_filsys fs)
 	if (fs->blocksize == 1024 && sb_blk == 0)
 		sb_blk = 1;
 
-	/* Maximum possible file size (we donly use the dindirect blocks) */
+	/* Maximum possible file size (we only use double indirect blocks) */
 	apb = EXT2_ADDR_PER_BLOCK(sb);
 	if ((dindir_blk = inode.i_block[EXT2_DIND_BLOCK])) {
 #ifdef RES_GDT_DEBUG
diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c
index b36c4858..9c1dd31d 100644
--- a/lib/ext2fs/tdb.c
+++ b/lib/ext2fs/tdb.c
@@ -712,7 +712,7 @@ int tdb_lockall_unmark(struct tdb_context *tdb)
 	return _tdb_unlockall(tdb, F_WRLCK | TDB_MARK_LOCK);
 }
 
-/* lock entire database with write lock - nonblocking varient */
+/* lock entire database with write lock - nonblocking variant */
 int tdb_lockall_nonblock(struct tdb_context *tdb)
 {
 	return _tdb_lockall(tdb, F_WRLCK, F_SETLK);
@@ -730,7 +730,7 @@ int tdb_lockall_read(struct tdb_context *tdb)
 	return _tdb_lockall(tdb, F_RDLCK, F_SETLKW);
 }
 
-/* lock entire database with read lock - nonblock varient */
+/* lock entire database with read lock - nonblock variant */
 int tdb_lockall_read_nonblock(struct tdb_context *tdb)
 {
 	return _tdb_lockall(tdb, F_RDLCK, F_SETLK);
@@ -1276,7 +1276,7 @@ void tdb_io_init(struct tdb_context *tdb)
     although once a transaction is started then an exclusive lock is
     gained until the transaction is committed or cancelled
 
-  - the commit stategy involves first saving away all modified data
+  - the commit strategy involves first saving away all modified data
     into a linearised buffer in the transaction recovery area, then
     marking the transaction recovery area with a magic value to
     indicate a valid recovery record. In total 4 fsync/msync calls are
@@ -2323,7 +2323,7 @@ static int update_tailer(struct tdb_context *tdb, tdb_off_t offset,
 }
 
 /* Add an element into the freelist. Merge adjacent records if
-   neccessary. */
+   necessary. */
 int tdb_free(struct tdb_context *tdb, tdb_off_t offset, struct list_struct *rec)
 {
 	tdb_off_t right, left;
@@ -2674,7 +2674,7 @@ static int tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock *tloc
 			   that we have done at least one fcntl lock at the
 			   start of a search to guarantee that memory is
 			   coherent on SMP systems. If records are added by
-			   others during the search then thats OK, and we
+			   others during the search then that's OK, and we
 			   could possibly miss those with this trick, but we
 			   could miss them anyway without this trick, so the
 			   semantics don't change.
@@ -2762,7 +2762,7 @@ static int tdb_traverse_internal(struct tdb_context *tdb,
 	struct list_struct rec;
 	int ret, count = 0;
 
-	/* This was in the initializaton, above, but the IRIX compiler
+	/* This was in the initialization, above, but the IRIX compiler
 	 * did not like it.  crh
 	 */
 	tl->next = tdb->travlocks.next;
@@ -4051,7 +4051,7 @@ int tdb_close(struct tdb_context *tdb)
 	return ret;
 }
 
-/* register a loging function */
+/* register a logging function */
 void tdb_set_logging_function(struct tdb_context *tdb,
                               const struct tdb_logging_context *log_ctx)
 {
diff --git a/lib/ext2fs/undo_io.c b/lib/ext2fs/undo_io.c
index 776d5b8b..19862414 100644
--- a/lib/ext2fs/undo_io.c
+++ b/lib/ext2fs/undo_io.c
@@ -381,7 +381,7 @@ static errcode_t undo_write_tdb(io_channel channel,
 		 * Read one block using the backing I/O manager
 		 * The backing I/O manager block size may be
 		 * different from the tdb_data_size.
-		 * Also we need to recalcuate the block number with respect
+		 * Also we need to recalculate the block number with respect
 		 * to the backing I/O manager.
 		 */
 		offset = block_num * data->tdb_data_size +
diff --git a/lib/ss/ct_c.sed b/lib/ss/ct_c.sed
index 8d6452be..9e5eebbe 100644
--- a/lib/ss/ct_c.sed
+++ b/lib/ss/ct_c.sed
@@ -25,7 +25,7 @@
 # an awk script to parse.
 
 #
-# The first section of this script is just to cannoicalize the file.  
+# The first section of this script is just to canonicalize the file.  
 # It removes comments, and puts each command_table request onto a single
 # line
 #
@@ -41,7 +41,7 @@ bFIRST
 }
 s/, */, /g
 #
-# Now we take care of some syntatic sugar.....
+# Now we take care of some syntactic sugar.....
 #
 /^unimplemented/ {
 	s/^unimplemented [A-Za-z_0-9]*/request ss_unimplemented/
diff --git a/lib/support/profile.c b/lib/support/profile.c
index ae9a2d9d..9e96673b 100644
--- a/lib/support/profile.c
+++ b/lib/support/profile.c
@@ -1112,7 +1112,7 @@ errcode_t profile_create_node(const char *name, const char *value,
 }
 
 /*
- * This function verifies that all of the representation invarients of
+ * This function verifies that all of the representation invariants of
  * the profile are true.  If not, we have a programming bug somewhere,
  * probably in this file.
  */
diff --git a/lib/support/profile_helpers.c b/lib/support/profile_helpers.c
index b8623268..d7d6f15e 100644
--- a/lib/support/profile_helpers.c
+++ b/lib/support/profile_helpers.c
@@ -179,7 +179,7 @@ cleanup_iterator:
 }
 
 /*
- * This function will return the list of the names of subections in the
+ * This function will return the list of the names of subsections in the
  * under the specified section name.
  */
 errcode_t
diff --git a/lib/support/quotaio.h b/lib/support/quotaio.h
index f89536eb..60689700 100644
--- a/lib/support/quotaio.h
+++ b/lib/support/quotaio.h
@@ -243,7 +243,7 @@ int parse_quota_types(const char *in_str, unsigned int *qtype_bits,
  * Return pointer to reserved inode field in superblock for given quota type.
  *
  * This allows the caller to get or set the quota inode by type without the
- * need for the quota array to be contiguous in the superbock.
+ * need for the quota array to be contiguous in the superblock.
  */
 static inline ext2_ino_t *quota_sb_inump(struct ext2_super_block *sb,
 					 enum quota_type qtype)
diff --git a/lib/support/quotaio_tree.h b/lib/support/quotaio_tree.h
index 0db0ca1e..b0b7257f 100644
--- a/lib/support/quotaio_tree.h
+++ b/lib/support/quotaio_tree.h
@@ -42,7 +42,7 @@ struct qtree_fmt_operations {
 	int (*is_id)(void *disk, struct dquot *dquot);
 };
 
-/* Inmemory copy of version specific information */
+/* In-memory copy of version specific information */
 struct qtree_mem_dqinfo {
 	unsigned int dqi_blocks;	/* # of blocks in quota file */
 	unsigned int dqi_free_blk;	/* First block in list of free blocks */
diff --git a/lib/uuid/gen_uuid_nt.c b/lib/uuid/gen_uuid_nt.c
index 79a40507..9a9a9775 100644
--- a/lib/uuid/gen_uuid_nt.c
+++ b/lib/uuid/gen_uuid_nt.c
@@ -64,7 +64,7 @@ NtCurrentTeb(void);
 
 //
 // The only way to get version information from the system is to examine
-// one stored in PEB. But it's pretty dangerouse because this value could
+// one stored in PEB. But it's pretty dangerous because this value could
 // be altered in image header.
 //
 
diff --git a/lib/uuid/uuid_compare.3.in b/lib/uuid/uuid_compare.3.in
index 4807f3a8..67bc9b9e 100644
--- a/lib/uuid/uuid_compare.3.in
+++ b/lib/uuid/uuid_compare.3.in
@@ -47,7 +47,7 @@ to each other.
 .SH RETURN VALUE
 Returns an integer less than, equal to, or greater than zero if
 .I uu1
-is found,  respectively, to be lexigraphically less than, equal, or
+is found,  respectively, to be lexicographical less than, equal, or
 greater than
 .IR uu2 .
 .SH AUTHOR
diff --git a/lib/uuid/uuid_generate.3.in b/lib/uuid/uuid_generate.3.in
index f44900cd..e6be9685 100644
--- a/lib/uuid/uuid_generate.3.in
+++ b/lib/uuid/uuid_generate.3.in
@@ -58,7 +58,7 @@ function forces the use of the all-random UUID format, even if
 a high-quality random number generator (i.e.,
 .IR /dev/urandom )
 is not available, in which case a pseudo-random
-generator will be subsituted.  Note that the use of a pseudo-random
+generator will be substituted.  Note that the use of a pseudo-random
 generator may compromise the uniqueness of UUID's
 generated in this fashion.
 .sp
@@ -75,7 +75,7 @@ function only uses this algorithm if a high-quality source of
 randomness is not available.
 .sp
 The UUID is 16 bytes (128 bits) long, which gives approximately 3.4x10^38
-unique values (there are approximately 10^80 elemntary particles in
+unique values (there are approximately 10^80 elementary particles in
 the universe according to Carl Sagan's
 .IR Cosmos ).
 The new UUID can reasonably be considered unique among all UUIDs created
diff --git a/misc/Makefile.in b/misc/Makefile.in
index f696d13a..4bb92ace 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -118,7 +118,7 @@ DEPLIBS_E2P= $(LIBE2P) $(DEPLIBCOM_ERR)
 
 COMPILE_ET=	_ET_DIR_OVERRIDE=$(srcdir)/../lib/et/et ../lib/et/compile_et
 
-# This nastyness is needed because of jfs_user.h hackery; when we finally
+# This nastiness is needed because of jfs_user.h hackery; when we finally
 # clean up this mess, we should be able to drop it
 JOURNAL_CFLAGS = -I$(srcdir)/../e2fsck $(ALL_CFLAGS) -DDEBUGFS
 DEPEND_CFLAGS = -I$(top_srcdir)/e2fsck
diff --git a/misc/chattr.1.in b/misc/chattr.1.in
index 44ee3370..967b8088 100644
--- a/misc/chattr.1.in
+++ b/misc/chattr.1.in
@@ -156,7 +156,7 @@ although it can be displayed by
 .PP
 A directory with the 'P' attribute set will enforce a hierarchical
 structure for project id's.  This means that files and directory created
-in the directory will inhert the project id of the directory, rename
+in the directory will inherit the project id of the directory, rename
 operations are constrained so when a file or directory is moved into
 another directory, that the project id's much match.  In addition, a
 hard link to file can only be created when the project id for the file
diff --git a/misc/create_inode.c b/misc/create_inode.c
index 8f7445d0..2dbb433c 100644
--- a/misc/create_inode.c
+++ b/misc/create_inode.c
@@ -33,7 +33,7 @@
 #include "create_inode.h"
 #include "support/nls-enable.h"
 
-/* 64KiB is the minimium blksize to best minimize system call overhead. */
+/* 64KiB is the minimum blksize to best minimize system call overhead. */
 #define COPY_FILE_BUFLEN	65536
 
 static int ext2_file_type(unsigned int mode)
diff --git a/misc/e2image.c b/misc/e2image.c
index 030f9cbe..be001f0f 100644
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -1109,7 +1109,7 @@ static int update_refcount(int fd, struct ext2_qcow2_image *img,
 	/*
 	 * We are relying on the fact that we are creating the qcow2
 	 * image sequentially, hence we will always allocate refcount
-	 * block items sequentialy.
+	 * block items sequentially.
 	 */
 	ref->refcount_block[ref->refcount_block_index] = ext2fs_cpu_to_be16(1);
 	ref->refcount_block_index++;
diff --git a/misc/e4crypt.c b/misc/e4crypt.c
index 600d0b7a..7b65d145 100644
--- a/misc/e4crypt.c
+++ b/misc/e4crypt.c
@@ -578,7 +578,7 @@ static void insert_key_into_keyring(const char *keyring, struct salt *salt)
 	 * We need to do this instead of simply adding the key to
 	 * KEY_SPEC_SESSION_KEYRING since trying to add a key to a
 	 * session keyring that does not yet exist will cause the
-	 * kernel to create a session keyring --- which wil then get
+	 * kernel to create a session keyring --- which will then get
 	 * garbage collected as soon as e4crypt exits.
 	 *
 	 * The fact that the keyctl system call and the add_key system
diff --git a/misc/e4defrag.c b/misc/e4defrag.c
index 5fa85b66..d63343e9 100644
--- a/misc/e4defrag.c
+++ b/misc/e4defrag.c
@@ -1016,7 +1016,7 @@ static int get_best_count(ext4_fsblk_t block_count)
 	int ret;
 	unsigned int flex_bg_num;
 
-	/* Calcuate best extents count */
+	/* Calculate best extents count */
 	if (feature_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG) {
 		flex_bg_num = 1 << log_groups_per_flex;
 		ret = ((block_count - 1) /
@@ -1580,7 +1580,7 @@ static int file_defrag(const char *file, const struct stat64 *buf,
 		goto out;
 	}
 
-	/* Calcuate donor inode's continuous physical region */
+	/* Calculate donor inode's continuous physical region */
 	donor_physical_cnt = get_physical_count(donor_list_physical);
 
 	/* Change donor extent list from physical to logical */
diff --git a/misc/findsuper.c b/misc/findsuper.c
index 47aa43af..ff20b988 100644
--- a/misc/findsuper.c
+++ b/misc/findsuper.c
@@ -30,7 +30,7 @@
  *   findsuper /dev/hda
  *   findsuper /dev/hda 437760 1024   (my disk has cyls of 855*512)
  *
- * I suppose the next step is to figgure out a way to determine if
+ * I suppose the next step is to figure out a way to determine if
  * the block found is the first superblock somehow, and if so, build
  * a partition table from the superblocks found... but this is still
  * useful as is.
@@ -75,7 +75,7 @@
  * For new systems that have a block group number in the superblock it
  * is immediately clear which superblock is the first of a partition.
  * For old systems where no group numbers are given, the first
- * superblock can be recognised by the timestamp: all superblock
+ * superblock can be recognized by the timestamp: all superblock
  * copies have the creation time in s_mtime, except the first, which
  * has the last time e2fsck or tune2fs wrote to the filesystem.
  *
diff --git a/misc/fsck.c b/misc/fsck.c
index 7c93ee82..de5ae256 100644
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -997,7 +997,7 @@ static int check_all(NOARGS)
 	}
 	/*
 	 * 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)
 		for (fs = filesys_info; fs; fs = fs->next)
diff --git a/misc/fsck.h b/misc/fsck.h
index 8a0f70e3..8a55fbd6 100644
--- a/misc/fsck.h
+++ b/misc/fsck.h
@@ -34,7 +34,7 @@
 #define EXIT_LIBRARY     128
 
 /*
- * Internal structure for mount tabel entries.
+ * Internal structure for mount table entries.
  */
 
 struct fs_info {
diff --git a/misc/logsave.c b/misc/logsave.c
index 6a624dea..96b6d8e0 100644
--- a/misc/logsave.c
+++ b/misc/logsave.c
@@ -52,7 +52,7 @@ static void usage(char *progname)
 
 /*
  * Helper function that does the right thing if write returns a
- * partial write, or an EGAIN/EINTR error.
+ * partial write, or an EAGAIN/EINTR error.
  */
 static int write_all(int fd, const char *buf, size_t count)
 {
diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index dc86e67f..766bf529 100644
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -433,7 +433,7 @@ be smaller than the blocksize of the filesystem, since in that case more
 inodes would be made than can ever be used.  Be warned that it is not
 possible to change this ratio on a filesystem after it is created, so be
 careful deciding the correct value for this parameter.  Note that resizing
-a filesystem changes the numer of inodes to maintain this ratio.
+a filesystem changes the number of inodes to maintain this ratio.
 .TP
 .BI \-I " inode-size"
 Specify the size of each inode in bytes.
diff --git a/misc/mke2fs.conf.5.in b/misc/mke2fs.conf.5.in
index a8517c39..21a0c882 100644
--- a/misc/mke2fs.conf.5.in
+++ b/misc/mke2fs.conf.5.in
@@ -384,7 +384,7 @@ This relation indicates whether file systems with the
 feature enabled should be created with 0, 1, or 2 backup superblocks.
 .TP
 .I packed_meta_blocks
-This boolean relation specifes whether the allocation bitmaps, inode
+This boolean relation specifies whether the allocation bitmaps, inode
 table, and journal should be located at the beginning of the file system.
 .TP
 .I inode_ratio
diff --git a/misc/tune2fs.h b/misc/tune2fs.h
index 7b7e431e..f31c8322 100644
--- a/misc/tune2fs.h
+++ b/misc/tune2fs.h
@@ -14,8 +14,8 @@
 extern "C" {
 #endif
 
-/* Takes exactly the same args as the tune2fs exectuable.
- * Is the entrypoint for libtune2fs.
+/* Takes exactly the same args as the tune2fs executable.
+ * Is the entry point for libtune2fs.
  */
 int tune2fs_main(int argc, char **argv);
 
diff --git a/resize/extent.c b/resize/extent.c
index ec81b944..e5ca16c0 100644
--- a/resize/extent.c
+++ b/resize/extent.c
@@ -8,7 +8,7 @@
  * Copyright (C) 1997, 1998 by Theodore Ts'o and
  * 	PowerQuest, Inc.
  *
- * Copyright (C) 1999, 2000 by Theosore Ts'o
+ * Copyright (C) 1999, 2000 by Theodore Ts'o
  *
  * %Begin-Header%
  * This file may be redistributed under the terms of the GNU Public
diff --git a/resize/main.c b/resize/main.c
index ab7375c1..ba6bb6b1 100644
--- a/resize/main.c
+++ b/resize/main.c
@@ -422,7 +422,7 @@ int main (int argc, char ** argv)
 	 * unless the user is forcing it.
 	 *
 	 * We do ERROR and VALID checks even if we're only printing the
-	 * minimimum size, because traversal of a badly damaged filesystem
+	 * minimum size, because traversal of a badly damaged filesystem
 	 * can cause issues as well.  We don't require it to be fscked after
 	 * the last mount time in this case, though, as this is a bit less
 	 * risky.
diff --git a/resize/online.c b/resize/online.c
index 9a4d828c..f0c214b1 100644
--- a/resize/online.c
+++ b/resize/online.c
@@ -201,7 +201,7 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
 	}
 
 	/* The current method of adding one block group at a time to a
-	 * mounted filesystem means it is impossible to accomodate the
+	 * mounted filesystem means it is impossible to accommodate the
 	 * flex_bg allocation method of placing the metadata together
 	 * in a single block group.  For now we "fix" this issue by
 	 * using the traditional layout for new block groups, where
diff --git a/resize/resize2fs.8.in b/resize/resize2fs.8.in
index 76434d74..3f0674ce 100644
--- a/resize/resize2fs.8.in
+++ b/resize/resize2fs.8.in
@@ -143,7 +143,7 @@ operation during an offline resize, so that the user can keep track
 of what the program is doing.
 .TP
 .B \-P
-Print an extimate of the number of file system blocks in the file system
+Print an estimate of the number of file system blocks in the file system
 if it is shrunk using
 .BR resize2fs 's
 .B \-M
diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 20a0c463..0bd325ba 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1997, 1998 by Theodore Ts'o and
  * 	PowerQuest, Inc.
  *
- * Copyright (C) 1999, 2000 by Theosore Ts'o
+ * Copyright (C) 1999, 2000 by Theodore Ts'o
  *
  * %Begin-Header%
  * This file may be redistributed under the terms of the GNU Public
@@ -80,7 +80,7 @@ static int is_inode_tb(ext2_filsys fs, unsigned int grp, blk64_t blk)
 		      fs->inode_blocks_per_group);
 }
 
-/* Some bigalloc helper macros which are more succint... */
+/* Some bigalloc helper macros which are more succinct... */
 #define B2C(x)	EXT2FS_B2C(fs, (x))
 #define C2B(x)	EXT2FS_C2B(fs, (x))
 #define EQ_CLSTR(x, y) (B2C(x) == B2C(y))
@@ -578,7 +578,7 @@ out:
 }
 
 /*
- * Clean up the bitmaps for unitialized bitmaps
+ * Clean up the bitmaps for uninitialized bitmaps
  */
 static void fix_uninit_block_bitmaps(ext2_filsys fs)
 {
@@ -932,7 +932,7 @@ retry:
 	/*
 	 * If we changed the number of block_group descriptor blocks,
 	 * we need to make sure they are all marked as reserved in the
-	 * file systems's block allocation map.
+	 * filesystem's block allocation map.
 	 */
 	for (i = 0; i < old_fs->group_desc_count; i++)
 		ext2fs_reserve_super_and_bgd(fs, i, fs->block_map);
@@ -1503,7 +1503,7 @@ static errcode_t blocks_to_move(ext2_resize_t rfs)
 
 		/*
 		 * For those structures that have changed, we need to
-		 * do bookkeepping.
+		 * do bookkeeping.
 		 */
 		if (ext2fs_block_bitmap_loc(old_fs, i) !=
 		    (blk = ext2fs_block_bitmap_loc(fs, i))) {
@@ -2939,7 +2939,7 @@ static int calc_group_overhead(ext2_filsys fs, blk64_t grp,
 
 
 /*
- * calcluate the minimum number of blocks the given fs can be resized to
+ * calculate the minimum number of blocks the given fs can be resized to
  */
 blk64_t calculate_minimum_resize_size(ext2_filsys fs, int flags)
 {
@@ -3032,7 +3032,7 @@ blk64_t calculate_minimum_resize_size(ext2_filsys fs, int flags)
 #endif
 
 	/*
-	 * if we need more group descriptors in order to accomodate our data
+	 * if we need more group descriptors in order to accommodate our data
 	 * then we need to add them here
 	 */
 	blks_needed = data_needed;
diff --git a/resize/resize2fs.h b/resize/resize2fs.h
index 829fcd8e..f9f58f20 100644
--- a/resize/resize2fs.h
+++ b/resize/resize2fs.h
@@ -4,7 +4,7 @@
  * Copyright (C) 1997, 1998 by Theodore Ts'o and
  * 	PowerQuest, Inc.
  *
- * Copyright (C) 1999, 2000 by Theosore Ts'o
+ * Copyright (C) 1999, 2000 by Theodore Ts'o
  *
  * %Begin-Header%
  * This file may be redistributed under the terms of the GNU Public
diff --git a/resize/sim_progress.c b/resize/sim_progress.c
index d4206ba2..321becdf 100644
--- a/resize/sim_progress.c
+++ b/resize/sim_progress.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1997, 1998 by Theodore Ts'o and
  * 	PowerQuest, Inc.
  *
- * Copyright (C) 1999, 2000 by Theosore Ts'o
+ * Copyright (C) 1999, 2000 by Theodore Ts'o
  *
  * %Begin-Header%
  * This file may be redistributed under the terms of the GNU Public
diff --git a/resize/test_extent.c b/resize/test_extent.c
index 60aa08f3..5e9aed79 100644
--- a/resize/test_extent.c
+++ b/resize/test_extent.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1997, 1998 by Theodore Ts'o and
  * 	PowerQuest, Inc.
  *
- * Copyright (C) 1999, 2000 by Theosore Ts'o
+ * Copyright (C) 1999, 2000 by Theodore Ts'o
  *
  * %Begin-Header%
  * This file may be redistributed under the terms of the GNU Public
diff --git a/util/gen-tarball.in b/util/gen-tarball.in
index a3a02cef..6b90acb6 100644
--- a/util/gen-tarball.in
+++ b/util/gen-tarball.in
@@ -12,7 +12,7 @@ GZIP=gzip
 
 #
 # This hack is needed because texi2dvi blows up horribly if there are 
-# any '~' chracters in the directory pathname.  So we kludge around it by
+# any '~' characters in the directory pathname.  So we kludge around it by
 # using a non-standard directory name for WIP releases.  dpkg-source
 # complains, but life goes on.
 #
diff --git a/util/subst.c b/util/subst.c
index e745d863..b37633d2 100644
--- a/util/subst.c
+++ b/util/subst.c
@@ -1,7 +1,7 @@
 /*
  * subst.c --- substitution program
  *
- * Subst is used as a quicky program to do @ substitutions
+ * Subst is used as a quickie program to do @ substitutions
  *
  */
 
diff --git a/util/symlinks.c b/util/symlinks.c
index 600effac..e9d2b011 100644
--- a/util/symlinks.c
+++ b/util/symlinks.c
@@ -126,7 +126,7 @@ static int shorten_path (char *path, char *abspath)
 
 	/* get rid of unnecessary "../dir" sequences */
 	while (abspath && strlen(abspath) > 1 && (p = strstr(path,"../"))) {
-		/* find innermost occurance of "../dir", and save "dir" */
+		/* find innermost occurrence of "../dir", and save "dir" */
 		int slashes = 2;
 		char *a, *s, *d = dir;
 		while ((s = strstr(p+3, "../"))) {