regenerated

diff --git a/doc/misc/options b/doc/misc/options
index bd322788e53232395ee346ef18a30bb98794778f..aa75a29deca2742eb82edfc07d1f3057eb244551 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -67,7 +67,7 @@ options {
         lame-ttl <integer>;
         max-ncache-ttl <integer>;
         max-cache-ttl <integer>;
-        transfer-format <string>;
+        transfer-format ( many-answers | one-answer );
         max-cache-size <size_no_default>;
         check-names <string> <string>; // not implemented
         cache-file <quoted_string>;
@@ -105,7 +105,7 @@ controls {
 acl <string> { <address_match_element>; ... };
 
 logging {
-        channel {
+        channel <string> {
                 file <logfile>;
                 syslog <optional_facility>;
                 null;
@@ -122,7 +122,7 @@ view <string> <optional_class> {
         match-clients { <address_match_element>; ... };
         match-destinations { <address_match_element>; ... };
         match-recursive-only <boolean>;
-        key {
+        key <string> {
                 algorithm <string>;
                 secret <string>;
         };
@@ -203,7 +203,7 @@ view <string> <optional_class> {
         lame-ttl <integer>;
         max-ncache-ttl <integer>;
         max-cache-ttl <integer>;
-        transfer-format <string>;
+        transfer-format ( many-answers | one-answer );
         max-cache-size <size_no_default>;
         check-names <string> <string>; // not implemented
         cache-file <quoted_string>;
@@ -240,7 +240,7 @@ lwres {
         ndots <integer>;
 };
 
-key {
+key <string> {
         algorithm <string>;
         secret <string>;
 };