Index: server/other/bind.xml
===================================================================
--- server/other/bind.xml	(revision 39f01ca98927aeae0a9825cc04a36d7104fe879c)
+++ server/other/bind.xml	(revision 814d1907f04a07e973c61c371843eae1c13be393)
@@ -1,3 +1,3 @@
-<sect1 id="bind" xreflabel="bind-&bind-version;">
+<sect1 id="bind" xreflabel="BIND-&bind-version;">
 <?dbhtml filename="bind.html" dir="server"?>
 <title><acronym>BIND</acronym>-&bind-version;</title>
@@ -6,5 +6,4 @@
 &bind-inst;
 &bind-config;
-&bind-config-exp;
 &bind-desc;
 
Index: rver/other/bind/bind-config-exp.xml
===================================================================
--- server/other/bind/bind-config-exp.xml	(revision 39f01ca98927aeae0a9825cc04a36d7104fe879c)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<sect2>
-<title>Configuration command explanations</title>
-<para><screen><userinput>groupadd -g 200 named
-useradd -m -g named -u 200 -s /bin/false named
-cd /home/named
-mkdir -p dev etc/namedb/slave var/run
-mknod /home/named/dev/null c 1 3
-mknod /home/named/dev/random c 1 8
-chmod 666 /home/named/dev/{null,random}
-mkdir /home/named/etc/namedb/pz
-cp /etc/localtime /home/named/etc</userinput></screen>
-Create the unprivileged user and group named, along with device files
-that named will need access to inside the chroot jail.</para>
-
-<para><userinput>cat &gt; /home/named/etc/named.conf &lt;&lt;
-"EOF"</userinput> : Create the BIND configuration file, from which named will read the
-location of zone files, root name servers and secure DNS keys.</para>
-<para><userinput>cat &gt; /home/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF"</userinput> : Create a single zone file.</para>
-<para><userinput>cat &gt; /home/named/etc/namedb/root.hints &lt;&lt; "EOF"</userinput> : The root.hints file is a list of root name servers.  This file must be
-updated periodically with the dig utility.  Consult the BIND 9
-Administrator Reference Manual for details.</para>
-<para><userinput>cat &gt; /etc/rndc.conf &lt;&lt; "EOF"</userinput> : The rndc.conf file contains information for controlling named
-operations with the rndc utility.</para>
-
-<para><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"</userinput> : The resolv.conf file will specify the local host(127.0.0.1) as the
-name server.</para>
-
-<para><userinput>cat &gt; /etc/rc.d/init.d/bind &lt;&lt;
-"EOF"</userinput> : Create the boot script for BIND 9, used to start and stop the name
-server daemon, named.</para>
-
-
-
-</sect2>
-
Index: server/other/bind/bind-config.xml
===================================================================
--- server/other/bind/bind-config.xml	(revision 39f01ca98927aeae0a9825cc04a36d7104fe879c)
+++ server/other/bind/bind-config.xml	(revision 814d1907f04a07e973c61c371843eae1c13be393)
@@ -1,14 +1,28 @@
 <sect2>
-<title>Configuring BIND</title>
-<para>We will configure BIND to run in a chroot jail as an unprivileged
-user(named).  This configuration is more secure in that a DNS
-compromise can only affect a few files in the named user's $HOME
-directory </para> 
-
-<para>First we set up some files and directories needed by
-BIND:</para>
-<para><screen><userinput>groupadd -g 200 named &amp;&amp;
-useradd -m -g named -u 200 -s /bin/false named &amp;&amp;
-cd /home/named &amp;&amp;
+<title>Configuring
+<application><acronym>BIND</acronym></application></title>
+
+<sect3><title>Config files</title>
+<para><filename>named.conf</filename>, <filename>root.hints</filename>,
+<filename>127.0.0</filename>, <filename>rndc.conf</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>We will configure
+<application><acronym>BIND</acronym></application> to run in a chroot
+jail as an unprivileged user (named). This configuration is more secure
+in that a <acronym>DNS</acronym> compromise can only affect a few files
+in the named user's <envar>$HOME</envar> directory.</para> 
+
+<para>First we create the unpriviledged user and group named:</para>
+
+<screen><userinput><command>groupadd -g 200 named &amp;&amp;
+useradd -m -g named -u 200 -s /bin/false named</command></userinput></screen>
+
+<para>Then we set up some files, directories and devices needed by
+<application><acronym>BIND</acronym></application>:</para>
+
+<screen><userinput><command>cd /home/named &amp;&amp;
 mkdir -p dev etc/namedb/slave var/run &amp;&amp;
 mknod /home/named/dev/null c 1 3 &amp;&amp;
