thanks, i'll have a look at merging tomorrow since I also need to merge some changes from OpenBSD
On Sun, Dec 15, 2013 at 11:13:50AM +0100, Philippe Lel?dy wrote: > It is not the whole rewrite I suggested, it only fixes typo errors. > > Not sure I used the good diff command to produce it. > > Ph. Le. > --- opensmtpd-201312142053/smtpd.conf.5 Sat Dec 14 20:53:25 2013 > +++ patch/man5/smtpd.conf.5 Sun Dec 15 10:56:42 2013 > @@ -17,7 +17,7 @@ > .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. > .\" > .\" > -.Dd $Mdocdate: December 5 2013 $ > +.Dd $Mdocdate: December 15 2013 $ > .Dt SMTPD.CONF 5 > .Os > .Sh NAME > @@ -87,7 +87,7 @@ > .It Xo > .Ic tagged > .Op Ic \! > -.Ic tag > +.Ar tag > .Xc > If specified, the rule will only be matched if the client session was tagged > with > .Ar tag . > @@ -109,7 +109,7 @@ > .Ic from > .Op Ic \! > .Ic source > -.Ic table > +.Ar table > .Xc > The rule matches if the connection is made from a client whose address > is declared in the table > @@ -121,7 +121,7 @@ > .It Xo > .Ic sender > .Op Ic \! > -.Ic senders > +.Ar senders > .Xc > If specified, the rule will only be matched if the sender email address > is found in the table > @@ -309,8 +309,7 @@ > .Op Ic as Ar address > .Op Ic source Ar source > .Bk -words > -.Op Ic hostname Ar name > -.Op Ic hostnames Ar names > +.Op Ic hostname Ar name | Ic hostnames Ar names > .Ek > .Op Ic pki Ar pkiname > .Op Ic tls | verify > @@ -371,11 +370,6 @@ > .Xr smtpd 8 > will automatically select the name that matches its source address > when connected to the remote server. > -The > -.Ic hostname > -and > -.Ic hostnames > -parameters are mutually exclusive. > .Pp > When relaying, STARTTLS is always attempted if available on remote host > and OpenSMTPD will try to present a certificate matching the outgoing > @@ -408,8 +402,7 @@ > .Op Ic auth Aq Ar auth > .Op Ic as Ar address > .Op Ic source Ar source > -.Op Ic hostname Ar name > -.Op Ic hostnames Ar names > +.Op Ic hostname Ar name | Ic hostnames Ar names > .Op Ic pki Ar pkiname > .Op Ic verify > .Xc > @@ -477,7 +470,7 @@ > parameter is specified, > .Xr smtpd 8 > will explicitly bind to an address found in the table referenced by > -.Ar table > +.Ar source > when connecting to the relay. > If the table contains more than one address, they are picked in turn each > time a new connection is opened. > @@ -501,11 +494,6 @@ > .Xr smtpd 8 > will automatically select the name that matches its source address > when connected to the remote server. > -The > -.Ic hostname > -and > -.Ic hostnames > -parameters are mutually exclusive. > .El > .Pp > If > @@ -736,7 +724,7 @@ > or > .Xr gzcat 1 > utilities. > -.It Ic queue encryption Op key Ar key > +.It Ic queue encryption Op Ic key Ar key > Enable transparent encryption of envelopes and messages. > .Ar key > must be a 16-byte random key in hexadecimal representation. -- Gilles Chehade https://www.poolp.org @poolpOrg -- You received this mail because you are subscribed to misc@opensmtpd.org To unsubscribe, send a mail to: misc+unsubscr...@opensmtpd.org
