mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

remove spurious commas from docbook

Browse Source
This commit is contained in:
Evan Hunt
2019-07-02 12:59:42 -07:00
committed by Matthijs Mekking
parent d1503cbfa2
commit 77c2a8bcbd
8 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
bin/named/named.conf.docbook
View File

@@ -13,7 +13,7 @@
<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named.conf"> <refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named.conf">
<info> <info>
<date>2019-05-10</date> <date>2019-06-28</date>
</info> </info>
<refentryinfo> <refentryinfo>
<corpname>ISC</corpname> <corpname>ISC</corpname>
@@ -158,9 +158,10 @@ logging {
<refsection><info><title>MANAGED-KEYS</title></info> <refsection><info><title>MANAGED-KEYS</title></info>
<para>Deprecated - see DNSSEC-KEYS.</para> <para>Deprecated - see DNSSEC-KEYS.</para>
<literallayout class="normal"> <literallayout class="normal">
managed-keys { <replaceable>string</replaceable> ( static-key | managed-keys { <replaceable>string</replaceable> ( static-key
initial-key ) <replaceable>integer</replaceable> <replaceable>integer</replaceable> <replaceable>integer</replaceable> | initial-key ) <replaceable>integer</replaceable>
<replaceable>quoted_string</replaceable>; ... }; <replaceable>integer</replaceable> <replaceable>integer</replaceable>
<replaceable>quoted_string</replaceable>; ... }; deprecated
</literallayout> </literallayout>
</refsection> </refsection>
@@ -220,7 +221,6 @@ options {
check-spf ( warn | ignore ); check-spf ( warn | ignore );
check-srv-cname ( fail | warn | ignore ); check-srv-cname ( fail | warn | ignore );
check-wildcard <replaceable>boolean</replaceable>; check-wildcard <replaceable>boolean</replaceable>;
cleaning-interval <replaceable>integer</replaceable>;
clients-per-query <replaceable>integer</replaceable>; clients-per-query <replaceable>integer</replaceable>;
cookie-algorithm ( aes | sha1 | sha256 ); cookie-algorithm ( aes | sha1 | sha256 );
cookie-secret <replaceable>string</replaceable>; cookie-secret <replaceable>string</replaceable>;
@@ -253,8 +253,9 @@ options {
dnssec-accept-expired <replaceable>boolean</replaceable>; dnssec-accept-expired <replaceable>boolean</replaceable>;
dnssec-dnskey-kskonly <replaceable>boolean</replaceable>; dnssec-dnskey-kskonly <replaceable>boolean</replaceable>;
dnssec-loadkeys-interval <replaceable>integer</replaceable>; dnssec-loadkeys-interval <replaceable>integer</replaceable>;
dnssec-lookaside ( <replaceable>string</replaceable> trust-anchor dnssec-lookaside ( <replaceable>string</replaceable>
<replaceable>string</replaceable> | auto | no );, deprecated trust-anchor <replaceable>string</replaceable> |
auto | no ); deprecated
dnssec-must-be-secure <replaceable>string</replaceable> <replaceable>boolean</replaceable>; dnssec-must-be-secure <replaceable>string</replaceable> <replaceable>boolean</replaceable>;
dnssec-secure-to-insecure <replaceable>boolean</replaceable>; dnssec-secure-to-insecure <replaceable>boolean</replaceable>;
dnssec-update-mode ( maintain | no-resign ); dnssec-update-mode ( maintain | no-resign );
@@ -534,7 +535,7 @@ statistics-channels {
<literallayout class="normal"> <literallayout class="normal">
trusted-keys { <replaceable>string</replaceable> <replaceable>integer</replaceable> trusted-keys { <replaceable>string</replaceable> <replaceable>integer</replaceable>
<replaceable>integer</replaceable> <replaceable>integer</replaceable> <replaceable>integer</replaceable> <replaceable>integer</replaceable>
<replaceable>quoted_string</replaceable>; ... };, deprecated <replaceable>quoted_string</replaceable>; ... }; deprecated
</literallayout> </literallayout>
</refsection> </refsection>
@@ -579,7 +580,6 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
check-spf ( warn | ignore ); check-spf ( warn | ignore );
check-srv-cname ( fail | warn | ignore ); check-srv-cname ( fail | warn | ignore );
check-wildcard <replaceable>boolean</replaceable>; check-wildcard <replaceable>boolean</replaceable>;
cleaning-interval <replaceable>integer</replaceable>;
clients-per-query <replaceable>integer</replaceable>; clients-per-query <replaceable>integer</replaceable>;
deny-answer-addresses { <replaceable>address_match_element</replaceable>; ... } [ deny-answer-addresses { <replaceable>address_match_element</replaceable>; ... } [
except-from { <replaceable>string</replaceable>; ... } ]; except-from { <replaceable>string</replaceable>; ... } ];
@@ -614,8 +614,9 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
initial-key ) <replaceable>integer</replaceable> <replaceable>integer</replaceable> initial-key ) <replaceable>integer</replaceable> <replaceable>integer</replaceable>
<replaceable>integer</replaceable> <replaceable>quoted_string</replaceable>; ... }; <replaceable>integer</replaceable> <replaceable>quoted_string</replaceable>; ... };
dnssec-loadkeys-interval <replaceable>integer</replaceable>; dnssec-loadkeys-interval <replaceable>integer</replaceable>;
dnssec-lookaside ( <replaceable>string</replaceable> trust-anchor dnssec-lookaside ( <replaceable>string</replaceable>
<replaceable>string</replaceable> | auto | no );, deprecated trust-anchor <replaceable>string</replaceable> |
auto | no ); deprecated
dnssec-must-be-secure <replaceable>string</replaceable> <replaceable>boolean</replaceable>; dnssec-must-be-secure <replaceable>string</replaceable> <replaceable>boolean</replaceable>;
dnssec-secure-to-insecure <replaceable>boolean</replaceable>; dnssec-secure-to-insecure <replaceable>boolean</replaceable>;
dnssec-update-mode ( maintain | no-resign ); dnssec-update-mode ( maintain | no-resign );
@@ -650,9 +651,11 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
key-directory <replaceable>quoted_string</replaceable>; key-directory <replaceable>quoted_string</replaceable>;
lame-ttl <replaceable>ttlval</replaceable>; lame-ttl <replaceable>ttlval</replaceable>;
lmdb-mapsize <replaceable>sizeval</replaceable>; lmdb-mapsize <replaceable>sizeval</replaceable>;
managed-keys { <replaceable>string</replaceable> ( static-key | managed-keys { <replaceable>string</replaceable> (
initial-key ) <replaceable>integer</replaceable> <replaceable>integer</replaceable> static-key | initial-key
<replaceable>integer</replaceable> <replaceable>quoted_string</replaceable>; ... };, deprecated ) <replaceable>integer</replaceable> <replaceable>integer</replaceable>
<replaceable>integer</replaceable>
<replaceable>quoted_string</replaceable>; ... }; deprecated
masterfile-format ( map | raw | text ); masterfile-format ( map | raw | text );
masterfile-style ( full | relative ); masterfile-style ( full | relative );
match-clients { <replaceable>address_match_element</replaceable>; ... }; match-clients { <replaceable>address_match_element</replaceable>; ... };
@@ -805,7 +808,7 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
trusted-keys { <replaceable>string</replaceable> trusted-keys { <replaceable>string</replaceable>
<replaceable>integer</replaceable> <replaceable>integer</replaceable> <replaceable>integer</replaceable> <replaceable>integer</replaceable>
<replaceable>integer</replaceable> <replaceable>integer</replaceable>
<replaceable>quoted_string</replaceable>; ... };, deprecated <replaceable>quoted_string</replaceable>; ... }; deprecated
try-tcp-refresh <replaceable>boolean</replaceable>; try-tcp-refresh <replaceable>boolean</replaceable>;
update-check-ksk <replaceable>boolean</replaceable>; update-check-ksk <replaceable>boolean</replaceable>;
use-alt-transfer-source <replaceable>boolean</replaceable>; use-alt-transfer-source <replaceable>boolean</replaceable>;