@@ -16,13 +30,11 @@
 chmod 666 /home/named/dev/{null,random} &amp;&amp;
 mkdir /home/named/etc/namedb/pz &amp;&amp;
-cp /etc/localtime /home/named/etc</userinput></screen></para>
-
-<sect3><title>Config files</title>
-<para><filename>named.conf</filename>,
-<filename>root.hints</filename>, <filename>127.0.0</filename> and
-<filename>rndc.conf</filename></para>
-
-<para>Create the named.conf file with the following commands:</para>
-<para><screen><userinput>cat &gt; /home/named/etc/named.conf &lt;&lt; "EOF"</userinput>
+cp /etc/localtime /home/named/etc</command></userinput></screen>
+
+<para>Create the <filename>named.conf</filename> file from which named
+will read the location of zone files, root name servers and secure
+<acronym>DNS</acronym> keys:</para>
+
+<screen><userinput><command>cat &gt; /home/named/etc/named.conf &lt;&lt; "EOF"</command>
  options {
      directory "/etc/namedb";
@@ -46,7 +58,9 @@
      file "pz/127.0.0";
  };
-<userinput>EOF</userinput></screen></para>
-<para>Create a zone file with the following contents: </para>
-<para><screen><userinput>cat &gt; /home/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF"</userinput>
+<command>>EOF</command></userinput></screen>
+
+<para>Create a zone file with the following contents:</para>
+
+<screen><userinput><command>cat &gt; /home/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF"</command>
 $TTL 3D
 @      IN      SOA     ns.local.domain. hostmaster.local.domain. (
@@ -58,10 +72,13 @@
                 NS      ns.local.domain.
 1               PTR     localhost.
-<userinput>EOF</userinput></screen></para>
-
-<para>Create the root.hints file with the following commands: </para>
+<command>EOF</command></userinput></screen>
+
+<para>Create the <filename>root.hints</filename> file with the following
+commands:</para>
+
 <note><para>Caution must be used to insure no leading spaces in this
 file.</para></note>
-<para><screen><userinput>cat &gt; /home/named/etc/namedb/root.hints &lt;&lt; "EOF"</userinput>
+
+<screen><userinput><command>cat &gt; /home/named/etc/namedb/root.hints &lt;&lt; "EOF"</command>
 .                       6D  IN      NS      A.ROOT-SERVERS.NET.
 .                       6D  IN      NS      B.ROOT-SERVERS.NET.
@@ -90,8 +107,15 @@
 L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
 M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
-<userinput>EOF</userinput></screen></para>
+<command>>EOF</command></userinput></screen>
+
+<para>The <filename>root.hints</filename> file is a list of root name
+servers. This file must be updated periodically with the
+<command>dig</command> utility.
+Consult the <acronym>BIND</acronym> 9 Administrator Reference Manual for
+details.</para>
 
 <para>Create the <filename>rndc.conf</filename> with the following commands:</para>
-<para><screen><userinput>cat &gt; /etc/rndc.conf &lt;&lt; "EOF"</userinput>
+
+<screen><userinput><command>cat &gt; /etc/rndc.conf &lt;&lt; "EOF"</command>
 key rndc_key {
 algorithm "hmac-md5";
@@ -103,23 +127,31 @@
     default-key    rndc_key;
 };
-<userinput>EOF</userinput></screen></para>
-
-<para>Create or modify <filename>resolv.conf</filename> to use the new name server with the
-following commands: </para>
+<command>EOF</command></userinput></screen>
+
+<para>The <filename>rndc.conf</filename> file contains information for
+controlling named operations with the <command>rndc</command>
+utility.</para>
+
+<para>Create or modify <filename>resolv.conf</filename> to use the new
+name server with the following commands:</para>
+
 <note><para>Replace yourdomain.com with your own valid domain
 name.</para></note>
 
-<para><screen><userinput>cp /etc/resolv.conf /etc/resolv.conf.bak &amp;&amp;
-cat &gt; /etc/resolv.conf &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cp /etc/resolv.conf /etc/resolv.conf.bak &amp;&amp;
+cat &gt; /etc/resolv.conf &lt;&lt; "EOF"</command>
 search yourdomain.com
 nameserver 127.0.0.1
-<userinput>EOF</userinput></screen></para>
+<command>>EOF</command></userinput></screen>
 
 <para>Set permissions on the chroot jail with the following
 command:</para>
-<para><screen><userinput>chown -R named.named /home/named</userinput></screen></para>
-
-<para>Create the BIND boot script:</para>
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/bind &lt;&lt; "EOF"</userinput>
+
+<screen><userinput><command>chown -R named.named /home/named</command></userinput></screen>
+
+<para>Create the <application><acronym>BIND</acronym></application>
+boot script:</para>
+
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/bind &lt;&lt; "EOF"</command>
 #!/bin/bash
 # Begin $rc_base/init.d/bind
@@ -157,8 +189,9 @@
 esac
 # End $rc_base/init.d/bind
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 <para>Add the run level symlinks:</para>
-<para><screen><userinput>chmod 754 /etc/rc.d/init.d/bind &amp;&amp;
+
+<screen><userinput><command>chmod 754 /etc/rc.d/init.d/bind &amp;&amp;
 ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc0.d/K49bind &amp;&amp;
 ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc1.d/K49bind &amp;&amp;
@@ -167,23 +200,33 @@
 ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc4.d/S22bind &amp;&amp;
 ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc5.d/S22bind &amp;&amp;
-ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc6.d/K49bind</userinput></screen></para>
-
-<para>Now start BIND with the new boot script: </para>
-<para><screen><userinput>/etc/rc.d/init.d/bind start</userinput></screen></para></sect3>
-
-<sect3><title>Testing BIND</title>
-<para>Test out the new BIND 9 installation.  First query the local
-host address with <command>dig</command>:</para>
-<para><screen><userinput>dig -x 127.0.0.1</userinput></screen></para>
+ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc6.d/K49bind</command></userinput></screen>
+
+<para>Now start <application><acronym>BIND</acronym></application> with
+the new boot script:</para>
+
+<screen><userinput><command>/etc/rc.d/init.d/bind start</command></userinput></screen>
+
+</sect3>
+
+<sect3><title>Testing <application><acronym>BIND</acronym></application></title>
+
+<para>Test out the new
+<application><acronym>BIND</acronym></application> 9 installation. First
+query the local host address with <command>dig</command>:</para>
+
+<screen><userinput><command>dig -x 127.0.0.1</command></userinput></screen>
+
 <para>Now try an external name lookup, taking note of the speed
-difference in repeated lookups due to the caching.  Run the dig
-command twice on the same address:</para>
-<para><screen><userinput>dig beyond.linuxfromscratch.org &amp;&amp;
-dig beyond.linuxfromscratch.org</userinput></screen>
-You can see almost instantaneous results with the named caching
-lookups.  Consult
-<filename>bind-&bind-version;/doc/arm/Bv9ARM.html</filename>, the BIND
-Administrator Reference Manual for further configuration options.
-</para></sect3>
+difference in repeated lookups due to the caching. Run the dig command
+twice on the same address:</para>
+
+<para><screen><userinput><command>dig beyond.linuxfromscratch.org &amp;&amp;
+dig beyond.linuxfromscratch.org</command></userinput></screen>
+You can see almost instantaneous results with the named caching lookups.
+Consult <filename>bind-&bind-version;/doc/arm/Bv9ARM.html</filename>,
+the <application><acronym>BIND</acronym></application> Administrator
+Reference Manual for further configuration options.</para>
+
+</sect3>
+
 </sect2>
-
Index: server/other/bind/bind-desc.xml
===================================================================
--- server/other/bind/bind-desc.xml	(revision 39f01ca98927aeae0a9825cc04a36d7104fe879c)
+++ server/other/bind/bind-desc.xml	(revision 814d1907f04a07e973c61c371843eae1c13be393)
@@ -2,18 +2,18 @@
 <title>Contents</title>
 
-<para>The BIND package contains
-<userinput>dig</userinput>,
-<userinput>host</userinput>,
-<userinput>rndc</userinput>,
-<userinput>rndc-confgen</userinput>,
-<userinput>named-checkconf</userinput>,
-<userinput>named-checkzone</userinput>,
-<userinput>lwresd</userinput>,
-<userinput>named</userinput>,
-<userinput>dnssec-signzone</userinput>,
-<userinput>dnssec-signkey</userinput>,
-<userinput>dnssec-keygen</userinput>,
-<userinput>dnssec-makekeyset</userinput> and
-<userinput>nsupdate</userinput>.</para>
+<para>The <application><acronym>BIND</acronym></application> package contains
+<command>dig</command>,
+<command>host</command>,
+<command>rndc</command>,
+<command>rndc-confgen</command>,
+<command>named-checkconf</command>,
+<command>named-checkzone</command>,
+<command>lwresd</command>,
+<command>named</command>,
+<command>dnssec-signzone</command>,
+<command>dnssec-signkey</command>,
+<command>dnssec-keygen</command>,
+<command>dnssec-makekeyset</command> and
+<command>nsupdate</command>.</para>
 </sect2>
 
@@ -21,33 +21,53 @@
 
 <sect3><title>dig</title>
-<para>dig interrogates DNS servers.</para></sect3>
+<para><command>dig</command> interrogates <acronym>DNS</acronym>
+servers.</para></sect3>
+
 <sect3><title>host</title>
-<para>host is a utility for DNS lookups.</para></sect3>
+<para><command>host</command> is a utility for <acronym>DNS</acronym>
+lookups.</para></sect3>
+
 <sect3><title>rndc</title>
-<para>rndc controls the operation of BIND.</para></sect3>
+<para><command>rndc</command> controls the operation of
+<application><acronym>BIND</acronym></application>.</para></sect3>
+
 <sect3><title>rndc-confgen</title>
-<para>rndc-confgen generates rndc.conf files.</para></sect3>
+<para><command>rndc-confgen</command> generates
+<filename>rndc.conf</filename> files.</para></sect3>
+
 <sect3><title>named-checkconf</title>
-<para>named-checkconf checks the syntax of named.conf
-files.</para></sect3>
+<para><command>named-checkconf</command> checks the syntax of
+<filename>named.conf</filename> files.</para></sect3>
+
 <sect3><title>named-checkzone</title>
-<para>named-checkzone checks zone file validity.</para></sect3>
+<para><command>named-checkzone</command> checks zone file
+validity.</para></sect3>
+
 <sect3><title>lwresd</title>
-<para>lwresd is a caching-only name server for local process
-use.</para></sect3>
+<para><command>lwresd</command> is a caching-only name server for local
+process use.</para></sect3>
+
 <sect3><title>named</title>
-<para>named is the name server daemon.</para></sect3>
+<para><command>named</command> is the name server daemon.</para></sect3>
+
 <sect3><title>dnssec-signzone</title>
-<para>dnssec-signzone generates signed versions of zone
-files.</para></sect3>
+<para><command>dnssec-signzone</command> generates signed versions of
+zone files.</para></sect3>
+
 <sect3><title>dnssec-signkey</title>
-<para>dnssec-signkey signs zone file key sets.</para></sect3>
+<para><command>dnssec-signkey</command> signs zone file key
+sets.</para></sect3>
+
 <sect3><title>dnssec-keygen</title>
-<para>dnssec-keygen is a key generator for secure DNS.</para></sect3>
+<para><command>dnssec-keygen</command> is a key generator for secure
+<acronym>DNS</acronym>.</para></sect3>
+
 <sect3><title>dnssec-makekeyset</title>
-<para>dnssec-makekeyset generates a key set from one or more keys
-created by dnssec-keygen.</para></sect3>
+<para><command>dnssec-makekeyset</command> generates a key set from one
+or more keys created by dnssec-keygen.</para></sect3>
+
 <sect3><title>nsupdate</title>
-<para>nsupdate is used to submit DNS update requests.</para></sect3>
+<para><command>nsupdate</command> is used to submit
+<acronym>DNS</acronym> update requests.</para></sect3>
+
 </sect2>
-
Index: server/other/bind/bind-inst.xml
===================================================================
--- server/other/bind/bind-inst.xml	(revision 39f01ca98927aeae0a9825cc04a36d7104fe879c)
+++ server/other/bind/bind-inst.xml	(revision 814d1907f04a07e973c61c371843eae1c13be393)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of <application>BIND</application></title>
+<title>Installation of <application><acronym>BIND</acronym></application></title>
 
-<para>Install <application>BIND</application> by running the following commands:</para>
+<para>Install <application><acronym>BIND</acronym></application> by
+running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
+
 </sect2>
-
Index: server/other/bind/bind-intro.xml
===================================================================
--- server/other/bind/bind-intro.xml	(revision 39f01ca98927aeae0a9825cc04a36d7104fe879c)
+++ server/other/bind/bind-intro.xml	(revision 814d1907f04a07e973c61c371843eae1c13be393)
@@ -1,12 +1,16 @@
 <sect2>
-<title>Introduction to BIND &bind-version;</title>
+<title>Introduction to <application><acronym>BIND</acronym></application></title>
 
-<screen>Download location (HTTP):       <ulink url="&bind-download-http;"/>
-Download location (FTP):        <ulink url="&bind-download-ftp;"/>
-Version used:                   &bind-version;
-Package size:                   &bind-size;
-Estimated Disk space required:  &bind-buildsize;</screen>
+<para>The <application><acronym>BIND</acronym></application> package
+provides a <acronym>DNS</acronym> server and client utilities.</para>
 
-<para>The Bind package provides a DNS server and client
-utilities.</para></sect2>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&bind-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&bind-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &bind-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &bind-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &bind-time;</para></listitem></itemizedlist>
+</sect3>
 
+</sect2>
Index: server/other/bind/bind.ent
===================================================================
--- server/other/bind/bind.ent	(revision 39f01ca98927aeae0a9825cc04a36d7104fe879c)
+++ server/other/bind/bind.ent	(revision 814d1907f04a07e973c61c371843eae1c13be393)
@@ -2,12 +2,10 @@
 <!ENTITY bind-intro SYSTEM "bind-intro.xml">
 <!ENTITY bind-inst SYSTEM "bind-inst.xml">
-<!ENTITY bind-exp SYSTEM "bind-exp.xml">
-<!ENTITY bind-config-exp SYSTEM "bind-config-exp.xml">
+<!ENTITY bind-config SYSTEM "bind-config.xml">
 <!ENTITY bind-desc SYSTEM "bind-desc.xml">
-<!ENTITY bind-config SYSTEM "bind-config.xml">
-<!ENTITY bind-buildsize "38 MB">
+<!ENTITY bind-buildsize "90 MB">
 <!ENTITY bind-version "9.2.2">
 <!ENTITY bind-download-http "">
 <!ENTITY bind-download-ftp "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
 <!ENTITY bind-size "4.8 MB">
-<!ENTITY bind-time "">
+<!ENTITY bind-time "0.89 SBU">
