7 files changed, 45 insertions, 40 deletions
diff --git a/contrib/bind/doc/man/Makefile b/contrib/bind/doc/man/Makefile
index b792ef9..604c293 100644
--- a/contrib/bind/doc/man/Makefile
+++ b/contrib/bind/doc/man/Makefile
@@ -279,7 +279,7 @@ NSUPDATE_OUT = 	nsupdate.${SYS_OPS_OUT_EXT}
 # Network library routines manual entries
 #
 LIB_NETWORK_BASE =	gethostbyname inet_cidr resolver hesiod getnetent \
-			tsig getaddrinfo inet_cidr getipnodebyname
+			tsig getaddrinfo getnameinfo getipnodebyname
 LIB_NETWORK_SRC_EXT =	3
 LIB_NETWORK_SRC = 	gethostbyname.${LIB_NETWORK_SRC_EXT} \
 			inet_cidr.${LIB_NETWORK_SRC_EXT} \
diff --git a/contrib/bind/doc/man/host.1 b/contrib/bind/doc/man/host.1
index 017d082..12219e7 100644
--- a/contrib/bind/doc/man/host.1
+++ b/contrib/bind/doc/man/host.1
@@ -50,7 +50,7 @@
 .\" SOFTWARE.
 .\" -
 .\" --Copyright--
-.\" $Id: host.1,v 8.2 1997/03/14 02:29:44 vixie Exp $
+.\" $Id: host.1,v 8.4 2000/02/29 03:50:47 vixie Exp $
 .Dd December 15, 1994
 .Dt HOST @CMD_EXT_U@
 .Os BSD 4
@@ -182,6 +182,8 @@ its own database.  It will not ask other servers for more
 information.
 .It Fl d
 Turn on debugging.  Network transactions are shown in detail.
+.It Fl s
+Chase signatures back to parent key (DNSSEC).
 .It Fl t Ar querytype
 Allows you to specify a particular 
 .Ar querytype 
@@ -255,6 +257,7 @@ is implemented by
 doing a complete zone transfer and then filtering out the information
 the you have asked for.  This command should be used only if it
 is absolutely necessary.
+.El
 .Sh CUSTOMIZING HOST NAME LOOKUP
 In general, if the name supplied by the user does not
 have any dots in it, a default domain is appended to the end.
diff --git a/contrib/bind/doc/man/named.8 b/contrib/bind/doc/man/named.8
index c0e73df..80ee217 100644
--- a/contrib/bind/doc/man/named.8
+++ b/contrib/bind/doc/man/named.8
@@ -332,7 +332,7 @@ An example SOA record is as follows:
 				86400 )	; minimum
 .Ed
 .Pp
-The SOA specifies a serial number, which should be changed each time the
+The SOA specifies a serial number, which should be incremented each time the
 master file is changed.  Note that the serial number can be given as a
 dotted number, but this is a 
 .Em very 
@@ -416,6 +416,7 @@ Toggles logging of all incoming queries via
 (requires server to have been built with the 
 .Li QRYLOG 
 option).
+.El
 .Sh FILES
 .Bl -tag -width "/var/tmp/named_dump.db (_PATH_DUMPFILE)   " -compact
 .It Pa /etc/named.conf
diff --git a/contrib/bind/doc/man/named.conf.5 b/contrib/bind/doc/man/named.conf.5
index 44f1ec9..6dde5ca 100644
--- a/contrib/bind/doc/man/named.conf.5
+++ b/contrib/bind/doc/man/named.conf.5
@@ -1281,7 +1281,8 @@ may also be specified in the
 .Ic zone
 statement, in which case it overrides the
 .Ic options allow-query
-statement.  If not specified, the default is
+statement.  If not specified, the default is to allow queries
+from all hosts.
 
 .Bl -tag -width 1 
 .It Ic allow-recursion
@@ -1310,6 +1311,7 @@ Specifies a list of addresses that the server will not accept queries from
 or use to resolve a query.  Queries from these addresses will not be
 responded to.
 .El
+.El
 
 .Ss Interfaces
 
