more typo fixing

diff --git a/debian/changelog b/debian/changelog
index e89bb85cda338dc873fbd33d22f9ee344badada2..42fd895f98488e3f805111db1f4fb05dc4c696d7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,7 +32,7 @@ mutt (1.5.20-7) unstable; urgency=low
     + adding ${misc:Depends} to make lintian happy
   * debian/rules: adding a commented rule to enable tokyocabinet if we want
 
- -- Antonio Radici <antonio@dyne.org>  Fri, 29 Jan 2010 23:32:55 +0000
+ -- Antonio Radici <antonio@dyne.org>  Mon, 08 Feb 2010 00:27:55 +0000
 
 mutt (1.5.20-6) unstable; urgency=low
 

diff --git a/debian/patches/upstream/547739-manual-typos.patch b/debian/patches/upstream/547739-manual-typos.patch
index 024b5005616852de57cd1f6ac6d28829e0113b9f..65a48493a4f79d2e39a3eba2abf8963ba6525606 100644 (file)
--- a/debian/patches/upstream/547739-manual-typos.patch
+++ b/debian/patches/upstream/547739-manual-typos.patch
@@ -70,3 +70,47 @@ Minor typos in manual.txt, see upstream http://bugs.mutt.org/3379
  </para>
  
  <para>
+--- a/doc/Muttrc
++++ b/doc/Muttrc
+@@ -1991,7 +1991,7 @@
+ # 
+ # 
+ # The default mailbox type used when creating new folders. May be any of
+-# ``mbox'', ``MMDF'', ``MH'' and ``Maildir''. This is overriden by the
++# ``mbox'', ``MMDF'', ``MH'' and ``Maildir''. This is overridden by the
+ # -m command-line option.
+ # 
+ # 
+--- a/doc/manual.txt
++++ b/doc/manual.txt
+@@ -7405,7 +7405,7 @@
+ Default: mbox
+ 
+ The default mailbox type used when creating new folders. May be any of ?mbox?,
+-?MMDF?, ?MH? and ?Maildir?. This is overriden by the -m command-line option.
++?MMDF?, ?MH? and ?Maildir?. This is overridden by the -m command-line option.
+ 
+ 3.128. menu_context
+ 
+--- a/edit.c
++++ b/edit.c
+@@ -39,7 +39,7 @@
+  * declared "static" (sigh)
+  */
+ static char* EditorHelp1 = N_("\
+-~~            insert a line begining with a single ~\n\
++~~            insert a line beginning with a single ~\n\
+ ~b users      add users to the Bcc: field\n\
+ ~c users      add users to the Cc: field\n\
+ ~f messages   include messages\n\
+--- a/recvattach.c
++++ b/recvattach.c
+@@ -698,7 +698,7 @@
+       {
+         if (!mutt_can_decode (top))
+         {
+-          mutt_error (_("I dont know how to print %s attachments!"), type);
++          mutt_error (_("I don't know how to print %s attachments!"), type);
+           return (0);
+         }
+       }