diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 1224e4e2ee..f8f223eb3c 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -13,7 +13,7 @@
 
 <refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named.conf">
   <info>
-    <date>2019-05-10</date>
+    <date>2019-06-28</date>
   </info>
   <refentryinfo>
     <corpname>ISC</corpname>
@@ -158,9 +158,10 @@ logging {
   <refsection><info><title>MANAGED-KEYS</title></info>
   <para>Deprecated - see DNSSEC-KEYS.</para>
     <literallayout class="normal">
-managed-keys { <replaceable>string</replaceable> ( static-key |
-    initial-key ) <replaceable>integer</replaceable> <replaceable>integer</replaceable> <replaceable>integer</replaceable>
-    <replaceable>quoted_string</replaceable>; ... };
+managed-keys { <replaceable>string</replaceable> ( static-key
+    | initial-key ) <replaceable>integer</replaceable>
+    <replaceable>integer</replaceable> <replaceable>integer</replaceable>
+    <replaceable>quoted_string</replaceable>; ... }; deprecated
 </literallayout>
   </refsection>
 
@@ -220,7 +221,6 @@ options {
 	check-spf ( warn | ignore );
 	check-srv-cname ( fail | warn | ignore );
 	check-wildcard <replaceable>boolean</replaceable>;
-	cleaning-interval <replaceable>integer</replaceable>;
 	clients-per-query <replaceable>integer</replaceable>;
 	cookie-algorithm ( aes | sha1 | sha256 );
 	cookie-secret <replaceable>string</replaceable>;
@@ -253,8 +253,9 @@ options {
 	dnssec-accept-expired <replaceable>boolean</replaceable>;
 	dnssec-dnskey-kskonly <replaceable>boolean</replaceable>;
 	dnssec-loadkeys-interval <replaceable>integer</replaceable>;
-	dnssec-lookaside ( <replaceable>string</replaceable> trust-anchor
-	    <replaceable>string</replaceable> | auto | no );, deprecated
+	dnssec-lookaside ( <replaceable>string</replaceable>
+	    trust-anchor <replaceable>string</replaceable> |
+	    auto | no ); deprecated
 	dnssec-must-be-secure <replaceable>string</replaceable> <replaceable>boolean</replaceable>;
 	dnssec-secure-to-insecure <replaceable>boolean</replaceable>;
 	dnssec-update-mode ( maintain | no-resign );
@@ -534,7 +535,7 @@ statistics-channels {
     <literallayout class="normal">
 trusted-keys { <replaceable>string</replaceable> <replaceable>integer</replaceable>
     <replaceable>integer</replaceable> <replaceable>integer</replaceable>
-    <replaceable>quoted_string</replaceable>; ... };, deprecated
+    <replaceable>quoted_string</replaceable>; ... }; deprecated
 </literallayout>
   </refsection>
 
@@ -579,7 +580,6 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
 	check-spf ( warn | ignore );
 	check-srv-cname ( fail | warn | ignore );
 	check-wildcard <replaceable>boolean</replaceable>;
-	cleaning-interval <replaceable>integer</replaceable>;
 	clients-per-query <replaceable>integer</replaceable>;
 	deny-answer-addresses { <replaceable>address_match_element</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>
 	    <replaceable>integer</replaceable> <replaceable>quoted_string</replaceable>; ... };
 	dnssec-loadkeys-interval <replaceable>integer</replaceable>;
-	dnssec-lookaside ( <replaceable>string</replaceable> trust-anchor
-	    <replaceable>string</replaceable> | auto | no );, deprecated
+	dnssec-lookaside ( <replaceable>string</replaceable>
+	    trust-anchor <replaceable>string</replaceable> |
+	    auto | no ); deprecated
 	dnssec-must-be-secure <replaceable>string</replaceable> <replaceable>boolean</replaceable>;
 	dnssec-secure-to-insecure <replaceable>boolean</replaceable>;
 	dnssec-update-mode ( maintain | no-resign );
@@ -650,9 +651,11 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
 	key-directory <replaceable>quoted_string</replaceable>;
 	lame-ttl <replaceable>ttlval</replaceable>;
 	lmdb-mapsize <replaceable>sizeval</replaceable>;
-	managed-keys { <replaceable>string</replaceable> ( static-key |
-	    initial-key ) <replaceable>integer</replaceable> <replaceable>integer</replaceable>
-	    <replaceable>integer</replaceable> <replaceable>quoted_string</replaceable>; ... };, deprecated
+	managed-keys { <replaceable>string</replaceable> (
+	    static-key | initial-key
+	    ) <replaceable>integer</replaceable> <replaceable>integer</replaceable>
+	    <replaceable>integer</replaceable>
+	    <replaceable>quoted_string</replaceable>; ... }; deprecated
 	masterfile-format ( map | raw | text );
 	masterfile-style ( full | relative );
 	match-clients { <replaceable>address_match_element</replaceable>; ... };
@@ -805,7 +808,7 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
 	trusted-keys { <replaceable>string</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>;
 	update-check-ksk <replaceable>boolean</replaceable>;
 	use-alt-transfer-source <replaceable>boolean</replaceable>;
diff --git a/doc/arm/managed-keys.grammar.xml b/doc/arm/managed-keys.grammar.xml
index d1aaee3c37..beb0f96725 100644
--- a/doc/arm/managed-keys.grammar.xml
+++ b/doc/arm/managed-keys.grammar.xml
@@ -12,7 +12,8 @@
 <!-- Generated by doc/misc/docbook-options.pl -->
 
 <programlisting>
-<command>managed-keys</command> { <replaceable>string</replaceable> ( static-key |
-    <command>initial-key</command> ) <replaceable>integer</replaceable> <replaceable>integer</replaceable> <replaceable>integer</replaceable>
-    <replaceable>quoted_string</replaceable>; ... };
+<command>managed-keys</command> { <replaceable>string</replaceable> ( static-key
+    | initial-key ) <replaceable>integer</replaceable>
+    <replaceable>integer</replaceable> <replaceable>integer</replaceable>
+    <replaceable>quoted_string</replaceable>; ... }; deprecated
 </programlisting>
diff --git a/doc/arm/options.grammar.xml b/doc/arm/options.grammar.xml
index 6f515c8400..ed399c07dd 100644
--- a/doc/arm/options.grammar.xml
+++ b/doc/arm/options.grammar.xml
@@ -57,7 +57,6 @@
 	<command>check-spf</command> ( warn | ignore );
 	<command>check-srv-cname</command> ( fail | warn | ignore );
 	<command>check-wildcard</command> <replaceable>boolean</replaceable>;
-	<command>cleaning-interval</command> <replaceable>integer</replaceable>;
 	<command>clients-per-query</command> <replaceable>integer</replaceable>;
 	<command>cookie-algorithm</command> ( aes | sha1 | sha256 );
 	<command>cookie-secret</command> <replaceable>string</replaceable>;
@@ -90,8 +89,9 @@
 	<command>dnssec-accept-expired</command> <replaceable>boolean</replaceable>;
 	<command>dnssec-dnskey-kskonly</command> <replaceable>boolean</replaceable>;
 	<command>dnssec-loadkeys-interval</command> <replaceable>integer</replaceable>;
-	<command>dnssec-lookaside</command> ( <replaceable>string</replaceable> trust-anchor
-	    <replaceable>string</replaceable> | auto | no );, deprecated
+	<command>dnssec-lookaside</command> ( <replaceable>string</replaceable>
+	    <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-secure-to-insecure</command> <replaceable>boolean</replaceable>;
 	<command>dnssec-update-mode</command> ( maintain | no-resign );
diff --git a/doc/arm/trusted-keys.grammar.xml b/doc/arm/trusted-keys.grammar.xml
index 2a0b6e9454..82a502dff0 100644
--- a/doc/arm/trusted-keys.grammar.xml
+++ b/doc/arm/trusted-keys.grammar.xml
@@ -14,5 +14,5 @@
 <programlisting>
 <command>trusted-keys</command> { <replaceable>string</replaceable> <replaceable>integer</replaceable>
     <replaceable>integer</replaceable> <replaceable>integer</replaceable>
-    <replaceable>quoted_string</replaceable>; ... };, deprecated
+    <replaceable>quoted_string</replaceable>; ... }; deprecated
 </programlisting>
diff --git a/doc/misc/docbook-grammars.pl b/doc/misc/docbook-grammars.pl
index 7d36da8fe3..98236beec9 100644
--- a/doc/misc/docbook-grammars.pl
+++ b/doc/misc/docbook-grammars.pl
@@ -67,7 +67,7 @@ while (<FH>) {
 
 	s{ // not configured}{};
 	s{ // non-operational}{};
-	s{ // may occur multiple times}{};
+	s{ // may occur multiple times,*}{};
 	s{<([a-z0-9_-]+)>}{<replaceable>$1</replaceable>}g;
 	s{^(\s*)([a-z0-9_-]+)\b}{$1<command>$2</command>};
 	s{[[]}{[}g;
diff --git a/doc/misc/docbook-options.pl b/doc/misc/docbook-options.pl
index e67213136d..92f3c78bd4 100644
--- a/doc/misc/docbook-options.pl
+++ b/doc/misc/docbook-options.pl
@@ -128,7 +128,7 @@ while (<FH>) {
 
 	s{ // not configured}{};
 	s{ // non-operational}{};
-	s{ (// )*may occur multiple times}{};
+	s{ (// )*may occur multiple times,*}{};
 	s{<([a-z0-9_-]+)>}{<replaceable>$1</replaceable>}g;
 	s{ // deprecated,*}{// deprecated};
 	s{[[]}{[}g;
diff --git a/doc/misc/docbook-zoneopt.pl b/doc/misc/docbook-zoneopt.pl
index 2adf2b10f9..0a1354bba2 100644
--- a/doc/misc/docbook-zoneopt.pl
+++ b/doc/misc/docbook-zoneopt.pl
@@ -51,7 +51,7 @@ while (<FH>) {
 	}
 
 	s{ // not configured}{};
-	s{ // may occur multiple times}{};
+	s{ // may occur multiple times,*}{};
 	s{<([a-z0-9_-]+)>}{<replaceable>$1</replaceable>}g;
 	s{^(\s*)([a-z0-9_-]+)\b}{$1<command>$2</command>};
 	s{[[]}{[}g;
diff --git a/doc/misc/options b/doc/misc/options
index 1c61197840..d697fe543e 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -146,8 +146,9 @@ options {
         dnssec-dnskey-kskonly <boolean>;
         dnssec-enable <boolean>; // obsolete
         dnssec-loadkeys-interval <integer>;
-        dnssec-lookaside ( <string> trust-anchor
-            <string> | auto | no ); // may occur multiple times, deprecated
+        dnssec-lookaside ( <string>
+            trust-anchor <string> |
+            auto | no ); // may occur multiple times, deprecated
         dnssec-must-be-secure <string> <boolean>; // may occur multiple times
         dnssec-secure-to-insecure <boolean>;
         dnssec-update-mode ( maintain | no-resign );
@@ -192,7 +193,7 @@ options {
         fstrm-set-output-queue-model ( mpsc | spsc ); // not configured
         fstrm-set-output-queue-size <integer>; // 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
         glue-cache <boolean>;
         has-old-clients <boolean>; // ancient
@@ -213,7 +214,7 @@ options {
         listen-on-v6 [ port <integer> ] [ dscp
             <integer> ] {
             <address_match_element>; ... }; // may occur multiple times
-        lmdb-mapsize <sizeval>; // non-operational
+        lmdb-mapsize <sizeval>;
         lock-file ( <quoted_string> | none );
         maintain-ixfr-base <boolean>; // ancient
         managed-keys-directory <quoted_string>;
@@ -524,8 +525,9 @@ view <string> [ <class> ] {
             initial-key ) <integer> <integer>
             <integer> <quoted_string>; ... }; // may occur multiple times
         dnssec-loadkeys-interval <integer>;
-        dnssec-lookaside ( <string> trust-anchor
-            <string> | auto | no ); // may occur multiple times, deprecated
+        dnssec-lookaside ( <string>
+            trust-anchor <string> |
+            auto | no ); // may occur multiple times, deprecated
         dnssec-must-be-secure <string> <boolean>; // may occur multiple times
         dnssec-secure-to-insecure <boolean>;
         dnssec-update-mode ( maintain | no-resign );
@@ -563,7 +565,7 @@ view <string> [ <class> ] {
         }; // may occur multiple times
         key-directory <quoted_string>;
         lame-ttl <ttlval>;
-        lmdb-mapsize <sizeval>; // non-operational
+        lmdb-mapsize <sizeval>;
         maintain-ixfr-base <boolean>; // ancient
         managed-keys { <string> (
             static-key | initial-key