From 197486d6a95ef23b1b414e96577bad21e57801cd Mon Sep 17 00:00:00 2001
From: Tinderbox User
Date: Thu, 16 May 2013 01:04:57 +0000
Subject: [PATCH] regen master
---
bin/named/named.conf.5 | 2 +-
bin/named/named.conf.html | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index afc506d5fb..20e4b95ce6 100644
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -187,7 +187,7 @@ options {
random\-device \fIquoted_string\fR;
recursive\-clients \fIinteger\fR;
serial\-query\-rate \fIinteger\fR;
- server\-id ( \fIquoted_string\fR | none |;
+ server\-id ( \fIquoted_string\fR | hostname | none );
stacksize \fIsize\fR;
statistics\-file \fIquoted_string\fR;
statistics\-interval \fIinteger\fR; // not yet implemented
diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index e32239ba08..31aa9495ba 100644
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -184,7 +184,7 @@ options
random-device quoted_string;
recursive-clients integer;
serial-query-rate integer;
- server-id ( quoted_string | none |;
+ server-id ( quoted_string | hostname | none );
stacksize size;
statistics-file quoted_string;
statistics-interval integer; // not yet implemented
@@ -362,7 +362,7 @@ options
-
VIEW
+
VIEW
view string optional_class {
match-clients { address_match_element; ... };
@@ -527,7 +527,7 @@ view
-
ZONE
+
ZONE
zone string optional_class {
type ( master | slave | stub | hint | redirect |
@@ -624,12 +624,12 @@ zone
-
FILES
+
FILES
/etc/named.conf
-
SEE ALSO
+
SEE ALSO
named(8),
named-checkconf(8),
rndc(8),