Fix typos as found by codespell

Signed-off-by: Georg Faerber <georg@riseup.net>

diff --git a/NEWS b/NEWS
index e4f8160bd47dd16448e80edc1d1c0c1d2adb3e37..17dba0194344049b9323c2344ad866e430fa3ddb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1444,7 +1444,7 @@ Command-Line Interface
 The commands set consistent exit status codes on failures
 
   The cli commands now consistently set exit status of 1 on failures,
-  except where explicitly otherwise noted. The notable expections are
+  except where explicitly otherwise noted. The notable exceptions are
   the status codes for format version mismatches for commands that
   support formatted output.
 
@@ -2654,7 +2654,7 @@ Turn "id:MSG-ID" links into buttons associated with notmuch searches
 
 Add keybinding ('c I') for stashing Message-ID's without an id: prefix
 
-  Reduces manual labour when stashing them for use outside notmuch.
+  Reduces manual labor when stashing them for use outside notmuch.
 
 Do not query on `notmuch-search` exit
 

diff --git a/bindings/python/docs/source/filesystem.rst b/bindings/python/docs/source/filesystem.rst
index a23ae41a875685214c45a57bfb41720e29f3538f..558c93de592af64be4c15839cf541a6d1f95fa4d 100644 (file)
--- a/bindings/python/docs/source/filesystem.rst
+++ b/bindings/python/docs/source/filesystem.rst
@@ -14,7 +14,7 @@ Files and directories
       iterator and broke list(Filenames()). Use `len(list(names))`
       instead.
 
-:class:`Directoy` -- A directory entry in the database
+:class:`Directory` -- A directory entry in the database
 ------------------------------------------------------
 
 .. autoclass:: Directory

diff --git a/contrib/go/src/notmuch/notmuch.go b/contrib/go/src/notmuch/notmuch.go
index 750ebb5bc1f51b4144f0d470de6f351d31cc334c..5496198aaabf5efa6f1d91c8f70f7aec6570db73 100644 (file)
--- a/contrib/go/src/notmuch/notmuch.go
+++ b/contrib/go/src/notmuch/notmuch.go
@@ -597,7 +597,7 @@ func (self *Threads) MoveToNext() {
  *
  * It's not strictly necessary to call this function. All memory from
  * the notmuch_threads_t object will be reclaimed when the
- * containg query object is destroyed.
+ * containing query object is destroyed.
  */
 func (self *Threads) Destroy() {
        if self.threads != nil {

diff --git a/debian/changelog b/debian/changelog
index 5f02d7a7b266a954cd14ae4ff48b889f04cda6cf..28c8f636d54311a630bf5ca2c201b9f4f1085723 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -529,7 +529,7 @@ notmuch (0.18-3) unstable; urgency=medium
 notmuch (0.18-2) unstable; urgency=medium
 
   * Disable atomicity tests on armhf. These should be re-enabled when
-    upstream relases a fix for this (in progress).
+    upstream releases a fix for this (in progress).
 
  -- David Bremner <bremner@debian.org>  Thu, 08 May 2014 08:28:33 +0900
 
@@ -950,7 +950,7 @@ notmuch (0.6.1-1) unstable; urgency=low
 notmuch (0.6) unstable; urgency=low
 
   * New upstream release; see /usr/share/doc/notmuch/NEWS for
-    details. Hilights include:
+    details. Highlights include:
     - Folder-based search (Closes: #597222)
     - PGP/MIME decryption and verification
   * Document strict dependency on emacs23 (Closes: #631994).

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 59b546a65f072b18420e80aced14f22f938fac87..fc8ac687e8208b64d95c9032e7e3e22ea989e5ca 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -103,7 +103,7 @@ Note that these functions use `mail-citation-hook' if that is non-nil."
   "Function to decide which parts get a header when replying.
 
 This function specifies which parts of a mime message with
-mutiple parts get a header."
+multiple parts get a header."
   :type '(radio (const :tag "No part headers"
                               notmuch-show-reply-insert-header-p-never)
                (const :tag "All except multipart/* and hidden parts"

diff --git a/test/T190-multipart.sh b/test/T190-multipart.sh
index f73535b7bf7e7d45afa2ff28a193ac8363a8713d..3eeac1db7920fad67b1c935a13f20b376748d2ee 100755 (executable)
--- a/test/T190-multipart.sh
+++ b/test/T190-multipart.sh
@@ -319,7 +319,7 @@ This is an embedded message, with a multipart/alternative part.
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
-test_begin_subtest "--format=text --part=7, inline attachement"
+test_begin_subtest "--format=text --part=7, inline attachment"
 notmuch show --format=text --part=7 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
 cat <<EOF >EXPECTED
 \fattachment{ ID: 7, Filename: attachment, Content-type: text/plain

diff --git a/test/T410-argument-parsing.sh b/test/T410-argument-parsing.sh
index a384ce8603338f28e8acaf5086abef11179e8421..b31d239a6f8330bfe8ec33018ce3d4598d83130b 100755 (executable)
--- a/test/T410-argument-parsing.sh
+++ b/test/T410-argument-parsing.sh
@@ -73,7 +73,7 @@ positional arg 1 bananas
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
-test_begin_subtest "test keyword arguments with non-default value separted by a space"
+test_begin_subtest "test keyword arguments with non-default value separated by a space"
 $TEST_DIRECTORY/arg-test --boolkeyword false bananas > OUTPUT
 cat <<EOF > EXPECTED
 boolkeyword 0

diff --git a/vim/README b/vim/README
index d6f23350740db8468ecbf82e75e47b79e5c3e200..c137bacdc0f4f1e3af78cb9617d5fe92f527c53f 100644 (file)
--- a/vim/README
+++ b/vim/README
@@ -5,7 +5,7 @@ utilizing the notmuch framework, through it's ruby bindings.
 
 == install ==
 
-Simply run 'make install'. However, check that you have the depencies below.
+Simply run 'make install'. However, check that you have the dependencies below.
 
 === vim +ruby ===