From 16654d0ba9f0601f4158eeed4c4fa1eb3c5c3db2 Mon Sep 17 00:00:00 2001 From: Pieter Praet Date: Mon, 20 Jun 2011 22:14:21 +0200 Subject: [PATCH] [PATCH] fix sum moar typos --- 7b/81c63b8970c7b6e117ffbdff0bfdeaafd6b095 | 735 ++++++++++++++++++++++ 1 file changed, 735 insertions(+) create mode 100644 7b/81c63b8970c7b6e117ffbdff0bfdeaafd6b095 diff --git a/7b/81c63b8970c7b6e117ffbdff0bfdeaafd6b095 b/7b/81c63b8970c7b6e117ffbdff0bfdeaafd6b095 new file mode 100644 index 000000000..0109225fc --- /dev/null +++ b/7b/81c63b8970c7b6e117ffbdff0bfdeaafd6b095 @@ -0,0 +1,735 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 092DB431FD0 + for ; Mon, 20 Jun 2011 13:14:36 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id xob5mgnX--Z4 for ; + Mon, 20 Jun 2011 13:14:33 -0700 (PDT) +Received: from mail-wy0-f181.google.com (mail-wy0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 7163D431FB6 + for ; Mon, 20 Jun 2011 13:14:33 -0700 (PDT) +Received: by wyb28 with SMTP id 28so2744025wyb.26 + for ; Mon, 20 Jun 2011 13:14:32 -0700 (PDT) +Received: by 10.227.24.8 with SMTP id t8mr5490699wbb.0.1308600872001; + Mon, 20 Jun 2011 13:14:32 -0700 (PDT) +Received: from localhost ([109.131.43.100]) + by mx.google.com with ESMTPS id en1sm3455196wbb.35.2011.06.20.13.14.28 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 20 Jun 2011 13:14:29 -0700 (PDT) +From: Pieter Praet +To: Notmuch Mail +Subject: [PATCH] fix sum moar typos +Date: Mon, 20 Jun 2011 22:14:21 +0200 +Message-Id: <1308600861-22684-1-git-send-email-pieter@praet.org> +X-Mailer: git-send-email 1.7.4.1 +In-Reply-To: <1307202852-4398-1-git-send-email-pieter@praet.org> +References: <1307202852-4398-1-git-send-email-pieter@praet.org> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 20 Jun 2011 20:14:36 -0000 + +Various typo fixes in docs, docstrings, comments, etc... + +Signed-off-by: Pieter Praet +--- +Rebased to current master (12d6f90e) + + NEWS | 10 +++++----- + TODO | 4 ++-- + compat/README | 2 +- + completion/Makefile | 2 +- + configure | 4 ++-- + emacs/Makefile | 2 +- + emacs/notmuch-hello.el | 2 +- + emacs/notmuch-lib.el | 2 +- + emacs/notmuch-maildir-fcc.el | 2 +- + emacs/notmuch-show.el | 6 +++--- + emacs/notmuch-wash.el | 2 +- + emacs/notmuch.el | 6 +++--- + gmime-filter-headers.h | 2 +- + lib/Makefile | 2 +- + lib/Makefile.local | 2 +- + lib/database.cc | 12 ++++++------ + lib/libsha1.c | 2 +- + lib/libsha1.h | 2 +- + lib/message.cc | 4 ++-- + lib/notmuch.h | 4 ++-- + notmuch-config.c | 2 +- + notmuch-new.c | 2 +- + notmuch-reply.c | 4 ++-- + notmuch.1 | 6 +++--- + notmuch.c | 2 +- + packaging/debian | 4 ++-- + test/Makefile | 2 +- + test/README | 6 +++--- + test/crypto | 2 +- + test/maildir-sync | 2 +- + test/multipart | 2 +- + test/test-lib.sh | 2 +- + test/uuencode | 4 ++-- + vim/README | 2 +- + vim/plugin/notmuch.vim | 4 ++-- + 35 files changed, 60 insertions(+), 60 deletions(-) + +diff --git a/NEWS b/NEWS +index 5a1778e..dae7832 100644 +--- a/NEWS ++++ b/NEWS +@@ -112,15 +112,15 @@ Allow for notmuch-fcc-dirs to have a value of nil. + string. Instead it's now a list of cons cells where the car of each + cell is a regular expression to be matched against the sender + address, and the cdr is the name of a folder to use for an FCC. So +- the old fallback behavior can be achieved by including a fineal cell ++ the old fallback behavior can be achieved by including a final cell + of (".*" . "default-fcc-folder"). + + Vim interface improvements + -------------------------- + Felipe Contreras provided a number of updates for the vim interface. + +- These include optimiations, support for newer versions of vim, fixed +- support for sending mail on modern systmms, new commands, and ++ These include optimizations, support for newer versions of vim, fixed ++ support for sending mail on modern systems, new commands, and + various cleanups. + + New bindings +@@ -606,7 +606,7 @@ Fix to compile against GMime 2.6 + + Fix configure script to accept (and ignore) various standard options. + +- For example, those that the gentoo build scripts expect configure to ++ For example, those that the Gentoo build scripts expect configure to + accept are now all accepted. + + Test suite +@@ -714,7 +714,7 @@ tags by region. + Selective bulk tagging is now possible by selecting a region of + threads and then using either the '+' or '-' keybindings. Bulk + tagging is still available for all threads matching the current +- search with th '*' binding. ++ search with the '*' binding. + + More meaningful buffer names for thread-view buffers. + +diff --git a/TODO b/TODO +index 260ffe1..14dfa55 100644 +--- a/TODO ++++ b/TODO +@@ -29,7 +29,7 @@ Make 'notmuch-show-pipe-message have a private history. + + Add support for a delete keybinding that adds a "deleted" tag to the + current message/thread and make searches not return deleted messages +-by default, (unless the user asks explicitly for deleted messags in ++by default, (unless the user asks explicitly for deleted messages in + the search query). + + Add keybindings for next/previous thread. +@@ -119,7 +119,7 @@ Allow configuration for filename patterns that should be ignored when + indexing. + + Replace the "notmuch part --part=id" command with "notmuch show +---part=id", (David Edmonson wants to rewrite some of "notmuch show" to ++--part=id", (David Edmondson wants to rewrite some of "notmuch show" to + provide more MIME-structure information in its output first). + + Replace the "notmuch search-tags" command with "notmuch search +diff --git a/compat/README b/compat/README +index cd32c56..38e2e14 100644 +--- a/compat/README ++++ b/compat/README +@@ -1,4 +1,4 @@ +-notmuch/comapt ++notmuch/compat + + This directory consists of two things: + +diff --git a/completion/Makefile b/completion/Makefile +index b6859ea..de492a7 100644 +--- a/completion/Makefile ++++ b/completion/Makefile +@@ -1,4 +1,4 @@ +-# See Makfefile.local for the list of files to be compiled in this ++# See Makefile.local for the list of files to be compiled in this + # directory. + all: + $(MAKE) -C .. all +diff --git a/configure b/configure +index cf525c9..3999ce8 100755 +--- a/configure ++++ b/configure +@@ -22,7 +22,7 @@ if [ "$srcdir" != "." ]; then + fi + + # Set several defaults (optionally specified by the user in +-# environemnt variables) ++# environment variables) + CC=${CC:-gcc} + CXX=${CXX:-g++} + CFLAGS=${CFLAGS:--O2} +@@ -608,7 +608,7 @@ includedir = ${INCLUDEDIR:=\$(prefix)/include} + # The directory to which man pages should be installed + mandir = ${MANDIR:=\$(prefix)/share/man} + +-# The directory to which read-only (configuration) filesshould be installed ++# The directory to which read-only (configuration) files should be installed + sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc} + + # The directory to which emacs lisp files should be installed +diff --git a/emacs/Makefile b/emacs/Makefile +index b6859ea..de492a7 100644 +--- a/emacs/Makefile ++++ b/emacs/Makefile +@@ -1,4 +1,4 @@ +-# See Makfefile.local for the list of files to be compiled in this ++# See Makefile.local for the list of files to be compiled in this + # directory. + all: + $(MAKE) -C .. all +diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el +index 916cda1..65fde75 100644 +--- a/emacs/notmuch-hello.el ++++ b/emacs/notmuch-hello.el +@@ -428,7 +428,7 @@ Complete list of currently available key bindings: + (let ((found-target-pos nil) + (final-target-pos nil)) + (let* ((saved-alist +- ;; Filter out empty saved seaches if required. ++ ;; Filter out empty saved searches if required. + (if notmuch-show-empty-saved-searches + notmuch-saved-searches + (loop for elem in notmuch-saved-searches +diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el +index a21dc14..f93c957 100644 +--- a/emacs/notmuch-lib.el ++++ b/emacs/notmuch-lib.el +@@ -88,7 +88,7 @@ the user hasn't set this variable with the old or new value." + (notmuch-config-get "user.primary_email")) + + (defun notmuch-user-other-email () +- "Return the user.primary_email value (as a list) from the notmuch configuration." ++ "Return the user.other_email value (as a list) from the notmuch configuration." + (split-string (notmuch-config-get "user.other_email") "\n")) + + (defun notmuch-kill-this-buffer () +diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el +index aede753..ef5f9f5 100644 +--- a/emacs/notmuch-maildir-fcc.el ++++ b/emacs/notmuch-maildir-fcc.el +@@ -163,7 +163,7 @@ will NOT be removed or replaced." + (make-directory (concat path "/new/") t) + (make-directory (concat path "/tmp/") t)) + ((file-regular-p path) +- (error "%s is a file. Can't creat maildir." path)) ++ (error "%s is a file. Can't create maildir." path)) + (t + (error "I don't know how to create a maildir here")))) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 0d9b52a..9c63ecb 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -121,7 +121,7 @@ same as that of the previous message." + "Use external viewers to view all attachments from the current message." + (interactive) + (with-current-notmuch-show-message +- ; We ovverride the mm-inline-media-tests to indicate which message ++ ; We override the mm-inline-media-tests to indicate which message + ; parts are already sufficiently handled by the original + ; presentation of the message in notmuch-show mode. These parts + ; will be inserted directly into the temporary buffer of +@@ -803,7 +803,7 @@ The optional QUERY-CONTEXT is a notmuch search term. Only + messages from the thread matching this search term are shown if + non-nil. + +-The optional BUFFER-NAME provides the neame of the buffer in ++The optional BUFFER-NAME provides the name of the buffer in + which the message thread is shown. If it is nil (which occurs + when the command is called interactively) the argument to the + function is used. " +@@ -921,7 +921,7 @@ more selectively, (such as '\\[notmuch-show-next-message]' and '\\[notmuch-show- + without removing any tags, and '\\[notmuch-show-archive-thread]' to archive an entire thread + without scrolling through with \\[notmuch-show-advance-and-archive]). + +-You can add or remove arbitary tags from the current message with ++You can add or remove arbitrary tags from the current message with + '\\[notmuch-show-add-tag]' or '\\[notmuch-show-remove-tag]'. + + All currently available key bindings: +diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el +index 92f07c5..1f420b2 100644 +--- a/emacs/notmuch-wash.el ++++ b/emacs/notmuch-wash.el +@@ -137,7 +137,7 @@ collapse the remaining lines into a button.") + (format label-format lines-count))) + + (defun notmuch-wash-region-to-button (msg beg end type prefix) +- "Auxilary function to do the actual making of overlays and buttons ++ "Auxiliary function to do the actual making of overlays and buttons + + BEG and END are buffer locations. TYPE should a string, either + \"citation\" or \"signature\". PREFIX is some arbitrary text to +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 3311fe8..f11ec24 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -64,7 +64,7 @@ + ("authors" . "%-20s ") + ("subject" . "%s ") + ("tags" . "(%s)")) +- "Search result formating. Supported fields are: ++ "Search result formatting. Supported fields are: + date, count, authors, subject, tags + For example: + (setq notmuch-search-result-format \(\(\"authors\" . \"%-40s\"\) +@@ -493,7 +493,7 @@ the messages that are about to be tagged" + :group 'notmuch) + + (defcustom notmuch-after-tag-hook nil +- "Hooks that are run before tags of a message are modified. ++ "Hooks that are run after tags of a message are modified. + + 'tags' will contain the tags that were added or removed as + a list of strings of the form \"+TAG\" or \"-TAG\". +@@ -836,7 +836,7 @@ non-authors is found, assume that all of the authors match." + (defun notmuch-search-operate-all (action) + "Add/remove tags from all matching messages. + +-Tis command adds or removes tags from all messages matching the ++This command adds or removes tags from all messages matching the + current search terms. When called interactively, this command + will prompt for tags to be added or removed. Tags prefixed with + '+' will be added and tags prefixed with '-' will be removed. +diff --git a/gmime-filter-headers.h b/gmime-filter-headers.h +index 47d1d45..1d1a3eb 100644 +--- a/gmime-filter-headers.h ++++ b/gmime-filter-headers.h +@@ -39,7 +39,7 @@ typedef struct _GMimeFilterHeadersClass GMimeFilterHeadersClass; + * @parent_object: parent #GMimeFilter + * @saw_nl: previous char was a \n + * @line: temporary buffer for line unfolding +- * @line_size: size of currently allocated nemory for @line ++ * @line_size: size of currently allocated memory for @line + * @lineptr: pointer to the first unused character in @line + * + * A filter to decode rfc2047 encoded headers +diff --git a/lib/Makefile b/lib/Makefile +index b6859ea..de492a7 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -1,4 +1,4 @@ +-# See Makfefile.local for the list of files to be compiled in this ++# See Makefile.local for the list of files to be compiled in this + # directory. + all: + $(MAKE) -C .. all +diff --git a/lib/Makefile.local b/lib/Makefile.local +index 4319023..d06f268 100644 +--- a/lib/Makefile.local ++++ b/lib/Makefile.local +@@ -82,7 +82,7 @@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME) + + install: install-$(dir) + +-# The (often-reused) $dir works fine within targets/pre-requisites, ++# The (often-reused) $dir works fine within targets/prerequisites, + # but cannot be used reliably within commands, so copy its value to a + # variable that is not reused. + lib := $(dir) +diff --git a/lib/database.cc b/lib/database.cc +index 7f79cf4..9c2f4ec 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -69,7 +69,7 @@ typedef struct { + * + * Multiple terms of given prefix: + * +- * reference: All message IDs from In-Reply-To and Re ferences ++ * reference: All message IDs from In-Reply-To and References + * headers in the message. + * + * tag: Any tags associated with this message by the user. +@@ -137,7 +137,7 @@ typedef struct { + * ASCII integer. The initial database version + * was 1, (though a schema existed before that + * were no "version" database value existed at +- * all). Succesive versions are allocated as ++ * all). Successive versions are allocated as + * changes are made to the database (such as by + * indexing new fields). + * +@@ -148,7 +148,7 @@ typedef struct { + * incremented for each thread ID. + * + * thread_id_* A pre-allocated thread ID for a particular +- * message. This is actually an arbitarily large ++ * message. This is actually an arbitrarily large + * family of metadata name. Any particular name is + * formed by concatenating "thread_id_" with a message + * ID (or the SHA1 sum of a message ID if it is very +@@ -422,7 +422,7 @@ skip_space_and_comments (const char **str) + } + + /* Parse an RFC 822 message-id, discarding whitespace, any RFC 822 +- * comments, and the '<' and '>' delimeters. ++ * comments, and the '<' and '>' delimiters. + * + * If not NULL, then *next will be made to point to the first character + * not parsed, (possibly pointing to the final '\0' terminator. +@@ -1149,7 +1149,7 @@ _notmuch_database_filename_to_direntry (void *ctx, + + /* Given a legal 'path' for the database, return the relative path. + * +- * The return value will be a pointer to the originl path contents, ++ * The return value will be a pointer to the original path contents, + * and will be either the original string (if 'path' was relative) or + * a portion of the string (if path was absolute and begins with the + * database path). +@@ -1476,7 +1476,7 @@ _notmuch_database_link_message_to_children (notmuch_database_t *notmuch, + * In all cases, we assign to the current message the first thread_id + * found (through either parent or child). We will also merge any + * existing, distinct threads where this message belongs to both, +- * (which is not uncommon when mesages are processed out of order). ++ * (which is not uncommon when messages are processed out of order). + * + * Finally, if no thread ID has been found through parent or child, we + * call _notmuch_message_generate_thread_id to generate a new thread +diff --git a/lib/libsha1.c b/lib/libsha1.c +index c39a5a1..5d16f6a 100644 +--- a/lib/libsha1.c ++++ b/lib/libsha1.c +@@ -174,7 +174,7 @@ void sha1_hash(const unsigned char data[], unsigned long len, sha1_ctx ctx[1]) + if((ctx->count[0] += len) < len) + ++(ctx->count[1]); + +- while(len >= space) /* tranfer whole blocks if possible */ ++ while(len >= space) /* transfer whole blocks if possible */ + { + memcpy(((unsigned char*)ctx->wbuf) + pos, sp, space); + sp += space; len -= space; space = SHA1_BLOCK_SIZE; pos = 0; +diff --git a/lib/libsha1.h b/lib/libsha1.h +index c1c848f..56f445a 100644 +--- a/lib/libsha1.h ++++ b/lib/libsha1.h +@@ -38,7 +38,7 @@ extern "C" + { + #endif + #if 0 +-} /* Appleasing Emacs */ ++} /* Appeasing Emacs */ + #endif + + #include +diff --git a/lib/message.cc b/lib/message.cc +index 4b59fa9..7ff39ab 100644 +--- a/lib/message.cc ++++ b/lib/message.cc +@@ -837,7 +837,7 @@ _notmuch_message_add_term (notmuch_message_t *message, + + /* Parse 'text' and add a term to 'message' for each parsed word. Each + * term will be added both prefixed (if prefix_name is not NULL) and +- * also unprefixed). */ ++ * also non-prefixed). */ + notmuch_private_status_t + _notmuch_message_gen_terms (notmuch_message_t *message, + const char *prefix_name, +@@ -1022,7 +1022,7 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message) + * + * A non-NULL return value is guaranteed to be a valid string pointer + * pointing to the characters "new/" or "cur/", (but not +- * NUL-terminated). ++ * NULL-terminated). + */ + static const char * + _filename_is_in_maildir (const char *filename) +diff --git a/lib/notmuch.h b/lib/notmuch.h +index e508309..974be8d 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -103,7 +103,7 @@ typedef enum _notmuch_status { + + /* Get a string representation of a notmuch_status_t value. + * +- * The result is readonly. ++ * The result is read-only. + */ + const char * + notmuch_status_to_string (notmuch_status_t status); +@@ -510,7 +510,7 @@ notmuch_threads_move_to_next (notmuch_threads_t *threads); + * + * It's not strictly necessary to call this function. All memory from + * the notmuch_threads_t object will be reclaimed when the +- * containg query object is destroyed. ++ * containing query object is destroyed. + */ + void + notmuch_threads_destroy (notmuch_threads_t *threads); +diff --git a/notmuch-config.c b/notmuch-config.c +index 6e4c5c4..485fa72 100644 +--- a/notmuch-config.c ++++ b/notmuch-config.c +@@ -69,7 +69,7 @@ static const char maildir_config_comment[] = + "\tsynchronize_flags Valid values are true and false.\n" + "\n" + "\tIf true, then the following maildir flags (in message filenames)\n" +- "\twill be syncrhonized with the corresponding notmuch tags:\n" ++ "\twill be synchronized with the corresponding notmuch tags:\n" + "\n" + "\t\tFlag Tag\n" + "\t\t---- -------\n" +diff --git a/notmuch-new.c b/notmuch-new.c +index 744f4ca..0fa2a3c 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -373,7 +373,7 @@ add_files_recursive (notmuch_database_t *notmuch, + /* If we're looking at a symlink, we only want to add it if it + * links to a regular file, (and not to a directory, say). + * +- * Similarly, if the file is of unknown type (due to filesytem ++ * Similarly, if the file is of unknown type (due to filesystem + * limitations), then we also need to look closer. + * + * In either case, a stat does the trick. +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 27ef37b..362e198 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -278,7 +278,7 @@ add_recipients_from_message (GMimeMessage *reply, + * The munging is easy to detect, because it results in a + * redundant reply-to header, (with an address that already exists + * in either To or Cc). So in this case, we ignore the Reply-To +- * field and use the From header. Thie ensures the original sender ++ * field and use the From header. This ensures the original sender + * will get the reply even if not subscribed to the list. Note + * that the address in the Reply-To header will always appear in + * the reply. +@@ -362,7 +362,7 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message + * them indications to which email address this message was + * delivered. + * The Received: header is special in our get_header function +- * and is always concated. ++ * and is always concatenated. + */ + received = notmuch_message_get_header (message, "received"); + if (received == NULL) +diff --git a/notmuch.1 b/notmuch.1 +index c1aa4e3..5a8c83d 100644 +--- a/notmuch.1 ++++ b/notmuch.1 +@@ -484,7 +484,7 @@ sup calls them). + + The + .B part +-command can used to output a single part of a multi-part MIME message. ++command can used to output a single part of a multipart MIME message. + + .RS 4 + .TP 4 +@@ -641,13 +641,13 @@ expression). + Finally, results can be restricted to only messages within a + particular time range, (based on the Date: header) with a syntax of: + +- .. ++ .. + + Each timestamp is a number representing the number of seconds since + 1970\-01\-01 00:00:00 UTC. This is not the most convenient means of + expressing date ranges, but until notmuch is fixed to accept a more + convenient form, one can use the date program to construct +-timestamps. For example, with the bash shell the folowing syntax would ++timestamps. For example, with the bash shell the following syntax would + specify a date range to return messages from 2009\-10\-01 until the + current time: + +diff --git a/notmuch.c b/notmuch.c +index 93f3194..f672695 100644 +--- a/notmuch.c ++++ b/notmuch.c +@@ -48,7 +48,7 @@ static int + notmuch_help_command (void *ctx, int argc, char *argv[]); + + static const char search_terms_help[] = +- "\tSeveral notmuch commands accept a comman syntax for search\n" ++ "\tSeveral notmuch commands accept a command syntax for search\n" + "\tterms.\n" + "\n" + "\tThe search terms can consist of free-form text (and quoted\n" +diff --git a/packaging/debian b/packaging/debian +index a586660..c8e8ddd 100644 +--- a/packaging/debian ++++ b/packaging/debian +@@ -1,2 +1,2 @@ +-The debian packaging exists in the top-level "debian" directory within +-this source-code respository. ++The Debian packaging exists in the top-level "debian" directory within ++this source-code repository. +diff --git a/test/Makefile b/test/Makefile +index b6859ea..de492a7 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -1,4 +1,4 @@ +-# See Makfefile.local for the list of files to be compiled in this ++# See Makefile.local for the list of files to be compiled in this + # directory. + all: + $(MAKE) -C .. all +diff --git a/test/README b/test/README +index 07da480..be75e0e 100644 +--- a/test/README ++++ b/test/README +@@ -151,7 +151,7 @@ library for your script to use. + + This works similar to test_expect_equal (see above) but is used to + mark a test that demonstrates a known breakage, (that is, the +- author of the test expectes "output" and "expected" to differ until ++ author of the test expects "output" and "expected" to differ until + the breakage is fixed). See test_expect_failure for details. + + test_debug