Correct spelling mistakes.

diff --git a/buffy.c b/buffy.c
index 728f819ded060b138c818c57064df62d36714f35..5d11ad9eff4a6598a4dfe1b95355baab0009a87c 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -307,7 +307,7 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
 
 /* Checks the specified maildir subdir (cur or new) for new mail or mail counts.
  * check_new:   if true, check for new mail.
- * check_stats: if true, count total, new, and flagged mesages.
+ * check_stats: if true, count total, new, and flagged messages.
  * Returns 1 if the dir has new mail.
  */
 static int buffy_maildir_check_dir (BUFFY* mailbox, const char *dir_name, int check_new,
@@ -387,7 +387,7 @@ static int buffy_maildir_check_dir (BUFFY* mailbox, const char *dir_name, int ch
 }
 
 /* Checks new mail for a maildir mailbox.
- * check_stats: if true, also count total, new, and flagged mesages.
+ * check_stats: if true, also count total, new, and flagged messages.
  * Returns 1 if the mailbox has new mail.
  */
 static int buffy_maildir_check (BUFFY* mailbox, int check_stats)
@@ -412,7 +412,7 @@ static int buffy_maildir_check (BUFFY* mailbox, int check_stats)
 }
 
 /* Checks new mail for an mbox mailbox
- * check_stats: if true, also count total, new, and flagged mesages.
+ * check_stats: if true, also count total, new, and flagged messages.
  * Returns 1 if the mailbox has new mail.
  */
 static int buffy_mbox_check (BUFFY* mailbox, struct stat *sb, int check_stats)

diff --git a/contrib/sample.muttrc b/contrib/sample.muttrc
index 07dbe1797fef033134ab87428f8868ed2f4f9bf0..be2644666f2ad5c1c5214994bed4ab4a3569cd50 100644 (file)
--- a/contrib/sample.muttrc
+++ b/contrib/sample.muttrc
@@ -37,7 +37,7 @@ set edit_headers              # let me edit the message header when composing
 #set fast_reply                        # skip initial prompts when replying
 #set fcc_attach                        # keep attachments in copies of sent messages?
 #set force_name                        # fcc by recipient, create if mailbox doesn't exist
-#set forward_decode            # weed and MIME decode forwaded messages
+#set forward_decode            # weed and MIME decode forwarded messages
 #set forward_format="[%a: %s]" # subject to use when forwarding messages
 #set forward_quote             # quote the header and body of forward msgs
 #set index_format="%4C %Z %{%m/%d} [%2N] %-15.15F (%4c) %s"

