diff --git a/Makefile.local b/Makefile.local index 1535c2ae..df95f5fc 100644 --- a/Makefile.local +++ b/Makefile.local @@ -176,7 +176,7 @@ verify-newer: echo "Refusing to replace an existing release."; \ echo "Don't forget to update \"version\" as described in RELEASING before release." ; \ false ;; \ - *) echo "An unexpected error occured"; \ + *) echo "An unexpected error occurred"; \ false;; esac # The user has not set any verbosity, default to quiet mode and inform the diff --git a/NEWS b/NEWS index 47b62d73..efd9043d 100644 --- a/NEWS +++ b/NEWS @@ -636,7 +636,7 @@ Fixed constant values so they are not all zero anymore Previously, it was impossible to open writable database handles, because `DATABASE_MODE_READ_ONLY` and `DATABASE_MODE_READ_WRITE` were both set to zero. - The same issue occured with sort modes. + The same issue occurred with sort modes. Notmuch 0.22.2 (2016-09-08) =========================== @@ -2661,7 +2661,7 @@ mailing list. nmbug - share tags with a given prefix nmbug helps maintain a git repo containing all tags with a given - prefix (by default "notmuch::"). Tags can be shared by commiting + prefix (by default "notmuch::"). Tags can be shared by committing them to git in one location and restoring in another. Notmuch 0.9 (2011-10-01) diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py index a1ae14fc..342d665a 100644 --- a/bindings/python/notmuch/database.py +++ b/bindings/python/notmuch/database.py @@ -566,7 +566,7 @@ class Database(object): :returns: :class:`Message` or `None` if no message is found. :raises: :exc:`OutOfMemoryError` - If an Out-of-memory occured while constructing the message. + If an Out-of-memory occurred while constructing the message. :exc:`XapianError` In case of a Xapian Exception. These exceptions include "Database modified" situations, e.g. when the @@ -591,7 +591,7 @@ class Database(object): function returns None if no message is found with the given filename. - :raises: :exc:`OutOfMemoryError` if an Out-of-memory occured while + :raises: :exc:`OutOfMemoryError` if an Out-of-memory occurred while constructing the message. :raises: :exc:`XapianError` in case of a Xapian Exception. These exceptions include "Database modified" diff --git a/bindings/python/notmuch/filenames.py b/bindings/python/notmuch/filenames.py index 29f4fdf6..3bbc22b9 100644 --- a/bindings/python/notmuch/filenames.py +++ b/bindings/python/notmuch/filenames.py @@ -67,7 +67,7 @@ class Filenames(Python3StringMixIn): def __init__(self, files_p, parent): """ :param files_p: A pointer to an underlying *notmuch_tags_t* - structure. These are not publically exposed, so a user + structure. These are not publicly exposed, so a user will almost never instantiate a :class:`Tags` object herself. They are usually handed back as a result, e.g. in :meth:`Database.get_all_tags`. *tags_p* must be diff --git a/bindings/python/notmuch/message.py b/bindings/python/notmuch/message.py index d5b98e4f..1b1f2174 100644 --- a/bindings/python/notmuch/message.py +++ b/bindings/python/notmuch/message.py @@ -223,7 +223,7 @@ class Message(Python3StringMixIn): :returns: The header value as string :raises: :exc:`NotInitializedError` if the message is not initialized - :raises: :exc:`NullPointerError` if any error occured + :raises: :exc:`NullPointerError` if any error occurred """ if not self._msg: raise NotInitializedError() @@ -295,7 +295,7 @@ class Message(Python3StringMixIn): :returns: A :class:`Tags` iterator. :raises: :exc:`NotInitializedError` if the message is not initialized - :raises: :exc:`NullPointerError` if any error occured + :raises: :exc:`NullPointerError` if any error occurred """ if not self._msg: raise NotInitializedError() diff --git a/bindings/python/notmuch/messages.py b/bindings/python/notmuch/messages.py index e17f1507..cae5da50 100644 --- a/bindings/python/notmuch/messages.py +++ b/bindings/python/notmuch/messages.py @@ -100,7 +100,7 @@ class Messages(object): def __init__(self, msgs_p, parent=None): """ :param msgs_p: A pointer to an underlying *notmuch_messages_t* - structure. These are not publically exposed, so a user + structure. These are not publicly exposed, so a user will almost never instantiate a :class:`Messages` object herself. They are usually handed back as a result, e.g. in :meth:`Query.search_messages`. *msgs_p* must be diff --git a/bindings/python/notmuch/tag.py b/bindings/python/notmuch/tag.py index 3b4a56ac..fbb18ce4 100644 --- a/bindings/python/notmuch/tag.py +++ b/bindings/python/notmuch/tag.py @@ -64,7 +64,7 @@ class Tags(Python3StringMixIn): def __init__(self, tags_p, parent=None): """ :param tags_p: A pointer to an underlying *notmuch_tags_t* - structure. These are not publically exposed, so a user + structure. These are not publicly exposed, so a user will almost never instantiate a :class:`Tags` object herself. They are usually handed back as a result, e.g. in :meth:`Database.get_all_tags`. *tags_p* must be diff --git a/bindings/python/notmuch/thread.py b/bindings/python/notmuch/thread.py index ed961885..9aa0e08c 100644 --- a/bindings/python/notmuch/thread.py +++ b/bindings/python/notmuch/thread.py @@ -71,7 +71,7 @@ class Thread(object): def __init__(self, thread_p, parent=None): """ :param thread_p: A pointer to an internal notmuch_thread_t - Structure. These are not publically exposed, so a user + Structure. These are not publicly exposed, so a user will almost never instantiate a :class:`Thread` object herself. They are usually handed back as a result, e.g. when iterating through :class:`Threads`. *thread_p* diff --git a/bindings/python/notmuch/threads.py b/bindings/python/notmuch/threads.py index 86f1f2cc..0c382d5b 100644 --- a/bindings/python/notmuch/threads.py +++ b/bindings/python/notmuch/threads.py @@ -85,7 +85,7 @@ class Threads(Python3StringMixIn): def __init__(self, threads_p, parent=None): """ :param threads_p: A pointer to an underlying *notmuch_threads_t* - structure. These are not publically exposed, so a user + structure. These are not publicly exposed, so a user will almost never instantiate a :class:`Threads` object herself. They are usually handed back as a result, e.g. in :meth:`Query.search_threads`. *threads_p* must be diff --git a/contrib/go/src/notmuch/notmuch.go b/contrib/go/src/notmuch/notmuch.go index 89093b2d..750ebb5b 100644 --- a/contrib/go/src/notmuch/notmuch.go +++ b/contrib/go/src/notmuch/notmuch.go @@ -937,7 +937,7 @@ func (self *Message) GetMessageId() string { return "" } id := C.notmuch_message_get_message_id(self.message) - // we dont own id + // we don't own id // defer C.free(unsafe.Pointer(id)) if id == nil { return "" @@ -962,7 +962,7 @@ func (self *Message) GetThreadId() string { return "" } id := C.notmuch_message_get_thread_id(self.message) - // we dont own id + // we don't own id // defer C.free(unsafe.Pointer(id)) if id == nil { @@ -1019,7 +1019,7 @@ func (self *Message) GetFileName() string { return "" } fname := C.notmuch_message_get_filename(self.message) - // we dont own fname + // we don't own fname // defer C.free(unsafe.Pointer(fname)) if fname == nil { @@ -1096,7 +1096,7 @@ func (self *Message) GetHeader(header string) string { var c_header *C.char = C.CString(header) defer C.free(unsafe.Pointer(c_header)) - /* we dont own value */ + /* we don't own value */ value := C.notmuch_message_get_header(self.message, c_header) if value == nil { return "" @@ -1335,7 +1335,7 @@ func (self *Tags) Get() string { return "" } s := C.notmuch_tags_get(self.tags) - // we dont own 's' + // we don't own 's' return C.GoString(s) } diff --git a/devel/release-checks.sh b/devel/release-checks.sh index 5a7578b8..7ba94822 100755 --- a/devel/release-checks.sh +++ b/devel/release-checks.sh @@ -51,7 +51,7 @@ then exit 1 fi else - echo "Reading './version' file failed (suprisingly!)" + echo "Reading './version' file failed (surprisingly!)" exit 1 fi < ./version diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst index f9fb672a..89909808 100644 --- a/doc/man1/notmuch-config.rst +++ b/doc/man1/notmuch-config.rst @@ -89,7 +89,7 @@ The available configuration items are described below. A regular expression delimited with // that will be matched against the path of the file or directory relative to the database path. Matching files and directories will be ignored. The - beginning and end of string must be explictly anchored. For + beginning and end of string must be explicitly anchored. For example, /.*/foo$/ would match "bar/foo" and "bar/baz/foo", but not "foo" or "bar/foobar". diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index c858a20b..aff8beb5 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -864,7 +864,7 @@ Supports the following entries in OPTIONS as a plist: :hide-if-empty - hide if no buttons would be shown (only makes sense without :show-empty-searches) :filter - This can be a function that takes the search query as its argument and - returns a filter to be used in conjuction with the query for that search or nil + returns a filter to be used in conjunction with the query for that search or nil to hide the element. This can also be a string that is used as a combined with each query using \"and\". :filter-count - Separate filter to generate the count displayed each search. Accepts diff --git a/lib/notmuch.h b/lib/notmuch.h index 39759b7a..7275d270 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -869,7 +869,7 @@ notmuch_query_get_sort (const notmuch_query_t *query); * * NOTMUCH_STATUS_SUCCESS: excluded was added successfully. * - * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occured. + * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occurred. * Most likely a problem lazily parsing the query string. * * NOTMUCH_STATUS_IGNORED: tag is explicitly present in the query, so @@ -1065,7 +1065,7 @@ notmuch_threads_destroy (notmuch_threads_t *threads); * * NOTMUCH_STATUS_SUCCESS: query completed successfully. * - * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occured. The + * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occurred. The * value of *count is not defined. * * @since libnotmuch 5 (notmuch 0.25) @@ -1101,7 +1101,7 @@ notmuch_query_count_messages_st (notmuch_query_t *query, unsigned int *count); * NOTMUCH_STATUS_SUCCESS: query completed successfully. * - * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occured. The + * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occurred. The * value of *count is not defined. * * @since libnotmuch 5 (notmuch 0.25) @@ -1778,7 +1778,7 @@ notmuch_message_destroy (notmuch_message_t *message); * * @returns * - NOTMUCH_STATUS_NULL_POINTER: *value* may not be NULL. - * - NOTMUCH_STATUS_SUCCESS: No error occured. + * - NOTMUCH_STATUS_SUCCESS: No error occurred. * @since libnotmuch 4.4 (notmuch 0.23) */ notmuch_status_t @@ -1790,7 +1790,7 @@ notmuch_message_get_property (notmuch_message_t *message, const char *key, const * @returns * - NOTMUCH_STATUS_ILLEGAL_ARGUMENT: *key* may not contain an '=' character. * - NOTMUCH_STATUS_NULL_POINTER: Neither *key* nor *value* may be NULL. - * - NOTMUCH_STATUS_SUCCESS: No error occured. + * - NOTMUCH_STATUS_SUCCESS: No error occurred. * @since libnotmuch 4.4 (notmuch 0.23) */ notmuch_status_t @@ -1804,7 +1804,7 @@ notmuch_message_add_property (notmuch_message_t *message, const char *key, const * @returns * - NOTMUCH_STATUS_ILLEGAL_ARGUMENT: *key* may not contain an '=' character. * - NOTMUCH_STATUS_NULL_POINTER: Neither *key* nor *value* may be NULL. - * - NOTMUCH_STATUS_SUCCESS: No error occured. + * - NOTMUCH_STATUS_SUCCESS: No error occurred. * @since libnotmuch 4.4 (notmuch 0.23) */ notmuch_status_t @@ -1819,7 +1819,7 @@ notmuch_message_remove_property (notmuch_message_t *message, const char *key, co * @returns * - NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in * read-only mode so message cannot be modified. - * - NOTMUCH_STATUS_SUCCESS: No error occured. + * - NOTMUCH_STATUS_SUCCESS: No error occurred. * * @since libnotmuch 4.4 (notmuch 0.23) */ @@ -1835,7 +1835,7 @@ notmuch_message_remove_all_properties (notmuch_message_t *message, const char *k * @returns * - NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in * read-only mode so message cannot be modified. - * - NOTMUCH_STATUS_SUCCESS: No error occured. + * - NOTMUCH_STATUS_SUCCESS: No error occurred. * * @since libnotmuch 5.1 (notmuch 0.26) */ diff --git a/notmuch.c b/notmuch.c index 2d193aa8..7810b685 100644 --- a/notmuch.c +++ b/notmuch.c @@ -26,7 +26,7 @@ * Notmuch subcommand hook. * * The return value will be used as notmuch exit status code, - * preferrably EXIT_SUCCESS or EXIT_FAILURE. + * preferably EXIT_SUCCESS or EXIT_FAILURE. */ typedef int (*command_function_t) (notmuch_config_t *config, int argc, char *argv[]); diff --git a/parse-time-string/parse-time-string.h b/parse-time-string/parse-time-string.h index 2063bcad..c394ecde 100644 --- a/parse-time-string/parse-time-string.h +++ b/parse-time-string/parse-time-string.h @@ -90,7 +90,7 @@ enum { * seconds. This is useful for callers that require a value for * inclusive comparison of the result. * - * Return 0 (PARSE_TIME_OK) for succesfully parsed date/time, or one + * Return 0 (PARSE_TIME_OK) for successfully parsed date/time, or one * of PARSE_TIME_ERR_* on error. 't' is not modified on error. */ int parse_time_string (const char *s, time_t *t, const time_t *ref, int round); diff --git a/tag-util.h b/tag-util.h index a2f0ddfa..ba0d98c8 100644 --- a/tag-util.h +++ b/tag-util.h @@ -36,7 +36,7 @@ typedef enum { typedef enum { TAG_PARSE_OUT_OF_MEMORY = -1, - /* Line parsed successfuly. */ + /* Line parsed successfully. */ TAG_PARSE_SUCCESS = 0, /* Line has a syntax error */ diff --git a/test/T080-search.sh b/test/T080-search.sh index 70f28549..a3f0dead 100755 --- a/test/T080-search.sh +++ b/test/T080-search.sh @@ -85,11 +85,11 @@ add_message '[subject]="search by to (name)"' '[date]="Sat, 01 Jan 2000 12:00:00 output=$(notmuch search 'to:"Search By To Name"' | notmuch_search_sanitize) test_expect_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unread)" -test_begin_subtest "Search by to: (name and adress)" +test_begin_subtest "Search by to: (name and address)" output=$(notmuch search 'to:"Search By To Name "' | notmuch_search_sanitize) test_expect_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unread)" -test_begin_subtest "Search by to: without prefix (name and adress)" +test_begin_subtest "Search by to: without prefix (name and address)" output=$(notmuch search '"Search By To Name "' | notmuch_search_sanitize) test_expect_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unread)" diff --git a/util/util.h b/util/util.h index d12fadb4..b24860af 100644 --- a/util/util.h +++ b/util/util.h @@ -15,11 +15,11 @@ typedef enum util_status { */ UTIL_EOF, /** - * Low level error occured, consult errno. + * Low level error occurred, consult errno. */ UTIL_ERRNO, /** - * Zlib error occured, call gzerror for details. + * Zlib error occurred, call gzerror for details. */ UTIL_GZERROR } util_status_t;