Fix typos

22 files changed, 33 insertions, 32 deletions

diff --git a/NEWS.org b/NEWS.org
index 2d2eae6..8dac2fe 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -90,7 +90,7 @@
       extensible.
 
     - ~mu4e~ recognizes an attribute ~:hide t~, which will hide the bookmark item
-      from the main-screen (and speedbar), but keep it avilable through the
+      from the main-screen (and speedbar), but keep it available through the
       completion UI.
 
     - ~mu4e-maildir-shortcuts~ have also become plists. The older format is still
@@ -254,7 +254,7 @@
     - fix a crash when running on OpenBSD
     - fix --clear-links (broken filenames)
     - You can now set the MU_HOME environment variable as an
-      alternative way of setting the mu homedir via the --muhome commadn-line
+      alternative way of setting the mu homedir via the --muhome command-line
       parameter.
 
 *** mu4e
@@ -366,7 +366,7 @@
    - bump version to 0.9.15. From now on, odd minor version numbers
      are for development versions; thus, 0.9.16 is to be the next stable
      release.
-   - special case text/calendar attachements to get .vcs
+   - special case text/calendar attachments to get .vcs
      extensions. This makes it easier to process those with external tools.
    - change the message file names to better conform to the maildir
      spec; this was confusing some tools.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e9dba8e..f4aa428 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,7 +15,7 @@
 ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # enforce compiling guile (optionally) first,then this dir first
-# before decending into tests/
+# before descending into tests/
 include $(top_srcdir)/gtest.mk
 
 SUBDIRS= utils query
diff --git a/lib/mu-container.h b/lib/mu-container.h
index 5bc268b..69c1950 100644
--- a/lib/mu-container.h
+++ b/lib/mu-container.h
@@ -168,7 +168,7 @@ gboolean   mu_container_foreach (MuContainer *c,
 				 gpointer user_data);
 
 /**
- * check wither container needle is a child or sibling (recursively)
+ * check whether container needle is a child or sibling (recursively)
  * of container haystack
  *
  * @param haystack a container
diff --git a/lib/mu-index.h b/lib/mu-index.h
index cdb28d8..c0faba8 100644
--- a/lib/mu-index.h
+++ b/lib/mu-index.h
@@ -35,7 +35,7 @@ struct _MuIndexStats {
 	unsigned _processed;     /* number of msgs processed or counted */
 	unsigned _updated;       /* number of msgs new or updated */
 	unsigned _cleaned_up;    /* number of msgs cleaned up */
-	unsigned _uptodate;      /* number of msgs already uptodate */
+	unsigned _uptodate;      /* number of msgs already up-to-date */
 };
 typedef struct _MuIndexStats MuIndexStats;
 
@@ -94,7 +94,7 @@ typedef MuError (*MuIndexMsgCallback) (MuIndexStats* stats, void *user_data);
  * @param enter did we enter (TRUE) or leave(FALSE) the dir?
  * @param user_data pointer to user data
  *
