Fix orthography

diff --git a/bindings/python/docs/source/query.rst b/bindings/python/docs/source/query.rst
index 044b5735d39b8bb8c837583f0ffbb76c7d9120bd..785e984b00eb1a0d5da7416658d9650b86143ab6 100644 (file)
--- a/bindings/python/docs/source/query.rst
+++ b/bindings/python/docs/source/query.rst
@@ -29,7 +29,7 @@
    .. attribute::  sort
 
       Instance attribute :attr:`sort` contains the sort order (see
-      :attr:`Query.SORT`) if explicitely specified via
+      :attr:`Query.SORT`) if explicitly specified via
       :meth:`set_sort`. By default it is set to `None`.
 
    .. automethod:: exclude_tag

diff --git a/bindings/python/notmuch/thread.py b/bindings/python/notmuch/thread.py
index cc151f7e2142eb4bbce751157e2a659497d647aa..ed96188541ae1606c1537f0b48c667139cd50eca 100644 (file)
--- a/bindings/python/notmuch/thread.py
+++ b/bindings/python/notmuch/thread.py
@@ -245,7 +245,7 @@ class Thread(object):
 
         The :class:`Tags` object is owned by the thread and as such, will only
         be valid for as long as this :class:`Thread` is valid (e.g. until the
-        query from which it derived is explicitely deleted).
+        query from which it derived is explicitly deleted).
 
         :returns: A :class:`Tags` iterator.
         :raises: :exc:`NotInitializedError` if query is not initialized

diff --git a/doc/man1/notmuch-address.rst b/doc/man1/notmuch-address.rst
index 446cefbd6758238e0ed27659cfd8b5b2e6a9594b..cc31cc5aa963879ef516843bfbb1b5ce5825592a 100644 (file)
--- a/doc/man1/notmuch-address.rst
+++ b/doc/man1/notmuch-address.rst
@@ -60,7 +60,7 @@ Supported options for **address** include
         Control the deduplication of results.
 
         **no**
-            Output all occurences of addresses in the matching
+            Output all occurrences of addresses in the matching
             messages. This is not applicable with --output=count.
 
         **mailbox**

diff --git a/doc/man1/notmuch-insert.rst b/doc/man1/notmuch-insert.rst
index 9847e674688ed1cb23b95ef87ccc2efb89599268..f79600d6571f02f44951eff7eb20cf74fc2b7173 100644 (file)
--- a/doc/man1/notmuch-insert.rst
+++ b/doc/man1/notmuch-insert.rst
@@ -65,7 +65,7 @@ errors most likely to be temporary in nature, e.g. failure to get a
 database write lock.
 
 ``75 (EX_TEMPFAIL)``
-    A temporary failure occured; the user is invited to retry.
+    A temporary failure occurred; the user is invited to retry.
 
 The exit status of the **post-insert** hook does not affect the exit
 status of the **insert** command.

diff --git a/doc/man1/notmuch-new.rst b/doc/man1/notmuch-new.rst
index 7f0b2237acad24e66afd6b0843312723c3dbfdc6..6acfa112ce5357f3d705cc7412d8c38a41fddd6d 100644 (file)
--- a/doc/man1/notmuch-new.rst
+++ b/doc/man1/notmuch-new.rst
@@ -49,7 +49,7 @@ EXIT STATUS
 This command supports the following special exit status code
 
 ``75 (EX_TEMPFAIL)``
-    A temporary failure occured; the user is invited to retry.
+    A temporary failure occurred; the user is invited to retry.
 
 SEE ALSO
 ========

diff --git a/doc/man1/notmuch.rst b/doc/man1/notmuch.rst
index 5e238ae450310b476044dfcdb740bf31592c7205..cb350d1a19767e4ac354925b525f8fc2c0aa25f9 100644 (file)
--- a/doc/man1/notmuch.rst
+++ b/doc/man1/notmuch.rst
@@ -123,7 +123,7 @@ If the given command is not known to notmuch, notmuch tries to execute
 the external **notmuch-<subcommand>** in ${PATH} instead. This allows
 users to have their own notmuch related tools to be run via the
 notmuch command. By design, this does not allow notmuch's own commands
-to be overriden using external commands.
+to be overridden using external commands.
 
 OPTION SYNTAX
 -------------

diff --git a/lib/notmuch.h b/lib/notmuch.h
index e17454442333c80b459c0e3073b766c3fec6888e..d813612b7e8973e04db0abaa7bf66daba44968a5 100644 (file)
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -829,7 +829,7 @@ notmuch_query_get_sort (const notmuch_query_t *query);
  * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occured.
  *      Most likely a problem lazily parsing the query string.
  *
- * NOTMUCH_STATUS_IGNORED: tag is explicitely present in the query, so
+ * NOTMUCH_STATUS_IGNORED: tag is explicitly present in the query, so
  *             not excluded.
  */
 notmuch_status_t

diff --git a/test/README b/test/README
index f2499bce780bdda3ae1c17242aab4f00d9ad8252..8e06f44241a667609fdd5b47eda05b51e6fd3b47 100644 (file)
--- a/test/README
+++ b/test/README
@@ -26,7 +26,7 @@ that you know if you break anything.
   - gpg(1)
   - python(1)
 
-If your system lacks these tools or have older, non-upgreable versions
+If your system lacks these tools or have older, non-upgradable versions
 of these, please (possibly compile and) install these to some other
 path, for example /usr/local/bin or /opt/gnu/bin. Then prepend the
 chosen directory to your PATH before running the tests.
@@ -144,9 +144,9 @@ remaining tests to be unaffected.
 
 Currently we do not consider skipped tests as build failures. For
 maximum robustness, when setting up automated build processes, you
-should explicitely skip tests, rather than relying on notmuch's
+should explicitly skip tests, rather than relying on notmuch's
 detection of missing prerequisites. In the future we may treat tests
-unable to run because of missing prerequisites, but not explicitely
+unable to run because of missing prerequisites, but not explicitly
 skipped by the user, as failures.
 
 Writing Tests