unbind;

11 files changed, 42 insertions, 54 deletions

diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index 33270dbdf67..91da969eba5 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getaddrinfo.3,v 1.55 2014/04/28 21:38:59 sperreault Exp $
+.\"	$OpenBSD: getaddrinfo.3,v 1.56 2014/08/23 07:25:54 jmc Exp $
 .\"	$KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 28 2014 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt GETADDRINFO 3
 .Os
 .Sh NAME
@@ -434,8 +434,7 @@ freeaddrinfo(res0);
 .Xr hosts 5 ,
 .Xr resolv.conf 5 ,
 .Xr services 5 ,
-.Xr hostname 7 ,
-.Xr named 8
+.Xr hostname 7
 .Rs
 .%A Craig Metz
 .%B Proceedings of the Freenix Track: 2000 USENIX Annual Technical Conference
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
index 206750a2c34..304f3140993 100644
--- a/lib/libc/net/gethostbyname.3
+++ b/lib/libc/net/gethostbyname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gethostbyname.3,v 1.26 2013/06/05 03:39:23 tedu Exp $
+.\"	$OpenBSD: gethostbyname.3,v 1.27 2014/08/23 07:25:54 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt GETHOSTBYNAME 3
 .Os
 .Sh NAME
@@ -67,10 +67,7 @@ and
 .Fn gethostbyaddr
 functions each return a pointer to an object with the following structure
 describing an Internet host referenced by name or by address, respectively.
-This structure contains either information obtained from the name server (i.e.,
-.Xr resolver 3
-and
-.Xr named 8 ) ,
+This structure contains either information obtained from a name server,
 broken-out fields from a line in
 .Pa /etc/hosts ,
 or database entries supplied by the
@@ -241,8 +238,7 @@ The function completed successfully.
 .Xr resolver 3 ,
 .Xr hosts 5 ,
 .Xr resolv.conf 5 ,
-.Xr hostname 7 ,
-.Xr named 8
+.Xr hostname 7
 .Sh HISTORY
 The
 .Fn herror
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index d023b2523d4..fb4cc3631ed 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getnameinfo.3,v 1.46 2014/01/21 03:15:45 schwarze Exp $
+.\"	$OpenBSD: getnameinfo.3,v 1.47 2014/08/23 07:25:54 jmc Exp $
 .\"	$KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 21 2014 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt GETNAMEINFO 3
 .Os
 .Sh NAME
@@ -162,8 +162,7 @@ printf("host=%s\en", hbuf);
 .Xr hosts 5 ,
 .Xr resolv.conf 5 ,
 .Xr services 5 ,
-.Xr hostname 7 ,
-.Xr named 8
+.Xr hostname 7
 .Rs
 .%A Craig Metz
 .%T Protocol Independence Using the Sockets API
diff --git a/lib/libc/net/getrrsetbyname.3 b/lib/libc/net/getrrsetbyname.3
index 677b2a4c2ed..8affd5a3f40 100644
--- a/lib/libc/net/getrrsetbyname.3
+++ b/lib/libc/net/getrrsetbyname.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getrrsetbyname.3,v 1.18 2013/07/16 15:21:11 schwarze Exp $
+.\" $OpenBSD: getrrsetbyname.3,v 1.19 2014/08/23 07:25:54 jmc Exp $
 .\"
 .\" Copyright (C) 2000, 2001  Internet Software Consortium.
 .\"
@@ -15,7 +15,7 @@
 .\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 .\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt GETRRSETBYNAME 3
 .Os
 .Sh NAME
@@ -137,8 +137,7 @@ Other failure.
 .El
 .Sh SEE ALSO
 .Xr resolver 3 ,
-.Xr resolv.conf 5 ,
-.Xr named 8
+.Xr resolv.conf 5
 .Sh HISTORY
 .Fn getrrsetbyname
 first appeared in
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index 93b365a619f..5454a406430 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolver.3,v 1.29 2014/01/21 03:15:45 schwarze Exp $
+.\"	$OpenBSD: resolver.3,v 1.30 2014/08/23 07:25:54 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 21 2014 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt RESOLVER 3
 .Os
 .Sh NAME
@@ -351,11 +351,7 @@ The configuration file.
 .Sh SEE ALSO
 .Xr gethostbyname 3 ,
 .Xr resolv.conf 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Rs
-.%T Name Server Operations Guide for BIND
-.Re
+.Xr hostname 7
 .Sh STANDARDS
 .Rs
 .%A M. Stahl
diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5
index 6654f00d9b0..0861108ff93 100644
--- a/share/man/man5/hosts.5
+++ b/share/man/man5/hosts.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hosts.5,v 1.21 2014/05/09 06:37:38 jmc Exp $
+.\"	$OpenBSD: hosts.5,v 1.22 2014/08/23 07:25:54 jmc Exp $
 .\"	$NetBSD: hosts.5,v 1.4 1994/11/30 19:31:20 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)hosts.5	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: May 9 2014 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt HOSTS 5
 .Os
 .Sh NAME
@@ -64,8 +64,7 @@ and the
 .Nm hosts
 database.
 .Pp
