Index: connect/connect.xml
===================================================================
--- connect/connect.xml	(revision 84a779b4d1f26dd4b652367a11bed02a0c5928ec)
+++ connect/connect.xml	(revision 68dcb2dd3706e66d8255829fa338f50d48cc768d)
@@ -7,16 +7,18 @@
 
 <part id="connect" xreflabel="Connecting to a Network">
-<?dbhtml filename="connect.html" dir="connect"?>
-<title>Connecting to a Network</title>
-
-<partintro><para>The <acronym>LFS</acronym> book covers setting up networking 
-by connecting to a <acronym>LAN</acronym> with a static
-<acronym>IP</acronym> address.  There are other methods used to connect to
-a <acronym>LAN</acronym> and other networks (such as the Internet).  We cover 
-the most popular methods in this chapter.</para></partintro>
-
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dialup/dialup.xml"/>  
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcp/dhcp.xml"/>  
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/other.xml"/>  
+  <?dbhtml filename="connect.html" dir="connect"?>
+  
+  <title>Connecting to a Network</title>
+  
+  <partintro>
+    <para>The LFS book covers setting up networking by connecting to a LAN 
+    with a static IP address. There are other methods used to connect to
+    a LAN and other networks (such as the Internet).  We cover 
+    the most popular methods in this chapter.</para>
+  </partintro>
+  
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dialup/dialup.xml"/>  
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcp/dhcp.xml"/>  
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/other.xml"/>  
 
 </part>
Index: connect/dialup/wvdial.xml
===================================================================
--- connect/dialup/wvdial.xml	(revision 84a779b4d1f26dd4b652367a11bed02a0c5928ec)
+++ connect/dialup/wvdial.xml	(revision 68dcb2dd3706e66d8255829fa338f50d48cc768d)
@@ -58,5 +58,5 @@
     </itemizedlist>
     
-    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+    <bridgehead renderas="sect3">WvDial Dependencies</bridgehead>
     
     <bridgehead renderas="sect4">Required</bridgehead>
Index: connect/other/other.xml
===================================================================
--- connect/other/other.xml	(revision 84a779b4d1f26dd4b652367a11bed02a0c5928ec)
+++ connect/other/other.xml	(revision 68dcb2dd3706e66d8255829fa338f50d48cc768d)
@@ -7,14 +7,14 @@
 
 <chapter id="connect-other">
-<?dbhtml filename="other.html"?>
-<title>Other Connections</title>
-
-<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>
-
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pppoe.xml"/> 
+  <?dbhtml filename="other.html"?>
+  
+  <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>
+  
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pppoe.xml"/> 
 
 </chapter>
Index: connect/other/pppoe.xml
===================================================================
--- connect/other/pppoe.xml	(revision 84a779b4d1f26dd4b652367a11bed02a0c5928ec)
+++ connect/other/pppoe.xml	(revision 68dcb2dd3706e66d8255829fa338f50d48cc768d)
@@ -14,286 +14,324 @@
 
 <sect1 id="pppoe" xreflabel="RP-PPPoE-&pppoe-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="pppoe.html"?>
