From: Tinderbox User <tbox@isc.org>
Date: Tue, 26 Aug 2014 01:05:40 +0000 (+0000)
Subject: regen master
X-Git-Tag: v9.11.0a1~1378^2~77
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=78c3882f77baeaba4c58a339e760a6135437aa11;p=thirdparty%2Fbind9.git

regen master
---

diff --git a/doc/misc/options b/doc/misc/options
index 70e4a06a3fa..6f4d1d7b489 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -373,7 +373,6 @@ view <string> <optional_class> {
         check-wildcard <boolean>;
         cleaning-interval <integer>;
         clients-per-query <integer>;
-        database <string>;
         deny-answer-addresses { <address_match_element>; ... } [
             except-from { <quoted_string>; ... } ];
         deny-answer-aliases { <quoted_string>; ... } [ except-from {
@@ -508,7 +507,6 @@ view <string> <optional_class> {
         root-delegation-only [ exclude { <quoted_string>; ... } ];
         rrset-order { [ class <string> ] [ type <string> ] [ name
             <quoted_string> ] <string> <string>; ... };
-        search <boolean>;
         serial-update-method ( increment | unixtime | date );
         server <netprefix> {
                 bogus <boolean>;