On Sat, Feb 13, 2016 at 08:32:23PM +0100, Joerg Jung wrote: > On Fri, Feb 12, 2016 at 05:00:59PM -0500, Peter Bisroev wrote: > > > Just in case the previous diff is OK, I am attaching the patch to the > > > smtpd.conf man page. > > > > Hi Gilles, > > > > I apologize, my previous manpage diff did not include the information > > regarding > > the fact that connections through local socket will always be tagged > > 'local'. > > > > Please find the corrected manpage diff below. > > Some minor comments inline below. >
I commited the man page after taking into consideration jung@'s comment and rewording a paragraph. I think jmc@ will find better wording than a german and a french ;-) > > Index: smtpd.conf.5 > > =================================================================== > > RCS file: /cvs/src/usr.sbin/smtpd/smtpd.conf.5,v > > retrieving revision 1.153 > > diff -u -p -r1.153 smtpd.conf.5 > > --- smtpd.conf.5 21 Jan 2016 23:40:27 -0000 1.153 > > +++ smtpd.conf.5 12 Feb 2016 21:56:51 -0000 > > @@ -654,6 +654,12 @@ of inflight envelopes falls below > > Changing the default value might degrade performance. > > .It Xo > > .Bk -words > > +.Ic listen on socket > > +.Op Ic filter Ar name > > +.Op Ic mask-source > > +.Ek > > +.br > > +.Bk -words > > .Ic listen on Ar interface > > .Op Ar family > > .Op Ic port Ar port > > @@ -671,11 +677,28 @@ Changing the default value might degrade > > .Ek > > .Xc > > .Pp > > -Specify an > > +Specify a > > +.Ic socket > > +or an > > +.Ar interface > > +to listen on for incoming connections. A > > New sentence -> new line, please. > > > +.Ic listen on socket > > +directive is used to customize listening behavior for messages submitted > > +through local queues, for example, via the > > +.Xr mail 1 > > +utility. This is an optional directive, and if not supplied, > > New sentence, new line. > > > +.Xr smtpd 8 > > +will listen for connections on the > > +.Ic socket > > +only. Clients connecting through the > > I do not like the wording "...only." here. Sounds ambiguous. However, > I'm not a native speaker. Also, new sentence, new line. > > > +.Ic socket > > +will always be tagged with the 'local' > > +.Ic tag . > > +.Pp > > +To listen on a specific network interface, specify an > > .Ar interface > > -and > > -.Ar port > > -to listen on. > > +and an optional > > +.Ar port . > > An interface group, an IP address or a domain name may > > be used in place of > > .Ar interface . > > > -- Gilles Chehade https://www.poolp.org @poolpOrg
