Merge commit 'upstream/1.5.21'

[software/mutt-debian.git] / debian / patches / upstream / 547739-manual-typos.patch

diff --git a/debian/patches/upstream/547739-manual-typos.patch b/debian/patches/upstream/547739-manual-typos.patch
index 65a48493a4f79d2e39a3eba2abf8963ba6525606..0eff7c2d093ba87307765fe18b7bb19456693d10 100644 (file)
--- a/debian/patches/upstream/547739-manual-typos.patch
+++ b/debian/patches/upstream/547739-manual-typos.patch
@@ -114,3 +114,14 @@ Minor typos in manual.txt, see upstream http://bugs.mutt.org/3379
            return (0);
          }
        }
+--- a/init.h
++++ b/init.h
+@@ -1413,7 +1413,7 @@
+   /*
+   ** .pp
+   ** 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
+   ** \fC-m\fP command-line option.
+   */
+   { "menu_context",   DT_NUM,  R_NONE, UL &MenuContext, 0 },