-When using the name server
-.Xr named 8 ,
+When using a name server
 this file provides a backup when the name server is not running.
 For the name server, it is suggested that only a few addresses
 be included in this file.
@@ -91,10 +90,8 @@ newline, or comment character.
 .Xr inet_addr 3 ,
 .Xr resolv.conf 5 ,
 .Xr ifconfig 8 ,
-.Xr named 8
-.Rs
-.%T "Name Server Operations Guide for BIND"
-.Re
+.Xr nsd 8 ,
+.Xr unbound 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man5/networks.5 b/share/man/man5/networks.5
index c2155d85290..62d5c78ff32 100644
--- a/share/man/man5/networks.5
+++ b/share/man/man5/networks.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: networks.5,v 1.18 2014/05/09 06:37:38 jmc Exp $
+.\"	$OpenBSD: networks.5,v 1.19 2014/08/23 07:25:54 jmc Exp $
 .\"	$NetBSD: networks.5,v 1.9 1999/03/17 20:19:47 garbled Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)networks.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: May 9 2014 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt NETWORKS 5
 .Os
 .Sh NAME
@@ -103,7 +103,8 @@ ISP should the need arise.
 .Xr resolver 3 ,
 .Xr resolv.conf 5 ,
 .Xr hostname 7 ,
-.Xr named 8
+.Xr nsd 8 ,
+.Xr unbound 8
 .Sh STANDARDS
 .Rs
 .%A P. Mockapetris
diff --git a/share/man/man5/resolv.conf.5 b/share/man/man5/resolv.conf.5
index 1ea47b900c2..1c96c9f12de 100644
--- a/share/man/man5/resolv.conf.5
+++ b/share/man/man5/resolv.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolv.conf.5,v 1.44 2013/07/14 19:44:39 jmc Exp $
+.\"	$OpenBSD: resolv.conf.5,v 1.45 2014/08/23 07:25:54 jmc Exp $
 .\"	$NetBSD: resolv.conf.5,v 1.7 1996/03/06 18:22:16 scottr Exp $
 .\"
 .\" Copyright (c) 1986, 1991 The Regents of the University of California.
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)resolver.5	5.12 (Berkeley) 5/10/91
 .\"
-.Dd $Mdocdate: July 14 2013 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt RESOLV.CONF 5
 .Os
 .Sh NAME
@@ -348,7 +348,8 @@ file.
 .Xr hosts 5 ,
 .Xr hostname 7 ,
 .Xr dhclient 8 ,
-.Xr named 8
+.Xr nsd 8 ,
+.Xr unbound 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 961ed518ece..00135bc0af3 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hier.7,v 1.129 2014/08/15 06:44:29 jmc Exp $
+.\"	$OpenBSD: hier.7,v 1.130 2014/08/23 07:25:54 jmc Exp $
 .\"	$NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: August 15 2014 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -590,9 +590,6 @@ Log files for
 .Pp
 .It mail/
 User mailbox files.
-.It named/
-Chroot directory for
-.Xr named 8 .
 .It nsd/
 Database and zone files for
 .Xr nsd 8 .
diff --git a/share/man/man7/hostname.7 b/share/man/man7/hostname.7
index 60e3a1d1da8..8ee32f2647e 100644
--- a/share/man/man7/hostname.7
+++ b/share/man/man7/hostname.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hostname.7,v 1.8 2007/05/31 19:19:58 jmc Exp $
+.\"	$OpenBSD: hostname.7,v 1.9 2014/08/23 07:25:54 jmc Exp $
 .\"	$NetBSD: hostname.7,v 1.4 1994/11/30 19:07:14 jtc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)hostname.7	8.2 (Berkeley) 12/30/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt HOSTNAME 7
 .Os
 .Sh NAME
@@ -85,7 +85,8 @@ by a system-wide configuration file (see
 .Xr gethostbyname 3 ,
 .Xr resolv.conf 5 ,
 .Xr mailaddr 7 ,
-.Xr named 8
+.Xr nsd 8 ,
+.Xr unbound 8
 .Sh HISTORY
 A
 .Nm
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 3925e321627..cbae239924d 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.8,v 1.23 2014/04/22 14:19:04 jmc Exp $
+.\"	$OpenBSD: intro.8,v 1.24 2014/08/23 07:25:54 jmc Exp $
 .\"	$NetBSD: intro.8,v 1.3 1994/11/30 19:36:24 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)intro.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: April 22 2014 $
+.Dd $Mdocdate: August 23 2014 $
 .Dt INTRO 8
 .Os
 .Sh NAME
@@ -124,8 +124,8 @@ variables:
 .Va amd_flags
 and
 .Va amd_master .
-.Ss BIND name server (DNS)
-If you are using the BIND name server, check the
+.Ss Domain Name Server (DNS)
+If you are using a name server, check the
 .Pa /etc/resolv.conf
 file.
 It may look something like:
@@ -142,7 +142,9 @@ If using a caching name server, add the line "nameserver 127.0.0.1" first.
 Relevant
 .Xr rc.conf 8
 variables:
-.Va named_flags .
+.Va named_flags
+and
+.Va unbound_flags .
 .Ss Clock synchronisation
 In order to make sure the system clock is correct,
 it may be synchronised with a number of external sources.