9.5.0a5

4 files changed, 25 insertions, 5 deletions

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 4251994e..058f254c 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3.18.2 2007/01/30 23:52:53 marka Exp $
+# $Id: Makefile.in,v 1.5 2007/01/30 23:52:54 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/doc/misc/ipv6 b/doc/misc/ipv6
index aeba2750..4060bc39 100644
--- a/doc/misc/ipv6
+++ b/doc/misc/ipv6
@@ -110,4 +110,4 @@ RELEVANT RFCs
 3542:  Advanced Sockets Application Program Interface (API) for IPv6
 
 
-$Id: ipv6,v 1.6.18.3 2004/08/10 04:28:41 jinmei Exp $
+$Id: ipv6,v 1.9 2004/08/10 04:27:51 jinmei Exp $
diff --git a/doc/misc/migration b/doc/misc/migration
index 6660e8f8..6674ad8d 100644
--- a/doc/misc/migration
+++ b/doc/misc/migration
@@ -252,4 +252,4 @@ necessary, the umask should be set explicitly in the script used to
 start the named process.
 
 
-$Id: migration,v 1.45.18.1 2004/11/22 22:32:19 marka Exp $
+$Id: migration,v 1.46 2004/11/22 22:24:37 marka Exp $
diff --git a/doc/misc/options b/doc/misc/options
index a17c5227..776ede32 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -50,8 +50,12 @@ options {
         use-ixfr <boolean>;
         version ( <quoted_string> | none );
         flush-zones-on-shutdown <boolean>;
+        stats-server <addrport4>;
+        stats-server-v6 <addrport6>;
         allow-query-cache { <address_match_element>; ... };
+        allow-query-cache-on { <address_match_element>; ... };
         allow-recursion { <address_match_element>; ... };
+        allow-recursion-on { <address_match_element>; ... };
         allow-v6-synthesis { <address_match_element>; ... }; // obsolete
         sortlist { <address_match_element>; ... };
         topology { <address_match_element>; ... }; // not implemented
@@ -101,7 +105,11 @@ options {
         empty-zones-enable <boolean>;
         disable-empty-zone <string>;
         zero-no-soa-ttl-cache <boolean>;
+        use-queryport-pool <boolean>;
+        queryport-pool-ports <integer>;
+        queryport-pool-updateinterval <integer>;
         allow-query { <address_match_element>; ... };
+        allow-query-on { <address_match_element>; ... };
         allow-transfer { <address_match_element>; ... };
         allow-update { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
@@ -147,6 +155,7 @@ options {
         check-sibling <boolean>;
         zero-no-soa-ttl <boolean>;
         update-check-ksk <boolean>;
+        try-tcp-refresh <boolean>;
 };
 
 controls {
@@ -195,12 +204,13 @@ view <string> <optional_class> {
                 pubkey <integer> <integer> <integer> <quoted_string>; //
                     obsolete
                 update-policy { ( grant | deny ) <string> ( name |
-                    subdomain | wildcard | self | selfsub | selfwild ) <string> <rrtypelist>; ... };
+                    subdomain | wildcard | self | selfsub | selfwild | krb5-self | ms-self | krb5-subdomain | ms-subdomain ) <string> <rrtypelist>; ... };
                 database <string>;
                 delegation-only <boolean>;
                 check-names ( fail | warn | ignore );
                 ixfr-from-differences <boolean>;
                 allow-query { <address_match_element>; ... };
+                allow-query-on { <address_match_element>; ... };
                 allow-transfer { <address_match_element>; ... };
                 allow-update { <address_match_element>; ... };
                 allow-update-forwarding { <address_match_element>; ... };
@@ -250,6 +260,7 @@ view <string> <optional_class> {
                 check-sibling <boolean>;
                 zero-no-soa-ttl <boolean>;
                 update-check-ksk <boolean>;
+                try-tcp-refresh <boolean>;
         };
         dlz <string> {
                 database <string>;
@@ -279,7 +290,9 @@ view <string> <optional_class> {
         trusted-keys { <string> <integer> <integer> <integer>
             <quoted_string>; ... };
         allow-query-cache { <address_match_element>; ... };
+        allow-query-cache-on { <address_match_element>; ... };
         allow-recursion { <address_match_element>; ... };
+        allow-recursion-on { <address_match_element>; ... };
         allow-v6-synthesis { <address_match_element>; ... }; // obsolete
         sortlist { <address_match_element>; ... };
         topology { <address_match_element>; ... }; // not implemented
@@ -329,7 +342,11 @@ view <string> <optional_class> {
         empty-zones-enable <boolean>;
         disable-empty-zone <string>;
         zero-no-soa-ttl-cache <boolean>;
+        use-queryport-pool <boolean>;
+        queryport-pool-ports <integer>;
+        queryport-pool-updateinterval <integer>;
         allow-query { <address_match_element>; ... };
+        allow-query-on { <address_match_element>; ... };
         allow-transfer { <address_match_element>; ... };
         allow-update { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
@@ -375,6 +392,7 @@ view <string> <optional_class> {
         check-sibling <boolean>;
         zero-no-soa-ttl <boolean>;
         update-check-ksk <boolean>;
+        try-tcp-refresh <boolean>;
         database <string>;
 };
 
@@ -401,12 +419,13 @@ zone <string> <optional_class> {
             <integer>] | <ipv6_address> [port <integer>] ) [ key <string> ]; ... };
         pubkey <integer> <integer> <integer> <quoted_string>; // obsolete
         update-policy { ( grant | deny ) <string> ( name | subdomain |
-            wildcard | self | selfsub | selfwild ) <string> <rrtypelist>; ... };
+            wildcard | self | selfsub | selfwild | krb5-self | ms-self | krb5-subdomain | ms-subdomain ) <string> <rrtypelist>; ... };
         database <string>;
         delegation-only <boolean>;
         check-names ( fail | warn | ignore );
         ixfr-from-differences <boolean>;
         allow-query { <address_match_element>; ... };
+        allow-query-on { <address_match_element>; ... };
         allow-transfer { <address_match_element>; ... };
         allow-update { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
@@ -452,6 +471,7 @@ zone <string> <optional_class> {
         check-sibling <boolean>;
         zero-no-soa-ttl <boolean>;
         update-check-ksk <boolean>;
+        try-tcp-refresh <boolean>;
 };
 
 dlz <string> {