From 47528807e35017cd1dc5edd7d4203bf5db2f13b2 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Wed, 25 Oct 2017 11:05:56 -0700 Subject: [PATCH] [v9_10] fix some documentation errors [RT #45527] (cherry picked from commit 81570e84a25071ebe8b8d2d0b9d4a64094d2a41e) (cherry picked from commit 4ee7a7472999bcb2c56e6f9217213370411b6e0d) --- doc/arm/Bv9ARM-book.xml | 2 ++ doc/misc/docbook-options.pl | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index 3fbcb6e792..371dbcdfd2 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -4402,6 +4402,7 @@ badresp:1,adberr:0,findfail:0,valfail:0] [ maintain-ixfr-base yes_or_no ; ] [ ixfr-from-differences ( yes_or_no | | ) ; ] [ auto-dnssec ( | | ) ; ] + [ inline-signing yes_or_no ; ] [ dnssec-enable yes_or_no ; ] [ dnssec-validation ( yes_or_no | ) ; ] [ dnssec-lookaside ( | | domain trust-anchor domain ) ; ] @@ -4606,6 +4607,7 @@ badresp:1,adberr:0,findfail:0,valfail:0] [ break-dnssec yes_or_no ] [ min-ns-dots number ] [ qname-wait-recurse yes_or_no ] ; ] + [ trust-anchor-telemetry yes_or_no ; ] } ; ] diff --git a/doc/misc/docbook-options.pl b/doc/misc/docbook-options.pl index 3aae211f04..d2d81a12cc 100644 --- a/doc/misc/docbook-options.pl +++ b/doc/misc/docbook-options.pl @@ -30,9 +30,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; @@ -123,15 +123,17 @@ while () { } } +my $blank = 0; while () { - 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_-]+)>}{$1}g; - s{[[]}{}g; - s{[]]}{}g; + s{[[]}{[}g; + s{[]]}{]}g; s{ }{\t}g; if (m{^([a-z0-9-]+) }) { my $HEADING = uc $1; @@ -141,11 +143,15 @@ while () { END } - if (m{^\s*$}) { + + if (m{^\s*$} && !$blank) { + $blank = 1; print < END + } else { + $blank = 0; } print; }