Index: connect/other/other.xml
===================================================================
--- connect/other/other.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ connect/other/other.xml	(revision 9d3e4bf9d6c3c87d3d420672db3891874c79aa2c)
@@ -3,10 +3,11 @@
 <title>Other Connections</title>
 
-<para>Other methods to connect to large networks are through ISDN and
-PPPoE interfaces, among others.  PPPoE is discussed here.  Pages written 
-for ISDN (or others as the need arises) are always welcome and will be 
-included in future books, if available.</para>
+<para>Other methods to connect to large networks are through <acronym>ISDN
+</acronym> and <acronym>PPPoE</acronym> interfaces, among others.
+<acronym>PPPoE</acronym> is discussed here.  Pages written 
+for <acronym>ISDN</acronym> (or others as the need arises) are always welcome 
+and will be included in future books, if available.</para>
 
-&connect-other-isdn;
+<!--&connect-other-isdn;-->
 &pppoe;
 
Index: connect/other/pppoe/pppoe-config.xml
===================================================================
--- connect/other/pppoe/pppoe-config.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ connect/other/pppoe/pppoe-config.xml	(revision 9d3e4bf9d6c3c87d3d420672db3891874c79aa2c)
@@ -1,32 +1,32 @@
 <sect2>
-<title>Configuring RP-PPPoE</title>
+<title>Configuring <application><acronym>RP-PPPoE</acronym></application></title>
 
 <sect3><title>Config files</title>
-<para><filename>/etc/ppp/pppoe.conf, 
-/etc/ppp/firewall-standalone, 
-/etc/ppp/firewall-masq, 
-/etc/ppp/pppoe-server-options, 
-/etc/resolv.conf, 
-/etc/ppp/pap-seecrets, 
-/etc/ppp/chap-secrets</filename></para></sect3>
+<para><filename>/etc/ppp/pppoe.conf</filename>, 
+<filename>/etc/ppp/firewall-standalone</filename>, 
+<filename>/etc/ppp/firewall-masq</filename>, 
+<filename>/etc/ppp/pppoe-server-options</filename>, 
+<filename>/etc/resolv.conf</filename>, 
+<filename>/etc/ppp/pap-seecrets</filename>, 
+<filename>/etc/ppp/chap-secrets</filename></para></sect3>
 
 <sect3><title>Configuration Information</title>
 
-<para>To configure RP-PPPoE after installation, you should run the
-<filename>adsl-setup</filename> script.</para>
+<para>To configure <application><acronym>RP-PPPoE</acronym></application> after 
+installation, you should run the <command>adsl-setup</command> script.</para>
 
 <para>When configuring your connection, you will need to have your 
-ISP's nameserver information available, as well as your username and 
-password.  You will also be asked whether to configure a dial-on-demand 
-or a constant connection.  If your service provider does not charge by 
-the minute, it is usually good to have a bootscript handle the 
+<acronym>ISP</acronym>'s nameserver information available, as well as your 
+username and password.  You will also be asked whether to configure a 
+dial-on-demand or a constant connection.  If your service provider does not 
+charge by the minute, it is usually good to have a bootscript handle the 
 connection for you.  You can, of course, choose not to install the 
 following script, and start your connection manually with the 
-<filename>adsl-start</filename> script.</para>
+<command>adsl-start</command> script.</para>
 
 <para>Use the following commands to create the 
 <emphasis>optional</emphasis> <filename>adsl</filename> bootscript:</para>
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/adsl &lt;&lt; "EOF"
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/adsl &lt;&lt; "EOF"</command>
 #!/bin/bash
 # Begin $rc_base/init.d/adsl
@@ -69,10 +69,9 @@
 
 # End $rc_base/init.d/adsl
-EOF
-chmod 755 /etc/rc.d/init.d/adsl</userinput></screen></para>
+<command>EOF
+chmod 755 /etc/rc.d/init.d/adsl</command></userinput></screen>
 
-<para>Now create the necessary symlinks:</para>
-
-<para><screen><userinput>ln -sf ../init.d/adsl /etc/rc.d/rc0.d/K49adsl &amp;&amp;
+<para>Now create the necessary symlinks:
+<screen><userinput><command>ln -sf ../init.d/adsl /etc/rc.d/rc0.d/K49adsl &amp;&amp;
 ln -sf ../init.d/adsl /etc/rc.d/rc1.d/K49adsl &amp;&amp;
 ln -sf ../init.d/adsl /etc/rc.d/rc2.d/K49adsl &amp;&amp;
