Thu Mar 29 18:37:22 2012 UTC ()
Replace references to resolver(5) with ones to resolv.conf(5).

From patch by Bug Hunting.


(wiz)
diff -r1.12 -r1.13 src/share/man/man7/hostname.7

cvs diff -r1.12 -r1.13 src/share/man/man7/hostname.7 (expand / switch to unified diff)

--- src/share/man/man7/hostname.7 2012/03/22 07:58:18 1.12
+++ src/share/man/man7/hostname.7 2012/03/29 18:37:21 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: hostname.7,v 1.12 2012/03/22 07:58:18 wiz Exp $ 1.\" $NetBSD: hostname.7,v 1.13 2012/03/29 18:37:21 wiz Exp $
2.\" 2.\"
3.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") 3.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
4.\" 4.\"
5.\" Permission to use, copy, modify, and distribute this software for any 5.\" Permission to use, copy, modify, and distribute this software for any
6.\" purpose with or without fee is hereby granted, provided that the above 6.\" purpose with or without fee is hereby granted, provided that the above
7.\" copyright notice and this permission notice appear in all copies. 7.\" copyright notice and this permission notice appear in all copies.
8.\" 8.\"
9.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES 9.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
10.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 10.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR 11.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
12.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 12.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 13.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 14.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
@@ -146,40 +146,40 @@ lithium.Berkeley.EDU @@ -146,40 +146,40 @@ lithium.Berkeley.EDU
146The environment variable 146The environment variable
147.Dq Ev LOCALDOMAIN 147.Dq Ev LOCALDOMAIN
148overrides the 148overrides the
149.Dq Li search 149.Dq Li search
150and 150and
151.Dq Li domain 151.Dq Li domain
152options, and if both 152options, and if both
153.Li search 153.Li search
154and 154and
155.Li domain 155.Li domain
156options are present in the resolver configuration file, then only the 156options are present in the resolver configuration file, then only the
157.Em last 157.Em last
158one listed is used (see 158one listed is used (see
159.Xr resolver 5 ) . 159.Xr resolv.conf 5 ) .
160.Pp 160.Pp
161If the name was not previously tried 161If the name was not previously tried
162.Dq as-is 162.Dq as-is
163(i.e., it fell below the 163(i.e., it fell below the
164.Dq Li ndots 164.Dq Li ndots
165threshold or did not contain a dot), then the name as 165threshold or did not contain a dot), then the name as
166originally provided is attempted. 166originally provided is attempted.
167.Sh ENVIRONMENT 167.Sh ENVIRONMENT
168.Bl -tag -width "/etc/resolv.conf " 168.Bl -tag -width "/etc/resolv.conf "
169.It Ev LOCALDOMAIN 169.It Ev LOCALDOMAIN
170Affects domains appended to partial hostnames. 170Affects domains appended to partial hostnames.
171.It Ev HOSTALIASES 171.It Ev HOSTALIASES
172Name of file containing 172Name of file containing
173.Pq Ar host alias , full hostname 173.Pq Ar host alias , full hostname
174pairs. 174pairs.
175.El 175.El
176.Sh FILES 176.Sh FILES
177.Bl -tag -width "/etc/resolv.conf " -compact 177.Bl -tag -width "/etc/resolv.conf " -compact
178.It Pa /etc/resolv.conf 178.It Pa /etc/resolv.conf
179See 179See
180.Xr resolver 5 . 180.Xr resolv.conf 5 .
181.El 181.El
182.Sh SEE ALSO 182.Sh SEE ALSO
183.Xr gethostbyname 3 , 183.Xr gethostbyname 3 ,
184.Xr resolver 5 , 184.Xr resolv.conf 5 ,
185.Xr mailaddr 7 185.Xr mailaddr 7