From 22bca01405d77eed1648764663b08b3c973ee920 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 29 May 2013 15:51:30 +1000
Subject: [PATCH] 3574.   [doc]           The 'hostname' keyword was missing
 from server-id                         description in the named.conf man
 page. [RT #33476]

---
 CHANGES                      | 3 +++
 bin/named/named.conf.docbook | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 5032e75f1a..9372712159 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3574.	[doc]		The 'hostname' keyword was missing from server-id
+			description in the named.conf man page. [RT #33476]
+
 	--- 9.9.3 released ---
 
 3568.	[cleanup]	Add a product description line to the version file,
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index d778706930..35cd6276dd 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -219,7 +219,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