Revert "debian/control: s/exim4/default-mta (Closes: 533442)"

[software/mutt-debian.git] / debian / patches / debian-specific / document_debian_defaults

diff --git a/debian/patches/debian-specific/document_debian_defaults b/debian/patches/debian-specific/document_debian_defaults
index ea8310a8a06ad64100828971a426e60b86b6df36..8d97e29becdbcd65efcff97acf394fca873bf79d 100644 (file)
--- a/debian/patches/debian-specific/document_debian_defaults
+++ b/debian/patches/debian-specific/document_debian_defaults
@@ -1,26 +1,29 @@
+Some customization of the option which are straying from the default
+only on Debian systems
+
 --- a/init.h
 +++ b/init.h
-@@ -295,6 +295,9 @@ struct option_t MuttVars[] = {
+@@ -312,6 +312,9 @@
    ** .pp
-   ** When this variable is set, mutt will include Delivered-To headers when
-   ** bouncing messages.  Postfix users may wish to unset this variable.
+   ** When this variable is \fIset\fP, mutt will include Delivered-To headers when
+   ** bouncing messages.  Postfix users may wish to \fIunset\fP this variable.
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, this option is unset by default in
 +  ** /etc/Muttrc.
    */
    { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
    /*
-@@ -825,6 +828,9 @@ struct option_t MuttVars[] = {
+@@ -1032,6 +1035,9 @@
    ** one is not used.
    ** .pp
-   ** Also see ``$$use_domain'' and ``$$hidden_host''.
+   ** Also see $$use_domain and $$hidden_host.
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, the default for this variable is obtained
 +  ** from /etc/mailname when Mutt starts.
    */
    { "ignore_linear_white_space",    DT_BOOL, R_NONE, OPTIGNORELWS, 0 },
    /*
-@@ -1338,6 +1344,9 @@ struct option_t MuttVars[] = {
+@@ -1564,6 +1570,9 @@
    ** system.  It is used with various sets of parameters to gather the
    ** list of known remailers, and to finally send a message through the
    ** mixmaster chain.
@@ -29,8 +32,8 @@
 +  ** ``mixmaster-filter'' in /etc/Muttrc.
    */
  #endif
- 
-@@ -1887,6 +1896,10 @@ struct option_t MuttVars[] = {
+   { "move",           DT_QUAD, R_NONE, OPT_MOVE, M_NO },
+@@ -2580,6 +2589,10 @@
    ** This variable contains the name of either a directory, or a file which
    ** contains trusted certificates for use with OpenSSL.
    ** (S/MIME only)
@@ -41,33 +44,33 @@
    */
    { "smime_certificates",     DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
    /*
-@@ -2093,6 +2106,9 @@ struct option_t MuttVars[] = {
-   ** certificates are also automatically accepted.
-   ** .pp
-   ** Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
+@@ -2786,6 +2799,9 @@
+   ** .ts
+   ** set smtp_authenticators="digest-md5:cram-md5"
+   ** .te
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, this variable defaults to the example
 +  ** mentioned. This file is managed by the ``ca-certificates'' package.
    */
- # endif /* USE_SSL_GNUTLS */
- #endif /* defined(USE_SSL) */
-@@ -2683,6 +2699,9 @@ struct option_t MuttVars[] = {
+ # endif /* USE_SASL */
+   { "smtp_pass",      DT_STR,  R_NONE, UL &SmtpPass, UL 0 },
+@@ -2833,6 +2849,9 @@
    ** .pp
-   ** You may optionally use the reverse- prefix to specify reverse sorting
-   ** order (example: set sort=reverse-date-sent).
+   ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
+   ** order (example: ``\fCset sort=reverse-date-sent\fP'').
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, this option is set by default to
 +  ** ``threads'' in /etc/Muttrc.
    */
    { "sort_alias",     DT_SORT|DT_SORT_ALIAS,  R_NONE, UL &SortAlias, SORT_ALIAS },
    /*
-@@ -3100,6 +3119,9 @@ struct option_t MuttVars[] = {
-   ** is set to deliver directly via SMTP (see ``$$smtp_url''), this
-   ** option does nothing: mutt will never write out the BCC header
+@@ -3358,6 +3377,9 @@
+   ** is set to deliver directly via SMTP (see $$smtp_url), this
+   ** option does nothing: mutt will never write out the ``Bcc:'' header
    ** in this case.
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by
 +  ** default. The above warning applies to exim3 users, see /etc/Muttrc.
    */
-   {"xterm_icon",       DT_STR,   R_BOTH, UL &XtermIcon,  UL "M%?n?AIL&ail?"},
+   { "write_inc",      DT_NUM,  R_NONE, UL &WriteInc, 10 },
    /*