Document that %f in $index_format is either Return-Path: or From:

depending on which parses correctly. Also note that alternates' regex
should be as precise as possible to avoid mismatches. Closes #1894.

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index fb682b1f1ab754842639f37f6e4e76c8385b0d98..7129a7d206a7dd392f2af365737d1cb878ae4a7c 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -2377,6 +2377,26 @@ expressions, each of which can identify an address under which you
 receive e-mail.
 </para>
 
+<para>
+As addresses are matched using regular expressions and not exact strict
+comparisons, you should make sure you specify your addresses as precise
+as possible to avoid mismatches. For example, if you specify:
+</para>
+
+<screen>
+alternates user@example
+</screen>
+
+<para>
+mutt will consider ``<literal>some-user@example</literal>'' as
+being your address, too which may not be desired. As a solution, in such
+cases addresses should be specified as:
+</para>
+
+<screen>
+alternates '^user@example$'
+</screen>
+
 <para>
 The <literal>-group</literal> flag causes all of the subsequent regular expressions
 to be added to the named group.

diff --git a/init.h b/init.h
index 527a3660844403e8763b5fe420d07f4ddcf71dd0..62c13b62410e3d6e6648ca89c6bcfd54d8f3fe5e 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1021,7 +1021,7 @@ struct option_t MuttVars[] = {
   **            ``date_format'' converted to the local time zone
   ** .dt %e .dd current message number in thread
   ** .dt %E .dd number of messages in current thread
-  ** .dt %f .dd entire From: line (address + real name)
+  ** .dt %f .dd sender (address + real name), either From: or Return-Path:
   ** .dt %F .dd author name, or recipient name if the message is from you
   ** .dt %H .dd spam attribute(s) of this message
   ** .dt %i .dd message-id of the current message