@@ -1757,6 +1759,8 @@ zone \fIdomain_name\fR [ ( in | hs | hesiod | chaos ) ] {
   [ allow-update { \fIaddress_match_list\fR }; ]
   [ allow-query { \fIaddress_match_list\fR }; ]
   [ allow-transfer { \fIaddress_match_list\fR }; ]
+  [ forward ( only | first ); ]
+  [ forwarders { [ \fIip_addr\fR ; [ \fIip_addr\fR ; ... ] ] }; ]
   [ dialup \fIyes_or_no\fR; ]
   [ notify \fIyes_or_no\fR; ]
   [ also-notify { \fIip_addr\fR; [ \fIip_addr\fR; ... ] };
@@ -1771,6 +1775,8 @@ zone \fIdomain_name\fR [ ( in | hs | hesiod | chaos ) ] {
   [ allow-update { \fIaddress_match_list\fR }; ]
   [ allow-query { \fIaddress_match_list\fR }; ]
   [ allow-transfer { \fIaddress_match_list\fR }; ]
+  [ forward ( only | first ); ]
+  [ forwarders { [ \fIip_addr\fR ; [ \fIip_addr\fR ; ... ] ] }; ]
   [ transfer-source \fIip_addr\fR; ]
   [ max-transfer-time-in \fInumber\fR; ]
   [ notify \fIyes_or_no\fR; ]
diff --git a/contrib/bind/doc/man/nslookup.8 b/contrib/bind/doc/man/nslookup.8
index 5ba1850..d74d84f 100644
--- a/contrib/bind/doc/man/nslookup.8
+++ b/contrib/bind/doc/man/nslookup.8
@@ -516,12 +516,14 @@ initial domain name and name server addresses
 user's initial options
 .It Pa /usr/share/misc/nslookup.help
 summary of commands
+.El
 .Sh ENVIRONMENT
 .Bl -tag -width "HOSTALIASESXXXX" -compact
 .It Ev HOSTALIASES
 file containing host aliases
 .It Ev LOCALDOMAIN
 overrides default domain
+.El
 .Sh SEE ALSO
 .Xr @INDOT@named @SYS_OPS_EXT@ ,
 .Xr resolver @LIB_NETWORK_EXT@ , 
diff --git a/contrib/bind/doc/man/nsupdate.8 b/contrib/bind/doc/man/nsupdate.8
index feaa64c..296709b 100644
--- a/contrib/bind/doc/man/nsupdate.8
+++ b/contrib/bind/doc/man/nsupdate.8
@@ -1,4 +1,4 @@
-.\" $Id: nsupdate.8,v 8.4 1999/10/17 06:26:18 cyarnell Exp $
+.\" $Id: nsupdate.8,v 8.5 2000/02/29 03:50:48 vixie Exp $
 .\"
 .\"Copyright (c) 1999 by Internet Software Consortium
 .\"
@@ -47,6 +47,7 @@ Debug mode.
 .It Fl v
 Virtual circuit - use TCP to communication with server.
 Default is UDP.
+.El
 .Sh INPUT FORMAT
 .Ic Nsupdate
 reads input records, one per line,
@@ -79,7 +80,7 @@ will be performed.
 understands the following input record formats:
 .Pp
 
-.Bl -ohang
+.Bl -hang
 
 .It Ic prereq nxdomain Va domain-name
 Requires that no RR of any type exists with name
@@ -178,7 +179,7 @@ $ nsupdate -k /var/named/keys:mykey
 .Ed
 
 .Sh DIAGNOSTICS
-.Bl -ohang
+.Bl -hang
 
 .It Qq send error
 Typically indicates that the authoritative nameservers could not be reached
@@ -196,9 +197,11 @@ being performed.  The only way to determine if the update was performed
 is to use debug mode
 .Fl ( d )
 and examine the status field in the nameserver's reply.
-
+.El
 .Sh FILES
+.Bl -hang
 .It Pa /etc/resolv.conf
+.El
 initial domain name and name server addresses
 .Sh SEE ALSO
 .Xr @INDOT@named @SYS_OPS_EXT@ ,
diff --git a/contrib/bind/doc/man/resolver.3 b/contrib/bind/doc/man/resolver.3
index 6ddfe11..890c836 100644
--- a/contrib/bind/doc/man/resolver.3
+++ b/contrib/bind/doc/man/resolver.3
@@ -16,17 +16,17 @@
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\"	@(#)resolver.3	6.5 (Berkeley) 6/23/90
-.\"	$Id: resolver.3,v 8.11 1999/09/13 23:33:24 vixie Exp $
+.\"	$Id: resolver.3,v 8.12 2000/07/11 06:10:55 vixie Exp $
 .\"
-.Dd October 19, 1998
+.Dd July 4, 2000
 .Dt RESOLVER @LIB_NETWORK_EXT_U@ 
 .Os BSD 4
 .Sh NAME
 .Nm res_ninit ,
-.Nm res_nisourserver ,
+.Nm res_ourserver_p ,
 .Nm fp_resstat ,
-.Nm res_npquery ,
 .Nm res_hostalias ,
+.Nm res_pquery ,
 .Nm res_nquery ,
 .Nm res_nsearch ,
 .Nm res_nquerydomain ,
@@ -36,16 +36,15 @@
 .Nm res_nmkupdate ,
 .Nm res_nclose ,
 .Nm res_nsendsigned ,
-.Nm res_nsendupdate ,
 .Nm res_findzonecut ,
 .Nm dn_comp ,
 .Nm dn_expand ,
 .Nm hstrerror ,
 .Nm res_init ,
 .Nm res_isourserver ,
-.Nm p_nquery ,
-.Mm p_query ,
-.Mm hostalias ,
+.Nm fp_nquery ,
+.Nm p_query ,
+.Nm hostalias ,
 .Nm res_query ,
 .Nm res_search ,
 .Nm res_querydomain ,
@@ -61,10 +60,10 @@
 .Fd #include <arpa/nameser.h>
 .Fd #include <resolv.h>
 .Fn res_ninit "res_state statp"
-.Fn res_nisourserver "const res_state statp" "const struct sockaddr_in *addr"
+.Fn res_ourserver_p "const res_state statp" "const struct sockaddr_in *addr"
 .Fn fp_resstat "const res_state statp" "FILE *fp"
-.Fn res_npquery "const res_state statp" "const u_char *msg" "int msglen" "FILE *fp"
 .Fn res_hostalias "const res_state statp" "const char *name" "char *buf" "size_t buflen"
+.Fn res_pquery "const res_state statp" "const u_char *msg" "int msglen" "FILE *fp"
 .Fn res_nquery "res_state statp" "const char *dname" "int class" "int type" "u_char *answer" "int anslen"
 .Fn res_nsearch "res_state statp" "const char *dname" "int class" "int type" "u_char * answer" "int anslen"
 .Fn res_nquerydomain "res_state statp" "const char *name" "const char *domain" "int class" "int type" "u_char *answer" "int anslen"
@@ -75,7 +74,6 @@
 .Fn res_nclose "res_state statp"
 .Fn res_nsendsigned "res_state statp" "const u_char *msg" "int msglen" "ns_tsig_key *key" "u_char *answer" "int anslen"
 .Fn res_findzonecut "res_state statp" "const char *dname" "ns_class class" "int options" "char *zname" "size_t zsize" "struct in_addr *addrs" "int naddrs"
-.Fn res_nsendupdate "res_state statp" "ns_updrec *rrecp_in" "ns_tsig_key *key" "char *zname" "struct in_addr addr"
 .Fn dn_comp "const char *exp_dn" "u_char *comp_dn" "int length" "u_char **dnptrs, **lastdnptr"
 .Fn dn_expand "const u_char *msg, *eomorig, *comp_dn" "char *exp_dn" "int  length"
 .Fn hstrerror "int err"
@@ -87,7 +85,7 @@
 .Fd #include <resolv.h>
 .Fn res_init "void"
 .Fn res_isourserver "const struct sockaddr_in *addr"
-.Fn p_nquery "const u_char *msg" "int msglen" "FILE *fp"
+.Fn fp_nquery "const u_char *msg" "int msglen" "FILE *fp"
 .Fn p_query "const u_char *msg" "FILE *fp"
 .Fn hostalias "const char *name"
 .Fn res_query "const char *dname" "int class, type" "u_char *answer" "int anslen"
@@ -111,7 +109,7 @@ should be set to all zeros prior to the first call to any of these functions.
 The functions
 .Fn res_init ,
 .Fn res_isourserver ,
-.Fn p_nquery ,
+.Fn fp_nquery ,
 .Fn p_query ,
 .Fn hostalias ,
 .Fn res_query ,
@@ -373,11 +371,9 @@ MUST be big enough to receive a maximum UDP response from the server or
 parts of the answer will be silently discarded.
 The default maximum UDP response size is 512 bytes.
 .Pp
-The functions
-.Fn res_nisourserver
-/
-.Fn res_isourserver
-return true when 
+The function
+.Fn res_ourserver_p
+returns true when 
 .Fa inp
 is one of the servers in
 .Fa statp->nsaddr_list
@@ -385,9 +381,7 @@ is one of the servers in
 .Fa _res.nsaddr_list .
 .Pp
 The functions
-.Fn res_npquery
-/
-.Fn p_nquery
+.Fn fp_nquery
 /
 .Fn p_query
 print out the query and any answer in
@@ -396,7 +390,7 @@ on
 .Fa fp .
 .Fn p_query
 is equivalent to
-.Fn p_nquery
+.Fn fp_nquery
 with
 .Fa msglen
 set to 512.
@@ -429,22 +423,18 @@ The functions
 take a list of ns_updrec
 .Fa rrecp_in .
 Identifies the containing zone for each record and groups the records
-according to containing zone maintaining in zone order then sends and
-update request to the servers for these zones.
-The number of zones updated is returned or -1 on error.
+according to containing zone maintaining in zone order then sends and update
+request to the servers for these zones.  The number of zones updated is
+returned or -1 on error.  Note that
+.Fn res_nupdate
+will perform TSIG authenticated dynamic update operations if the key is not
+NULL.
 .Pp
 The function
 .Fn res_findzonecut
 discovers the closest enclosing zone cut for a specified domain name,
 and finds the IP addresses of the zone's master servers.
 .Pp
-The function
-.Fn res_nsendupdate
-is used to perform TSIG authenticated dynamic update operations.
-.Fn res_nsendupdate
-sends a dynamic update to the specified IP address, authenticating the update
-if the key is not NULL.
-.Pp
 The functions 
 .Fn res_nmkupdate
 /