- Fix for #44: nicer top-level clause documentation.

NLnetLabs · Nov 11, 2019 · 03744cc · 03744cc
1 parent 5d3cc1b
commit 03744cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -2,6 +2,7 @@
 	- Fix #44: document that remote-control is a top-level nsd.conf
 	  attribute.
 	- Fix compile on OSX.
+	- Fix for #44: nicer top-level clause documentation.
 
 22 October 2019: Jeroen
 	- Number of different UDP handlers has been reduced to one. recvmmsg

diff --git a/nsd.conf.5.in b/nsd.conf.5.in
@@ -100,25 +100,13 @@ with a colon ':'. An attribute is followed by its containing
 attributes, or a value. 
 .P
 At the top level only 
-.B server:
-and
-.B key: 
-and 
-.B pattern:
-and
-.B zone: 
+.BR server: ,
+.BR key: ,
+.BR pattern: ,
+.BR zone: ,
 and
 .B remote-control:
-are allowed. These are followed by their attributes or the start of 
-a new 
-.B server:
-or 
-.B key: 
-or
-.B pattern:
-or
-.B zone: 
-clause. The 
+are allowed. These are followed by their attributes or a new top-level keyword. The
 .B zone:
 attribute is followed by zone options. The 
 .B server: