add missing space

noticed in manual review of the PDF
minor so wasn't reviewed

and fixed conflicts after cherry-pick
This commit is contained in:
Jeremy C. Reed 2015-09-10 10:38:02 -04:00
parent 5b15652954
commit 91e9bc341e

View file

@ -4791,7 +4791,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
<optional> max-clients-per-query <replaceable>number</replaceable> ; </optional>
<optional> fetches-per-server <replaceable>number</replaceable> <optional><replaceable>(drop | fail)</replaceable></optional>; </optional>
<optional> fetch-quota-params <replaceable>number fixedpoint fixedpoint fixedpoint</replaceable> ; </optional>
<optional> fetches-per-zone<replaceable>number</replaceable> <optional><replaceable>(drop | fail)</replaceable></optional>; </optional>
<optional> fetches-per-zone <replaceable>number</replaceable> <optional><replaceable>(drop | fail)</replaceable></optional>; </optional>
<optional> serial-query-rate <replaceable>number</replaceable>; </optional>
<optional> serial-queries <replaceable>number</replaceable>; </optional>
<optional> tcp-listen-queue <replaceable>number</replaceable>; </optional>