@@ -80,5 +79,5 @@
 ln -sf ../init.d/adsl /etc/rc.d/rc4.d/S24adsl &amp;&amp;
 ln -sf ../init.d/adsl /etc/rc.d/rc5.d/S24adsl &amp;&amp;
-ln -sf ../init.d/adsl /etc/rc.d/rc6.d/K49adsl</userinput></screen></para>
+ln -sf ../init.d/adsl /etc/rc.d/rc6.d/K49adsl</command></userinput></screen></para>
 
 </sect3>
Index: connect/other/pppoe/pppoe-desc.xml
===================================================================
--- connect/other/pppoe/pppoe-desc.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ connect/other/pppoe/pppoe-desc.xml	(revision 9d3e4bf9d6c3c87d3d420672db3891874c79aa2c)
@@ -2,7 +2,9 @@
 <title>Contents</title>
 
-<para>The RP-PPPoE package contains <userinput>adsl-setup, adsl-start, 
-adls-status, adsl-stop, pppoe, pppoe-relay, pppoe-server, and
-pppoe-sniff</userinput>.</para>
+<para>The <application><acronym>RP-PPPoE</acronym></application> package 
+contains <command>adsl-setup</command>, <command>adsl-start</command>, 
+<command>adsl-status</command>, <command>adsl-stop</command>, <command>
+pppoe</command>, <command>pppoe-relay</command>, <command>pppoe-server
+</command> and <command>pppoe-sniff</command>.</para>
 
 </sect2>
@@ -14,23 +16,28 @@
 in <filename>/etc/ppp/pppoe.conf</filename>.</para></sect3>
 
-<sect3><title>adsl-start</title><para>Starts the client using the options 
+<sect3><title>adsl-start</title>
+<para><command>adsl-start</command> starts the client using the options 
 specified in <filename>/etc/ppp/pppoe.conf</filename>.</para></sect3>
 
-<sect3><title>adsl-status</title><para>Displays the status of the adsl 
-connection.</para></sect3>
+<sect3><title>adsl-status</title>
+<para><command>adsl-status</command> displays the status of the adsl connection.
+</para></sect3>
 
-<sect3><title>adsl-stop</title><para>Stops the client.</para></sect3>
+<sect3><title>adsl-stop</title>
+<para><command>adsl-stop</command> stops the client.</para></sect3>
 
-<sect3><title>pppoe</title><para>This is the client itself.
-Generally it should not be started on its own.</para></sect3>
+<sect3><title>pppoe</title>
+<para>This is the client itself. Generally it should not be started on its 
+own.</para></sect3>
 
-<sect3><title>pppoe-relay</title><para>Starts the server relay 
-agent.</para></sect3>
+<sect3><title>pppoe-relay</title>
+<para><command>pppoe-relay</command> starts the server relay agent.</para></sect3>
 
-<sect3><title>pppoe-server</title><para>Starts the server 
-componenet.</para></sect3>
+<sect3><title>pppoe-server</title>
+<para><command>pppoe-server</command> starts the server componenet.</para></sect3>
 
-<sect3><title>pppoe-sniff</title><para>A small network sniffer designed 
-to assist in setting PPPOE_EXTRA setttings.</para></sect3>
+<sect3><title>pppoe-sniff</title>
+<para>A small network sniffer designed to assist in setting <envar>PPPOE_EXTRA
+</envar> setttings.</para></sect3>
 
 </sect2>
Index: connect/other/pppoe/pppoe-exp.xml
===================================================================
--- connect/other/pppoe/pppoe-exp.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ connect/other/pppoe/pppoe-exp.xml	(revision 9d3e4bf9d6c3c87d3d420672db3891874c79aa2c)
@@ -3,8 +3,8 @@
 
 <para>These are the standard installation commands that will install into
-the <userinput>/usr</userinput> prefix.  You can optionally use the 
-<userinput>'go'</userinput> script in the root of the source tree, to
+the <filename>/usr</filename> prefix.  You can optionally use the 
+<command>go</command> script in the root of the source tree, to
 run the same commands, which are then immediately followed by the 
