diff --git a/NEWS b/NEWS index edbca4cd..c0b865df 100644 --- a/NEWS +++ b/NEWS @@ -483,13 +483,13 @@ Stopped `notmuch dump` failing if someone writes to the database process already has the write lock the dump will not start, so script callers should still check the return value. -`notmuch insert` requires succesful message indexing for success status +`notmuch insert` requires successful message indexing for success status Previously the `notmuch insert` subcommand indicated success even if the message indexing failed, as long as the message was delivered to file system. This could have lead to delivered messages missing tags, etc. `notmuch insert` is now more strict, also requiring - succesful indexing for success status. Use the new `--keep` option + successful indexing for success status. Use the new `--keep` option to revert to the old behaviour (keeping the delivered message file and returning success even if indexing fails). diff --git a/doc/man1/notmuch-dump.rst b/doc/man1/notmuch-dump.rst index 94986a86..d56974ed 100644 --- a/doc/man1/notmuch-dump.rst +++ b/doc/man1/notmuch-dump.rst @@ -78,7 +78,7 @@ Supported options for **dump** include **config** Output configuration data stored in the database. Each line - starts with "#@ ", followed by a space seperated key-value + starts with "#@ ", followed by a space separated key-value pair. Both key and value are hex encoded if needed. **tags** diff --git a/doc/man1/notmuch-insert.rst b/doc/man1/notmuch-insert.rst index 2c9c0d02..9e7afc36 100644 --- a/doc/man1/notmuch-insert.rst +++ b/doc/man1/notmuch-insert.rst @@ -45,7 +45,7 @@ Supported options for **insert** include Keep the message file if indexing fails, and keep the message indexed if applying tags or maildir flag synchronization fails. Ignore these errors and return exit status 0 to - indicate succesful mail delivery. + indicate successful mail delivery. ``--no-hooks`` Prevent hooks from being run. @@ -53,7 +53,7 @@ Supported options for **insert** include EXIT STATUS =========== -This command returns exit status 0 on succesful mail delivery, +This command returns exit status 0 on successful mail delivery, non-zero otherwise. The default is to indicate failed mail delivery on any errors, including message file delivery to the filesystem, message indexing to Notmuch database, changing tags, and synchronizing tags to diff --git a/doc/man1/notmuch-restore.rst b/doc/man1/notmuch-restore.rst index 87fa22ef..706f8912 100644 --- a/doc/man1/notmuch-restore.rst +++ b/doc/man1/notmuch-restore.rst @@ -57,7 +57,7 @@ Supported options for **restore** include **config** Restore configuration data to the database. Each configuration line starts - with "#@ ", followed by a space seperated key-value pair. + with "#@ ", followed by a space separated key-value pair. Both key and value are hex encoded if needed. **tags** diff --git a/doc/man5/notmuch-hooks.rst b/doc/man5/notmuch-hooks.rst index f96a923b..3a72a80b 100644 --- a/doc/man5/notmuch-hooks.rst +++ b/doc/man5/notmuch-hooks.rst @@ -41,7 +41,7 @@ The currently available hooks are described below. message has been delivered, added to the database, and initial tags have been applied. The hook will not be run if there have been any errors during the message delivery; what is regarded - as succesful delivery depends on the ``--keep`` option. + as successful delivery depends on the ``--keep`` option. Typically this hook is used to perform additional query-based tagging on the delivered messages.