Assorted spelling fixes.

Mostly detected with the 'codespell' utility, but also includes some
manual grammar fixes.

15 files changed, 23 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index 88286f9..2e2743f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,5 @@ gocryptfs.1
 /vendor
 /_vendor-*
 
-# Source tarball version. Should never be commited to git.
+# Source tarball version. Should never be committed to git.
 /VERSION
diff --git a/Documentation/CLI_ABI.md b/Documentation/CLI_ABI.md
index 979280b..9581556 100644
--- a/Documentation/CLI_ABI.md
+++ b/Documentation/CLI_ABI.md
@@ -98,5 +98,5 @@ Content of "change.txt":
 Further Reading
 ---------------
 
-Additional exit codes that are unlikely to occour are defined in
+Additional exit codes that are unlikely to occur are defined in
 [exitcodes.go](../internal/exitcodes/exitcodes.go).
diff --git a/Documentation/extractloop.md b/Documentation/extractloop.md
index ee8c0ae..62f9939 100644
--- a/Documentation/extractloop.md
+++ b/Documentation/extractloop.md
@@ -13,8 +13,8 @@ What the extractloop stress test does is (top comment in `extractloop.bash`):
 # huge numbers of files.
 ```
 
-Memory usage stabilises at 119MiB, we do not run of fds,
-and the interation time is stable at 37 seconds. The test
+Memory usage stabilises at 119MiB, we do not run out of fds,
+and the iteration time is stable at 37 seconds. The test
 runs slower in the beginning due to xfstests running in
 parallel on the test machine.
 
diff --git a/README.md b/README.md
index 5fe5c3d..eb7981c 100644
--- a/README.md
+++ b/README.md
@@ -454,7 +454,7 @@ v0.7.2, 2016-01-19
 
 v0.7.1, 2016-01-09
 * Make the `build.bash` script compatible with Go 1.3
-* Disable fallocate on OSX (system call not availabe)
+* Disable fallocate on OSX (system call not available)
 * Introduce pre-built binaries for Fedora 23 and Debian 8
 
 v0.7, 2015-12-20
@@ -502,7 +502,7 @@ v0.4, 2015-11-15
   * `-plaintextnames`: disables filename encryption, added on user request
   * `-extpass`: calls an external program for prompting for the password
   * `-config`: allows to specify a custom gocryptfs.conf path
-* Add `FeatureFlags` gocryptfs.conf paramter
+* Add `FeatureFlags` gocryptfs.conf parameter
   * This is a config format change, hence the on-disk format is incremented
   * Used for ext4-style filesystem feature flags. This should help avoid future
     format changes. The first user is `-plaintextnames`.
diff --git a/fsck.go b/fsck.go
index 07e1a88..31033de 100644
--- a/fsck.go
+++ b/fsck.go
@@ -36,7 +36,7 @@ func (ck *fsckObj) markCorrupt(path string) {
 	ck.corruptListLock.Unlock()
 }
 
-// Watch for mitigated corruptions that occour during OpenDir()
+// Watch for mitigated corruptions that occur during OpenDir()
 func (ck *fsckObj) watchMitigatedCorruptionsOpenDir(path string) {
 	for {
 		select {
@@ -95,7 +95,7 @@ func (ck *fsckObj) symlink(path string) {
 	}
 }
 
-// Watch for mitigated corruptions that occour during Read()
+// Watch for mitigated corruptions that occur during Read()
 func (ck *fsckObj) watchMitigatedCorruptionsRead(path string) {
 	for {
 		select {
@@ -165,7 +165,7 @@ func (ck *fsckObj) file(path string) {
 	}
 }
 
-// Watch for mitigated corruptions that occour during ListXAttr()
+// Watch for mitigated corruptions that occur during ListXAttr()
 func (ck *fsckObj) watchMitigatedCorruptionsListXAttr(path string) {
 	for {
 		select {
diff --git a/internal/contentenc/content.go b/internal/contentenc/content.go
index 57ad489..bda3fdc 100644
--- a/internal/contentenc/content.go
+++ b/internal/contentenc/content.go
@@ -151,7 +151,7 @@ func concatAD(blockNo uint64, fileID []byte) (aData []byte) {
 // DecryptBlock - Verify and decrypt GCM block
 //
 // Corner case: A full-sized block of all-zero ciphertext bytes is translated
-// to an all-zero plaintext block, i.e. file hole passtrough.
+// to an all-zero plaintext block, i.e. file hole passthrough.
 func (be *ContentEnc) DecryptBlock(ciphertext []byte, blockNo uint64, fileID []byte) ([]byte, error) {
 
 	// Empty block?
diff --git a/internal/contentenc/intrablock.go b/internal/contentenc/intrablock.go
index 3714e37..55b0841 100644
--- a/internal/contentenc/intrablock.go
+++ b/internal/contentenc/intrablock.go
@@ -5,12 +5,12 @@ type IntraBlock struct {
 	// BlockNo is the block number in the file
 	BlockNo uint64
 	// Skip is an offset into the block payload
-	// In forwared mode: block plaintext
+	// In forward mode: block plaintext
 	// In reverse mode: offset into block ciphertext. Takes the header into
 	// account.
 	Skip uint64
 	// Length of payload data in this block
-	// In forwared mode: length of the plaintext
+	// In forward mode: length of the plaintext
 	// In reverse mode: length of the ciphertext. Takes header and trailer into
 	// account.
 	Length uint64
diff --git a/internal/exitcodes/exitcodes.go b/internal/exitcodes/exitcodes.go
index b8173c7..c4e18df 100644
--- a/internal/exitcodes/exitcodes.go
+++ b/internal/exitcodes/exitcodes.go
@@ -58,7 +58,7 @@ const (
 	OpenConf = 23
 	// WriteConf - could not write the gocryptfs.conf
 	WriteConf = 24
-	// Profiler - error occoured when trying to write cpu or memory profile or
+	// Profiler - error occurred when trying to write cpu or memory profile or
 	// execution trace
 	Profiler = 25
 	// FsckErrors - the filesystem check found errors
@@ -68,7 +68,7 @@ const (
 	// TrezorError - an error was encountered while interacting with a Trezor
 	// device
 	TrezorError = 28
-	// ExcludeError - an error occoured while processing "-exclude"
+	// ExcludeError - an error occurred while processing "-exclude"
 	ExcludeError = 29
 )
 
diff --git a/internal/nametransform/dirivcache/dirivcache.go b/internal/nametransform/dirivcache/dirivcache.go
index c0eca6d..962ae37 100644
--- a/internal/nametransform/dirivcache/dirivcache.go
+++ b/internal/nametransform/dirivcache/dirivcache.go
@@ -31,9 +31,9 @@ type DirIVCache struct {
 	rootDirIV []byte
 
 	// expiry is the time when the whole cache expires.
-	// The cached entry my become out-of-date if the ciphertext directory is
-	// modifed behind the back of gocryptfs. Having an expiry time limits the
-	// inconstency to one second, like attr_timeout does for the kernel
+	// The cached entry might become out-of-date if the ciphertext directory is
+	// modified behind the back of gocryptfs. Having an expiry time limits the
+	// inconstancy to one second, like attr_timeout does for the kernel
 	// getattr cache.
 	expiry time.Time
 
diff --git a/internal/nametransform/names.go b/internal/nametransform/names.go
index 65e6f06..22e639a 100644
--- a/internal/nametransform/names.go
+++ b/internal/nametransform/names.go
@@ -18,7 +18,7 @@ type NameTransform struct {
 	emeCipher  *eme.EMECipher
 	longNames  bool
 	DirIVCache dirivcache.DirIVCache
-	// B64 = either base64.URLEncoding or base64.RawURLEncoding, depeding
+	// B64 = either base64.URLEncoding or base64.RawURLEncoding, depending
 	// on the Raw64 feature flag
 	B64 *base64.Encoding
 }
diff --git a/internal/stupidgcm/stupidgcm_test.go b/internal/stupidgcm/stupidgcm_test.go
index b340179..18732df 100644
--- a/internal/stupidgcm/stupidgcm_test.go
+++ b/internal/stupidgcm/stupidgcm_test.go
@@ -26,7 +26,7 @@ func randBytes(n int) []byte {
 }
 
 // TestEncryptDecrypt encrypts and decrypts using both stupidgcm and Go's built-in
-// GCM implemenatation and verifies that the results are identical.
+// GCM implementation and verifies that the results are identical.
 func TestEncryptDecrypt(t *testing.T) {
 	key := randBytes(32)
 	sGCM := New(key, false)
diff --git a/tests/defaults/main_test.go b/tests/defaults/main_test.go
index 3eae919..171b3be 100644
--- a/tests/defaults/main_test.go
+++ b/tests/defaults/main_test.go
@@ -47,7 +47,7 @@ func Test1980Tar(t *testing.T) {
 // The sequence below caused an I/O error to be returned.
 func TestOpenTruncateRead(t *testing.T) {
 	fn := test_helpers.DefaultPlainDir + "/TestTruncateWrite"
-	// First FD is used for write and trucate.
+	// First FD is used for write and truncate.
 	writeFd, err := os.Create(fn)
 	if err != nil {
 		t.Fatal(err)
diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go
index a7788e7..b1e0fda 100644
--- a/tests/example_filesystems/example_filesystems_test.go
+++ b/tests/example_filesystems/example_filesystems_test.go
@@ -316,7 +316,7 @@ func TestExampleFSv13MasterkeyStdin(t *testing.T) {
 
 // gocryptfs v1.3 introduced HKDF.
 // We check the md5 sum of the encrypted version of a file to make sure we don't
-// accidentially change the ciphertext generation.
+// accidentally change the ciphertext generation.
 // Create a full crypto round-trip by mounting two times:
 // dirA -> reverse mount -> dirB -> forward mount -> dirC
 func TestExampleFSv13reverse(t *testing.T) {
diff --git a/tests/fuse-unmount.bash b/tests/fuse-unmount.bash
index 087b6fe..debae29 100755
--- a/tests/fuse-unmount.bash
+++ b/tests/fuse-unmount.bash
@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 #
-# Compatability wrapper around "fusermount" on Linux and "umount" on
+# Compatibility wrapper around "fusermount" on Linux and "umount" on
 # Mac OS X and friends.
 #
 # This script can be sourced or executed directly.
diff --git a/tests/reverse/correctness_test.go b/tests/reverse/correctness_test.go
index 246936b..931be42 100644
--- a/tests/reverse/correctness_test.go
+++ b/tests/reverse/correctness_test.go
@@ -171,7 +171,7 @@ func TestAccess(t *testing.T) {
 	}
 }
 
-// Opening a nonexistant file name should return ENOENT
+// Opening a nonexistent file name should return ENOENT
 // and not EBADMSG or EIO or anything else.
 func TestEnoent(t *testing.T) {
 	fn := dirB + "/TestEnoent"