Re: ifconfig.8: Small improvement, typofix

2017-04-05 Thread Jason McIntyre
On Tue, Apr 04, 2017 at 03:32:19PM +0200, Klemens Nanni wrote:
> Hey,
> 
> blocknonip's description is a tad clearer that way, the rest is mostly
> cosmetical but still.


now committed, thanks. i left out hunk 3 as the text that's there
is correct. you have to read it like this: three times four is
twelve.  i initially thought the text was wrong too.  since i
couldn;t think of a clear improvement, i left it alone.

jmc

> Index: sbin/ifconfig/ifconfig.8
> ===
> RCS file: /cvs/src/sbin/ifconfig/ifconfig.8,v
> retrieving revision 1.280
> diff -u -p -r1.280 ifconfig.8
> --- sbin/ifconfig/ifconfig.8  20 Mar 2017 14:06:26 -  1.280
> +++ sbin/ifconfig/ifconfig.8  4 Apr 2017 09:33:37 -
> @@ -400,7 +400,7 @@ output from
>  .Cm hwfeatures
>  shows the maximum supported MTU.
>  .It Cm netmask Ar mask
> -(inet and inet6)
> +(inet and inet6 only)
>  Specify how much of the address to reserve for subdividing
>  networks into subnetworks.
>  The mask includes the network part of the local address
> @@ -508,7 +508,7 @@ Disable automatic point-to-point link de
>  .It Cm blocknonip Ar interface
>  Mark
>  .Ar interface
> -so that no non-IPv4, IPv6, ARP, or Reverse
> +so that only IPv4, IPv6, ARP, and Reverse
>  ARP packets are accepted from it or forwarded to it from other
>  bridge member interfaces.
>  .It Cm -blocknonip Ar interface
> @@ -824,7 +824,7 @@ The formula is
>  +
>  .Pf ( Cm advskew
>  / 256).
> -If the master does not advertise within three times this interval, this host
> +If the master does not advertise this interval within three times, this host
>  will begin advertising as master.
>  .Sh IEEE 802.11 (WIRELESS DEVICES)
>  .nr nS 1
> @@ -1520,7 +1520,7 @@ Remove the trunk port
>  Set the trunk protocol.
>  Refer to
>  .Xr trunk 4
> -for a complete list of the available protocols,
> +for a complete list of the available protocols.
>  .El
>  .Sh TUNNEL
>  .nr nS 1



Re: ifconfig.8: Small improvement, typofix

2017-04-04 Thread Jason McIntyre
On Tue, Apr 04, 2017 at 04:12:16PM +0200, Mike Belopuhov wrote:
> On Tue, Apr 04, 2017 at 15:32 +0200, Klemens Nanni wrote:
> > Hey,
> > 
> > blocknonip's description is a tad clearer that way, the rest is mostly
> > cosmetical but still.
> 
> > Index: sbin/ifconfig/ifconfig.8
> > ===
> > RCS file: /cvs/src/sbin/ifconfig/ifconfig.8,v
> > retrieving revision 1.280
> > diff -u -p -r1.280 ifconfig.8
> > --- sbin/ifconfig/ifconfig.820 Mar 2017 14:06:26 -  1.280
> > +++ sbin/ifconfig/ifconfig.84 Apr 2017 09:33:37 -
> > @@ -400,7 +400,7 @@ output from
> >  .Cm hwfeatures
> >  shows the maximum supported MTU.
> >  .It Cm netmask Ar mask
> > -(inet and inet6)
> > +(inet and inet6 only)
> >  Specify how much of the address to reserve for subdividing
> >  networks into subnetworks.
> >  The mask includes the network part of the local address
> > @@ -508,7 +508,7 @@ Disable automatic point-to-point link de
> >  .It Cm blocknonip Ar interface
> >  Mark
> >  .Ar interface
> > -so that no non-IPv4, IPv6, ARP, or Reverse
> > +so that only IPv4, IPv6, ARP, and Reverse
> >  ARP packets are accepted from it or forwarded to it from other
> >  bridge member interfaces.
> >  .It Cm -blocknonip Ar interface
> > @@ -824,7 +824,7 @@ The formula is
> >  +
> >  .Pf ( Cm advskew
> >  / 256).
> > -If the master does not advertise within three times this interval, this 
> > host
> > +If the master does not advertise this interval within three times, this 
> > host
> >  will begin advertising as master.
> >  .Sh IEEE 802.11 (WIRELESS DEVICES)
> >  .nr nS 1
> > @@ -1520,7 +1520,7 @@ Remove the trunk port
> >  Set the trunk protocol.
> >  Refer to
> >  .Xr trunk 4
> > -for a complete list of the available protocols,
> > +for a complete list of the available protocols.
> >  .El
> >  .Sh TUNNEL
> >  .nr nS 1
> 
> I agree that this reads better.  OK mikeb
> 

