diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 4ff9b7b841..f2ef235829 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -1,5 +1,5 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+	       "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) 2004-2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
@@ -157,56 +157,56 @@
 
       <variablelist>
 
-        <varlistentry>
-          <term><constant>server</constant></term>
-          <listitem>
-            <para>
-              is the name or IP address of the name server to query.  This
-              can be an IPv4 address in dotted-decimal notation or an IPv6
-              address in colon-delimited notation.  When the supplied
-              <parameter>server</parameter> argument is a hostname,
-              <command>dig</command> resolves that name before querying
-              that name server.
-            </para>
-            <para>
-              If no <parameter>server</parameter> argument is
-              provided, <command>dig</command> consults
-              <filename>/etc/resolv.conf</filename>; if an
-              address is found there, it queries the name server at
-              that address. If either of the <option>-4</option> or
-              <option>-6</option> options are in use, then
-              only addresses for the corresponding transport
-              will be tried.  If no usable addresses are found,
-              <command>dig</command> will send the query to the
-              local host.  The reply from the name server that
-              responds is displayed.
-            </para>
-          </listitem>
-        </varlistentry>
+	<varlistentry>
+	  <term><constant>server</constant></term>
+	  <listitem>
+	    <para>
+	      is the name or IP address of the name server to query.  This
+	      can be an IPv4 address in dotted-decimal notation or an IPv6
+	      address in colon-delimited notation.  When the supplied
+	      <parameter>server</parameter> argument is a hostname,
+	      <command>dig</command> resolves that name before querying
+	      that name server.
+	    </para>
+	    <para>
+	      If no <parameter>server</parameter> argument is
+	      provided, <command>dig</command> consults
+	      <filename>/etc/resolv.conf</filename>; if an
+	      address is found there, it queries the name server at
+	      that address. If either of the <option>-4</option> or
+	      <option>-6</option> options are in use, then
+	      only addresses for the corresponding transport
+	      will be tried.  If no usable addresses are found,
+	      <command>dig</command> will send the query to the
+	      local host.  The reply from the name server that
+	      responds is displayed.
+	    </para>
+	  </listitem>
+	</varlistentry>
 
-        <varlistentry>
-          <term><constant>name</constant></term>
-          <listitem>
-            <para>
-              is the name of the resource record that is to be looked up.
-            </para>
-          </listitem>
-        </varlistentry>
+	<varlistentry>
+	  <term><constant>name</constant></term>
+	  <listitem>
+	    <para>
+	      is the name of the resource record that is to be looked up.
+	    </para>
+	  </listitem>
+	</varlistentry>
 
-        <varlistentry>
-          <term><constant>type</constant></term>
-          <listitem>
-            <para>
-              indicates what type of query is required &mdash;
-              ANY, A, MX, SIG, etc.
-              <parameter>type</parameter> can be any valid query
-              type.  If no
-              <parameter>type</parameter> argument is supplied,
-              <command>dig</command> will perform a lookup for an
-              A record.
-            </para>
-          </listitem>
-        </varlistentry>
+	<varlistentry>
+	  <term><constant>type</constant></term>
+	  <listitem>
+	    <para>
+	      indicates what type of query is required &mdash;
+	      ANY, A, MX, SIG, etc.
+	      <parameter>type</parameter> can be any valid query
+	      type.  If no
+	      <parameter>type</parameter> argument is supplied,
+	      <command>dig</command> will perform a lookup for an
+	      A record.
+	    </para>
+	  </listitem>
+	</varlistentry>
 
       </variablelist>
     </para>
@@ -246,7 +246,7 @@
     <para>
       The <option>-m</option> option enables memory usage debugging.
       <!-- It enables ISC_MEM_DEBUGTRACE and ISC_MEM_DEBUGRECORD
-           documented in include/isc/mem.h -->
+	   documented in include/isc/mem.h -->
     </para>
 
     <para>
@@ -321,13 +321,13 @@
       base-64
       encoded string, typically generated by
       <citerefentry>
-        <refentrytitle>dnssec-keygen</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>dnssec-keygen</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>.
 
       Caution should be taken when using the <option>-y</option> option on
       multi-user systems as the key can be visible in the output from
       <citerefentry>