7
doc/arm/managed-keys.grammar.xml
View File

@@ -12,7 +12,8 @@
<!-- Generated by doc/misc/docbook-options.pl --> <!-- Generated by doc/misc/docbook-options.pl -->
<programlisting> <programlisting>
<command>managed-keys</command> { <replaceable>string</replaceable> ( static-key | <command>managed-keys</command> { <replaceable>string</replaceable> ( static-key
<command>initial-key</command> ) <replaceable>integer</replaceable> <replaceable>integer</replaceable> <replaceable>integer</replaceable> | initial-key ) <replaceable>integer</replaceable>
<replaceable>quoted_string</replaceable>; ... }; <replaceable>integer</replaceable> <replaceable>integer</replaceable>
<replaceable>quoted_string</replaceable>; ... }; deprecated
</programlisting> </programlisting>

6
doc/arm/options.grammar.xml
View File

@@ -57,7 +57,6 @@
<command>check-spf</command> ( warn | ignore ); <command>check-spf</command> ( warn | ignore );
<command>check-srv-cname</command> ( fail | warn | ignore ); <command>check-srv-cname</command> ( fail | warn | ignore );
<command>check-wildcard</command> <replaceable>boolean</replaceable>; <command>check-wildcard</command> <replaceable>boolean</replaceable>;
<command>cleaning-interval</command> <replaceable>integer</replaceable>;
<command>clients-per-query</command> <replaceable>integer</replaceable>; <command>clients-per-query</command> <replaceable>integer</replaceable>;
<command>cookie-algorithm</command> ( aes | sha1 | sha256 ); <command>cookie-algorithm</command> ( aes | sha1 | sha256 );
<command>cookie-secret</command> <replaceable>string</replaceable>; <command>cookie-secret</command> <replaceable>string</replaceable>;
@@ -90,8 +89,9 @@
<command>dnssec-accept-expired</command> <replaceable>boolean</replaceable>; <command>dnssec-accept-expired</command> <replaceable>boolean</replaceable>;
<command>dnssec-dnskey-kskonly</command> <replaceable>boolean</replaceable>; <command>dnssec-dnskey-kskonly</command> <replaceable>boolean</replaceable>;
<command>dnssec-loadkeys-interval</command> <replaceable>integer</replaceable>; <command>dnssec-loadkeys-interval</command> <replaceable>integer</replaceable>;
<command>dnssec-lookaside</command> ( <replaceable>string</replaceable> trust-anchor <command>dnssec-lookaside</command> ( <replaceable>string</replaceable>
<replaceable>string</replaceable> | auto | no );, deprecated <command>trust-anchor</command> <replaceable>string</replaceable> |
<command>auto</command> | no ); deprecated
<command>dnssec-must-be-secure</command> <replaceable>string</replaceable> <replaceable>boolean</replaceable>; <command>dnssec-must-be-secure</command> <replaceable>string</replaceable> <replaceable>boolean</replaceable>;
<command>dnssec-secure-to-insecure</command> <replaceable>boolean</replaceable>; <command>dnssec-secure-to-insecure</command> <replaceable>boolean</replaceable>;
<command>dnssec-update-mode</command> ( maintain | no-resign ); <command>dnssec-update-mode</command> ( maintain | no-resign );

