Clarify the documentation for $use_envelope_from (closes #2936).

Thanks to Vincent Lefevre for the suggestions.

diff --git a/ChangeLog b/ChangeLog
index 6daccb34cdb0ef23b4fd2c22574974d2d0b63d99..5b095089b10e6f941dd7a4579c3756b7eda7cad5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2007-07-16 09:44 -0700  Brendan Cully  <brendan@kublai.com>  (1d6b9fb4a927)
+2007-07-25 11:16 -0700  Vincent Lefevre  <vincent@vinc17.org>  (6bc60516fffa)
+
+       * po/fr.po: Updated French translation.
+
+2007-07-16 10:46 -0700  Brendan Cully  <brendan@kublai.com>  (bd75134a6b65)
+
+       * enter.c: Make is_shell_char static. Closes #2907.
 
        * init.c: Check that spam expression has enough matches for its
        template. Closes #2927.

diff --git a/init.h b/init.h
index 73260a153b850242c47952b97d8f1330d56481d9..85890b9a227f5a4c78ddcb9e2e28dfc253e09a63 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2911,13 +2911,15 @@ struct option_t MuttVars[] = {
   { "use_envelope_from",       DT_BOOL, R_NONE, OPTENVFROM, 0 },
   /*
    ** .pp
-   ** When \fIset\fP, mutt will use ``$$envelope_from_address'' as the
-   ** \fIenvelope\fP sender if that is set, otherwise it will attempt to
-   ** derive it from the "From:" header.  Note that this information is passed 
-   ** to sendmail command using the "-f" command line switch, so don't set this
-   ** option if you are using that switch in $$sendmail yourself,
-   ** or if the sendmail on your machine doesn't support that command
-   ** line switch.
+   ** When \fIset\fP, mutt will set the \fIenvelope\fP sender of the message.
+   ** If ``$$envelope_from_address'' is set, it will be used as the sender
+   ** address. If not, mutt will attempt to derive the sender from the
+   ** "From:" header.
+   ** .pp
+   ** Note that this information is passed to sendmail command using the
+   ** "-f" command line switch. Therefore setting this option is not useful
+   ** if the ``$$sendmail'' variable already contains "-f" or if the
+   ** executable pointed to by $$sendmail doesn't support the "-f" switch.
    */
   { "envelope_from",   DT_SYN,  R_NONE, UL "use_envelope_from", 0 },
   /*