-        <refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum>
+	<refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum>
       </citerefentry>
       or in the shell's history file.  When
       using TSIG authentication with <command>dig</command>, the name
@@ -362,8 +362,8 @@
 
       <variablelist>
 
-        <varlistentry>
-          <term><option>+[no]aaflag</option></term>
+	<varlistentry>
+	  <term><option>+[no]aaflag</option></term>
 	  <listitem>
 	    <para>
 	      A synonym for <parameter>+[no]aaonly</parameter>.
@@ -371,8 +371,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]aaonly</option></term>
+	<varlistentry>
+	  <term><option>+[no]aaonly</option></term>
 	  <listitem>
 	    <para>
 	      Sets the "aa" flag in the query.
@@ -380,8 +380,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]additional</option></term>
+	<varlistentry>
+	  <term><option>+[no]additional</option></term>
 	  <listitem>
 	    <para>
 	      Display [do not display] the additional section of a
@@ -390,8 +390,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]adflag</option></term>
+	<varlistentry>
+	  <term><option>+[no]adflag</option></term>
 	  <listitem>
 	    <para>
 	      Set [do not set] the AD (authentic data) bit in the
@@ -407,8 +407,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]all</option></term>
+	<varlistentry>
+	  <term><option>+[no]all</option></term>
 	  <listitem>
 	    <para>
 	      Set or clear all display flags.
@@ -416,8 +416,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]answer</option></term>
+	<varlistentry>
+	  <term><option>+[no]answer</option></term>
 	  <listitem>
 	    <para>
 	      Display [do not display] the answer section of a
@@ -426,8 +426,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]authority</option></term>
+	<varlistentry>
+	  <term><option>+[no]authority</option></term>
 	  <listitem>
 	    <para>
 	      Display [do not display] the authority section of a
@@ -436,8 +436,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]besteffort</option></term>
+	<varlistentry>
+	  <term><option>+[no]besteffort</option></term>
 	  <listitem>
 	    <para>
 	      Attempt to display the contents of messages which are
@@ -447,8 +447,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+bufsize=B</option></term>
+	<varlistentry>
+	  <term><option>+bufsize=B</option></term>
 	  <listitem>
 	    <para>
 	      Set the UDP message buffer size advertised using EDNS0
@@ -461,8 +461,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]cdflag</option></term>
+	<varlistentry>
+	  <term><option>+[no]cdflag</option></term>
 	  <listitem>
 	    <para>
 	      Set [do not set] the CD (checking disabled) bit in
@@ -472,8 +472,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]cl</option></term>
+	<varlistentry>
+	  <term><option>+[no]cl</option></term>
 	  <listitem>
 	    <para>
 	      Display [do not display] the CLASS when printing the
@@ -482,8 +482,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]cmd</option></term>
+	<varlistentry>
+	  <term><option>+[no]cmd</option></term>
 	  <listitem>
 	    <para>
 	      Toggles the printing of the initial comment in the
@@ -494,8 +494,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]comments</option></term>
+	<varlistentry>
+	  <term><option>+[no]comments</option></term>
 	  <listitem>
 	    <para>
 	      Toggle the display of comment lines in the output.
@@ -504,8 +504,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]crypto</option></term>
+	<varlistentry>
+	  <term><option>+[no]crypto</option></term>
 	  <listitem>
 	    <para>
 	      Toggle the display of cryptographic fields in DNSSEC
@@ -520,8 +520,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]defname</option></term>
+	<varlistentry>
+	  <term><option>+[no]defname</option></term>
 	  <listitem>
 	    <para>
 	      Deprecated, treated as a synonym for
@@ -530,8 +530,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]dnssec</option></term>
+	<varlistentry>
+	  <term><option>+[no]dnssec</option></term>
 	  <listitem>
 	    <para>
 	      Requests DNSSEC records be sent by setting the DNSSEC
@@ -541,8 +541,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+domain=somename</option></term>
+	<varlistentry>
+	  <term><option>+domain=somename</option></term>
 	  <listitem>
 	    <para>
 	      Set the search list to contain the single domain
@@ -580,8 +580,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]expire</option></term>
+	<varlistentry>
+	  <term><option>+[no]expire</option></term>
 	  <listitem>
 	    <para>
 	      Send an EDNS Expire option.