2
doc/arm/trusted-keys.grammar.xml
View File

@@ -14,5 +14,5 @@
<programlisting> <programlisting>
<command>trusted-keys</command> { <replaceable>string</replaceable> <replaceable>integer</replaceable> <command>trusted-keys</command> { <replaceable>string</replaceable> <replaceable>integer</replaceable>
<replaceable>integer</replaceable> <replaceable>integer</replaceable> <replaceable>integer</replaceable> <replaceable>integer</replaceable>
<replaceable>quoted_string</replaceable>; ... };, deprecated <replaceable>quoted_string</replaceable>; ... }; deprecated
</programlisting> </programlisting>

2
doc/misc/docbook-grammars.pl
View File

@@ -67,7 +67,7 @@ while (<FH>) {
s{ // not configured}{}; s{ // not configured}{};
s{ // non-operational}{}; s{ // non-operational}{};
s{ // may occur multiple times}{}; s{ // may occur multiple times,*}{};
s{<([a-z0-9_-]+)>}{<replaceable>$1</replaceable>}g; s{<([a-z0-9_-]+)>}{<replaceable>$1</replaceable>}g;
s{^(\s*)([a-z0-9_-]+)\b}{$1<command>$2</command>}; s{^(\s*)([a-z0-9_-]+)\b}{$1<command>$2</command>};
s{[[]}{[}g; s{[[]}{[}g;

2
doc/misc/docbook-options.pl
View File

@@ -128,7 +128,7 @@ while (<FH>) {
s{ // not configured}{}; s{ // not configured}{};
s{ // non-operational}{}; s{ // non-operational}{};
s{ (// )*may occur multiple times}{}; s{ (// )*may occur multiple times,*}{};
s{<([a-z0-9_-]+)>}{<replaceable>$1</replaceable>}g; s{<([a-z0-9_-]+)>}{<replaceable>$1</replaceable>}g;
s{ // deprecated,*}{// deprecated}; s{ // deprecated,*}{// deprecated};
s{[[]}{[}g; s{[[]}{[}g;

2
doc/misc/docbook-zoneopt.pl
View File

@@ -51,7 +51,7 @@ while (<FH>) {
} }
s{ // not configured}{}; s{ // not configured}{};
s{ // may occur multiple times}{}; s{ // may occur multiple times,*}{};
s{<([a-z0-9_-]+)>}{<replaceable>$1</replaceable>}g; s{<([a-z0-9_-]+)>}{<replaceable>$1</replaceable>}g;
s{^(\s*)([a-z0-9_-]+)\b}{$1<command>$2</command>}; s{^(\s*)([a-z0-9_-]+)\b}{$1<command>$2</command>};
s{[[]}{[}g; s{[[]}{[}g;

16
doc/misc/options
View File

@@ -146,8 +146,9 @@ options {
dnssec-dnskey-kskonly <boolean>; dnssec-dnskey-kskonly <boolean>;
dnssec-enable <boolean>; // obsolete dnssec-enable <boolean>; // obsolete
dnssec-loadkeys-interval <integer>; dnssec-loadkeys-interval <integer>;
dnssec-lookaside ( <string> trust-anchor dnssec-lookaside ( <string>
<string> | auto | no ); // may occur multiple times, deprecated trust-anchor <string> |
auto | no ); // may occur multiple times, deprecated
dnssec-must-be-secure <string> <boolean>; // may occur multiple times dnssec-must-be-secure <string> <boolean>; // may occur multiple times
dnssec-secure-to-insecure <boolean>; dnssec-secure-to-insecure <boolean>;
dnssec-update-mode ( maintain | no-resign ); dnssec-update-mode ( maintain | no-resign );
@@ -192,7 +193,7 @@ options {
fstrm-set-output-queue-model ( mpsc | spsc ); // not configured fstrm-set-output-queue-model ( mpsc | spsc ); // not configured
fstrm-set-output-queue-size <integer>; // not configured fstrm-set-output-queue-size <integer>; // not configured
fstrm-set-reopen-interval <ttlval>; // not configured fstrm-set-reopen-interval <ttlval>; // not configured
geoip-directory ( <quoted_string> | none ); // not configured geoip-directory ( <quoted_string> | none );
geoip-use-ecs <boolean>; // obsolete geoip-use-ecs <boolean>; // obsolete
glue-cache <boolean>; glue-cache <boolean>;
has-old-clients <boolean>; // ancient has-old-clients <boolean>; // ancient
@@ -213,7 +214,7 @@ options {
listen-on-v6 [ port <integer> ] [ dscp listen-on-v6 [ port <integer> ] [ dscp
<integer> ] { <integer> ] {
<address_match_element>; ... }; // may occur multiple times <address_match_element>; ... }; // may occur multiple times
lmdb-mapsize <sizeval>; // non-operational lmdb-mapsize <sizeval>;
lock-file ( <quoted_string> | none ); lock-file ( <quoted_string> | none );
maintain-ixfr-base <boolean>; // ancient maintain-ixfr-base <boolean>; // ancient
managed-keys-directory <quoted_string>; managed-keys-directory <quoted_string>;
@@ -524,8 +525,9 @@ view <string> [ <class> ] {
initial-key ) <integer> <integer> initial-key ) <integer> <integer>
<integer> <quoted_string>; ... }; // may occur multiple times <integer> <quoted_string>; ... }; // may occur multiple times
dnssec-loadkeys-interval <integer>; dnssec-loadkeys-interval <integer>;
dnssec-lookaside ( <string> trust-anchor dnssec-lookaside ( <string>
<string> | auto | no ); // may occur multiple times, deprecated trust-anchor <string> |
auto | no ); // may occur multiple times, deprecated
dnssec-must-be-secure <string> <boolean>; // may occur multiple times dnssec-must-be-secure <string> <boolean>; // may occur multiple times
dnssec-secure-to-insecure <boolean>; dnssec-secure-to-insecure <boolean>;
dnssec-update-mode ( maintain | no-resign ); dnssec-update-mode ( maintain | no-resign );
@@ -563,7 +565,7 @@ view <string> [ <class> ] {
}; // may occur multiple times }; // may occur multiple times
key-directory <quoted_string>; key-directory <quoted_string>;
lame-ttl <ttlval>; lame-ttl <ttlval>;
lmdb-mapsize <sizeval>; // non-operational lmdb-mapsize <sizeval>;
maintain-ixfr-base <boolean>; // ancient maintain-ixfr-base <boolean>; // ancient
managed-keys { <string> ( managed-keys { <string> (
static-key | initial-key static-key | initial-key