-<title>RP-PPPoE-&pppoe-version;</title>
-<indexterm zone="pppoe">
-<primary sortas="a-RP-PPPoE">RP-PPPoE</primary></indexterm>
-
-<sect2>
-<title>Introduction to 
-<application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application></title>
-
-<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>
-
-<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 MD5 sum: &pppoe-md5sum;</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</acronym>-<acronym>PPPoE</acronym></application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="ppp"/> and
-<xref linkend="net-tools"/> (you may omit
-<application>Net-tools</application> by using the following patch to
-utilize <application><acronym>IP</acronym>Route2</application>: <ulink 
-url="&patch-root;/rp-pppoe-&pppoe-version;-iproute2-1.patch"/>)</para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2 id="pppoe-kernel">
-<title>Installation of 
-<application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application>
-</title>
-
-<note><para>If you plan on using kernel-mode <acronym>PPPoE</acronym>, 
-this package is no longer explicitly needed, however, it is recomended
-for ease of configuration.   Additional information about kernel mode 
-<acronym>PPPoE</acronym> can be found in 
-<filename>rp-pppoe-&pppoe-version;/doc/KERNEL-MODE-PPPOE</filename>.</para></note>
-<indexterm zone="pppoe pppoe-kernel">
-<primary sortas="d-Kernel-mode-PPPoE">Kernel-mode PPPoE</primary></indexterm>
-
-<para>Fix the location of the logger executable in several
-<acronym>ADSL</acronym> scripts:</para>
-
-<screen><userinput><command>sed -i s%/usr/bin/logger%/bin/logger% scripts/adsl-{connect,setup,stop}.in</command></userinput></screen>
-
-<para>Install 
-<application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application> by 
-running the following commands:</para>
-
-<screen><userinput><command>cd src &amp;&amp;
+  <?dbhtml filename="pppoe.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>RP-PPPoE-&pppoe-version;</title>
+  
+  <indexterm zone="pppoe">
+    <primary sortas="a-RP-PPPoE">RP-PPPoE</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to RP-PPPoE</title>
+    
+    <para>The Roaring Penguin <application>PPPoE</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 
+    PPPoE protocol, common among ADSL providers. The server component 
+    runs alongside the client, allowing you to configure other clients that send 
+    out a configuration request.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <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 MD5 sum: &pppoe-md5sum;</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>
+    
+    <bridgehead renderas="sect3">RP-PPPoE Dependencies</bridgehead>
+    
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="ppp"/> and
+    <xref linkend="net-tools"/> (you may omit
+    <application>Net-tools</application> by using the following patch to
+    utilize <application>IPRoute2</application>: <ulink 
+    url="&patch-root;/rp-pppoe-&pppoe-version;-iproute2-1.patch"/>)</para>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of RP-PPPoE</title>
+
+    <note id="pppoe-kernel">
+      <para>If you plan on using kernel-mode PPPoE, this package is no longer explicitly 
+      needed, however, it is recomended for ease of configuration. Additional information 
+      about kernel mode PPPoE can be found in 
+      <filename>rp-pppoe-&pppoe-version;/doc/KERNEL-MODE-PPPOE</filename>.</para>
+    </note>
+    
+    <indexterm zone="pppoe pppoe-kernel">
+      <primary sortas="d-Kernel-mode-PPPoE">Kernel-mode PPPoE</primary>
+    </indexterm>
+    
+    <para>Fix the location of the logger executable in several ADSL scripts:</para>
+
+<screen><userinput>sed -i s%/usr/bin/logger%/bin/logger% scripts/adsl-{connect,setup,stop}.in</userinput></screen>
+
+    <para>Install <application>RP-PPPoE</application> by running the following 
+    commands:</para>
+
+<screen><userinput>cd src &amp;&amp;
 ./configure &amp;&amp;