-<userinput>adsl-setup</userinput> script.</para>
+<command>adsl-setup</command> script.</para>
 
 </sect2>
Index: connect/other/pppoe/pppoe-inst.xml
===================================================================
--- connect/other/pppoe/pppoe-inst.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ connect/other/pppoe/pppoe-inst.xml	(revision 9d3e4bf9d6c3c87d3d420672db3891874c79aa2c)
@@ -1,11 +1,20 @@
 <sect2>
-<title>Installation of RP-PPPoE</title>
+<title>Installation of <application><acronym>RP-PPPoE</acronym></application></title>
 
-<para>Install RP-PPPoE by running the following commands:</para>
+<para>If you plan on using demand dialing, or kernel mode
+<acronym>PPPoE</acronym>, you need to patch <xref linkend="ppp"/> and
+re-install using the standard <acronym>BLFS</acronym> instructions.  The
+patch can be downloaded from here:
+<ulink url="&hfile-root;/ppp-2.4.1-pppoe-4.patch"/>.   Additional
+information about kernel mode <acronym>PPPoE</acronym> can be found in
+<filename>rp-pppoe-&pppoe-version;/doc/KERNEL-MODE-PPPOE</filename>.</para>
 
-<para><screen><userinput>cd src &amp;&amp;
+<para>Install <application><acronym>RP-PPPoE</acronym></application> by running 
+the following commands:</para>
+
+<screen><userinput><command>cd src &amp;&amp;
 ./configure &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: connect/other/pppoe/pppoe-intro.xml
===================================================================
--- connect/other/pppoe/pppoe-intro.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ connect/other/pppoe/pppoe-intro.xml	(revision 9d3e4bf9d6c3c87d3d420672db3891874c79aa2c)
@@ -1,27 +1,31 @@
 <sect2>
-<title>Introduction to RP-PPPoE</title>
+<title>Introduction to <application><acronym>RP-PPPoE</acronym></application></title>
 
-<screen>Download location (HTTP):       <ulink url="&pppoe-download-http;"/>
-Download location (FTP):        <ulink url="&pppoe-download-ftp;"/>
-Version used:                   &pppoe-version;
-Package size:                   &pppoe-size;
-Estimated Disk space required:  &pppoe-buildsize;</screen>
-
-<para>The Roaring Penguin PPPoE package contains both a client and a 
-server component that works with the client. The client allows you 
-to connect to large networks that use the PPPoE protocol, common among 
-ADSL providers.  The server component runs alongside the client, 
+<para>The Roaring Penguin <application><acronym>PPPoE</acronym></application> 
+package contains both a client and a server component that works with the 
+client. The client allows you to connect to large networks that use the 
+<acronym>PPPoE</acronym> protocol, common among <acronym>ADSL</acronym> 
+providers.  The server component runs alongside the client, 
 allowing you to configure other clients that send out a configuration 
 request.</para>
 
-<screen>RP-PPPoE depends on:
-<xref linkend="ppp"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&pppoe-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&pppoe-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &pppoe-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&pppoe-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&pppoe-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>RP-PPPoE</acronym></application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="ppp"/></para></sect4>
+</sect3>
 
-<para>In addition, if you plan to use demand dialing, or kernel mode
-PPPoE, you need to patch ppp-2.4.1 and re-install using the standard
-BLFS instructions.  The patch can be downloaded from here: 
-<ulink url="&hfile-root;/ppp-2.4.1-pppoe-4.patch"/>.   Additional
-information about kernel mode PPPoE can be found in 
-<filename>rp-pppoe-3.5/doc/KERNEL-MODE-PPPOE</filename>.</para>
 
 </sect2>
Index: connect/other/pppoe/pppoe.ent
===================================================================
--- connect/other/pppoe/pppoe.ent	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ connect/other/pppoe/pppoe.ent	(revision 9d3e4bf9d6c3c87d3d420672db3891874c79aa2c)
@@ -10,2 +10,3 @@
 <!ENTITY pppoe-download-ftp "ftp://ftp.rutgers.edu/pub/slackware/slackware_source/n/rp-pppoe/rp-pppoe-3.5.tar.gz">
 <!ENTITY pppoe-size "185 KB">
+<!ENTITY pppoe-time "">
