3574. [doc] The 'hostname' keyword was missing from server-id

                        description in the named.conf man page. [RT #33476]

diff --git a/CHANGES b/CHANGES
index d03b9503cbb46ccff32e060a6ac4baef230c1ea3..05d893a14ab4aa61cd4fd8f96e41f1c7d8389c03 100644 (file)
--- 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]
+
 3573.  [bug]           "rndc addzone" and "rndc delzone" incorrectly handled
                        zone names containing punctuation marks and other
                        nonstandard characters. [RT #33419]
@@ -32,7 +35,7 @@
 3561.  [bug]           dig: issue a warning if an EDNS query returns FORMERR
                        or NOTIMP.  Adjust usage message. [RT #33363]
                        
-3560.  [bug]           isc-config.sh did not honour includedir and libdir
+3560.  [bug]           isc-config.sh did not honor includedir and libdir
                        when set via configure. [RT #33345]
 
 3559.  [func]          Check that both forms of Sender Policy Framework
@@ -81,7 +84,7 @@
                        managed keys as recorded in managed-keys.bind.
                        Contributed by Tony Finch <dot@dotat.at>
 
-3543.  [bug]           Update socket stucture before attaching to socket
+3543.  [bug]           Update socket structure before attaching to socket
                        manager after accept. [RT #33084]
 
 3542.  [placeholder]
@@ -301,7 +304,7 @@
                        have address records (missing AAAA or A, or the name
                        doesn't exist). [RT #29348]
 
-3481.  [cleanup]       removed use of const const in atf
+3481.  [cleanup]       Removed use of const const in atf.
 
 3480.  [bug]           Silence logging noise when setting up zone
                        statistics. [RT #32525]
@@ -501,7 +504,7 @@
 3416.  [bug]           Named could die on shutdown if running with 128 UDP
                        dispatches per interface. [RT #31743]
 
-3415.  [bug]           named could die with a REQUIRE failure if a valdation
+3415.  [bug]           named could die with a REQUIRE failure if a validation
                        was canceled. [RT #31804]
 
 3414.  [bug]           Address locking issues found by Coverity. [RT #31626]
@@ -610,7 +613,7 @@
 3381.  [contrib]       Update queryperf to support more RR types.
                        [RT #30762]
 
-3380.  [bug]           named could die if a non-existant master list was
+3380.  [bug]           named could die if a nonexistent master list was
                        referenced in a also-notify. [RT #31004]
 
 3379.  [bug]           isc_interval_zero and isc_time_epoch should be
@@ -843,8 +846,8 @@
                        multiprocessor systems by reducing lock contention.
                        [RT #28605]
 
-3314.  [bug]           The masters list could be updated while refesh_callback
-                       and stub_callback were using it. [RT #26732]
+3314.  [bug]           The masters list could be updated while stub_callback
+                       or refresh_callback were using it. [RT #26732]
 
 3313.  [protocol]      Add TLSA record type. [RT #28989]
 

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index f6b76c36fb8ebecb6097150d68d13780b6d56b3f..1bace40b4ac3c46b427a988d038a0073d47ec5cd 100644 (file)
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -220,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