Signed-off-by: Georg Faerber
---
NEWS | 4 ++--
bindings/python/docs/source/filesystem.rst | 2 +-
contrib/go/src/notmuch/notmuch.go | 2 +-
debian/changelog | 4 ++--
emacs/notmuch-mua.el | 2 +-
test/T190-multipart.sh | 2 +-
test/T410-argument-parsing.sh | 2 +-
vim/README | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/NEWS b/NEWS
index e4f8160b..17dba019 100644
--- 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 a23ae41a..558c93de 100644
--- 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 750ebb5b..5496198a 100644
--- 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 5f02d7a7..28c8f636 100644
--- 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 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 59b546a6..fc8ac687 100644
--- 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 f73535b7..3eeac1db 100755
--- 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@yoom.home.cworth.org'
>OUTPUT
cat OUTPUT
cat < E