diff --git a/crypt-mod.h b/crypt-mod.h
index 617f830d896f24a5c6190bce6431d9a4d5507799..2b8ba4b87a97ac00d55dea4c16ffc0465f943902 100644 (file)
--- a/crypt-mod.h
+++ b/crypt-mod.h
@@ -69,7 +69,7 @@ typedef void (*crypt_func_init_t) (void);
 typedef void (*crypt_func_set_sender_t) (const char *sender);
 
 /*
-   A structure to keep all crypto module fucntions together.
+   A structure to keep all crypto module functions together.
  */
 typedef struct crypt_module_functions
 {

diff --git a/crypt.c b/crypt.c
index 90cd0928d5210af2100fe5fda69eea97f6e70898..11a668b4b138ea709ddfc6c163f03db8da429d9f 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -248,7 +248,7 @@ int mutt_protect (HEADER *msg, char *keylist)
       /* free tmp_body if messages was signed AND encrypted ... */
       if (tmp_smime_pbody != msg->content && tmp_smime_pbody != tmp_pbody)
       {
-       /* detatch and don't delete msg->content,
+       /* detach and don't delete msg->content,
           which tmp_smime_pbody->parts after signing. */
        tmp_smime_pbody->parts = tmp_smime_pbody->parts->next;
        msg->content->next = NULL;

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 4f413091105e5c12c4aab9add79c05ff325e801b..67fbcbc0dd5d6b8fdc729733c3f69d9e3f00d530 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -5266,7 +5266,7 @@ coloring.
 </para>
 
 <para>
-Special attention has to be payed when using regular expressions inside
+Special attention has to be paid when using regular expressions inside
 of patterns.  Specifically, Mutt's parser for these patterns will strip
 one level of backslash (<quote>\</quote>), which is normally used for
 quoting.  If it is your intention to use a backslash in the regular

diff --git a/hcache.c b/hcache.c
index 2b73b5b252e52730d88fa78d13248e835fe1edbf..0aa05d6a3a52eac0a669ea818edfa9abe9eedcfb 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -686,7 +686,7 @@ mutt_hcache_per_folder(const char *path, const char *folder,
   return hcpath;
 }
 
-/* This function transforms a header into a char so that it is useable by
+/* This function transforms a header into a char so that it is usable by
  * db_store.
  */
 static void *

diff --git a/init.c b/init.c
index f8a54e6d93d42baa779fc57750f6ac6d7578fc0a..2e010674e67c349c6a9bb11b1ddb2556add1c142 100644 (file)
--- a/init.c
+++ b/init.c
@@ -3571,7 +3571,7 @@ void mutt_init (int skip_sys_rc, LIST *commands)
     AliasFile = safe_strdup (Muttrc);
   }
 
-  /* Process the global rc file if it exists and the user hasn't explicity
+  /* Process the global rc file if it exists and the user hasn't explicitly
      requested not to via "-n".  */
   if (!skip_sys_rc)
   {

diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 54d2156b96f29ba9ab795d1a6935d03d3a96b9b0..49078e4b3e90430f7fc91a3d68af7285ecb1d21c 100644 (file)
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -573,7 +573,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
          /* When this is a SUID binary we must not allow accessing files
             outside the dedicated directories.  */
          if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
-           /* Ingore this entry.  */
+           /* Ignore this entry.  */
            continue;
        }
 

diff --git a/intl/libgettext.h b/intl/libgettext.h
index af34744551f9f6b28015f5b2a6d514ff06ab824d..de1bf3488a9eaabb0037715cc83fbe95a8312bc7 100644 (file)
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -42,7 +42,7 @@
 
 #endif
 
-/* For automatical extraction of messages sometimes no real
+/* For automatic extraction of messages sometimes no real
    translation is needed.  Instead the string itself is the result.  */
 #define gettext_noop(Str) (Str)
 

diff --git a/mh.c b/mh.c
index 2618fe12f121f1a94c0167829485001ba359a664..4d616e0a9551e39bdbd0d487c5b362fd6ab9ac5a 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -265,7 +265,7 @@ static int mh_already_notified(BUFFY *b, int msgno)
 }
 
 /* Checks new mail for a mh mailbox.
- * check_stats: if true, also count total, new, and flagged mesages.
+ * check_stats: if true, also count total, new, and flagged messages.
  * Returns 1 if the mailbox has new mail.
  */
 int mh_buffy (BUFFY *mailbox, int check_stats)
