From owner-dev-commits-src-main@freebsd.org Tue May 25 15:23:28 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3685964EB6F; Tue, 25 May 2021 15:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FqHsX0D1Yz3JjQ; Tue, 25 May 2021 15:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA04C1F8F2; Tue, 25 May 2021 15:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14PFNRfb013338; Tue, 25 May 2021 15:23:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14PFNRlb013337; Tue, 25 May 2021 15:23:27 GMT (envelope-from git) Date: Tue, 25 May 2021 15:23:27 GMT Message-Id: <202105251523.14PFNRlb013337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ceri Davies Subject: git: a23b08cf98d9 - main - man5/{hosts, resolver}.5: note that IPv6 addresses are allowed. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ceri X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a23b08cf98d92ff82adeebc84673e9bd3cd0a6da Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 15:23:28 -0000 The branch main has been updated by ceri (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a23b08cf98d92ff82adeebc84673e9bd3cd0a6da commit a23b08cf98d92ff82adeebc84673e9bd3cd0a6da Author: Ceri Davies AuthorDate: 2021-05-25 15:16:24 +0000 Commit: Ceri Davies CommitDate: 2021-05-25 15:23:20 +0000 man5/{hosts,resolver}.5: note that IPv6 addresses are allowed. The patch in the PR largely no longer applied due to age, but thanks to Evgeniy Khramtsov for the patches in the PR. PR: 120024 Reported by: bcran Approved by: blackend (mentor) Obtained from: Evgeniy Khramtsov (partly) --- share/man/man5/hosts.5 | 10 ++++++---- share/man/man5/resolver.5 | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5 index d80c544b3644..ca7586f039b7 100644 --- a/share/man/man5/hosts.5 +++ b/share/man/man5/hosts.5 @@ -28,7 +28,7 @@ .\" @(#)hosts.5 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd December 25, 2013 +.Dd May 25, 2021 .Dt HOSTS 5 .Os .Sh NAME @@ -64,9 +64,10 @@ These include addresses for the local interfaces that .Xr ifconfig 8 needs at boot time and a few machines on the local network. .Pp -Network addresses are specified in the conventional -``.'' (dot) notation using the -.Xr inet_addr 3 +Network addresses are specified in either the conventional +``.'' (dot) notation for IPv4 or colon hexadecimal notation for IPv6, +as understood by the +.Xr inet_pton 3 routine from the Internet address manipulation library, .Xr inet 3 . @@ -83,6 +84,7 @@ file resides in .El .Sh SEE ALSO .Xr gethostbyname 3 , +.Xr inet 3 , .Xr nsswitch.conf 5 , .Xr ifconfig 8 .Rs diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5 index cc439f123442..d5c02599bafb 100644 --- a/share/man/man5/resolver.5 +++ b/share/man/man5/resolver.5 @@ -28,7 +28,7 @@ .\" @(#)resolver.5 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd August 16, 2018 +.Dd May 25, 2021 .Dt RESOLVER 5 .Os .Sh NAME @@ -54,7 +54,7 @@ and the domain search path is constructed from the domain name. The different configuration options are: .Bl -tag -width nameserver .It Sy nameserver -Internet address (in dot notation) of a name server +IPv4 or IPv6 address of a name server that the resolver should query. Up to .Dv MAXNS