From 31d2a413a81bd13d01c8e6beef19b6c7ae0194e8 Mon Sep 17 00:00:00 2001
From: Rocco Rutte <pdmef@gmx.net>
Date: Sun, 4 Nov 2007 17:01:12 +0100
Subject: [PATCH] Improve DSN docs (require sendmail-compatible MTA, add SMTP
 notes). Closes #2979

---
 doc/manual.xml.head | 24 +++++++++++++++++++-----
 init.h              | 18 ++++++++++++------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 9061a1b0..d6c422a6 100644
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -4615,17 +4615,31 @@ current message into a whole different thread.
 <para>
 RFC1894 defines a set of MIME content types for relaying information
 about the status of electronic mail messages.  These can be thought of as
-``return receipts.'' Berkeley sendmail 8.8.x currently has some command
-line options in which the mail client can make requests as to what type
-of status messages should be returned.
+``return receipts.''
 </para>
 
 <para>
-To support this, there are two variables. <link linkend="dsn-notify">&dollar;dsn&lowbar;notify</link> is used to request receipts for
+To support DSN, there are two variables. <link linkend="dsn-notify">&dollar;dsn&lowbar;notify</link> is used to request receipts for
 different results (such as failed message, message delivered, etc.).
 <link linkend="dsn-return">&dollar;dsn&lowbar;return</link> requests how much
 of your message should be returned with the receipt (headers or full
-message).  Refer to the man page on sendmail for more details on DSN.
+message).
+</para>
+
+<para>
+When using <link linkend="sendmail">&dollar;sendmail</link> for mail
+delivery, you need to use either Berkeley sendmail 8.8.x (or greater) a MTA
+supporting DSN command line options compatible to Sendmail: The -N and -R
+options can be used by the mail client to make requests as to what type of
+status messages should be returned. Please consider your MTA documentation
+whether DSN is supported.
+</para>
+
+<para>
+For SMTP delivery using <link
+  linkend="smtp-url">&dollar;smtp&lowbar;url</link>, it depends on the
+capabilities announced by the server whether mutt will attempt to
+request DSN or not.
 </para>
 
 </sect1>
diff --git a/init.h b/init.h
index d2335519..1ae3d817 100644
--- a/init.h
+++ b/init.h
@@ -497,9 +497,6 @@ struct option_t MuttVars[] = {
   { "dsn_notify",	DT_STR,	 R_NONE, UL &DsnNotify, UL "" },
   /*
   ** .pp
-  ** \fBNote:\fP you should not enable this unless you are using Sendmail
-  ** 8.8.x or greater.
-  ** .pp
   ** This variable sets the request for when notification is returned.  The
   ** string consists of a comma separated list (no spaces!) of one or more
   ** of the following: \fInever\fP, to never request notification,
@@ -508,18 +505,27 @@ struct option_t MuttVars[] = {
   ** notified of successful transmission.
   ** .pp
   ** Example: set dsn_notify="failure,delay"
+  ** .pp
+  ** \fBNote:\fP when using $$sendmail for delivery, you should not enable
+  ** this unless you are either using Sendmail 8.8.x or greater or a MTA
+  ** providing a sendmail(1)-compatible interface supporting the -N option
+  ** for DSN. For SMTP delivery, it depends on the server whether DSN is
+  ** supported or not.
   */
   { "dsn_return",	DT_STR,	 R_NONE, UL &DsnReturn, UL "" },
   /*
   ** .pp
-  ** \fBNote:\fP you should not enable this unless you are using Sendmail
-  ** 8.8.x or greater.
-  ** .pp
   ** This variable controls how much of your message is returned in DSN
   ** messages.  It may be set to either \fIhdrs\fP to return just the
   ** message header, or \fIfull\fP to return the full message.
   ** .pp
   ** Example: set dsn_return=hdrs
+  ** .pp
+  ** \fBNote:\fP when using $$sendmail for delivery, you should not enable
+  ** this unless you are either using Sendmail 8.8.x or greater or a MTA
+  ** providing a sendmail(1)-compatible interface supporting the -R option
+  ** for DSN. For SMTP delivery, it depends on the server whether DSN is
+  ** supported or not.
   */
   { "duplicate_threads",	DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, 1 },
   /*
-- 
2.50.0