From: Daniel Kahn Gillmor Date: Mon, 17 Jul 2017 22:16:02 +0000 (+0200) Subject: Fix orthography X-Git-Tag: 0.25_rc1~5 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=87bdfbc91f65cb1031ef0ac8a804759f2061ac10;hp=f0b91832c2d273754e9cf1f2652790f992d0abef Fix orthography --- diff --git a/bindings/python/docs/source/query.rst b/bindings/python/docs/source/query.rst index 044b5735..785e984b 100644 --- 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 cc151f7e..ed961885 100644 --- 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 446cefbd..cc31cc5a 100644 --- 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 9847e674..f79600d6 100644 --- 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 7f0b2237..6acfa112 100644 --- 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 5e238ae4..cb350d1a 100644 --- 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-** 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 e1745444..d813612b 100644 --- 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 f2499bce..8e06f442 100644 --- 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