2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00

Merge branch '3185-follow-up-fix-zone-documentation' into 'main'

Fix zone named.conf man page documentation

Closes #3185

See merge request isc-projects/bind9!5977
This commit is contained in:
Matthijs Mekking 2022-03-15 13:14:25 +00:00
commit fd8dd9841d
3 changed files with 17 additions and 1 deletions

View File

@ -885,6 +885,11 @@ VIEW
zone-statistics ( full | terse | none | boolean ); zone-statistics ( full | terse | none | boolean );
}; };
ZONE
^^^^
Any of these zone statements can also be set inside the view statement.
.. include:: ../../doc/misc/primary.zoneopt.rst .. include:: ../../doc/misc/primary.zoneopt.rst
.. include:: ../../doc/misc/secondary.zoneopt.rst .. include:: ../../doc/misc/secondary.zoneopt.rst
.. include:: ../../doc/misc/mirror.zoneopt.rst .. include:: ../../doc/misc/mirror.zoneopt.rst

View File

@ -974,6 +974,9 @@ view string [ class ] {
.fi .fi
.UNINDENT .UNINDENT
.UNINDENT .UNINDENT
.SS ZONE
.sp
Any of these zone statements can also be set inside the view statement.
.INDENT 0.0 .INDENT 0.0
.INDENT 3.5 .INDENT 3.5
.sp .sp

View File

@ -79,6 +79,8 @@ while (<FH>) {
} }
} }
my $UNDERLINE;
my $blank = 0; my $blank = 0;
while (<FH>) { while (<FH>) {
if (m{// not.*implemented} || m{// obsolete} || if (m{// not.*implemented} || m{// obsolete} ||
@ -97,7 +99,7 @@ while (<FH>) {
s{ }{\t}g; s{ }{\t}g;
if (m{^([a-z0-9-]+) }) { if (m{^([a-z0-9-]+) }) {
my $HEADING = uc $1; my $HEADING = uc $1;
my $UNDERLINE = $HEADING; $UNDERLINE = $HEADING;
$UNDERLINE =~ s/./^/g; $UNDERLINE =~ s/./^/g;
print $HEADING . "\n"; print $HEADING . "\n";
print $UNDERLINE . "\n\n"; print $UNDERLINE . "\n\n";
@ -123,6 +125,12 @@ while (<FH>) {
} }
print "ZONE\n";
$UNDERLINE = "ZONE";
$UNDERLINE =~ s/./^/g;
print $UNDERLINE . "\n\n";
print "Any of these zone statements can also be set inside the view statement.\n\n";
print <<END; print <<END;
.. include:: ../../doc/misc/primary.zoneopt.rst .. include:: ../../doc/misc/primary.zoneopt.rst
.. include:: ../../doc/misc/secondary.zoneopt.rst .. include:: ../../doc/misc/secondary.zoneopt.rst