drop 27-int-size.patch: already applied

[people/ms/dma.git] / dma.8

diff --git a/dma.8 b/dma.8
index e6affb0398ecd637752ec92a033e165816a0e57b..774ee9a463b609a0f452ee7e30fae3b4303b0dd6 100644 (file)
--- a/dma.8
+++ b/dma.8
@@ -181,7 +181,7 @@ option, because
 will deliver all mails to this port, regardless of whether a smarthost is set
 or not.
 .It Ic ALIASES Xo
-(string, default=/etc/mail/aliases)
+(string, default=/etc/aliases)
 .Xc
 Path to the local aliases file.
 Just stick with the default.
@@ -201,13 +201,27 @@ file.
 .It Ic SECURETRANS Xo
 (boolean, default=commented)
 .Xc
-Comment if you want TLS/SSL secured transfer.
+Uncomment if you want TLS/SSL secured transfer.
 .It Ic STARTTLS Xo
 (boolean, default=commented)
 .Xc
-Comment if you want to use STARTTLS.
+Uncomment if you want to use STARTTLS.
 Only useful together with
 .Sq SECURETRANS .
+.It Ic OPPORTUNISTIC_TLS Xo
+(boolean, default=commented)
+.Xc
+Uncomment if you want to allow the STARTTLS negotiation to fail.
+Most useful when
+.Nm
+is used without a smarthost, delivering remote messages directly to
+the outside mail exchangers; in opportunistic TLS mode, the connection will
+be encrypted if the remote server supports STARTTLS, but an unencrypted
+delivery will still be made if the negotiation fails.
+Only useful together with
+.Sq SECURETRANS
+and
+.Sq STARTTLS .
 .It Ic CERTFILE Xo
 (string, default=empty)
 .Xc
@@ -215,7 +229,7 @@ Path to your SSL certificate file.
 .It Ic SECURE Xo
 (boolean, default=commented)
 .Xc
-Change this entry to
+Uncomment this entry and change it to
 .Sq INSECURE
 to use plain text SMTP login over an insecure connection.
 You have to rename this variable manually to prevent that you send your
@@ -223,7 +237,7 @@ password accidentally over an insecure connection.
 .It Ic DEFER Xo
 (boolean, default=commented)
 .Xc
-Comment if you want that
+Uncomment if you want that
 .Nm
 defers your mail.
 You have to flush your mail queue manually with the
@@ -238,17 +252,16 @@ message, not just the headers.
 .It Ic MAILNAME Xo
 (string, default=empty)
 .Xc
-The name to be used when introducing this host, if different from
-the result of
-.Xr hostname 1 .
-If specified, this option overrides
-.Sq MAILNAMEFILE .
-.It Ic MAILNAMEFILE Xo
-(string, default=empty)
-.Xc
-The name of the file to read the
+The internet hostname
+.Nm
+uses to identify the host.
+If not set or empty, the result of
+.Xr gethostname 2
+is used.
+If
 .Sq MAILNAME
-from.
+is an absolute path to a file, the first line of this file will be used
+as the hostname.
 .El
 .Ss Environment variables
 The behavior of