upstream/547739-manual-typos.patch: typos in manual.txt (Closes: 547739)

diff --git a/debian/changelog b/debian/changelog
index ed84fa54196a6e20f349e54c34c095e8a8325b67..fd58a545e80eda014b4af5b2794e47f041b38949 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ mutt (1.5.20-7) unstable; urgency=low
       attachments (Closes: 228671)
     + upstream/383769-score-match.patch: match full name with ~F, same as
       mutt-ng (Closes: 383769)
+    + upstream/547739-manual-typos.patch: typos in manual.txt (Closes: 547739)
     + debian-specific/Muttrc: set time_inc to be 250ms (Closes: 537746)
   * debian/control: 
     + bumping Standards-Version to 3.8.4, nothing to be done

diff --git a/debian/patches/series b/debian/patches/series
index 933b8692d11c6ccc6c2200a7f08f1b711ce23b7f..764f675e5c3d54dfe1c4aee7c2b5e753b89cb3e0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,8 +56,9 @@ upstream/568295-references.patch
 upstream/547980-smime_keys-chaining.patch
 upstream/528233-readonly-open.patch
 upstream/228671-pipe-mime.patch
-
 upstream/383769-score-match.patch
+upstream/547739-manual-typos.patch
+
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch

diff --git a/debian/patches/upstream/547739-manual-typos.patch b/debian/patches/upstream/547739-manual-typos.patch
new file mode 100644 (file)
index 0000000..024b500
--- /dev/null
+++ b/debian/patches/upstream/547739-manual-typos.patch
@@ -0,0 +1,72 @@
+Minor typos in manual.txt, see upstream http://bugs.mutt.org/3379
+
+--- a/doc/manual.xml.head
++++ b/doc/manual.xml.head
+@@ -1511,7 +1511,7 @@
+ 
+ <para>
+ After editing the initial message text and before entering
+-the compose menu, Mutt properly space-stuffes the message.
++the compose menu, Mutt properly space-stuffs the message.
+ <emphasis>Space-stuffing</emphasis> is required by RfC3676 defining
+ <literal>format=flowed</literal> and means to prepend a space to:
+ </para>
+@@ -2507,7 +2507,7 @@
+ 
+ <itemizedlist>
+ <listitem><para>attachment</para></listitem>
+-<listitem><para>bold (hiliting bold patterns in the body of messages)</para></listitem>
++<listitem><para>bold (highlighting bold patterns in the body of messages)</para></listitem>
+ <listitem><para>error (error messages printed by Mutt)</para></listitem>
+ <listitem><para>hdrdefault (default color of the message header in the pager)</para></listitem>
+ <listitem><para>indicator (arrow or bar used to indicate the current item in a menu)</para></listitem>
+@@ -2516,11 +2516,11 @@
+ <listitem><para>normal</para></listitem>
+ <listitem><para>quoted (text matching <link linkend="quote-regexp">&dollar;quote&lowbar;regexp</link> in the body of a message)</para></listitem>
+ <listitem><para>quoted1, quoted2, ..., quoted<emphasis>N</emphasis> (higher levels of quoting)</para></listitem>
+-<listitem><para>search (hiliting of words in the pager)</para></listitem>
++<listitem><para>search (highlighting of words in the pager)</para></listitem>
+ <listitem><para>signature</para></listitem><listitem><para>status (mode lines used to display info about the mailbox or message)</para></listitem>
+ <listitem><para>tilde (the <quote>&tilde;</quote> used to pad blank lines in the pager)</para></listitem>
+ <listitem><para>tree (thread tree drawn in the message index and attachment menu)</para></listitem>
+-<listitem><para>underline (hiliting underlined patterns in the body of messages)</para></listitem>
++<listitem><para>underline (highlighting underlined patterns in the body of messages)</para></listitem>
+ </itemizedlist>
+ 
+ <para>
+@@ -3095,7 +3095,7 @@
+ the command is executed, so if these names contain <link linkend="shortcuts">shortcut characters</link> (such as <quote>=</quote> and <quote>!</quote>), any variable
+ definition that affects these characters (like <link linkend="folder">&dollar;folder</link> and <link linkend="spoolfile">&dollar;spoolfile</link>)
+ should be set before the <command>mailboxes</command> command. If
+-none of these shorcuts are used, a local path should be absolute as
++none of these shortcuts are used, a local path should be absolute as
+ otherwise Mutt tries to find it relative to the directory
+ from where Mutt was started which may not always be desired.
+ </para>
+@@ -5841,7 +5841,7 @@
+ If the <emphasis>command</emphasis> is empty, this operation is
+ disabled for this file type. In this case, the folder will be open and
+ closed again (using <link linkend="open-hook">open-hook</link> and
+-<link linkend="close-hook">close-hook</link>respectively) each time you
++<link linkend="close-hook">close-hook</link> respectively) each time you
+ will add to it.
+ </para>
+ </sect2>
+@@ -6811,7 +6811,7 @@
+ ## line is unnecessary if you already have "attach-allow */.*", of
+ ## course.  These are off by default!  The MIME elements contained
+ ## within a message/* or multipart/* are still examined, even if the
+-## containers themseves don't qualify.
++## containers themselves don't qualify.
+ ##
+ #attachments  +A message/.* multipart/.*
+ #attachments  +I message/.* multipart/.*
+@@ -7465,7 +7465,7 @@
+ the current chain position, use <literal>&lt;select-entry&gt;</literal> or <literal>&lt;append&gt;</literal>.
+ You can also delete entries from the chain, using the corresponding
+ function.  Finally, to abandon your changes, leave the menu, or
+-<literal>&lt;accept&gt;</literal> them pressing (by default) the <literal>Return</literal> key.
++<literal>&lt;accept&gt;</literal> them, pressing (by default) the <literal>Return</literal> key.
+ </para>
+ 
+ <para>