From 989b3b2d6068ce5b525479b7754977baf6364a7d Mon Sep 17 00:00:00 2001
From: Erwin Lansing <erwin@FreeBSD.org>
Date: Mon, 24 Feb 2014 13:58:58 +0000
Subject: Vendor import of BIND 9.9.5

Approved by:	delphij (mentor, implicit)
Sponsored by:	DK Hostmaster A/S
---
 bin/named/named.conf.docbook | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'bin/named/named.conf.docbook')

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index d778706930e0..b4d0c38e5e62 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -45,6 +45,7 @@
       <year>2010</year>
       <year>2011</year>
       <year>2013</year>
+      <year>2014</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
@@ -219,7 +220,7 @@ options {
 	random-device <replaceable>quoted_string</replaceable>;
 	recursive-clients <replaceable>integer</replaceable>;
 	serial-query-rate <replaceable>integer</replaceable>;
-	server-id ( <replaceable>quoted_string</replaceable> | none );
+	server-id ( <replaceable>quoted_string</replaceable> | hostname | none );
 	stacksize <replaceable>size</replaceable>;
 	statistics-file <replaceable>quoted_string</replaceable>;
 	statistics-interval <replaceable>integer</replaceable>; // not yet implemented
@@ -366,7 +367,7 @@ options {
 	zone-statistics <replaceable>boolean</replaceable>;
 	key-directory <replaceable>quoted_string</replaceable>;
 	managed-keys-directory <replaceable>quoted_string</replaceable>;
-	auto-dnssec <constant>allow</constant>|<constant>maintain</constant>|<constant>create</constant>|<constant>off</constant>;
+	auto-dnssec <constant>allow</constant>|<constant>maintain</constant>|<constant>off</constant>;
 	try-tcp-refresh <replaceable>boolean</replaceable>;
 	zero-no-soa-ttl <replaceable>boolean</replaceable>;
 	zero-no-soa-ttl-cache <replaceable>boolean</replaceable>;
-- 
cgit v1.3