Index: connect/dialup/dialup.xml
===================================================================
--- connect/dialup/dialup.xml	(revision 1af021dc849fd23b73097dcb29de5f1162aeeb14)
+++ connect/dialup/dialup.xml	(revision 246c904b82dfea1a2752df2d957cb58ec6b352e6)
@@ -1,8 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
 <chapter id="connect-dialup">
 <?dbhtml filename="dialup.html"?>
 <title>Dial-up networking</title>
 
-&ppp;
-&wvdial;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppp.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="wvdial.xml"/> 
 
 </chapter>
Index: connect/dialup/ppp.xml
===================================================================
--- connect/dialup/ppp.xml	(revision 1af021dc849fd23b73097dcb29de5f1162aeeb14)
+++ connect/dialup/ppp.xml	(revision 246c904b82dfea1a2752df2d957cb58ec6b352e6)
@@ -1,10 +1,121 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+ 
+  <!ENTITY ppp-download-http "http://ccache.samba.org/ftp/ppp/ppp-&ppp-version;.tar.gz">
+  <!ENTITY ppp-download-ftp  "ftp://ftp.samba.org/pub/ppp/ppp-&ppp-version;.tar.gz">
+  <!ENTITY ppp-size          "757 KB">
+  <!ENTITY ppp-buildsize     "7.4 MB">
+  <!ENTITY ppp-time          "0.13 SBU">
+]>
+
 <sect1 id="ppp" xreflabel="PPP-&ppp-version;">
 <?dbhtml filename="ppp.html"?>
 <title>PPP-&ppp-version;</title>
 
-&ppp-intro;
-&ppp-inst;
-&ppp-config;
-&ppp-desc;
+<sect2>
+<title>Introduction to <application><acronym>PPP</acronym></application></title>
+
+<para>The <application><acronym>PPP</acronym></application> package contains 
+the <command>pppd</command> daemon and the <command>chat</command> program.
+This is used for connecting to other machines; often for connecting to
+the Internet via a dial-up or <acronym>PPPoE</acronym> connection to an 
+<acronym>ISP</acronym>.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&ppp-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&ppp-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ppp-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&ppp-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&ppp-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch:
+<ulink
+url="&patch-root;/ppp-&ppp-version;-nobpf-3.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
+<sect3><title><application>ppp</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libpcap"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>PPP</acronym></application></title>
+
+<note><para><application><acronym>PPP</acronym></application> support must be 
+compiled into the kernel or available as a kernel module.</para></note>
+
+<para>Install <application><acronym>PPP</acronym></application> by running the 
+following commands:</para>
+
+<screen><userinput><command>patch -Np1 -i ../ppp-&ppp-version;-nobpf-3.patch &amp;&amp;
+./configure &amp;&amp;
+make ETCDIR=/etc/ppp &amp;&amp;
+make ETCDIR=/etc/ppp install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application><acronym>PPP</acronym></application></title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/ppp/*</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>The <application><acronym>PPP</acronym></application> daemon
+requires very little configuration.  The main trick is scripting the 
+connection.  This can be done either using the chat program which comes with 
+this package or by using <xref linkend="wvdial"/>.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>PPP</acronym></application> package contains 
+the <command>chat</command>,
+<command>pppd</command>, <command>pppdump</command> and
+<command>pppstats</command> programs.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>chat</title>
+<para>The <command>chat</command> program defines a conversational exchange 
+between the computer and the modem.  Its primary purpose is to establish the 
+connection between the Point-to-Point Protocol  Daemon
+(<acronym>PPPD</acronym>)  and  the remote's <command>pppd</command> process.
+</para></sect3>
+
+<sect3><title>pppd</title>
+<para><command>pppd</command> is the Point to Point Protocol daemon.</para></sect3>
+
+<sect3><title>pppdump</title>
+<para><command>pppdump</command> is used to convert
+<application><acronym>PPP</acronym></application> record files 
+to a readable format.</para></sect3>
+
+<sect3><title>pppstats</title>
+<para><command>pppstats</command> is used to print
+<application><acronym>PPP</acronym></application> statistics.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: connect/dialup/wvdial.xml
===================================================================
--- connect/dialup/wvdial.xml	(revision 1af021dc849fd23b73097dcb29de5f1162aeeb14)
+++ connect/dialup/wvdial.xml	(revision 246c904b82dfea1a2752df2d957cb58ec6b352e6)
@@ -1,10 +1,97 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+ 
+  <!ENTITY wvdial-download-http "http://open.nit.ca/download/wvdial-&wvdial-version;.tar.gz">
+  <!ENTITY wvdial-download-ftp  "ftp://ftp.ing-steen.se/pub/unix/unsort/wvdial-&wvdial-version;.tar.gz">
+  <!ENTITY wvdial-size          "66 KB">
+  <!ENTITY wvdial-buildsize     "2.3 MB">
+  <!ENTITY wvdial-time          "0.06 SBU">
+]>
+
 <sect1 id="wvdial" xreflabel="WvDial-&wvdial-version;">
 <?dbhtml filename="wvdial.html"?>
 <title>WvDial-&wvdial-version;</title>
 
-&wvdial-intro;
-&wvdial-inst;
-&wvdial-config;
-&wvdial-desc;
+<sect2>
+<title>Introduction to <application>WvDial</application></title>
+
+<para>The <application>WvDial</application> package contains a no-nonsense, 
+quick and easy to use alternative to <command>chat</command> and
+<command>pppd</command> scripts. If you simply want to dial a modem 
+without the fuss and hassle of <command>chat</command> issues, then you'll 
+want this.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&wvdial-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&wvdial-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &wvdial-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &wvdial-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &wvdial-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>WvDial</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="wvstreams"/> and <xref linkend="ppp"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>WvDial</application></title>
+
+<para>Install <application>WvDial</application> by running the following commands:</para>
+
+<screen><userinput><command>make PREFIX=/usr &amp;&amp;
+make PREFIX=/usr install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>WvDial</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/wvdial.conf</filename>, 
+<filename>/etc/ppp/peers/*</filename></para></sect3>
+
+<sect3><title>Configuration Information</title>
+
+<screen><userinput><command>touch /etc/wvdial.conf &amp;&amp;
+wvdialconf /etc/wvdial.conf</command></userinput></screen>
+<para><command>wvdialconf</command> will test that you have a working modem 
+and try to determine its exact setup. You will then need to enter your
+<acronym>ISP</acronym>'s phone number, login name and password into the
+<filename>/etc/wvdial.conf</filename> file.</para>
+
+<para>You then start wvdial with:</para>
+<screen><userinput><command>wvdial</command></userinput></screen>
+
+<para>For more information, examine the wvdialconf, wvdial.conf and wvdial man pages.</para>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>WvDial</application> package contains the <command>
+wvdial</command> and <command>wvdialconf</command> programs.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>wvdial</title>
+<para>Starts a <acronym>PPP</acronym> connection.</para></sect3>
+
+<sect3><title>wvdialconf</title>
+<para>Automates the configuration of <command>wvdial</command>.</para></sect3>
+
+</sect2>
 
 </sect1>
