---
Makefile|4 ++--
README |6 +++---
gmime-filter-reply.h|2 +-
lib/database.cc |2 +-
lib/index.cc|2 +-
lib/message.cc |2 +-
lib/messages.c |2 +-
lib/notmuch-private.h |2 +-
lib/notmuch.h | 10 +-
lib/sha1.c |2 +-
lib/thread.cc |2 +-
notmuch-completion.bash |2 +-
notmuch-new.c |4 ++--
notmuch-search.c|2 +-
notmuch.1 |4 ++--
notmuch.el | 10 +-
show-message.c |2 +-
17 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/Makefile b/Makefile
index 436dacf..96aaa73 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Default FLAGS, (can be overriden by user such as "make CFLAGS=-O2")
+# Default FLAGS, (can be overridden by user such as "make CFLAGS=-O2")
WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
CFLAGS=-O2
@@ -14,7 +14,7 @@ override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags)
$(extra_cxxflags)
override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
`xapian-config --libs`
-# Include our local Makfile.local first so that its first target is default
+# Include our local Makefile.local first so that its first target is default
include Makefile.local
include lib/Makefile.local
diff --git a/README b/README
index 40f05ab..27af77f 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Notmuch - thread-based email index, search and tagging.
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages. It uses the Xapian library to
provide fast, full-text search of very large collection of email with
-a very convenient search syntas.
+a very convenient search syntax.
Notmuch is free software, released under the GNU General Public
License version 3 (or later).
@@ -45,7 +45,7 @@ obtaining a more sophisticated interface:
notmuch.el file in this distribution.
If someone were to write a curses-based interface, or similar,
- it might also be reasonable to buil on the "notmuch"
+ it might also be reasonable to build on the "notmuch"
command-line interface.
2. Build on top of the notmuch library interface.
@@ -67,4 +67,4 @@ still in development. We would appreciate any contributions
to these
efforts.
-
\ No newline at end of file
+
diff --git a/gmime-filter-reply.h b/gmime-filter-reply.h
index 41cbc13..b7cbc6b 100644
--- a/gmime-filter-reply.h
+++ b/gmime-filter-reply.h
@@ -40,7 +40,7 @@ typedef struct _GMimeFilterReplyClass GMimeFilterReplyClass;
* @saw_nl: previous char was a \n
* @saw_angle: previous char was a >
*
- * A filter to insert/remove reply markers (lines begining with >)
+ * A filter to insert/remove reply markers (lines beginning with >)
**/
struct _GMimeFilterReply {
GMimeFilter parent_object;
diff --git a/lib/database.cc b/lib/database.cc
index 3c8d626..27597cf 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -180,7 +180,7 @@ notmuch_status_to_string (notmuch_status_t status)
case NOTMUCH_STATUS_TAG_TOO_LONG:
return "Tag value is too long (exceeds NOTMUCH_TAG_MAX)";
case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW:
- return "Unblanced number of calls to notmuch_message_freeze/thaw";
+ return "Unbalanced number of calls to notmuch_message_freeze/thaw";
default:
case NOTMUCH_STATUS_LAST_STATUS:
return "Unknown error status value";
diff --git a/lib/index.cc b/lib/index.cc
index 65b83b3..80df64b 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -198,7 +198,7 @@ _index_mime_part (notmuch_message_t *message,
if (i == 1)
continue;
if (i > 1)
- fprintf (stderr, "Warning: Unexpected extra parts of
mutlipart/signed. Indexing anyway.\n");
+ fprintf (stderr, "Warning: Unexpected extra parts of
multipart/signed. Indexing anyway.\n");
}
_index_mime_part (message,
g_mime_multipart_get_part (multipart, i));
diff --git a/lib/message.cc b/lib/message.cc
index a4b090b..1d6623f 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -144,7 +144,7 @@ _notmuch_message_create (const void *talloc_owner,
}
/* Create a new notmuch_message_t object for a specific message ID,
- * (which may or may not already exist in the databas).
+ * (which may or may not already exist in the database).
*
* Here, 'talloc owner' is an optional talloc context to which the new
* message will belong. This allows for the caller to not bother
diff --git a/lib/messages.c b/lib/messages.c
index a588f8f..2f7c283 100644
--- a/lib/messages.c
+++ b/lib/messages.c
@@ -47,7 +47,7 @@ _notmuch_message_list_create (const void *ctx)
return list;
}
-/* Append 'node' (which can of course point to an aribtrarily