diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index cb6fb5ac86..d0a658e460 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -4309,6 +4309,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
   [ <command>maintain-ixfr-base</command> <replaceable>yes_or_no</replaceable> ; ]
   [ <command>ixfr-from-differences</command> ( <replaceable>yes_or_no</replaceable> | <option>master</option> | <option>slave</option> ) ; ]
   [ <command>auto-dnssec</command> ( <option>allow</option> | <option>maintain</option> | <option>off</option> ) ; ]
+  [ <command>inline-signing</command> <replaceable>yes_or_no</replaceable> ; ]
   [ <command>dnssec-enable</command> <replaceable>yes_or_no</replaceable> ; ]
   [ <command>dnssec-validation</command> ( <replaceable>yes_or_no</replaceable> | <option>auto</option> ) ; ]
   [ <command>dnssec-lookaside</command> ( <option>auto</option> | <option>no</option> | <replaceable>domain</replaceable> trust-anchor <replaceable>domain</replaceable> ) ; ]
@@ -4548,6 +4549,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
 	...
     <command>}</command> ; ]
   [ <command>v6-bias</command> <replaceable>number</replaceable> ; ]
+  [ <command>trust-anchor-telemetry</command> <replaceable>yes_or_no</replaceable> ; ]
 <command>}</command> ; ]
 </programlisting>
 
diff --git a/doc/misc/docbook-options.pl b/doc/misc/docbook-options.pl
index 4d7a096a22..9b78fd5ea4 100644
--- a/doc/misc/docbook-options.pl
+++ b/doc/misc/docbook-options.pl
@@ -22,9 +22,9 @@ my $FILE = shift;
 
 my $DATE;
 if (@ARGV >= 2) {
-        $DATE = shift
+	$DATE = shift
 } else {
-        $DATE = `git log --max-count=1 --date=short --format='%cd' $FILE` or die "unable to determine last modification date of '$FILE'; specify on command line\nexiting";
+	$DATE = `git log --max-count=1 --date=short --format='%cd' $FILE` or die "unable to determine last modification date of '$FILE'; specify on command line\nexiting";
 }
 chomp $DATE;
 
@@ -115,15 +115,17 @@ while (<FH>) {
 	}
 }
 
+my $blank = 0;
 while (<FH>) {
-        if (m{// not.*implemented} || m{// obsolete}) {
-                next;
-        }
+	if (m{// not.*implemented} || m{// obsolete} || m{// test.*only}) {
+		next;
+	}
+
 	s{ // not configured}{};
 	s{ // may occur multiple times}{};
 	s{<([a-z0-9_-]+)>}{<replaceable>$1</replaceable>}g;
-	s{[[]}{<optional>}g;
-	s{[]]}{</optional>}g;
+	s{[[]}{[}g;
+	s{[]]}{]}g;
 	s{        }{\t}g;
 	if (m{^([a-z0-9-]+) }) {
 		my $HEADING = uc $1;
@@ -133,11 +135,15 @@ while (<FH>) {
     <literallayout class="normal">
 END
 	}
-	if (m{^\s*$}) {
+
+	if (m{^\s*$} && !$blank) {
+		$blank = 1;
 		print <<END;
 </literallayout>
   </refsection>
 END
+	} else {
+		$blank = 0;
 	}
 	print;
 }