@@ -1394,7 +1394,7 @@ static void maildir_flags (char *dest, size_t destlen, HEADER * hdr)
 
   /*
    * The maildir specification requires that all files in the cur
-   * subdirectory have the :unique string appeneded, regardless of whether
+   * subdirectory have the :unique string appended, regardless of whether
    * or not there are any flags.  If .old is set, we know that this message
    * will end up in the cur directory, so we include it in the following
    * test even though there is no associated flag.

diff --git a/mutt.h b/mutt.h
index 663beb4ff031ce01cd91663b09417afe19208253..c539f3a0887767a5ec223bfeb9c83e0cd194a024 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -665,7 +665,7 @@ typedef struct parameter
   struct parameter *next;
 } PARAMETER;
 
-/* Information that helps in determing the Content-* of an attachment */
+/* Information that helps in determining the Content-* of an attachment */
 typedef struct content
 {
   long hibin;              /* 8-bit characters */

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 436f916d0dd00af73ba671bd11810941cbe5207e..32080cf0df4a831413c3a523c63d600654c8e96b 100644 (file)
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -296,7 +296,7 @@ int mutt_ssl_starttls (CONNECTION* conn)
  * Even though only OpenSSL 0.9.5 and later will complain about the
  * lack of entropy, we try to our best and fill the pool with older
  * versions also. (That's the reason for the ugly #ifdefs and macros,
- * otherwise I could have simply #ifdef'd the whole ssl_init funcion)
+ * otherwise I could have simply #ifdef'd the whole ssl_init function)
  */
 static int ssl_init (void)
 {

diff --git a/pager.c b/pager.c
index 69341d88174ffeaa25f0fc5ada2a945175796fec..5419fa27d063734c6e569c3b95aa719f4e3eb607 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -179,7 +179,7 @@ static void
 resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, int special,
     ansi_attr *a)
 {
-  int def_color;               /* color without syntax hilight */
+  int def_color;               /* color without syntax highlight */
   int color;                   /* final color */
   static int last_color;       /* last color set */
   int search = 0, i, m;

diff --git a/postpone.c b/postpone.c
index 7c5ca5b867af96593878d8a0d253dcee83ed4f2b..082820afe7faa20d9bc3a3f16644dab766c0dec4 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -298,7 +298,7 @@ int mutt_get_postponed (CONTEXT *ctx, HEADER *hdr, HEADER **cur, char *fcc, size
     {
       if (ctx)
       {
-       /* if a mailbox is currently open, look to see if the orignal message
+       /* if a mailbox is currently open, look to see if the original message
           the user attempted to reply to is in this mailbox */
        p = skip_email_wsp(tmp->data + 18);
        if (!ctx->id_hash)

diff --git a/send.c b/send.c
index 6f7f9e6f3173a28a788f03530f17a89a68f92afc..1a28605808f8d71ed86bb7879715b09ca1ffa242 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1575,7 +1575,7 @@ ci_send_message (int flags,               /* send mode */
       }
     }
 
-    /* opportunistic encrypt relys on SMIME or PGP already being selected */
+    /* opportunistic encrypt relies on SMIME or PGP already being selected */
     if (option (OPTCRYPTOPPORTUNISTICENCRYPT))
     {
       /* If something has already enabled encryption, e.g. OPTCRYPTAUTOENCRYPT

diff --git a/sendlib.c b/sendlib.c
index ef428541ba9ecf402a2d09bffa312d21862e0600..b1e9ea547df83aca406ea91880b749bf9f552b70 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -2806,7 +2806,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post,
    * */
   mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0);
 
-  /* (postponment) if this was a reply of some sort, <msgid> contians the
+  /* (postponment) if this was a reply of some sort, <msgid> contains the
    * Message-ID: of message replied to.  Save it using a special X-Mutt-
    * header so it can be picked up if the message is recalled at a later
    * point in time.  This will allow the message to be marked as replied if

diff --git a/smime_keys.pl b/smime_keys.pl
index 7c2c94b53f506d318c588ee4f78764cbd7ec9c76..fdab3856fcaefd479d8c3137e621b8aa7aa50b0e 100755 (executable)
--- a/smime_keys.pl
+++ b/smime_keys.pl
@@ -176,7 +176,7 @@ Usage: smime_keys <operation>  [file(s) | keyID [file(s)]]
         label     : keyID required. changes/removes/adds label.
         remove    : keyID required.
         verify    : 1=keyID and optionally 2=CRL
-                    Verifies the certificate chain, and optionally wether
+                    Verifies the certificate chain, and optionally whether
                     this certificate is included in supplied CRL (PEM format).
                     Note: to verify all certificates at the same time,
                     replace keyID with "all"
@@ -615,7 +615,7 @@ sub openssl_dump_cert ($) {
   my $format = openssl_format($filename);
   my @args = ("x509", "-in", $filename, "-inform", $format);
   my $output = join("", openssl_exec(@args));
-  $? and die "openssl x509 certicate dump returned $?";
+  $? and die "openssl x509 certificate dump returned $?";
 
   return $output;
 }

diff --git a/thread.c b/thread.c
index 4c4c7b04a4fa7b532bf9a9a42246981b053af6c8..2fb56fd50a3e435e6e706989efbfa1e53ec92aba 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -408,7 +408,7 @@ static LIST *make_subject_list (THREAD *cur, time_t *dateptr)
   return (subjects);
 }
 
-/* find the best possible match for a parent mesage based upon subject.
+/* find the best possible match for a parent message based upon subject.
  * if there are multiple matches, the one which was sent the latest, but
  * before the current message, is used. 
  */