@@ -589,8 +589,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]fail</option></term>
+	<varlistentry>
+	  <term><option>+[no]fail</option></term>
 	  <listitem>
 	    <para>
 	      Do not try the next server if you receive a SERVFAIL.
@@ -600,8 +600,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]identify</option></term>
+	<varlistentry>
+	  <term><option>+[no]identify</option></term>
 	  <listitem>
 	    <para>
 	      Show [or do not show] the IP address and port number
@@ -614,8 +614,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]ignore</option></term>
+	<varlistentry>
+	  <term><option>+[no]ignore</option></term>
 	  <listitem>
 	    <para>
 	      Ignore truncation in UDP responses instead of retrying
@@ -624,8 +624,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]keepopen</option></term>
+	<varlistentry>
+	  <term><option>+[no]keepopen</option></term>
 	  <listitem>
 	    <para>
 	      Keep the TCP socket open between queries and reuse
@@ -635,8 +635,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]multiline</option></term>
+	<varlistentry>
+	  <term><option>+[no]multiline</option></term>
 	  <listitem>
 	    <para>
 	      Print records like the SOA records in a verbose
@@ -648,8 +648,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+ndots=D</option></term>
+	<varlistentry>
+	  <term><option>+ndots=D</option></term>
 	  <listitem>
 	    <para>
 	      Set the number of dots that have to appear in
@@ -666,8 +666,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]nsid</option></term>
+	<varlistentry>
+	  <term><option>+[no]nsid</option></term>
 	  <listitem>
 	    <para>
 	      Include an EDNS name server ID request when sending
@@ -676,8 +676,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]nssearch</option></term>
+	<varlistentry>
+	  <term><option>+[no]nssearch</option></term>
 	  <listitem>
 	    <para>
 	      When this option is set, <command>dig</command>
@@ -700,8 +700,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]qr</option></term>
+	<varlistentry>
+	  <term><option>+[no]qr</option></term>
 	  <listitem>
 	    <para>
 	      Print [do not print] the query as it is sent.  By
@@ -710,8 +710,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]question</option></term>
+	<varlistentry>
+	  <term><option>+[no]question</option></term>
 	  <listitem>
 	    <para>
 	      Print [do not print] the question section of a query
@@ -721,8 +721,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]recurse</option></term>
+	<varlistentry>
+	  <term><option>+[no]recurse</option></term>
 	  <listitem>
 	    <para>
 	      Toggle the setting of the RD (recursion desired) bit
@@ -735,8 +735,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+retry=T</option></term>
+	<varlistentry>
+	  <term><option>+retry=T</option></term>
 	  <listitem>
 	    <para>
 	      Sets the number of times to retry UDP queries to
@@ -747,8 +747,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]rrcomments</option></term>
+	<varlistentry>
+	  <term><option>+[no]rrcomments</option></term>
 	  <listitem>
 	    <para>
 	      Toggle the display of per-record comments in the
@@ -759,8 +759,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]search</option></term>
+	<varlistentry>
+	  <term><option>+[no]search</option></term>
 	  <listitem>
 	    <para>
 	      Use [do not use] the search list defined by the
@@ -771,8 +771,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]short</option></term>
+	<varlistentry>
+	  <term><option>+[no]short</option></term>
 	  <listitem>
 	    <para>
 	      Provide a terse answer.  The default is to print the
@@ -781,8 +781,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]showsearch</option></term>
+	<varlistentry>
+	  <term><option>+[no]showsearch</option></term>
 	  <listitem>
 	    <para>
 	      Perform [do not perform] a search showing intermediate
@@ -791,8 +791,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]sigchase</option></term>
+	<varlistentry>
+	  <term><option>+[no]sigchase</option></term>
 	  <listitem>
 	    <para>
 	      Chase DNSSEC signature chains.  Requires dig be
@@ -801,8 +801,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]sit<optional>=####</optional></option></term>
+	<varlistentry>
+	  <term><option>+[no]sit<optional>=####</optional></option></term>
 	  <listitem>
 	    <para>
 	      Send a Source Identity Token EDNS option, with optional
