commit 1b878877d928a5279c3c0003d067d8b875f7e42a (patch)
parent e4d75fcc ruby: remove FileNames object
tree 59b02a7ea2aa2ac7e3bb3ac21d5ba12d83e93944
author Jakub Wilk <jwilk@jwilk.net> 2023-04-13 15:52:11 +0200
committer David Bremner <david@tethera.net> 2023-04-13 11:14:58 -0300
doc: fix typos
---
doc/man1/notmuch-config.rst | 2 +-
doc/man1/notmuch-git.rst | 4 ++--
doc/man7/notmuch-sexp-queries.rst | 8 ++++----
doc/notmuch-emacs.rst | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst
index 988dc5a3..bd34afa4 100644
--- a/doc/man1/notmuch-config.rst
+++ b/doc/man1/notmuch-config.rst
@@ -126,7 +126,7 @@ paths are presumed relative to `$HOME` for items in section
List of regular expressions (without delimiters) for MIME types to
be indexed as text. Currently this applies only to attachments. By
- default the regex matches anywhere in the content type; if they
+ default the regex matches anywhere in the content type; if the
user wants an anchored match, they should include anchors in their
regexes.
diff --git a/doc/man1/notmuch-git.rst b/doc/man1/notmuch-git.rst
index ac1908b6..33a46f84 100644
--- a/doc/man1/notmuch-git.rst
+++ b/doc/man1/notmuch-git.rst
@@ -325,11 +325,11 @@ If it is unset, 'default' is assumed.
.. envvar:: NOTMUCH_GIT_DIR
- Default location of git repository. Overriden by :option:`--git-dir`.
+ Default location of git repository. Overridden by :option:`--git-dir`.
.. envvar:: NOTMUCH_GIT_PREFIX
- Default tag prefix (filter). Overriden by :option:`--tag-prefix`.
+ Default tag prefix (filter). Overridden by :option:`--tag-prefix`.
SEE ALSO
========
diff --git a/doc/man7/notmuch-sexp-queries.rst b/doc/man7/notmuch-sexp-queries.rst
index 422154c7..858ff685 100644
--- a/doc/man7/notmuch-sexp-queries.rst
+++ b/doc/man7/notmuch-sexp-queries.rst
@@ -274,7 +274,7 @@ EXAMPLES
Matches any word starting with "prelim", inside a message subject.
-``(subject (starts-wih quick) "brown fox")``
+``(subject (starts-with quick) "brown fox")``
Match messages whose subject contains "quick brown fox", but also
"brown fox quicksand".
@@ -336,7 +336,7 @@ user defined fields is permitted within a macro.
NOTES
=====
-.. [#macro-details] Technically macros impliment lazy evaluation and
+.. [#macro-details] Technically macros implement lazy evaluation and
lexical scope. There is one top level scope
containing all macro definitions, but all
parameter definitions are local to a given macro.
@@ -347,10 +347,10 @@ NOTES
.. [#aka-bool] a.k.a. boolean prefixes
-.. [#not-phrase] Due to the implemention of phrase fields in Xapian,
+.. [#not-phrase] Due to the implementation of phrase fields in Xapian,
regex queries could only match individual words.
-.. [#not-body] Due the the way ``body`` is implemented in notmuch,
+.. [#not-body] Due to the way ``body`` is implemented in notmuch,
this modifier is not supported in the ``body`` field.
.. [#not-path] Due to the way recursive ``path`` queries are implemented
diff --git a/doc/notmuch-emacs.rst b/doc/notmuch-emacs.rst
index 71f10e20..7dff7d64 100644
--- a/doc/notmuch-emacs.rst
+++ b/doc/notmuch-emacs.rst
@@ -14,7 +14,7 @@ manual to refer to the Emacs interface to Notmuch. When this distinction
is important, we’ll refer to the Emacs interface as
*notmuch-emacs*.
-Notmuch-emacs is highly customizable via the the Emacs customization
+Notmuch-emacs is highly customizable via the Emacs customization
framework (or just by setting the appropriate variables). We try to
point out relevant variables in this manual, but in order to avoid
duplication of information, you can usually find the most detailed
@@ -493,7 +493,7 @@ in :ref:`notmuch-search`.
Dealing with duplicates
-----------------------
-If there are are multiple files with the same :mailheader:`Message-ID`
+If there are multiple files with the same :mailheader:`Message-ID`
(see :any:`duplicate-files`), then :any:`notmuch-show` displays the
number of duplicates and identifies the current duplicate. In the
following example duplicate 3 of 5 is displayed.
@@ -717,7 +717,7 @@ operations specified in ``notmuch-tagging-keys``; i.e. each
notmuch-tag-undo
----------------
-Each notmuch buffer supporting tagging operations (i.e buffers in
+Each notmuch buffer supporting tagging operations (i.e. buffers in
:any:`notmuch-show`, :any:`notmuch-search`, :any:`notmuch-tree`, and
:any:`notmuch-unthreaded` mode) keeps a local stack of tagging
operations. These can be undone via :any:`notmuch-tag-undo`. By default
glossary
--------
Commit objects reference one tree, and zero or more parents.
Single parent commits can typically generate a patch in
unified diff format via `git format-patch'.
Multiple parents means the commit is a merge.
Root commits have no ancestor. Note that it is
possible to have multiple root commits when merging independent histories.
Every commit references one top-level tree object.
git clone https://yhetil.org/notmuch.git