release dma 0.8

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

diff --git a/dma.8 b/dma.8
index 18b2c8c16db10f38278a0e13603634bf42f0bdac..b121cd065bb07fd4671a145122a7140c0d2d7010 100644 (file)
--- a/dma.8
+++ b/dma.8
@@ -29,8 +29,6 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"

-.\" $DragonFly: src/libexec/dma/dma.8,v 1.10 2008/09/06 14:17:56 swildner Exp $
-.\"

 .Dd April 22, 2010
 .Dt DMA 8
 .Os
 .Dd April 22, 2010
 .Dt DMA 8
 .Os


@@ -130,7 +128,7 @@ is specified or not.
 .El
 .Sh CONFIGURATION
 .Nm
 .El
 .Sh CONFIGURATION
 .Nm

-can be configured with three config files:
+can be configured with two config files:

 .Pp
 .Bl -bullet -compact
 .It
 .Pp
 .Bl -bullet -compact
 .It


@@ -139,7 +137,7 @@ auth.conf
 dma.conf
 .El
 .Pp
 dma.conf
 .El
 .Pp

-These three files are stored per default in
+These two files are stored per default in

 .Pa /etc/dma .
 .Sh FILE FORMAT
 Every file contains parameters of the form
 .Pa /etc/dma .
 .Sh FILE FORMAT
 Every file contains parameters of the form


@@ -185,6 +183,22 @@ or not.
 .Xc
 Path to the local aliases file.
 Just stick with the default.
 .Xc
 Path to the local aliases file.
 Just stick with the default.

+The aliases file is of the format
+.Dl nam: dest1 dest2 ...
+In this case, mails to
+.Li nam
+will instead be delivered to
+.Li dest1
+and
+.Li dest2 ,
+which in turn could be entries in
+.Pa /etc/aliases .
+The special name
+.Ql *
+can be used to create a catch-all alias, which gets used if no other
+matching alias is found.
+Use the catch-all alias only if you don't want any local mail to be
+delivered.

 .It Ic SPOOLDIR Xo
 (string, default=/var/spool/dma)
 .Xc
 .It Ic SPOOLDIR Xo
 (string, default=/var/spool/dma)
 .Xc


@@ -256,18 +270,47 @@ The internet hostname
 .Nm
 uses to identify the host.
 If not set or empty, the result of
 .Nm
 uses to identify the host.
 If not set or empty, the result of

-.Xr gethostname 2
+.Xr gethostname 3

 is used.
 If
 .Sq MAILNAME
 is an absolute path to a file, the first line of this file will be used
 as the hostname.
 is used.
 If
 .Sq MAILNAME
 is an absolute path to a file, the first line of this file will be used
 as the hostname.

+.It Ic MASQUERADE Xo
+(string, default=empty)
+.Xc
+Masquerade the envelope-from addresses with this address/hostname.
+Use this setting if mails are not accepted by destination mail servers
+because your sender domain is invalid.
+This setting is overridden by the
+.Fl f
+flag and the
+.Ev EMAIL
+environment variable.
+.Pp
+If
+.Sq MASQUERADE
+does not contain a
+.Li @
+sign, the string is interpreted as a host name.
+For example, setting
+.Sq MASQUERADE
+to
+.Ql john@
+on host
+.Ql hamlet
+will send all mails as
+.Ql john@hamlet ;
+setting it to
+.Ql percolator
+will send all mails as
+.Ql Sm off Va username @percolator .
+.Sm on

 .El
 .Ss Environment variables
 The behavior of
 .Nm
 can be influenced by some environment variables.
 .El
 .Ss Environment variables
 The behavior of
 .Nm
 can be influenced by some environment variables.

-.Pp

 .Bl -tag -width 4n
 .It Ev EMAIL Xo
 .Xc
 .Bl -tag -width 4n
 .It Ev EMAIL Xo
 .Xc