- * @return  MU_OK to contiue, MU_STOP to stopd or MU_ERROR in
+ * @return  MU_OK to continue, MU_STOP to stopd or MU_ERROR in
  * case of some error.
  */
 typedef MuError (*MuIndexDirCallback) (const char* path, gboolean enter,
diff --git a/lib/utils/mu-command-parser.hh b/lib/utils/mu-command-parser.hh
index 458e031..58c2f11 100644
--- a/lib/utils/mu-command-parser.hh
+++ b/lib/utils/mu-command-parser.hh
@@ -38,12 +38,13 @@ namespace Command {
 /// Commands are s-expressions with the follow properties:
 
 /// 1) a command is a list with a command-name as its first argument
-/// 2) the rest of the parameters are pairs of colon-prefixed symbol and a value of some type
-///      (ie. 'keyword arguments')
+/// 2) the rest of the parameters are pairs of colon-prefixed symbol and a value of some
+///    type (ie. 'keyword arguments')
 /// 3) each command is described by its CommandInfo structure, which defines the type
 /// 4) calls to the command must include all required parameters
 /// 5) all parameters must be of the specified type; however the symbol 'nil' is allowed
-///    for specify a non-required parameter to be absent; this is for convience on the call side.
+///    for specify a non-required parameter to be absent; this is for convenience on the
+///    call side.
 
 
 /// Information about a function argument
diff --git a/lib/utils/mu-util.h b/lib/utils/mu-util.h
index 0b07b8a..72be341 100644
--- a/lib/utils/mu-util.h
+++ b/lib/utils/mu-util.h
@@ -51,7 +51,7 @@ char* mu_util_dir_expand (const char* path)
 
 /**
  * guess the maildir; first try $MAILDIR; if it is unset or
- * non-existant, try ~/Maildir if both fail, return NULL
+ * non-existent, try ~/Maildir if both fail, return NULL
  *
  * @return full path of the guessed Maildir, or NULL; must be freed (gfree)
  */
diff --git a/lib/utils/mu-utils.hh b/lib/utils/mu-utils.hh
index afb8755..0c35170 100644
--- a/lib/utils/mu-utils.hh
+++ b/lib/utils/mu-utils.hh
@@ -103,7 +103,7 @@ std::string format (const char *frm, va_list args) __attribute__((format(printf,
  * @param first whether to fill out incomplete dates to the start or the end;
  * ie. either 1972 -> 197201010000 or 1972 -> 197212312359
  *
- * @return the corresponding time_t expressed as a strng
+ * @return the corresponding time_t expressed as a string
  */
 std::string date_to_time_t_string (const std::string& date, bool first);
 
diff --git a/man/mu-easy.1 b/man/mu-easy.1
index 34dce8b..38953be 100644
--- a/man/mu-easy.1
+++ b/man/mu-easy.1
@@ -254,7 +254,7 @@ can use:
   \fB$ mu find --fields="l" t:julius fruit\fR
 .fi
 
-And we'll get someting like:
+And we'll get something like:
 .nf
   /home/someuser/Maildir/archive/cur/1266188485_0.6850.cthulhu:2,
 .fi
@@ -269,7 +269,7 @@ We can now display this message:
      Date: 2008-07-31T21:57:25 EEST
 
      OF Mans First Disobedience, and the Fruit
-     Of that Forbidden Tree, whose mortal tast
+     Of that Forbidden Tree, whose mortal taste
      Brought Death into the World, and all our woe,
      [...]
 .fi
diff --git a/man/mu-find.1 b/man/mu-find.1
index 315e4bc..5e46487 100644
--- a/man/mu-find.1
+++ b/man/mu-find.1
@@ -219,7 +219,7 @@ same message, which is a common occurrence when using e.g. Gmail together with
 \fBofflineimap\fR.
 
 .TP
-\fB\-\-include\-related\fR,\fB-r\fR also include messages being refered to by
+\fB\-\-include\-related\fR,\fB-r\fR also include messages being referred to by
 the matched messages -- i.e.. include messages that are part of the same
 message thread as some matched messages. This is useful if you want
 Gmail-style 'conversations'. Note, finding these related messages make
diff --git a/man/mu-query.7 b/man/mu-query.7
index 4051aa4..c3f3f5c 100644
--- a/man/mu-query.7
+++ b/man/mu-query.7
@@ -162,7 +162,7 @@ is the same as
 from:foo@bar
 .EX2
 For queries that are not one-off, we would recommend the longer name
-for readabilty.
+for readability.
 
 There are also the special fields \fBcontact:\fR, which matches all
 contact-fields (\fIfrom\fR, \fIto\fR, \fIcc\fR and \fIbcc\fR), and
diff --git a/man/mu.1 b/man/mu.1
index e27e650..e8a36eb 100644
--- a/man/mu.1
+++ b/man/mu.1
@@ -115,7 +115,7 @@ For \fBfind\fR the output is encoded according the locale for
 .SH DATABASE AND FILE
 
 Commands \fBmu index\fR and \fBfind\fR and \fBcfind\fR work with the database,
-while the other ones work on invidual mail files. Hence, running \fBview\fR,
+while the other ones work on individual mail files. Hence, running \fBview\fR,
 \fBmkdir\fR and \fBextract\fR does not require the mu database.
 
 The various commands are discussed in more detail in their own separate
diff --git a/mu/mu-cmd-server.cc b/mu/mu-cmd-server.cc
index 11811d0..bce9025 100644
--- a/mu/mu-cmd-server.cc
+++ b/mu/mu-cmd-server.cc
@@ -402,7 +402,7 @@ compose_handler (Context& context, const Parameters& params)
                 const unsigned docid{(unsigned)get_int_or(params, "docid")};
                 auto msg{mu_store_get_msg (context.store, docid, &gerr)};
                 if (!msg)
-                        throw Error{Error::Code::Store, &gerr, "faile to get message %u", docid};
+                        throw Error{Error::Code::Store, &gerr, "failed to get message %u", docid};
 
                 const auto opts{message_options(params)};
                 sexp = mu_msg_to_sexp (msg, docid, NULL, opts);
@@ -756,7 +756,7 @@ help_handler (Context& context, const Parameters& params)
                 std::cout << ";; Commands are s-expressions of the form\n"
                           << ";;   (<command-name> :param1 val1 :param2 val2 ...)\n"
                           << ";; For instance:\n;;  (help :command quit)\n"
-                          << ";; to get information about the 'quit' commmand\n;;\n";
+                          << ";; to get information about the 'quit' command\n;;\n";
                 std::cout << ";; The following commands are available:\n";
         }
 
diff --git a/mu/mu-cmd.c b/mu/mu-cmd.c
index c00b6e7..6c4c53b 100644
--- a/mu/mu-cmd.c
+++ b/mu/mu-cmd.c
@@ -586,7 +586,7 @@ cmd_init (MuConfig *opts, GError **err)
 		mu_store_print_info (store, opts->nocolor);
 		g_print ("\nstore created.\n"
 			 "use 'mu index' to fill the database "
-                         "with your messsages.\n"
+                         "with your messages.\n"
 			 "see mu-index(1) for details\n");
 	}
 
diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index d0c8b0b..faee887 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -594,7 +594,7 @@ message we will forward / reply to.
 
 Optionally (when inline forwarding) INCLUDES contains a list of
    (:file-name <filename> :mime-type <mime-type> :disposition <disposition>)
-for the attachements to include; file-name refers to
+for the attachments to include; file-name refers to
 a file which our backend has conveniently saved for us (as a
 tempfile)."
 
diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index abbc8bf..054ccaf 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -1412,7 +1412,7 @@ descendants."
     (unless (memq mark allowed-marks)
       (mu4e-error "The mark (%s) has to be one of: %s"
                   mark allowed-marks)))
-  ;; note: the tread id is shared by all messages in a thread
+  ;; note: the thread id is shared by all messages in a thread
   (let* ((msg (mu4e-message-at-point))
          (thread-id (mu4e~headers-get-thread-info msg 'thread-id))
          (path      (mu4e~headers-get-thread-info msg 'path))
diff --git a/mu4e/mu4e-main.el b/mu4e/mu4e-main.el
index a577c08..debcbf4 100644
--- a/mu4e/mu4e-main.el
+++ b/mu4e/mu4e-main.el
@@ -33,7 +33,7 @@
 ;;; Mode
 
 (defvar mu4e-main-buffer-hide-personal-addresses nil
-  "Whether to hid trhe personal address in the main view. This
+  "Whether to hid the personal address in the main view. This
   can be useful to avoid the noise when there are many.
 
   This also hides the warning if your `user-mail-address' is not
@@ -269,7 +269,7 @@ When REFRESH is non nil refresh infos from server."
 	  (mu4e~main-menu))
       ;; `mu4e~main-view' is called from `mu4e~start', so don't call it
       ;; a second time here i.e. do not refresh unless specified
-      ;; explicitely with REFRESH arg.
+      ;; explicitly with REFRESH arg.
       (switch-to-buffer buf)
       (with-current-buffer buf
         (mu4e~main-view-real-1 refresh))
diff --git a/mu4e/mu4e-message.el b/mu4e/mu4e-message.el
index 0614997..cf75f94 100644
--- a/mu4e/mu4e-message.el
+++ b/mu4e/mu4e-message.el
@@ -306,7 +306,7 @@ A part would look something like:
 
 (defun mu4e-field-at-point (field)
   "Get FIELD for the message at point.
-Eiter in the headers buffer or the view buffer. Field is a
+Either in the headers buffer or the view buffer. Field is a
 symbol, see `mu4e-header-info'."
   (plist-get (mu4e-message-at-point) field))
 
@@ -329,8 +329,8 @@ Emacs. Based on code by Titus von der Malsburg."
      (let (
            ;; When HTML emails contain references to remote images,
            ;; retrieving these images leaks information. For example,
-           ;; the sender can see when I openend the email and from which
-           ;; computer (IP address). For this reason, it is preferrable
+           ;; the sender can see when I opened the email and from which
+           ;; computer (IP address). For this reason, it is preferable
            ;; to not retrieve images.
            ;; See this discussion on mu-discuss:
            ;; https://groups.google.com/forum/#!topic/mu-discuss/gr1cwNNZnXo
diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el
index 06fd4f9..c959dc3 100644
--- a/mu4e/mu4e-vars.el
+++ b/mu4e/mu4e-vars.el
@@ -1021,7 +1021,7 @@ mu4e-compose.")
 
 ;;; Handler functions
 ;;
-;; The handler funcions define what happens when we receive a certain
+;; The handler functions define what happens when we receive a certain
 ;; message from the server.  Here we register our handler functions;
 ;; these connect server messages to functions to handle them.
 ;;
diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index 482c048..ded6ef4 100644
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@@ -190,7 +190,7 @@ The first letter of NAME is used as a shortcut character."
     (define-key map [mouse-2] 'mu4e~view-save-attach-from-binding)
     (define-key map (kbd "<S-return>") 'mu4e~view-save-attach-from-binding)
     map)
-  "Keymap used in the \"Attachements\" header field.")
+  "Keymap used in the \"Attachments\" header field.")
 
 ;;; Variables
 
diff --git a/toys/msg2pdf/Makefile.am b/toys/msg2pdf/Makefile.am
index f68020f..279c22c 100644
--- a/toys/msg2pdf/Makefile.am
+++ b/toys/msg2pdf/Makefile.am
@@ -16,7 +16,7 @@
 
 include $(top_srcdir)/gtest.mk
 
-# enforce compiling this dir first before decending into tests/
+# enforce compiling this dir first before descending into tests/
 SUBDIRS= .
 
 AM_CPPFLAGS=-I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS)
diff --git a/toys/mug/Makefile.am b/toys/mug/Makefile.am
index 26a17b2..f9b3491 100644
--- a/toys/mug/Makefile.am
+++ b/toys/mug/Makefile.am
@@ -16,7 +16,7 @@
 
 include $(top_srcdir)/gtest.mk
 
-# enforce compiling this dir first before decending into tests/
+# enforce compiling this dir first before descending into tests/
 SUBDIRS= .
 
 AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS)	\
diff --git a/www/cheatsheet.md b/www/cheatsheet.md
index 7f746c2..3ff6553 100644
--- a/www/cheatsheet.md
+++ b/www/cheatsheet.md
@@ -20,7 +20,7 @@ If `mu` did not guess the right Maildir, you can set it explicitly:
 
 If you want to exclude certain directories from being indexed (for example,
 directories with spam-messages), put a file called `.noindex` in the directory
-to exlude, and it will be ignored when indexing (including its children)
+to exclude, and it will be ignored when indexing (including its children)
 
 ## Finding messages