Merge commit 'upstream/1.5.20'

[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 372695316ca20d4a1a9594b767847e6170c7add5..523c9284effd6b9fdfd4715cd3f05947e0d0509d 100644 (file)
--- a/debian/patches/debian-specific/document_debian_defaults
+++ b/debian/patches/debian-specific/document_debian_defaults
@@ -1,28 +1,29 @@
-Index: debian-mutt/init.h
-===================================================================
---- debian-mutt.orig/init.h    2007-03-21 21:58:13.000000000 +0100
-+++ debian-mutt/init.h 2007-03-21 22:10:38.000000000 +0100
-@@ -289,6 +289,9 @@ struct option_t MuttVars[] = {
+Some customization of the option which are straying from the default
+only on Debian systems
+
+--- a/init.h
++++ b/init.h
+@@ -304,6 +304,9 @@ struct option_t MuttVars[] = {
    ** .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 },
    /*
-@@ -798,6 +801,9 @@ struct option_t MuttVars[] = {
-   ** Specifies the hostname to use after the ``@'' in local e-mail
-   ** addresses.  This overrides the compile time definition obtained from
-   ** /etc/resolv.conf.
+@@ -866,6 +869,9 @@ struct option_t MuttVars[] = {
+   ** one is not used.
+   ** .pp
+   ** 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 },
    /*
-@@ -1301,6 +1307,9 @@ struct option_t MuttVars[] = {
+@@ -1399,6 +1405,9 @@ struct option_t MuttVars[] = {
    ** 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.
@@ -31,20 +32,41 @@ Index: debian-mutt/init.h
 +  ** ``mixmaster-filter'' in /etc/Muttrc.
    */
  #endif
- 
-@@ -2626,6 +2635,9 @@ struct option_t MuttVars[] = {
+   { "move",           DT_QUAD, R_NONE, OPT_MOVE, M_NO },
+@@ -1999,6 +2008,10 @@ struct option_t MuttVars[] = {
+   ** This variable contains the name of either a directory, or a file which
+   ** contains trusted certificates for use with OpenSSL.
+   ** (S/MIME only)
++  ** .pp
++  ** \fBNote:\fP On Debian systems, this defaults to the first existing file in
++  ** the following list: ~/.smime/ca-certificates.crt ~/.smime/ca-bundle.crt
++  ** /etc/ssl/certs/ca-certificates.crt.
+   */
+   { "smime_certificates",     DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
+   /*
+@@ -2237,6 +2250,9 @@ struct option_t MuttVars[] = {
+   ** .ts
+   ** set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
+   ** .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) */
+@@ -2873,6 +2889,9 @@ struct option_t MuttVars[] = {
    ** .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 },
    /*
-@@ -3022,6 +3034,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
+@@ -3306,6 +3325,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
    ** in this case.
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by