** English).
*/
#ifdef DEBUG
- {"debug_level", DT_NUM, R_NONE, UL &DebugLevel, "0" },
+ {"debug_level", DT_NUM, R_NONE, UL &DebugLevel, "1" },
/*
** .pp
** Availability: debug
** delivery and transport agents tend to do with messages.
**
** .pp
- ** \fBNote:\fP as mutt-ng currently violates RfC3676 defining
+ ** \fBNote:\fP as Mutt-ng currently violates RfC3676 defining
** \fTformat=flowed\fP, it's <em/strongly/ advised to \fIset\fP
** this option although discouraged by the standard. Alternatively,
** you must take care of space-stuffing <tt/From / lines (with a trailing
** space) yourself.
*/
- {"envelope_from", DT_BOOL, R_NONE, OPTENVFROM, "no" },
+ {"envelope_from", DT_SYN, R_NONE, UL "use_envelope_from", 0 },
+ {"use_envelope_from", DT_BOOL, R_NONE, OPTENVFROM, "no" },
/*
** .pp
- ** When \fIset\fP, Mutt-ng will try to derive the message's \fIenvelope\fP
- ** sender from the ``\fTFrom:\fP'' header field. Note that this information is passed
- ** to the sendmail command using the ``\fT-f\fP" 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-ng 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.
+ **
+ ** .pp
+ ** \fBNote:\fP This information is passed
+ ** to sendmail command using the "-f" command line switch and
+ ** passed to the SMTP server for libESMTP (if support is compiled in).
*/
+ {"envelope_from_address", DT_ADDR, R_NONE, UL &EnvFrom, "" },
+ /*
+ ** Manually sets the \fIenvelope\fP sender for outgoing messages.
+ ** This value is ignored if ``$$use_envelope_from'' is unset.
+ */
{"escape", DT_STR, R_NONE, UL &EscChar, "~"},
/*
** .pp
** .pp
** E.g. you can use
** \fTsend-hook Mutt-ng-devel@lists.berlios.de 'my_hdr From: Foo Bar <foo@bar.fb>'\fP
- ** when replying to the mutt-ng developer's mailing list and Mutt-ng takes this email address.
+ ** when replying to the Mutt-ng developer's mailing list and Mutt-ng takes this email address.
** .pp
** Defaults to the contents of the environment variable \fT$$$EMAIL\fP.
*/
** .pp
** When \fIset\fP, Mutt-ng will not show the presence of messages that are hidden
** by limiting, at the top of threads in the thread tree. Note that when
- ** $$hide_missing is set, this option will have no effect.
+ ** $$hide_missing is \fIset\fP, this option will have no effect.
*/
{"hide_top_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPMISSING, "yes" },
/*
** \fIThis is a read-only system property and specifies the
** directory containing the muttng documentation.\fP
*/
-#if USE_HCACHE
+#ifdef USE_HCACHE
#if HAVE_QDBM
{"muttng_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" },
#elif HAVE_GDBM
** .pp
** This variable controls how message counts are printed when the sidebar
** is enabled. If this variable is \fIempty\fP (\fIand only if\fP), no numbers
- ** will be printed \fIand\fP mutt-ng won't frequently count mail (which
+ ** will be printed \fIand\fP Mutt-ng won't frequently count mail (which
** may be a great speedup esp. with mbox-style mailboxes.)
** .pp
** The following \fTprintf(3)\fP-like sequences are supported all of which
** was connection lost.
*/
#endif
+#ifdef USE_SOCKET
+ { "net_inc", DT_NUM, R_NONE, UL &NetInc, "10" },
+ /*
+ ** .pp
+ ** Operations that expect to transfer a large amount of data over the
+ ** network will update their progress every \fInet_inc\fP kilobytes.
+ ** If set to 0, no progress messages will be displayed.
+ ** .pp
+ ** See also ``$$read_inc'' and ``$$write_inc''.
+ */
+#endif
{"pager", DT_PATH, R_NONE, UL &Pager, "builtin"},
/*
** .pp
** presents a security risk since the superuser of your machine may read it
** regardless of the file's permissions.
*/
- {"smtp_envelope", DT_STR, R_NONE, UL &SmtpEnvFrom, "" },
- /*
- ** .pp
- ** Availability: SMTP
- **
- ** .pp
- ** If this variable is non-empty, it'll be used as the envelope sender. If it's empty
- ** (the default), the value of the regular \fTFrom:\fP header will be used.
- **
- ** .pp
- ** This may be necessary as some providers don't allow for arbitrary values
- ** as the envelope sender but only a particular one which may not be the same as the
- ** user's desired \fTFrom:\fP header.
- */
+ {"smtp_envelope", DT_SYN, R_NONE, UL "envelope_from_address", 0 },
+
{"smtp_host", DT_STR, R_NONE, UL &SmtpHost, "" },
/*
** .pp
{"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, "no" },
/*
** .pp
- ** If this variable is \fIset\fP, mutt-ng will require that all connections
+ ** If this variable is \fIset\fP, Mutt-ng will require that all connections
** to remote servers be encrypted. Furthermore it will attempt to
** negotiate TLS even if the server does not advertise the capability,
** since it would otherwise have to abort the connection anyway. This
** if ``$$edit_headers'' is unset.
**
** .pp
- ** If this variable is \fIset\fP, mutt-ng is strict and allows anything to be
+ ** If this variable is \fIset\fP, Mutt-ng is strict and allows anything to be
** changed. If it's \fIunset\fP, all headers given will be prefixed with
** ``X-Mailto-'' and the message including headers will be shown in the editor
** regardless of what ``$$edit_headers'' is set to.
** default, messages with the same subject are grouped together in
** ``pseudo threads.'' This may not always be desirable, such as in a
** personal mailbox where you might have several unrelated messages with
- ** the subject ``hi'' which will get grouped together.
+ ** the subject ``hi'' which will get grouped together. See also
+ ** ``$$sort_re'' for a less drastic way of controlling this
+ ** behaviour.
*/
{"strip_was", DT_BOOL, R_NONE, OPTSTRIPWAS, "no" },
/**
** .pp
- ** When \fIset\fP, mutt-ng will remove the trailing part of the ``\fTSubject:\fP''
+ ** When \fIset\fP, Mutt-ng will remove the trailing part of the ``\fTSubject:\fP''
** line which matches $$strip_was_regex when replying. This is useful to
** properly react on subject changes and reduce ``subject noise.'' (esp. in Usenet)
**/
{"strip_was_regex", DT_RX, R_NONE, UL &StripWasRegexp, "\\([Ww][Aa][RrSs]: .*\\)[ ]*$"},
/**
** .pp
- ** When non-empty and $$strip_was is \fIset\fP, mutt-ng will remove this
+ ** When non-empty and $$strip_was is \fIset\fP, Mutt-ng will remove this
** trailing part of the ``Subject'' line when replying if it won't be empty
** afterwards.
**/
/*
** .pp
** If $$xterm_set_titles is \fIset\fP, this string will be used to
- ** set the title when leaving mutt-ng. For terminal-based programs,
- ** there's no easy and portable way to read the current title so mutt-ng
+ ** set the title when leaving Mutt-ng. For terminal-based programs,
+ ** there's no easy and portable way to read the current title so Mutt-ng
** cannot read it upon startup and restore it when exiting.
**
** .pp
#ifdef USE_SASL
"sasl",
#endif
-#ifdef USE_SASL2
- "sasl2",
-#endif
#ifdef USE_LIBESMTP
"libesmtp",
#endif