please commit this with my ok too. but one adjustment is incorrect:

> > -If the master does not advertise within three times this interval, this 
> > host
> > +If the master does not advertise this interval within three times, this 
> > host

the change is wrong, because "within three times what"? the interval of
course. it's just the wording that's a bit off. try:

...does not advertise within thrice this interval, ...

that's how it should read, but i'm aware some people will faint if you use
the word "thrice". if you want to come up with something else feel free,
but don;t commit that change as-is.

jmc



Re: ifconfig.8: Small improvement, typofix

2017-04-04 Thread Denis Fondras
> -If the master does not advertise within three times this interval, this host
> +If the master does not advertise this interval within three times, this host
> 

I think the old phrasing is easier to understand.



Re: ifconfig.8: Small improvement, typofix

2017-04-04 Thread Mike Belopuhov
On Tue, Apr 04, 2017 at 15:32 +0200, Klemens Nanni wrote:
> Hey,
> 
> blocknonip's description is a tad clearer that way, the rest is mostly
> cosmetical but still.

> Index: sbin/ifconfig/ifconfig.8
> ===
> RCS file: /cvs/src/sbin/ifconfig/ifconfig.8,v
> retrieving revision 1.280
> diff -u -p -r1.280 ifconfig.8
> --- sbin/ifconfig/ifconfig.8  20 Mar 2017 14:06:26 -  1.280
> +++ sbin/ifconfig/ifconfig.8  4 Apr 2017 09:33:37 -
> @@ -400,7 +400,7 @@ output from
>  .Cm hwfeatures
>  shows the maximum supported MTU.
>  .It Cm netmask Ar mask
> -(inet and inet6)
> +(inet and inet6 only)
>  Specify how much of the address to reserve for subdividing
>  networks into subnetworks.
>  The mask includes the network part of the local address
> @@ -508,7 +508,7 @@ Disable automatic point-to-point link de
>  .It Cm blocknonip Ar interface
>  Mark
>  .Ar interface
> -so that no non-IPv4, IPv6, ARP, or Reverse
> +so that only IPv4, IPv6, ARP, and Reverse
>  ARP packets are accepted from it or forwarded to it from other
>  bridge member interfaces.
>  .It Cm -blocknonip Ar interface
> @@ -824,7 +824,7 @@ The formula is
>  +
>  .Pf ( Cm advskew
>  / 256).
> -If the master does not advertise within three times this interval, this host
> +If the master does not advertise this interval within three times, this host
>  will begin advertising as master.
>  .Sh IEEE 802.11 (WIRELESS DEVICES)
>  .nr nS 1
> @@ -1520,7 +1520,7 @@ Remove the trunk port
>  Set the trunk protocol.
>  Refer to
>  .Xr trunk 4
> -for a complete list of the available protocols,
> +for a complete list of the available protocols.
>  .El
>  .Sh TUNNEL
>  .nr nS 1

I agree that this reads better.  OK mikeb



ifconfig.8: Small improvement, typofix

2017-04-04 Thread Klemens Nanni

Hey,

blocknonip's description is a tad clearer that way, the rest is mostly
cosmetical but still.
Index: sbin/ifconfig/ifconfig.8
===
RCS file: /cvs/src/sbin/ifconfig/ifconfig.8,v
retrieving revision 1.280
diff -u -p -r1.280 ifconfig.8
--- sbin/ifconfig/ifconfig.820 Mar 2017 14:06:26 -  1.280
+++ sbin/ifconfig/ifconfig.84 Apr 2017 09:33:37 -
@@ -400,7 +400,7 @@ output from
 .Cm hwfeatures
 shows the maximum supported MTU.
 .It Cm netmask Ar mask
-(inet and inet6)
+(inet and inet6 only)
 Specify how much of the address to reserve for subdividing
 networks into subnetworks.
 The mask includes the network part of the local address
@@ -508,7 +508,7 @@ Disable automatic point-to-point link de
 .It Cm blocknonip Ar interface
 Mark
 .Ar interface
-so that no non-IPv4, IPv6, ARP, or Reverse
+so that only IPv4, IPv6, ARP, and Reverse
 ARP packets are accepted from it or forwarded to it from other
 bridge member interfaces.
 .It Cm -blocknonip Ar interface
@@ -824,7 +824,7 @@ The formula is
 +
 .Pf ( Cm advskew
 / 256).
-If the master does not advertise within three times this interval, this host
+If the master does not advertise this interval within three times, this host
 will begin advertising as master.
 .Sh IEEE 802.11 (WIRELESS DEVICES)
 .nr nS 1
@@ -1520,7 +1520,7 @@ Remove the trunk port
 Set the trunk protocol.
 Refer to
 .Xr trunk 4
-for a complete list of the available protocols,
+for a complete list of the available protocols.
 .El
 .Sh TUNNEL
 .nr nS 1