git: 1288a10af617 - stable/12 - Update resolv.conf(5) "not necessary" language.

From: Pau Amma <>
Date: Wed, 30 Nov 2022 19:17:13 UTC
The branch stable/12 has been updated by pauamma (doc committer):


commit 1288a10af617884ce3104e84f71b09df27d07d8d
Author:     Pau Amma <>
AuthorDate: 2022-11-21 00:19:55 +0000
Commit:     Pau Amma <>
CommitDate: 2022-11-30 19:09:32 +0000

    Update resolv.conf(5) "not necessary" language.
    While there, fix mandoc -T lint warnings.
    PR:             262492
    Differential Revision:
    MFC after:      1 week
    Reviewed by:    gjb
    Approved by:    gjb (mentor)
    (cherry picked from commit e8261bba4e18ab95fe958e195b07a66df1b8d855)
    Clarify what's normally not required.
    Reported by:    karels
    Reviewed by:    carlavilla, karels (informally)
    Approved by:    carlavilla (mentor), gjb (mentor, implicitly)
    Differential Revision:
    (cherry picked from commit 06703946d0be0baaf0f2a88f85e2dd5354e861da)
 share/man/man5/resolver.5 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5
index e2c78e8a3bc9..a0c1aea24b88 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 November 7, 2022
+.Dd November 23, 2022
@@ -46,8 +46,10 @@ by the resolver routines the first time they are invoked by a process.
 The file is designed to be human readable and contains a list of
 keywords with values that provide various types of resolver information.
-On a normally configured system this file should not be necessary.
-The only name server to be queried will be on the local machine,
+On a normally configured system, setting this file manually should not
+be necessary.
+The only name server(s) to be queried will be on the local machine
+or automatically configured using DHCP or a similar mechanism,
 the domain name is determined from the host name,
 and the domain search path is constructed from the domain name.
@@ -132,7 +134,7 @@ in _res.options.
 to use TCP instead of UDP for queries.
-.It Sy ndots: Ns Ar n
+.It Sy ndots : Ns Ar n
 sets a threshold for the number of dots which must appear in a name given to
 .Fn res_query
@@ -148,7 +150,7 @@ meaning that if there are any dots in a name, the name
 will be tried first as an absolute name before any
 .Em search list
 elements are appended to it.
-.It Sy timeout: Ns Ar n
+.It Sy timeout : Ns Ar n
 sets the initial amount of time the resolver will wait
 for a response from a remote
 name server before retrying the query via a different name server.
@@ -161,7 +163,7 @@ the allowed maximum is
 .In resolv.h ) .
-.It Sy attempts: Ns Ar n
+.It Sy attempts : Ns Ar n
 sets the number of times the resolver will send a query to each of
 its name servers
 before giving up and returning an error to the calling application.
@@ -180,7 +182,7 @@ the resolver from obeying the standard
 .Sy search
 rules with the given name.
-.It Sy reload-period: Ns Ar n
+.It Sy reload-period : Ns Ar n
 The resolver checks the modification time of
 .Pa /etc/resolv.conf