Document difference between index and pager search. Closes #2886.

diff --git a/ChangeLog b/ChangeLog
index fd648f240ad36b16cea26edb75ff1ef17e7f4718..16cd60a2aaae800f15cea39fa9b90185f99e2273 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2008-06-25 22:43 -0700  Brendan Cully  <brendan@kublai.com>  (e2780a423d96)
+
+       * commands.c, copy.c, crypt-gpgme.c, handler.c, mbox.c, pgp.c: Make
+       mutt_copy_message distinguish between fatal and non-fatal errors.
+       Non-fatal errors should prevent moving messages, since they indicate
+       data loss. But mutt should still attempt to display them, since
+       being able to see some attachments is better than nothing. Also stop
+       printing out non-PGP material in application/pgp attachments. Closes
+       #2545, #2912.
+
+2008-06-24 23:12 -0700  Brendan Cully  <brendan@kublai.com>  (f5fe657f0633)
+
+       * handler.c: Make multipart decoding a little more
+       forgiving. First, ignore bad content-transfer-encoding in
+       multipart sections. Second, if an attachment fails to decode,
+       print a warning and continue instead of giving up on the entire
+       message.
+
 1970-01-01 00:00 +0000  Brendan Cully  <brendan@kublai.com>  (a2e8f6fab8d3)
 
        * smtp.c: Test that envelope from or from is set before attempting

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index d28fba292fa7e7828fc8a603edaf6aeac21f2cb0..44b5d8c46f8b8231a3bbfd4b3bc490c9cb0837de 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -604,9 +604,9 @@ featureful.
 <row><entry>S</entry><entry>skip beyond quoted text</entry></row>
 <row><entry>T</entry><entry>toggle display of quoted text</entry></row>
 <row><entry>?</entry><entry>show keybindings</entry></row>
-<row><entry>/</entry><entry>search for a regular expression (pattern)</entry></row>
-<row><entry>ESC /</entry><entry>search backwards for a regular expression</entry></row>
-<row><entry>&bsol;</entry><entry>toggle search pattern coloring</entry></row>
+<row><entry>/</entry><entry>regular expression search</entry></row>
+<row><entry>ESC /</entry><entry>backward regular expression search</entry></row>
+<row><entry>&bsol;</entry><entry>toggle highlighting of search matches</entry></row>
 <row><entry>&circ;</entry><entry>jump to the top of the message</entry></row>
 </tbody>
 </tgroup>
@@ -686,6 +686,15 @@ display, for example by changing the color associated with color2 for
 your xterm, then that color will be used instead of green.
 </para>
 
+<para>
+Note that the search commands in the pager take regular expressions,
+which are not quite the same as the more
+complex <link linkend="patterns">patterns</link> used by the search
+command in the index. This is because the pager only performs simple
+text search, whereas the index provides boolean filtering on several
+aspects of messages.
+</para>
+
 </sect2>
 
 <sect2 id="threads">