On Fri, Feb 12, 2021 at 03:30:11PM +, Larry Hynes wrote:
>
> Index: table.5
> ===
> RCS file: /cvs/src/usr.sbin/smtpd/table.5,v
> retrieving revision 1.11
> diff -u -p -r1.11 table.5
> --- table.5 11 Aug 2019 13:00:57 - 1.11
> +++ table.5 12 Feb 2021 15:29:25 -
> @@ -52,7 +52,7 @@ value3
> .Ed
> .Pp
> A mapping will be written with each key and value on a line,
> -whitespaces separating both columns:
> +whitespace separating both columns:
> .Bd -literal -offset indent
> key1 value1
> key2 value2
> @@ -90,7 +90,7 @@ user3 otheru...@example.com
> .Ed
> .Pp
> In a virtual domain context, the key is either a user part, a full email
> -address or a catch all, following selection rules described in
> +address or a catch-all, following selection rules described in
taken, since makemap.8 uses the same spelling
> .Xr smtpd.conf 5 ,
> and the value is one or many recipients as described in
> .Xr aliases 5 :
> @@ -164,7 +164,7 @@ They can only be used in the following c
> When used as a "from source", the address of a client is compared to the list
> of addresses in the table until a match is found.
> .Pp
> -A netaddr table can contain exact addresses or netmasks, and looks as follow:
> +A netaddr table can contain exact addresses or netmasks, as follows:
> .Bd -literal -offset indent
> 192.168.1.1
> ::1
> @@ -172,7 +172,7 @@ ipv6:::1
> 192.168.1.0/24
> .Ed
> .Ss Userinfo tables
> -User info tables are used in rule context to specify an alternate user base,
> +Userinfo tables are used in a rule context to specify an alternate userbase,
taken
> mapping virtual users to local system users by UID, GID and home directory.
> .Pp
> .D1 Ic action Ar name method Cm userbase Pf < Ar table Ns >
> @@ -234,15 +234,15 @@ user@*.domain
> .Ed
> .Ss Addrname tables
> Addrname tables are used to map IP addresses to hostnames.
> -They can be used in both listen context and relay context:
> +They can be used in both listen and relay contexts:
> .Bd -unfilled -offset indent
> .Ic listen on Ar interface Cm hostnames Pf < Ar table Ns >
> .Ic action Ar name Cm relay helo\-src Pf < Ar table Ns >
> .Ed
> .Pp
> -In listen context, the table is used to look up the server name to advertise
> +In a listen context, the table is used to look up the server name to
> advertise
> depending on the local address of the socket on which a connection is
> accepted.
> -In relay context, the table is used to determine the hostname for the HELO
> +In a relay context, the table is used to determine the hostname for the HELO
> sequence of the SMTP protocol, depending on the local address used for the
> outgoing connection.
> .Pp
>
changes not commented on not committed.
jmc
