This commit was generated by cvs2svn to compensate for changes in r72571,

which included commits to RCS files with non-trunk default branches.

6 files changed, 38 insertions, 19 deletions

diff --git a/contrib/bind/doc/html/config.html b/contrib/bind/doc/html/config.html
index 97f3a1b..b139ef2 100644
--- a/contrib/bind/doc/html/config.html
+++ b/contrib/bind/doc/html/config.html
@@ -11,7 +11,7 @@
 
 <H3>Overview</H3>
 
-<P>BIND 8 is much more configurable than previous release of BIND.
+<P>BIND 8 is much more configurable than previous releases of BIND.
 There are entirely new areas of configuration, such as access control lists
 and categorized logging.  Many options that previously applied to all zones
 can now be used selectively.  These features, plus a consideration of future
@@ -91,7 +91,7 @@ the BIND 8.2.x source kits.
 
 <HR>
 <ADDRESS>
-Last Updated: $Id: config.html,v 1.10 1999/09/15 20:28:01 cyarnell Exp $
+Last Updated: $Id: config.html,v 1.11 2000/11/28 20:03:48 cyarnell Exp $
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/contrib/bind/doc/html/options.html b/contrib/bind/doc/html/options.html
index 5e96d1f..d5ea552 100644
--- a/contrib/bind/doc/html/options.html
+++ b/contrib/bind/doc/html/options.html
@@ -27,6 +27,7 @@ options {
   [ fetch-glue <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ has-old-clients <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ host-statistics <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
+  [ host-statistics-max <VAR>number</VAR>; ]
   [ multiple-cnames <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ notify <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ recursion <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
@@ -200,6 +201,12 @@ If <CODE>yes</CODE>, statistics are kept for every host that the
 the nameserver interacts with.  The default is <CODE>no</CODE>.  <I>Note:</I>
 turning on <CODE>host-statistics</CODE> can consume huge amounts of memory.
 
+<DT><CODE>host-statistics-max</CODE>
+<DD>
+The maximum number of host records that will be kept.  When this limit is
+reached no new hosts will be added to the host statistics.  If the set
+to zero then there is no limit set.  The default value is zero.
+
 <DT><CODE>maintain-ixfr-base</CODE>
 <DD>
 If <CODE>yes</CODE>, a transaction log is kept for 
@@ -806,7 +813,7 @@ request for the root servers to be accepted.  Default 2.
 
 <HR>
 <ADDRESS>
-Last Updated: $Id: options.html,v 1.40 2000/06/01 21:37:46 cyarnell Exp $
+Last Updated: $Id: options.html,v 1.41 2000/11/29 11:49:09 marka Exp $
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/contrib/bind/doc/html/server.html b/contrib/bind/doc/html/server.html
index eba350b..cb0d7d1 100644
--- a/contrib/bind/doc/html/server.html
+++ b/contrib/bind/doc/html/server.html
@@ -30,7 +30,9 @@ associated with a remote name server.</P>
 
 <P>If you discover that a server is giving out bad data, marking it as
 <CODE>bogus</CODE> will prevent further queries to it.  The default value of
-<CODE>bogus</CODE> is <CODE>no</CODE>.
+<CODE>bogus</CODE> is <CODE>no</CODE>.  Marking a server as <CODE>bogus</CODE>
+will mark all other addresses for that server as <CODE>bogus</CODE> when
+a match is made when looking up a server's address by name. 
 
 <P>The server supports two zone transfer methods.  The first,
 <CODE>one-answer</CODE>, uses one DNS message per resource record
@@ -63,7 +65,7 @@ required to be signed by this key.
 
 <HR>
 <ADDRESS>
-Last Updated: $Id: server.html,v 1.10 1999/09/15 20:28:02 cyarnell Exp $
+Last Updated: $Id: server.html,v 1.11 2000/11/08 04:15:07 marka Exp $
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/contrib/bind/doc/man/named.conf.5 b/contrib/bind/doc/man/named.conf.5
index 6dde5ca..e2f4a0f 100644
--- a/contrib/bind/doc/man/named.conf.5
+++ b/contrib/bind/doc/man/named.conf.5
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1999 by Internet Software Consortium
+.\" Copyright (c) 1999-2000 by Internet Software Consortium
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -826,6 +826,7 @@ options {
   [ fetch-glue \fIyes_or_no\fR; ]
   [ has-old-clients \fIyes_or_no\fR; ]
   [ host-statistics \fIyes_or_no\fR; ]
+  [ host-statistics-max \fInumber\fR; ]
   [ multiple-cnames \fIyes_or_no\fR; ]
   [ notify \fIyes_or_no\fR; ]
   [ recursion \fIyes_or_no\fR; ]
@@ -1070,15 +1071,20 @@ turning on
 .Ic host-statistics
 can consume huge amounts of memory.
 
+.It IC host-statistics-max
+The maximum number of host records that will be kept.
+When this limit is reached no new hosts will be added to the host statistics.
+If the set to zero then there is no limit set.
+The default value is zero.
+
 .It Ic maintain-ixfr-base
 If
 .Li yes ,
-statistics are kept for every host that the nameserver interacts with.  The default is
+a IXFR database file is kept for all dynamicaly updated zones.
+This enables the server to answer IXFR queries which can speed up
+zone transfers enormously.
+The default is
 .Li no .
-.Em Note:
-turning on 
-.Li host-statistics
-can consume huge amounts of memory.
 
 .It Ic multiple-cnames
 If
@@ -1287,12 +1293,7 @@ from all hosts.
 .Bl -tag -width 1 
 .It Ic allow-recursion
 Specifies which hosts are allowed to ask recursive questions.
-.Ic allow-recursion
-may also be specified in the
-.Ic zone
-statement, in which case it overrides the
-.Ic options allow-recursion 
-statement.  If not specified, the default is to allow recursive queries 
+If not specified, the default is to allow recursive queries 
 from all hosts.
 
 .It Ic allow-transfer
@@ -2141,6 +2142,11 @@ will prevent further queries to it.  The default value of
 .Ic bogus
 is
 .Li no .
+Marking a server as
+.Ic bogus
+will mark all other addresses for that server as
+.Ic bogus
+when a match is made when looking up a server's address by name.
 
 .Pp
 The server supports two zone transfer methods.  The first,
diff --git a/contrib/bind/doc/man/nsupdate.8 b/contrib/bind/doc/man/nsupdate.8
index 296709b..88dc327 100644
--- a/contrib/bind/doc/man/nsupdate.8
+++ b/contrib/bind/doc/man/nsupdate.8
@@ -1,4 +1,4 @@
-.\" $Id: nsupdate.8,v 8.5 2000/02/29 03:50:48 vixie Exp $
+.\" $Id: nsupdate.8,v 8.6 2000/10/30 23:06:57 cyarnell Exp $
 .\"
 .\"Copyright (c) 1999 by Internet Software Consortium
 .\"
@@ -55,6 +55,8 @@ each line contributing a resource record to an
 update request.
 All domain names used in a single update request
 must belong to the same DNS zone.
+Updates are sent to the master server as defined in the SOA
+MNAME field.
 A blank line causes the accumulated
 records to be formated into a single update request
 and transmitted to the zone's authoritative name servers.
diff --git a/contrib/bind/doc/man/resolver.3 b/contrib/bind/doc/man/resolver.3
index 890c836..b858d28 100644
--- a/contrib/bind/doc/man/resolver.3
+++ b/contrib/bind/doc/man/resolver.3
@@ -16,7 +16,7 @@
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\"	@(#)resolver.3	6.5 (Berkeley) 6/23/90
-.\"	$Id: resolver.3,v 8.12 2000/07/11 06:10:55 vixie Exp $
+.\"	$Id: resolver.3,v 8.13 2000/12/05 02:37:33 vixie Exp $
 .\"
 .Dd July 4, 2000
 .Dt RESOLVER @LIB_NETWORK_EXT_U@ 
@@ -59,6 +59,8 @@
 .Fd #include <netinet/in.h>
 .Fd #include <arpa/nameser.h>
 .Fd #include <resolv.h>
+.Ft typedef struct __res_state *res_state;
+.Pp
 .Fn res_ninit "res_state statp"
 .Fn res_ourserver_p "const res_state statp" "const struct sockaddr_in *addr"
 .Fn fp_resstat "const res_state statp" "FILE *fp"