From: jmc Date: Sat, 2 Jul 2016 05:58:00 +0000 (+0000) Subject: do not uppercase "hop limit"; X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b0033adac0d6227ff6f3797c305dba1659ef9cb6;p=openbsd do not uppercase "hop limit"; --- diff --git a/usr.bin/nc/nc.1 b/usr.bin/nc/nc.1 index 384442b6035..8b7c92aa636 100644 --- a/usr.bin/nc/nc.1 +++ b/usr.bin/nc/nc.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.73 2016/06/28 17:35:14 jca Exp $ +.\" $OpenBSD: nc.1,v 1.74 2016/07/02 05:58:00 jmc Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 28 2016 $ +.Dd $Mdocdate: July 2 2016 $ .Dt NC 1 .Os .Sh NAME @@ -174,9 +174,9 @@ Additionally, any timeouts specified with the .Fl w option are ignored. .It Fl M Ar ttl -Set the TTL / Hop Limit of outgoing packets. +Set the TTL / hop limit of outgoing packets. .It Fl m Ar minttl -Ask the kernel to drop incoming packets whose TTL / Hop Limit is under +Ask the kernel to drop incoming packets whose TTL / hop limit is under .Ar minttl . .It Fl N .Xr shutdown 2 diff --git a/usr.sbin/ldpd/ldpd.conf.5 b/usr.sbin/ldpd/ldpd.conf.5 index 57ee2660968..158c96824df 100644 --- a/usr.sbin/ldpd/ldpd.conf.5 +++ b/usr.sbin/ldpd/ldpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ldpd.conf.5,v 1.31 2016/07/01 23:29:55 renato Exp $ +.\" $OpenBSD: ldpd.conf.5,v 1.32 2016/07/02 05:58:00 jmc Exp $ .\" .\" Copyright (c) 2013, 2016 Renato Westphal .\" Copyright (c) 2009 Michele Marchetto @@ -19,7 +19,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 1 2016 $ +.Dd $Mdocdate: July 2 2016 $ .Dt LDPD.CONF 5 .Os .Sh NAME @@ -158,8 +158,8 @@ and RFC 7552 (for the IPv6 address-family). Since GTSM is mandatory for LDPv6, the only effect of disabling GTSM for the IPv6 address-family is that .Xr ldpd 8 -will not check the incoming packets' Hop Limit. -Outgoing packets will still be sent using a Hop Limit of 255 to guarantee +will not check the incoming packets' hop limit. +Outgoing packets will still be sent using a hop limit of 255 to guarantee interoperability. .Pp If GTSM is enabled, multi-hop neighbors should have either GTSM disabled @@ -269,7 +269,7 @@ Override the inherited configuration and enable/disable GTSM for this neighbor. .It Ic gtsm-hops Ar hops Set the maximum number of hops the neighbor may be away. When GTSM is enabled for this neighbor, incoming packets are required to have -a TTL/Hop Limit of 256 minus this value, ensuring they have not passed +a TTL/hop limit of 256 minus this value, ensuring they have not passed through more than the expected number of hops. The default value is 1; valid range is 1\-255. .It Ic password Ar secret