@@ -814,8 +814,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+split=W</option></term>
+	<varlistentry>
+	  <term><option>+split=W</option></term>
 	  <listitem>
 	    <para>
 	      Split long hex- or base64-formatted fields in resource
@@ -830,8 +830,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]stats</option></term>
+	<varlistentry>
+	  <term><option>+[no]stats</option></term>
 	  <listitem>
 	    <para>
 	      This query option toggles the printing of statistics:
@@ -842,8 +842,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]subnet=addr/prefix</option></term>
+	<varlistentry>
+	  <term><option>+[no]subnet=addr/prefix</option></term>
 	  <listitem>
 	    <para>
 	      Send an EDNS Client Subnet option with the speciifed
@@ -852,8 +852,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]tcp</option></term>
+	<varlistentry>
+	  <term><option>+[no]tcp</option></term>
 	  <listitem>
 	    <para>
 	      Use [do not use] TCP when querying name servers. The
@@ -865,23 +865,23 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+time=T</option></term>
+	<varlistentry>
+	  <term><option>+time=T</option></term>
 	  <listitem>
 	    <para>
 
-              Sets the timeout for a query to
-              <parameter>T</parameter> seconds.  The default
+	      Sets the timeout for a query to
+	      <parameter>T</parameter> seconds.  The default
 	      timeout is 5 seconds.
-              An attempt to set <parameter>T</parameter> to less
-              than 1 will result
-              in a query timeout of 1 second being applied.
-            </para>
-          </listitem>
-        </varlistentry>
+	      An attempt to set <parameter>T</parameter> to less
+	      than 1 will result
+	      in a query timeout of 1 second being applied.
+	    </para>
+	  </listitem>
+	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]topdown</option></term>
+	<varlistentry>
+	  <term><option>+[no]topdown</option></term>
 	  <listitem>
 	    <para>
 	      When chasing DNSSEC signature chains perform a top-down
@@ -890,8 +890,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]trace</option></term>
+	<varlistentry>
+	  <term><option>+[no]trace</option></term>
 	  <listitem>
 	    <para>
 	      Toggle tracing of the delegation path from the root
@@ -909,8 +909,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+tries=T</option></term>
+	<varlistentry>
+	  <term><option>+tries=T</option></term>
 	  <listitem>
 	    <para>
 	      Sets the number of times to try UDP queries to server
@@ -922,8 +922,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+trusted-key=####</option></term>
+	<varlistentry>
+	  <term><option>+trusted-key=####</option></term>
 	  <listitem>
 	    <para>
 	      Specifies a file containing trusted keys to be used
@@ -940,8 +940,8 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]ttlid</option></term>
+	<varlistentry>
+	  <term><option>+[no]ttlid</option></term>
 	  <listitem>
 	    <para>
 	      Display [do not display] the TTL when printing the
@@ -950,19 +950,19 @@
 	  </listitem>
 	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]ttlunits</option></term>
-          <listitem>
-            <para>
-              Display [do not display] the TTL in friendly human-readable
-              time units of "s", "m", "h", "d", and "w", representing
-              seconds, minutes, hours, days and weeks.  Implies +ttlid.
-            </para>
-          </listitem>
-        </varlistentry>
+	<varlistentry>
+	  <term><option>+[no]ttlunits</option></term>
+	  <listitem>
+	    <para>
+	      Display [do not display] the TTL in friendly human-readable
+	      time units of "s", "m", "h", "d", and "w", representing
+	      seconds, minutes, hours, days and weeks.  Implies +ttlid.
+	    </para>
+	  </listitem>
+	</varlistentry>
 
-        <varlistentry>
-          <term><option>+[no]vc</option></term>
+	<varlistentry>
+	  <term><option>+[no]vc</option></term>
 	  <listitem>
 	    <para>
 	      Use [do not use] TCP when querying name servers.  This
@@ -1053,13 +1053,13 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
   <refsect1>
     <title>SEE ALSO</title>
     <para><citerefentry>
-        <refentrytitle>host</refentrytitle><manvolnum>1</manvolnum>
+	<refentrytitle>host</refentrytitle><manvolnum>1</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>named</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>named</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>dnssec-keygen</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>dnssec-keygen</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citetitle>RFC1035</citetitle>.
     </para>