-make</command></userinput></screen>
-
-<para>This package does not come with a test suite.</para>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para>These are the standard installation commands that will install into
-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 
-<command>adsl-setup</command> script.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring 
-<application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application>
-</title>
-
-<sect3 id="pppoe-config"><title>Config files</title>
-<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-secrets</filename>, 
-<filename>/etc/ppp/chap-secrets</filename></para>
-<indexterm zone="pppoe pppoe-config"><primary 
-sortas="e-etc-ppp-pppoe.conf">/etc/ppp/pppoe.conf</primary>
-</indexterm>
-<indexterm zone="pppoe pppoe-config"><primary 
-sortas="e-etc-ppp-firewall-standalone">/etc/ppp/firewall-standalone</primary>
-</indexterm>
-<indexterm zone="pppoe pppoe-config"><primary 
-sortas="e-etc-ppp-firewall-masq">/etc/ppp/firewall-masq</primary>
-</indexterm>
-<indexterm zone="pppoe pppoe-config"><primary 
-sortas="e-etc-ppp-pppoe-server-options">/etc/ppp/pppoe-server-options</primary>
-</indexterm>
-<indexterm zone="pppoe pppoe-config"><primary 
-sortas="e-etc-resolv.conf">/etc/resolv.conf</primary>
-</indexterm>
-<indexterm zone="pppoe pppoe-config"><primary 
-sortas="e-etc-ppp-pap-secrets">/etc/ppp/pap-secrets</primary>
-</indexterm>
-<indexterm zone="pppoe pppoe-config"><primary 
-sortas="e-etc-ppp-chap-secrets">/etc/ppp/chap-secrets</primary>
-</indexterm>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para>To configure 
-<application><acronym>RP</acronym>-<acronym>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 
-<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 
-<command>adsl-start</command> script.</para>
-
-<para id="pppoe-init"><emphasis>Optionally</emphasis> install the 
-<filename>/etc/sysconfig/network-devices/services/pppoe</filename> service 
-script included with the <xref linkend="intro-important-bootscripts"/> 
-package (as user root).</para>
-<indexterm zone="pppoe pppoe-init">
-<primary sortas="f-pppoe-service-script">pppoe (service script)</primary>
-</indexterm>
-
-<screen><userinput role='root'><command>make install-service-pppoe</command></userinput></screen>
-
-<para id="pppoe-config2">Now create the config file for use with the 
-<filename>pppoe</filename> service script (as user root):</para>
-<indexterm zone="pppoe pppoe-config2">
-<primary sortas="e-etc-sysconfig-pppoe">/etc/sysconfig/.../pppoe</primary>
-</indexterm>
-
-<note><para>If you have previously configured the network interface that
-will now use <acronym>PPPoE</acronym>, you should remove the interface 
-configuration files for that interface (as user root):</para>
-
-<para><command><userinput role='root'>rm 
-/etc/sysconfig/network-devices/ifconfig.eth0/*</userinput></command></para>
-</note>
-
-<screen><userinput role='root'><command>install -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
-cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/pppoe &lt;&lt; "EOF"</command>
-ONBOOT="yes"
-SERVICE="pppoe"
-<command>EOF</command></userinput></screen>
-
-<!-- A TYPE="[user/kernel]" will be added at a later date when kernel
-mode pppoe is described here. -->
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>adsl-connect, adsl-setup, adsl-start, adsl-status, adsl-stop, pppoe, 
-pppoe-relay, pppoe-server and pppoe-sniff</seg>
-<seg>None</seg>
-<seg>/etc/ppp/plugins and /usr/share/doc/rp-pppoe-&pppoe-version;</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="adsl-connect">
-<term><command>adsl-connect</command></term>
-<listitem><para>is a shell script which manages an <acronym>ADSL</acronym> 
-connection using the user-space <acronym>PPPoE</acronym> client.</para>
-<indexterm zone="pppoe adsl-connect">
-<primary sortas="b-adsl-connect">adsl-connect</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="adsl-setup">
-<term><command>adsl-setup</command></term>
-<listitem><para>is a script for configuring the client. Configuration is 
-then stored in <filename>/etc/ppp/pppoe.conf</filename>.</para>
-<indexterm zone="pppoe adsl-setup">
-<primary sortas="b-adsl-setup">adsl-setup</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="adsl-start">
-<term><command>adsl-start</command></term>
-<listitem><para>starts the client using the options specified in 
-<filename>/etc/ppp/pppoe.conf</filename>.</para>
-<indexterm zone="pppoe adsl-start">
-<primary sortas="b-adsl-start">adsl-start</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="adsl-status">
-<term><command>adsl-status</command></term>
-<listitem><para>displays the status of the <acronym>ADSL</acronym> 
-connection.</para>
-<indexterm zone="pppoe adsl-status">
-<primary sortas="b-adsl-status">adsl-status</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="adsl-stop">
-<term><command>adsl-stop</command></term>
-<listitem><para>stops the client.</para>
-<indexterm zone="pppoe adsl-stop">
-<primary sortas="b-adsl-stop">adsl-stop</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pppoe-prog">
-<term><command>pppoe</command></term>
-<listitem><para>is the client program. Generally it should not be started on 
-its own.</para>
-<indexterm zone="pppoe pppoe-prog">
-<primary sortas="b-pppoe">pppoe</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pppoe-relay">
-<term><command>pppoe-relay</command></term>
-<listitem><para>starts the server relay agent.</para>
-<indexterm zone="pppoe pppoe-relay">
-<primary sortas="b-pppoe-relay">pppoe-relay</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pppoe-server">
-<term><command>pppoe-server</command></term>
-<listitem><para>starts the server component.</para>
-<indexterm zone="pppoe pppoe-server">
-<primary sortas="b-pppoe-server">pppoe-server</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pppoe-sniff">
-<term><command>pppoe-sniff</command></term>
-<listitem><para>is a small network sniffer designed to assist in setting 
-<envar>PPPOE_EXTRA</envar> settings.</para>
-<indexterm zone="pppoe pppoe-sniff">
-<primary sortas="b-pppoe-sniff">pppoe-sniff</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+    
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    
+<screen role="root"><userinput>make install</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>These are the standard installation commands that will install into
+    the <filename class="directory">/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 
+    <command>adsl-setup</command> script.</para>
+    
+  </sect2>
+  
+  <sect2 role="configuration">
+    <title>Configuring RP-PPPoE</title>
+
+    <sect3 id="pppoe-config">
+      <title>Config Files</title>
+      
+      <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-secrets</filename>, 
+      <filename>/etc/ppp/chap-secrets</filename></para>
+      
+      <indexterm zone="pppoe pppoe-config">
+        <primary sortas="e-etc-ppp-pppoe.conf">/etc/ppp/pppoe.conf</primary>
+      </indexterm>
+      
+      <indexterm zone="pppoe pppoe-config">
+        <primary sortas="e-etc-ppp-firewall-standalone">/etc/ppp/firewall-standalone</primary>
+      </indexterm>
+      
+      <indexterm zone="pppoe pppoe-config">
+        <primary sortas="e-etc-ppp-firewall-masq">/etc/ppp/firewall-masq</primary>
+      </indexterm>
+      
+      <indexterm zone="pppoe pppoe-config">
+        <primary sortas="e-etc-ppp-pppoe-server-options">/etc/ppp/pppoe-server-options</primary>
+      </indexterm>
+      
+      <indexterm zone="pppoe pppoe-config">
+        <primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary>
+      </indexterm>
+      
+      <indexterm zone="pppoe pppoe-config">
+        <primary sortas="e-etc-ppp-pap-secrets">/etc/ppp/pap-secrets</primary>
+      </indexterm>
+      
+      <indexterm zone="pppoe pppoe-config">
+        <primary sortas="e-etc-ppp-chap-secrets">/etc/ppp/chap-secrets</primary>
+      </indexterm>
+    
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>To configure <application>RP-PPPoE</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 
+      connection for you.  You can, of course, choose not to install the 
+      following script, and start your connection manually with the 
+      <command>adsl-start</command> script.</para>
+
+      <para id="pppoe-init"><emphasis>Optionally</emphasis> install the 
+      <filename>/etc/sysconfig/network-devices/services/pppoe</filename> service 
+      script included with the <xref linkend="intro-important-bootscripts"/> 
+      package (as user <systemitem class="username">root</systemitem>).</para>
+      
+      <indexterm zone="pppoe pppoe-init">
+        <primary sortas="f-pppoe-service-script">pppoe (service script)</primary>
+      </indexterm>
+
+<screen role='root'><userinput>make install-service-pppoe</userinput></screen>
+
+      <para id="pppoe-config2">Now create the config file for use with the 
+      <filename>pppoe</filename> service script (as user <systemitem 
+      class="username">root</systemitem>):</para>
+      
+      <indexterm zone="pppoe pppoe-config2">
+        <primary sortas="e-etc-sysconfig-pppoe">/etc/sysconfig/.../pppoe</primary>
+      </indexterm>
+      
+      <note>
+        <para>If you have previously configured the network interface that
+        will now use PPPoE, you should remove the interface 
+        configuration files for that interface (as user <systemitem 
+        class="username">root</systemitem>):</para>
+      
+<screen role='root'><userinput>rm /etc/sysconfig/network-devices/ifconfig.eth0/*</userinput></screen>
+      </note>
+
+<screen role='root'><userinput>install -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
+cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/pppoe &lt;&lt; "EOF"
+<literal>ONBOOT="yes"
+SERVICE="pppoe"</literal>
+EOF</userinput></screen>
+
+      <!-- A TYPE="[user/kernel]" will be added at a later date when kernel
+      mode pppoe is described here. -->
+      
+    </sect3>
+    
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+      
+      <seglistitem>
+        <seg>adsl-connect, adsl-setup, adsl-start, adsl-status, adsl-stop, pppoe, 
+        pppoe-relay, pppoe-server and pppoe-sniff</seg>
+        <seg>None</seg>
+        <seg>/etc/ppp/plugins and /usr/share/doc/rp-pppoe-&pppoe-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      
+      <varlistentry id="adsl-connect">
+        <term><command>adsl-connect</command></term>
+        <listitem>
+          <para>is a shell script which manages an ADSL 
+          connection using the user-space PPPoE client.</para>
+          <indexterm zone="pppoe adsl-connect">
+            <primary sortas="b-adsl-connect">adsl-connect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="adsl-setup">
+        <term><command>adsl-setup</command></term>
+        <listitem>
+          <para>is a script for configuring the client. Configuration is 
+          then stored in <filename>/etc/ppp/pppoe.conf</filename>.</para>
+          <indexterm zone="pppoe adsl-setup">
+            <primary sortas="b-adsl-setup">adsl-setup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="adsl-start">
+        <term><command>adsl-start</command></term>
+        <listitem>
+          <para>starts the client using the options specified in 
+          <filename>/etc/ppp/pppoe.conf</filename>.</para>
+          <indexterm zone="pppoe adsl-start">
+            <primary sortas="b-adsl-start">adsl-start</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="adsl-status">
+        <term><command>adsl-status</command></term>
+        <listitem>
+          <para>displays the status of the ADSL 
+          connection.</para>
+          <indexterm zone="pppoe adsl-status">
+            <primary sortas="b-adsl-status">adsl-status</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="adsl-stop">
+        <term><command>adsl-stop</command></term>
+        <listitem>
+          <para>stops the client.</para>
+          <indexterm zone="pppoe adsl-stop">
+            <primary sortas="b-adsl-stop">adsl-stop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="pppoe-prog">
+        <term><command>pppoe</command></term>
+        <listitem>
+          <para>is the client program. Generally it should not be started on 
+          its own.</para>
+          <indexterm zone="pppoe pppoe-prog">
+            <primary sortas="b-pppoe">pppoe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="pppoe-relay">
+        <term><command>pppoe-relay</command></term>
+        <listitem>
+          <para>starts the server relay agent.</para>
+          <indexterm zone="pppoe pppoe-relay">
+            <primary sortas="b-pppoe-relay">pppoe-relay</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="pppoe-server">
+        <term><command>pppoe-server</command></term>
+        <listitem>
+          <para>starts the server component.</para>
+          <indexterm zone="pppoe pppoe-server">
+            <primary sortas="b-pppoe-server">pppoe-server</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="pppoe-sniff">
+        <term><command>pppoe-sniff</command></term>
+        <listitem>
+          <para>is a small network sniffer designed to assist in setting 
+          <envar>PPPOE_EXTRA</envar> settings.</para>
+          <indexterm zone="pppoe pppoe-sniff">
+            <primary sortas="b-pppoe-sniff">pppoe-sniff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    
+    </variablelist>
+
+  </sect2>
 
 </sect1>
