Index: basicnet/basicnet.xml
===================================================================
--- basicnet/basicnet.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ basicnet/basicnet.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -17,4 +17,5 @@
 
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="connect/connect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="netlibs/netlibs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="textweb/textweb.xml"/>
Index: basicnet/connect/connect.xml
===================================================================
--- basicnet/connect/connect.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
+++ basicnet/connect/connect.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<chapter id="basicnet-connect">
+  <?dbhtml filename="connect.html"?>
+
+  <title>Connecting to a Network</title>
+
+  <para>The LFS book covers setting up networking by connecting to a LAN
+  with a static IP address. There are other methods used to obtain an IP
+  address and connect to a LAN and other networks (such as the Internet).
+  The most popular methods (DHCP and PPP) are covered in this chapter.</para>
+
+  <para>DHCP stands for Dynamic Host Configuration Protocol. It is a protocol
+  used by many sites to automatically provide information such as IP addresses,
+  subnet masks and routing information to computers.  If your network uses
+  DHCP, you will need a DHCP client in order to connect to it.</para>
+
+  <para>PPP stands for Potint-to-Point Protocol. It is data link protocol
+  commonly used for establishing an authenticated IP connections over
+  a phone line with a modem, or over radio waves with a cellular phone. There
+  is also a variant (PPPoE) that works over Ethernet and is used by cable
+  providers to authenticate the Internet connections.</para>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcpcd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcp-client.xml"/>
+
+</chapter>
Index: basicnet/connect/dhcp-client.xml
===================================================================
--- basicnet/connect/dhcp-client.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
+++ basicnet/connect/dhcp-client.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="dhcp-client" xreflabel="DHCP-&dhcp-version; Client">
+  <?dbhtml filename="dhcpclient.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>DHCP-&dhcp-version; Client</title>
+
+  <indexterm zone="dhcp-client">
+    <primary sortas="b-dhclient">dhclient</primary>
+  </indexterm>
+
+  <para>The <application>DHCP</application> package comes with
+  both a client (<command>dhclient</command>) and a server program for
+  using DHCP.  If you want to install this package,
+  the instructions can be found at <xref linkend="dhcp"/>.
+  Note that if you only want to use the client, you
+  do <emphasis>not</emphasis> need to run the server and so do not need
+  the startup script and links provided for the server daemon.
+  You only need to run the DHCP server if you're providing
+  this service to a network, and it's likely that you'll know if that's the
+  case; if it isn't, don't run the server!  Once you have installed the
+  package, return here for information on how to configure the client
+  (<command>dhclient</command>).</para>
+
+  <sect2 role="configuration">
+    <title>Configuring DHCP Client</title>
+
+      <para id="dhclient-service">To configure <command>dhclient</command>,
+      you need to first install the network service script,
+      <filename>/etc/sysconfig/network-devices/services/dhclient</filename>
+      included in the <xref linkend="bootscripts"/> package
+      (as <systemitem class="username">root</systemitem>):</para>
+
+      <indexterm zone="dhcp-client dhclient-service">
+        <primary sortas="f-dhclient">dhclient (service script)</primary>
+      </indexterm>
+
+<screen role='root'><userinput>make install-service-dhclient</userinput></screen>
+
+    <para id="dhclient-config1">Next, create the
+    <filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhclient</filename>
+    configuration file with the following commands as the <systemitem
+    class="username">root</systemitem> user.  Adjust as
+    necessary for additional interfaces:</para>
+
+    <indexterm zone="dhcp-client dhclient-config1">
+      <primary sortas="e-etc-sysconfig-...-dhclient">/etc/sysconfig/.../dhclient</primary>
+    </indexterm>
+
+<screen role='root'><userinput>install -v -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
+cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/dhclient &lt;&lt; "EOF"
+<literal>ONBOOT="yes"
+SERVICE="dhclient"
+DHCP_START="-q <replaceable>&lt;add additional start parameters here&gt;</replaceable>"
+DHCP_STOP="-q -r <replaceable>&lt;add additional stop parameters here&gt;</replaceable>"
+
+# Set PRINTIP="yes" to have the script print
+# the DHCP assigned IP address
+PRINTIP="no"
+
+# Set PRINTALL="yes" to print the DHCP assigned values for
+# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
+PRINTALL="no"</literal>
+EOF</userinput></screen>
+
+    <para>For more information on the appropriate
+    <envar>DHCP_START</envar> and <envar>DHCP_STOP</envar>
+    values, examine the man page for <command>dhclient</command>.</para>
+
+    <para id="dhclient-config2">Finally, you should create the
+    <filename>/etc/dhclient.conf</filename> file using the following commands
+    as the <systemitem class="username">root</systemitem> user:</para>
+
+    <indexterm zone="dhcp-client dhclient-config2">
+      <primary sortas="e-etc-dhclient.conf">/etc/dhclient.conf</primary>
+    </indexterm>
+
+    <note>
+      <para>You'll need to add a second interface definition to the file if you
+      have more than one interface.</para>
+    </note>
+
+<screen role='root'><userinput>cat &gt; /etc/dhclient.conf &lt;&lt; "EOF"
+<literal># dhclient.conf
+
+interface "eth0"{
+prepend domain-name-servers 127.0.0.1;
+request subnet-mask, broadcast-address, time-offset, routers,
+        domain-name, domain-name-servers, host-name;
+require subnet-mask, domain-name-servers;
+}
+# end dhclient.conf</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+</sect1>
Index: basicnet/connect/dhcpcd.xml
===================================================================
--- basicnet/connect/dhcpcd.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
+++ basicnet/connect/dhcpcd.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY dhcpcd-download-http "http://download.berlios.de/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
+  <!ENTITY dhcpcd-download-ftp  "ftp://ftp.osuosl.org/pub/gentoo/distfiles/dhcpcd-&dhcpcd-version;.tar.bz2">
+  <!ENTITY dhcpcd-md5sum        "90d6df62d663bdea65d5905023377b39">
+  <!ENTITY dhcpcd-size          "32.5 KB">
+  <!ENTITY dhcpcd-buildsize     "0.3 MB">
+  <!ENTITY dhcpcd-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="dhcpcd" xreflabel="dhcpcd-&dhcpcd-version;">
+  <?dbhtml filename="dhcpcd.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>dhcpcd-&dhcpcd-version;</title>
+
+  <indexterm zone="dhcpcd">
+    <primary sortas="a-dhcpcd">dhcpcd</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to dhcpcd</title>
+
+    <para><application>dhcpcd</application> is an implementation of the
+    DHCP client specified in RFC2131. This is useful for connecting
+    your computer to a network which uses DHCP to assign network
+    addresses.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&dhcpcd-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&dhcpcd-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &dhcpcd-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &dhcpcd-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &dhcpcd-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &dhcpcd-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/dhcpcd"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of dhcpcd</title>
+
+    <para>Install <application>dhcpcd</application> by running the following
+    commands:</para>
+
+<screen><userinput>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="configuration">
+    <title>Configuring dhcpcd</title>
+
+    <sect3 id="dhcpcd-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/dhcpcd.sh</filename></para>
+
+      <indexterm zone="dhcpcd dhcpcd-config">
+        <primary sortas="e-etc-dhcpcd-sh">/etc/dhcpcd.sh</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3 id="dhcpcd-init">
+      <title>Configuration Information</title>
+
+      <para>To configure <command>dhcpcd</command>, you need to first install
+      the network service script,
+      <filename>/etc/sysconfig/network-devices/services/dhcpcd</filename>
+      included in the <xref linkend="bootscripts"/> package
+      (as user <systemitem class="username">root</systemitem>):</para>
+
+      <indexterm zone="dhcpcd dhcpcd-init">
+        <primary sortas="f-dhcpcd">dhcpcd (service script)</primary>
+      </indexterm>
+
+<screen role='root'><userinput>make install-service-dhcpcd</userinput></screen>
+
+      <para>Whenever <command>dhcpcd</command> configures or shuts down
+      a network interface, it executes the script
+      <filename>/etc/dhcpcd.sh</filename>. This script can be
+      customized to perform additional actions for the network interface.
+      See the man page of <command>dhcpcd</command> for more details. An
+      example file is shipped in the tarball which can be used to send
+      the interface details to syslog.</para>
+
+      <para id="dhcpcd-config2">Finally, as the <systemitem
+      class="username">root</systemitem> user create the
+      <filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd</filename>
+      configuration file using the following commands.  Adjust appropriately
+      for additional interfaces:</para>
+
+      <indexterm zone="dhcpcd dhcpcd-config2">
+        <primary sortas="e-etc-sysconfig-dhcpcd">/etc/sysconfig/.../dhcpcd</primary>
+      </indexterm>
+
+<screen role='root'><userinput>install -v -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
+cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd &lt;&lt; "EOF"
+<literal>ONBOOT="yes"
+SERVICE="dhcpcd"
+DHCP_START="<replaceable>&lt;insert appropriate start options here&gt;</replaceable>"
+DHCP_STOP="-k <replaceable>&lt;insert additional stop options here&gt;</replaceable>"
+
+# Set PRINTIP="yes" to have the script print
+# the DHCP assigned IP address
+PRINTIP="no"
+
+# Set PRINTALL="yes" to print the DHCP assigned values for
+# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
+PRINTALL="no"</literal>
+EOF</userinput></screen>
+
+      <para>For more information on the appropriate <envar>DHCP_START</envar> and
+      <envar>DHCP_STOP</envar> values, examine the man page for
+      <command>dhcpcd</command>.</para>
+
+      <note>
+        <para id="dhcpcd-config3">The default behavior of
+        <command>dhcpcd</command> is to overwrite (after making backup copies)
+        <filename>/etc/resolv.conf</filename>, <filename>/etc/yp.conf</filename> and
+        <filename>/etc/ntp.conf</filename> with new files containing information from
+        the DHCP server. If this is undesirable, review the
+        <command>dhcpcd</command> man page for switches to add to the
+        <envar>DHCP_START</envar> value.</para>
+      </note>
+
+      <indexterm zone="dhcpcd dhcpcd-config3">
+        <primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary>
+      </indexterm>
+
+      <indexterm zone="dhcpcd dhcpcd-config3">
+        <primary sortas="e-etc-yp.conf">/etc/yp.conf</primary>
+      </indexterm>
+
+      <indexterm zone="dhcpcd dhcpcd-config3">
+        <primary sortas="e-etc-ntp.conf">/etc/ntp.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>dhcpcd</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="dhcpcd-prog">
+        <term><command>dhcpcd</command></term>
+        <listitem>
+          <para>is an implementation of the DHCP client specified
+          in RFC2131 (when -r option is not specified) and RFC1541
+          (when -r option is specified).</para>
+          <indexterm zone="dhcpcd dhcpcd-prog">
+            <primary sortas="b-dhcpcd">dhcpcd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: basicnet/connect/ppp.xml
===================================================================
--- basicnet/connect/ppp.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
+++ basicnet/connect/ppp.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY ppp-download-http "http://samba.org/ftp/ppp/ppp-&ppp-version;.tar.gz">
+  <!ENTITY ppp-download-ftp  "&gentoo-ftp-repo;/ppp-&ppp-version;.tar.gz">
+  <!ENTITY ppp-md5sum        "183800762e266132218b204dfb428d29">
+  <!ENTITY ppp-size          "673 KB">
+  <!ENTITY ppp-buildsize     "5.6 MB">
+  <!ENTITY ppp-time          "0.1 SBU">
+]>
+
+<sect1 id="ppp" xreflabel="PPP-&ppp-version;">
+  <?dbhtml filename="ppp.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>PPP-&ppp-version;</title>
+
+  <indexterm zone="ppp">
+    <primary sortas="a-PPP">PPP</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to PPP</title>
+
+    <para>The <application>PPP</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 PPPoE connection to an ISP.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <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 MD5 sum: &ppp-md5sum;</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>
+
+    <bridgehead renderas="sect3">PPP Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="libpcap"/> (needed to do PPP filtering),
+    <xref linkend="linux-pam"/> (to authenticate incoming calls using PAM),
+    and <ulink url="http://linux-atm.sourceforge.net/">Linux ATM</ulink> (to
+    build the pppoatm.so plugin)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/PPP"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of PPP</title>
+
+    <note id="ppp-kernel">
+      <para><application>PPP</application> support (CONFIG_PPP),
+      the asynchronous line discipline (CONFIG_PPP_ASYNC), the
+      driver for your serial port device and/or the PPP over Ethernet
+      (PPPoE) protocol driver (CONGIG_PPPOE) must be compiled into the
+      kernel or loaded as kernel modules.
+      Udev doesn't load the ppp_generic and pppoe modules automatically, they
+      must be mentioned in the <filename>/etc/sysconfig/modules</filename>
+      file.</para>
+    </note>
+
+    <indexterm zone="ppp ppp-kernel">
+      <primary sortas="d-PPP-support">PPP support</primary>
+    </indexterm>
+
+    <para>Create (as <systemitem class="username">root</systemitem>)
+    the group for users who may run <application>PPP</application>:</para>
+
+<screen role="root"><userinput>groupadd -g 52 pppusers</userinput></screen>
+
+    <para>Install <application>PPP</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+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 &amp;&amp;
+<!-- FIXME: is "make install-etcppp" needed for KPPP/WvDial?
+The example configuration below overwrites two of three files, and
+already includes the "lock" option in each peer file
+-->make install-etcppp &amp;&amp;
+install -m755 scripts/{pon,poff,plog} /usr/bin &amp;&amp;
+instal -m644 scripts/pon.1 /usr/share/man/man1</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>make install-etcppp</command>: This command puts example
+    configuration files in <filename class="directory">/etc/ppp</filename>.</para>
+
+<!-- FIXME: the three options below are taken from pppd/Makefile.linux file.
+     They have not been tested. There are other options, such as USE_SRP=y,
+     that cannot work (in this case, because libsrp is not available from
+     anywhere) - Alexander E. Patrakov -->
+
+    <para><parameter>USE_PAM=y</parameter>: Add this argument to the
+    <command>make</command> command to compile in support for PAM, usually
+    needed for authenticating inbound calls against a central database.</para>
+
+    <para><parameter>HAVE_INET6=y</parameter>: Add this argument to the
+    <command>make</command> command to compile in support for IPv6.</para>
+
+    <para><parameter>CBCP=y</parameter>: Add this argument to the
+    <command>make</command> command to compile in support for
+    Microsoft proprietary Callback Control Protocol.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring PPP</title>
+
+    <sect3 id="ppp-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/ppp/*</filename></para>
+
+      <indexterm zone="ppp ppp-config">
+        <primary sortas="e-etc-ppp-star">/etc/ppp/*</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>The <application>PPP</application> daemon requires some
+      configuration. The main trick is scripting the connection.
+      For dialup and GPRS connections, this can be done
+      either using the <command>chat</command> program which comes with
+      this package, or by using external tools such as
+      <ulink url="http://alumnit.ca/wiki/?WvDial">WvDial</ulink>
+      or <application>KPPP</application> from
+      <xref linkend="kdenetwork"/>. The text below explains how to set up
+      dialup and GPRS and PPPoE connections using only tools provided with
+      the <application>PPP</application> package. All configuration steps
+      in this section are executed as
+      <systemitem class="username">root</systemitem> user.</para>
+
+    <sect4>
+      <title>Setting the passwords</title>
+
+      <warning><para>Instructions in this section result in your password
+      appearing on the screen in a visible clear-text form. Make sure that
+      nobody else looks at the screen.</para></warning>
+
+      <para>Passwords are stored in <filename>/etc/ppp/pap-secrets</filename>
+      and <filename>/etc/ppp/chap-secrets</filename> files, depending on the
+      authentication method used by the ISP. If in doubt, place the password
+      into both files. E.g., if the username given by the ISP is
+      <quote>jdoe</quote>, the password is <quote>guessit</quote>, the
+      ISP uses PAP and the user wants to name this account
+      <quote>dialup</quote> in order to distinguish it from other PPP accounts,
+      the following file has to be created:</para>
+<screen role="root"><userinput>touch /etc/ppp/pap-secrets
+chmod 600 /etc/ppp/pap-secrets
+cat &gt;&gt;/etc/ppp/pap-secrets &lt;&lt;"EOF"</userinput>
+<literal># username      remotename    password        IP for the peer
+jdoe            dialup        guessit         *</literal>
+<userinput>EOF</userinput></screen>
+    </sect4>
+
+    <sect4>
+      <title>DNS Server Configuration</title>
+
+      <para>If you don't run your own caching DNS server, create a simple
+      <command>ip-up</command> script (to be called by <command>pppd</command>
+      automatically once the connection is brought up) that populates the
+      <filename>/etc/resolv.conf</filename> file with nameservers specified
+      by the ISP.</para>
+<screen role="root"><userinput>cat &gt;/etc/ppp/ip-up &lt;&lt;"EOF"</userinput>
+<literal>#!/bin/sh
+if [ "$USEPEERDNS" = "1" ] &amp;&amp; [ -s /etc/ppp/resolv.conf ]
+then
+        install -m 644 /etc/ppp/resolv.conf /etc/resolv.conf
+fi</literal>
+<userinput>EOF
+chmod 755 /etc/ppp/ip-up</userinput></screen>
+      <para>If you use a caching DNS server such as <xref linkend="bind"/>
+      or <ulink url="http://www.phys.uu.nl/~rombouts/pdnsd.html">Pdnsd</ulink>,
+      the script above is wrong for you. In such case, write your
+      own script that tells your caching nameserver to forward queries to
+      upstream DNS servers specified in the $DNS1 and $DNS2 environment
+      variables.</para>
+      <!-- FIXME: write the replacement script that works with Bind -->
+    </sect4>
+
+    <sect4>
+      <title>Dialup Modem Connection</title>
+<!-- This section has been tested with various ISPs in Yekaterinburg,
+     Russia using Lucent WinModem. I cannot test it anymore, because
+     there is no free PCI slot for the modem in my new computer. However,
+     it is similar enough to GPRS for me to be sure that it still works,
+     and nobody complained about non-working dialup on the LFS LiveCD.
+     - Alexander E. Patrakov -->
+
+      <para>Dialup connections are established with the help of a modem
+      connected to a computer and the telephone line. The modem dials a
+      telephone number of the ISP's modem, and they exchange data using
+      the signal frequencies 300-4000 Hz. Typical data transfer
+      rate is 40-50 kilobits per second, and the gateway ping time
+      (latency) is up to 300-400 ms. In order to configure the
+      dialup connection, it is required to know the telephone number of
+      the ISP's modem pool, the username and the password.</para>
+
+      <para>In order to configure a dialup connection, two files have to
+      be created: a chat script that automates the connection procedure
+      (common for all dialup accounts), and a peer file that provides
+      configuration information about a specific connection to
+      <command>pppd</command>:</para>
+<screen role="root"><userinput>cat &gt;/etc/ppp/dialup.chat &lt;&lt;"EOF"</userinput>
+<literal>ABORT BUSY ABORT 'NO CARRIER' ABORT VOICE ABORT 'NO DIALTONE'
+ABORT 'NO DIAL TONE' ABORT 'NO ANSWER' ABORT DELAYED
+ABORT ERROR ABORT BLACKLISTED
+
+TIMEOUT 5
+'' AT
+# \T is the phone number, passed from /etc/ppp/peers/<replaceable>dialup</replaceable>
+OK-+++\dATH0-OK ATD\T
+TIMEOUT 75
+CONNECT \d\c</literal>
+<userinput>EOF
+
+cat &gt;/etc/ppp/peers/<replaceable>dialup</replaceable> &lt;&lt;"EOF"</userinput>
+<literal># Your username at the ISP
+user "<replaceable>jdoe</replaceable>"
+# What should be in the second column in /etc/ppp/*-secrets
+remotename "<replaceable>dialup</replaceable>"
+# Replace <replaceable>TTTTTTT</replaceable> with the ISP phone number
+connect "/usr/sbin/chat -T <replaceable>TTTTTTT</replaceable> -f /etc/ppp/dialup.chat"
+
+# Specify your modem serial port and speed below
+<replaceable>/dev/ttyS0</replaceable>
+<replaceable>115200</replaceable>
+
+# The settings below usually don't need to be changed
+updetach
+noauth
+hide-password
+debug
+lock
+defaultroute
+noipdefault
+usepeerdns</literal>
+<userinput>EOF</userinput></screen>
+
+      <para>The first three lines of the
+      <filename>/etc/ppp/dialup.chat</filename> file abort the script when
+      it receives an indication of an error from the modem. Then the timeout
+      is set to 5 seconds and the script checks that the modem responds to
+      the dummy AT command at all. If not, measures are taken to dewedge it
+      (by interrupting the data transfer and going on hook). Then the
+      telephone number is dialed, and the script waits for the answer for
+      75 seconds. The serial connection is considered established when the
+      modem sends the string CONNECT.</para>
+
+    </sect4>
+
+    <sect4>
+      <title>GPRS and EDGE Connections</title>
+<!-- This section has been tested with GPRS service from MOTIV in
+     Yekaterinburg, Russia. According to forum messages, the procedure
+     also works with EDGE, but my cellular phone (Motorola C350) does not
+     support EDGE. - Alexander E. Patrakov -->
+
+      <para>GPRS and EDGE connections are established with the help of a
+      cellular phone connected to a computer via serial or USB cable, or
+      using Bluetooth.
+      The phone exchanges data packets with the nearest base station,
+      which can be up to 35 kilometers away.
+
+      <!-- FIXME: watch for new standards! SkyLink is already offering
+           3.1 megabits per second with CDMA mobile phones, and
+           the configuration below doesn't work. It is reported that
+           a regular dialup setup with the telephone number "#777",
+           username "mobile" and password "internet" works with SkyLink. -->
+
+      The maximum possible data transfer rate is 170 kilobits per second
+      for GPRS and 474 kilobits per second for EDGE, but many cellular
+      operators impose lower limits, such as 64 kilobits per second. The
+      gateway ping time is 900 ms for GPRS, which makes playing many online
+      games impossible and causes connection to ICQ to be unreliable.
+      In order to configure a GPRS or EDGE connection,
+      it is required to know the access point name (APN) and, rarely, the
+      username and the password.
+      In most cases, billing is based on the telephone number, and the
+      username/password pair is not needed, as assumed in the example
+      below.</para>
+
+      <para>In order to configure a GPRS connection, two files have to
+      be created: a chat script that automates the connection procedure
+      (common for all GPRS accounts), and a peer file that provides
+      configuration information about a specific connection to
+      <command>pppd</command>:</para>
+<screen role="root"><userinput>cat &gt;/etc/ppp/gprs.chat &lt;&lt;"EOF"</userinput>
+<literal>ABORT BUSY ABORT 'NO CARRIER' ABORT VOICE ABORT 'NO DIALTONE'
+ABORT 'NO DIAL TONE' ABORT 'NO ANSWER' ABORT DELAYED
+ABORT ERROR ABORT BLACKLISTED
+
+TIMEOUT 5
+'' AT
+OK-+++\dATH0-OK ATZ
+# \T is the APN, passed from /etc/ppp/peers/<replaceable>gprs</replaceable>
+# This example stores the APN as profile #1 in the phone.
+# The "telephone number", *99***&lt;profile_number&gt;#, is always the same.
+# If you want to store this as profile #2, change 1 to 2 in the
+# following two lines.
+OK AT+CGDCONT=<replaceable>1</replaceable>,"IP","\T"
+OK "ATD*99***<replaceable>1</replaceable>#"
+CONNECT \d\c</literal>
+<userinput>EOF
+
+cat &gt;/etc/ppp/peers/<replaceable>gprs</replaceable> &lt;&lt;"EOF"</userinput>
+<literal># Replace <replaceable>inet.example.com</replaceable> with the proper APN for your provider
+connect "/usr/sbin/chat -T <replaceable>inet.example.com</replaceable> -f /etc/ppp/gprs.chat"
+
+# Specify your cellphone serial port and speed below
+# Note: you must manually send some vendor-specific AT commands
+# to certain old cellular phones (such as Sony-Ericsson T200)
+# in order to achieve connection speed more than 9600 bits ber second.
+<replaceable>/dev/ttyS1</replaceable>
+<replaceable>115200</replaceable>
+
+# The settings below usually don't need to be changed
+noccp
+noauth
+updetach
+debug
+lock
+defaultroute
+noipdefault
+usepeerdns</literal>
+<userinput>EOF</userinput></screen>
+    </sect4>
+
+    <sect4>
+      <title>PPPoE connections</title>
+
+      <!-- This section has been tested with the "USI" ISP in Yekaterinburg,
+      Russia. Other editors can test it as described in
+      http://linuxfromscratch.org/pipermail/blfs-dev/2008-March/018290.html
+      - Alexander E. Patrakov -->
+
+      <para>PPPoE connections are established over Ethernet, typically between
+      a computer and an ADSL router (usually installed in the same room)
+      that forwards the packets down the telephone line using frequencies
+      25-2500 kHz, thus not interfering with voice calls. Although the router
+      can, in theory, forward any Ethernet packet, PPP encapsulation is used
+      for password-based authentication, so that the ISP can limit the
+      bandwidth and charge money according to the chosen tariff. The maximum
+      data transfer rate on ADSL is 24 megabits per second, and the gateway
+      ping time is typically less than 10 ms. In order to configure a PPPoE
+      connection, it is required to know the username, the password, and,
+      sometimes, the service name and/or the access concentrator name.</para>
+
+      <para>In order to configure a PPPoE connection, only the peer file
+      has to be created:</para>
+<screen role="root"><userinput>cat &gt;/etc/ppp/peers/<replaceable>adsl</replaceable> &lt;&lt;"EOF"</userinput>
+<literal>plugin rp-pppoe.so
+# Ethernet interface name
+<replaceable>eth0</replaceable>
+# Your username at the ISP
+user "<replaceable>jdoe</replaceable>"
+# What should be in the second column in /etc/ppp/*-secrets
+remotename "<replaceable>adsl</replaceable>"
+# If needed, specify the service and the access concentrator name
+# rp_pppoe_service "<replaceable>internet</replaceable>"
+# rp_pppoe_ac "<replaceable>ac1</replaceable>"
+
+# The settings below usually don't need to be changed
+noauth
+hide-password
+updetach
+debug
+defaultroute
+noipdefault
+usepeerdns</literal>
+<userinput>EOF</userinput></screen>
+    </sect4>
+
+    <sect4>
+      <title>Establishing the connection manually</title>
+
+      <para>In order to establish a PPP connection described by the
+      <filename>/etc/ppp/peers/<replaceable>peername</replaceable></filename>
+      file, run, as root or as a member of the
+      <systemitem class="groupname">pppusers</systemitem> group:</para>
+<screen><userinput>pon <replaceable>peername</replaceable></userinput></screen>
+
+      <para>In order to tear the connection down, run:</para>
+<screen><userinput>poff <replaceable>peername</replaceable></userinput></screen>
+
+    </sect4>
+
+    <sect4>
+      <title>Bringing up PPPoE connection at boot time</title>
+      <para>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>pon</command> command,
+      as described above. If you wish your PPPoE connection to be brought
+      up at boot time, run:</para>
+
+<screen role='root'><userinput>make install-service-pppoe</userinput></screen>
+
+      <para>The above command installs the <filename>pppoe</filename>
+      service script and the <filename>/etc/ppp/peers/pppoe</filename>
+      file with some settings that make sense for most PPPoE connections.
+      The bootscript calls <command>pppd</command> with the the following
+      options:</para>
+
+<screen>pppd call pppoe ${1} linkname ${1} ${PPP_OPTS}</screen>
+
+      <para>Here <quote>${1}</quote> is the network interface name,
+      <quote>linkname ${1}</quote> is added for creation of the
+      <filename>/var/run/ppp-${1}.pid</filename> file with the
+      <command>pppd</command> process ID (to be used when bringing
+      the connection down), and the <quote>${PPP_OPTS}</quote> variable
+      contains user-specified options such as <quote>user</quote> and
+      <quote>remotename</quote>.</para>
+
+      <para>Now create the config file for use with the <filename>pppoe</filename>
+      service script:</para>
+
+<screen role='root'><userinput>install -v -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"
+PPP_OPTS="user <replaceable>jdoe</replaceable> remotename <replaceable>adsl</replaceable>"</literal>
+EOF</userinput></screen>
+
+      <note><para>Instead of specifying additional options in the $PPP_OPTS
+      variable, you can also edit the <filename>/etc/ppp/peers/pppoe</filename>
+      file, but then your configuration will be lost when upgrading
+      BLFS bootscripts.</para></note>
+
+    </sect4>
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>chat, pon, poff, plog, pppd, pppdump, pppoe-discovery and pppstats</seg>
+        <seg>Several plugin modules installed in
+        <filename class='directory'>/usr/lib/pppd/&ppp-version;</filename></seg>
+        <seg>/etc/ppp, /usr/include/pppd and /usr/lib/pppd</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="chat">
+        <term><command>chat</command></term>
+        <listitem>
+          <para>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 (PPPD) and the remote
+          <command>pppd</command> process.</para>
+          <indexterm zone="ppp chat">
+            <primary sortas="b-chat">chat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pon">
+        <term><command>pon</command></term>
+        <listitem>
+          <para>is the script that establishes a PPP connection</para>
+          <indexterm zone="ppp pon">
+            <primary sortas="b-pon">pon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="poff">
+        <term><command>poff</command></term>
+        <listitem>
+          <para>is the script that tears a PPP connection down.</para>
+          <indexterm zone="ppp poff">
+            <primary sortas="b-poff">poff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="plog">
+        <term><command>plog</command></term>
+        <listitem>
+          <para>is a script that prints the tail of the PPP log.</para>
+          <indexterm zone="ppp plog">
+            <primary sortas="b-plog">plog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry id="pppd">
+        <term><command>pppd</command></term>
+        <listitem>
+          <para>is the Point to Point Protocol daemon.</para>
+          <indexterm zone="ppp pppd">
+            <primary sortas="b-pppd">pppd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pppdump">
+        <term><command>pppdump</command></term>
+        <listitem>
+          <para>is used to convert
+          <application>PPP</application> record files to a readable
+          format.</para>
+          <indexterm zone="ppp pppdump">
+            <primary sortas="b-pppdump">pppdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pppstats">
+        <term><command>pppstats</command></term>
+        <listitem>
+          <para>is used to print
+          <application>PPP</application> statistics.</para>
+          <indexterm zone="ppp pppstats">
+            <primary sortas="b-pppstats">pppstats</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: basicnet/netlibs/netlibs.xml
===================================================================
--- basicnet/netlibs/netlibs.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ basicnet/netlibs/netlibs.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -23,5 +23,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="curl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="wvstreams.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnet.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libsoup.xml"/>
Index: sicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ 	(revision )
@@ -1,322 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY wvstreams-download-http "http://open.nit.ca/download/wvstreams-&wvstreams-version;.tar.gz">
-  <!ENTITY wvstreams-download-ftp  " ">
-  <!ENTITY wvstreams-md5sum        "103230cb9926cb8f3f4d8dc8584f3b9c">
-  <!ENTITY wvstreams-size          "1.2 MB">
-  <!ENTITY wvstreams-buildsize     "46 MB (additional 44 MB to install documentation)">
-  <!ENTITY wvstreams-time          "0.8 SBU (additional 1.9 SBU to build documentation)">
-]>
-
-<sect1 id="wvstreams" xreflabel="WvStreams-&wvstreams-version;">
-  <?dbhtml filename="wvstreams.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>WvStreams-&wvstreams-version;</title>
-
-  <indexterm zone="wvstreams">
-    <primary sortas="a-WvStreams">WvStreams</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WvStreams</title>
-
-    <para><application>WvStreams</application> is a library suite containing
-    platform-independent C++ networking and utilities libraries for rapid
-    application development.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&wvstreams-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&wvstreams-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &wvstreams-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &wvstreams-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &wvstreams-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &wvstreams-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">WvStreams Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="openssl"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pkgconfig"/>,
-    <xref linkend="gamin"/>,
-    <!-- <xref linkend="db"/>, -->
-    <xref linkend="linux-pam"/>,
-    <xref linkend="tcl"/>,
-    <xref linkend="qt"/>,
-    <xref linkend="speex"/>,
-    <xref linkend="libvorbis"/>,
-    <xref linkend="doxygen"/>,
-    <ulink url="http://www.fftw.org/">FFTW-2.<replaceable>&lt;X&gt;</replaceable></ulink>,
-    <ulink url="http://www.swig.org">SWIG</ulink>,
-    <ulink url="http://qdbm.sourceforge.net/">QDBM</ulink>,
-    <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
-    <ulink url="http://xplc.sourceforge.net/">XPLC</ulink>,
-    <ulink url="http://valgrind.kde.org/">Valgrind</ulink>, and
-    <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/wvstreams"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WvStreams</title>
-
-    <para>If you have <application>Tcl</application> and
-    <application>SWIG</application> installed and wish to utilize them, run the
-    following:</para>
-
-<screen><userinput>sed -i -e "s/8_3/8_4/"  -e "s/8\.3/8.4/" \
-      configure{,.ac} include/wvautoconf.h.in bindings/rules.mk</userinput></screen>
-
-    <para>Install <application>WvStreams</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var &amp;&amp;
-make</userinput></screen>
-
-    <para>If <application>Doxygen</application> is installed and you wish to build
-    the API documentation, issue the following command:</para>
-
-<screen><userinput>make doxygen</userinput></screen>
-
-    <para>To test the results, issue: <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-    <para>If you built the API documentation, install it using the following commands:</para>
-
-<screen role='root'><userinput>install -v -d -m755 /usr/share/doc/wvstreams-&wvstreams-version;/doxy-html &amp;&amp;
-install -v -m644 Docs/doxy-html/* \
-    /usr/share/doc/wvstreams-&wvstreams-version;/doxy-html</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i ...</command>: Change to tcl8.4 from tcl8.3.</para>
-
-    <para><parameter>--sysconfdir=/etc</parameter>: This parameter places
-    configuration files in <filename class='directory'>/etc</filename> instead of
-    <filename class='directory'>/usr/etc</filename>.</para>
-
-    <para><parameter>--localstatedir=/var</parameter>: This parameter places
-    <command>uniconfd</command> run-time files in
-    <filename class='directory'>/var/lib</filename> instead of
-    <filename class='directory'>/usr/var/lib</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring WvStreams</title>
-
-    <sect3 id="wvstreams-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/uniconf.conf</filename></para>
-
-      <indexterm zone="wvstreams wvstreams-config">
-        <primary sortas="e-etc-uniconf.conf">/etc/uniconf.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../../xincludes/lib-config.xml"/>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>uni and uniconfd</seg>
-        <seg>libuniconf.{so,a}, libwvbase.{so,a}, libwvfft.{so,a},
-        libwvoggspeex.{so,a}, libwvoggvorbis.{so,a}, libwvqt.{so,a},
-        libwvstreams.{so,a}, libwvtelephony.{so,a}, libwvutils.{so,a} and
-        libxplc-cxx.a</seg>
-        <seg>/usr/include/wvstreams, /usr/share/doc/wvstreams-&wvstreams-version; and
-        /var/lib/uniconf</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="uni">
-        <term><command>uni</command></term>
-        <listitem>
-          <para>is a program to interface with the UniConf configuration system.</para>
-          <indexterm zone="wvstreams uni">
-            <primary sortas="b-uni">uni</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uniconfd">
-        <term><command>uniconfd</command></term>
-        <listitem>
-          <para>is a daemon program for the UniConf configuration system.</para>
-          <indexterm zone="wvstreams uniconfd">
-            <primary sortas="b-uniconfd">uniconfd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libuniconf">
-        <term><filename class='libraryfile'>libuniconf.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that define a hierarchical registry
-          abstraction in the UniConf configuration system.</para>
-          <indexterm zone="wvstreams libuniconf">
-            <primary sortas="c-libuniconf">libuniconf.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwvbase">
-        <term><filename class='libraryfile'>libwvbase.{so,a}</filename></term>
-        <listitem>
-          <para>contains the Base64 encoder and decoder implementations functions.</para>
-          <indexterm zone="wvstreams libwvbase">
-            <primary sortas="c-libwvbase">libwvbase.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwvfft">
-        <term><filename class='libraryfile'>libwvfft.{so,a}</filename></term>
-        <listitem>
-          <para>enables <application>WvStreams</application> programs to
-          easily handle Fast-Fourier transforms, instead of forcing the programmer to
-          use the much harder to use <filename class="libraryfile">libfftw</filename>
-          interface.</para>
-          <indexterm zone="wvstreams libwvfft">
-            <primary sortas="c-libwvfft">libwvfft.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwvoggspeex">
-        <term><filename class='libraryfile'>libwvoggspeex.{so,a}</filename></term>
-        <listitem>
-          <para>enables quick and painless creation of audio streams using
-          the <application>Speex</application> Voice over
-          IP CODEC.</para>
-          <indexterm zone="wvstreams libwvoggspeex">
-            <primary sortas="c-libwvoggspeex">libwvoggspeex.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwvoggvorbis">
-        <term><filename class='libraryfile'>libwvoggvorbis.{so,a}</filename></term>
-        <listitem>
-          <para>enables quick and painless creation of audio streams using
-          the OggVorbis CODEC.</para>
-          <indexterm zone="wvstreams libwvoggvorbis">
-            <primary sortas="c-libwvoggvorbis">libwvoggvorbis.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwvqt">
-        <term><filename class='libraryfile'>libwvqt.{so,a}</filename></term>
-        <listitem>
-          <para>enables <application>WvStreams</application> to act as the
-          I/O and configuration back end for <application>Qt</application> and
-          <application>KDE</application>.</para>
-          <indexterm zone="wvstreams libwvqt">
-            <primary sortas="c-libwvqt">libwvqt.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwvstreams">
-        <term><filename class='libraryfile'>libwvstreams.{so,a}</filename></term>
-        <listitem>
-          <para>provides functions for basic streaming I/O support.</para>
-          <indexterm zone="wvstreams libwvstreams">
-            <primary sortas="c-libwvstreams">libwvstreams.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtelephony">
-        <term><filename class='libraryfile'>libtelephony.{so,a}</filename></term>
-        <listitem>
-          <para>contains telephony function routines such as echo
-          cancellation, dc offset removal, automatic gain control, etc.</para>
-          <indexterm zone="wvstreams libtelephony">
-            <primary sortas="c-libtelephony">libtelephony.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwvutils">
-        <term><filename class='libraryfile'>libwvutils.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions required by the
-          <application>WvStreams</application> libraries and utility programs.</para>
-          <indexterm zone="wvstreams libwvutils">
-            <primary sortas="c-libwvutils">libwvutils.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxplc-cxx">
-        <term><filename class='libraryfile'>libxplc-cxx.a</filename></term>
-        <listitem>
-          <para>contains helper functions for the C++
-          <application>WvStreams</application> bindings.</para>
-          <indexterm zone="wvstreams libxplc-cxx">
-            <primary sortas="c-libxplc-cxx">libxplc-cxx.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: nnect/connect.xml
===================================================================
--- connect/connect.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<part id="connect" xreflabel="Connecting to a Network">
-  <?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). The most popular methods
-    are covered 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: nnect/dhcp/dhcp-client.xml
===================================================================
--- connect/dhcp/dhcp-client.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ 	(revision )
@@ -1,107 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="dhcp-client" xreflabel="DHCP-&dhcp-version; Client">
-  <?dbhtml filename="dhcpclient.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>DHCP-&dhcp-version; Client</title>
-
-  <indexterm zone="dhcp-client">
-    <primary sortas="b-dhclient">dhclient</primary>
-  </indexterm>
-
-  <para>The <application>DHCP</application> package comes with
-  both a client (<command>dhclient</command>) and a server program for
-  using DHCP.  If you want to install this package,
-  the instructions can be found at <xref linkend="dhcp"/>.
-  Note that if you only want to use the client, you
-  do <emphasis>not</emphasis> need to run the server and so do not need
-  the startup script and links provided for the server daemon.
-  You only need to run the DHCP server if you're providing
-  this service to a network, and it's likely that you'll know if that's the
-  case; if it isn't, don't run the server!  Once you have installed the
-  package, return here for information on how to configure the client
-  (<command>dhclient</command>).</para>
-
-  <sect2 role="configuration">
-    <title>Configuring DHCP Client</title>
-
-      <para id="dhclient-service">To configure <command>dhclient</command>,
-      you need to first install the network service script,
-      <filename>/etc/sysconfig/network-devices/services/dhclient</filename>
-      included in the <xref linkend="bootscripts"/> package
-      (as <systemitem class="username">root</systemitem>):</para>
-
-      <indexterm zone="dhcp-client dhclient-service">
-        <primary sortas="f-dhclient">dhclient (service script)</primary>
-      </indexterm>
-
-<screen role='root'><userinput>make install-service-dhclient</userinput></screen>
-
-    <para id="dhclient-config1">Next, create the
-    <filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhclient</filename>
-    configuration file with the following commands as the <systemitem
-    class="username">root</systemitem> user.  Adjust as
-    necessary for additional interfaces:</para>
-
-    <indexterm zone="dhcp-client dhclient-config1">
-      <primary sortas="e-etc-sysconfig-...-dhclient">/etc/sysconfig/.../dhclient</primary>
-    </indexterm>
-
-<screen role='root'><userinput>install -v -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
-cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/dhclient &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-SERVICE="dhclient"
-DHCP_START="-q <replaceable>&lt;add additional start parameters here&gt;</replaceable>"
-DHCP_STOP="-q -r <replaceable>&lt;add additional stop parameters here&gt;</replaceable>"
-
-# Set PRINTIP="yes" to have the script print
-# the DHCP assigned IP address
-PRINTIP="no"
-
-# Set PRINTALL="yes" to print the DHCP assigned values for
-# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
-PRINTALL="no"</literal>
-EOF</userinput></screen>
-
-    <para>For more information on the appropriate
-    <envar>DHCP_START</envar> and <envar>DHCP_STOP</envar>
-    values, examine the man page for <command>dhclient</command>.</para>
-
-    <para id="dhclient-config2">Finally, you should create the
-    <filename>/etc/dhclient.conf</filename> file using the following commands
-    as the <systemitem class="username">root</systemitem> user:</para>
-
-    <indexterm zone="dhcp-client dhclient-config2">
-      <primary sortas="e-etc-dhclient.conf">/etc/dhclient.conf</primary>
-    </indexterm>
-
-    <note>
-      <para>You'll need to add a second interface definition to the file if you
-      have more than one interface.</para>
-    </note>
-
-<screen role='root'><userinput>cat &gt; /etc/dhclient.conf &lt;&lt; "EOF"
-<literal># dhclient.conf
-
-interface "eth0"{
-prepend domain-name-servers 127.0.0.1;
-request subnet-mask, broadcast-address, time-offset, routers,
-        domain-name, domain-name-servers, host-name;
-require subnet-mask, domain-name-servers;
-}
-# end dhclient.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-</sect1>
Index: nnect/dhcp/dhcp.xml
===================================================================
--- connect/dhcp/dhcp.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<chapter id="connect-dhcp">
-  <?dbhtml filename="dhcp.html"?>
-
-  <title>DHCP Clients</title>
-
-  <para>DHCP stands for Dynamic Host Configuration Protocol. It is a protocol
-  used by many sites to automatically provide information such as IP addresses,
-  subnet masks and routing information to computers.  If your network uses
-  DHCP, you will need a DHCP client in order to connect to it.
-  DHCP is also used by some cable modems.</para>
-
-  <para>BLFS currently provides installation instructions for
-  two DHCP clients, <command>dhclient</command> (from the
-  <application>dhcp</application> package) and <command>dhcpcd</command>.
-  BLFS presents both sets of installation instructions and
-  discusses how to create an appropriate service script to work with the
-  <command>network</command> bootscript and the DHCP
-  client of your choice.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcp-client.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcpcd.xml"/>
-
-</chapter>
Index: nnect/dhcp/dhcpcd.xml
===================================================================
--- connect/dhcp/dhcpcd.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ 	(revision )
@@ -1,209 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY dhcpcd-download-http "http://download.berlios.de/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
-  <!ENTITY dhcpcd-download-ftp  "ftp://ftp.osuosl.org/pub/gentoo/distfiles/dhcpcd-&dhcpcd-version;.tar.bz2">
-  <!ENTITY dhcpcd-md5sum        "90d6df62d663bdea65d5905023377b39">
-  <!ENTITY dhcpcd-size          "32.5 KB">
-  <!ENTITY dhcpcd-buildsize     "0.3 MB">
-  <!ENTITY dhcpcd-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="dhcpcd" xreflabel="dhcpcd-&dhcpcd-version;">
-  <?dbhtml filename="dhcpcd.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>dhcpcd-&dhcpcd-version;</title>
-
-  <indexterm zone="dhcpcd">
-    <primary sortas="a-dhcpcd">dhcpcd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to dhcpcd</title>
-
-    <para><application>dhcpcd</application> is an implementation of the
-    DHCP client specified in RFC2131. This is useful for connecting
-    your computer to a network which uses DHCP to assign network
-    addresses.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&dhcpcd-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&dhcpcd-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &dhcpcd-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &dhcpcd-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &dhcpcd-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &dhcpcd-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/dhcpcd"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of dhcpcd</title>
-
-    <para>Install <application>dhcpcd</application> by running the following
-    commands:</para>
-
-<screen><userinput>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="configuration">
-    <title>Configuring dhcpcd</title>
-
-    <sect3 id="dhcpcd-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/dhcpcd.sh</filename></para>
-
-      <indexterm zone="dhcpcd dhcpcd-config">
-        <primary sortas="e-etc-dhcpcd-sh">/etc/dhcpcd.sh</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3 id="dhcpcd-init">
-      <title>Configuration Information</title>
-
-      <para>To configure <command>dhcpcd</command>, you need to first install
-      the network service script,
-      <filename>/etc/sysconfig/network-devices/services/dhcpcd</filename>
-      included in the <xref linkend="bootscripts"/> package
-      (as user <systemitem class="username">root</systemitem>):</para>
-
-      <indexterm zone="dhcpcd dhcpcd-init">
-        <primary sortas="f-dhcpcd">dhcpcd (service script)</primary>
-      </indexterm>
-
-<screen role='root'><userinput>make install-service-dhcpcd</userinput></screen>
-
-      <para>Whenever <command>dhcpcd</command> configures or shuts down
-      a network interface, it executes the script
-      <filename>/etc/dhcpcd.sh</filename>. This script can be
-      customized to perform additional actions for the network interface.
-      See the man page of <command>dhcpcd</command> for more details. An
-      example file is shipped in the tarball which can be used to send
-      the interface details to syslog.</para>
-
-      <para id="dhcpcd-config2">Finally, as the <systemitem
-      class="username">root</systemitem> user create the
-      <filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd</filename>
-      configuration file using the following commands.  Adjust appropriately
-      for additional interfaces:</para>
-
-      <indexterm zone="dhcpcd dhcpcd-config2">
-        <primary sortas="e-etc-sysconfig-dhcpcd">/etc/sysconfig/.../dhcpcd</primary>
-      </indexterm>
-
-<screen role='root'><userinput>install -v -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
-cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-SERVICE="dhcpcd"
-DHCP_START="<replaceable>&lt;insert appropriate start options here&gt;</replaceable>"
-DHCP_STOP="-k <replaceable>&lt;insert additional stop options here&gt;</replaceable>"
-
-# Set PRINTIP="yes" to have the script print
-# the DHCP assigned IP address
-PRINTIP="no"
-
-# Set PRINTALL="yes" to print the DHCP assigned values for
-# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
-PRINTALL="no"</literal>
-EOF</userinput></screen>
-
-      <para>For more information on the appropriate <envar>DHCP_START</envar> and
-      <envar>DHCP_STOP</envar> values, examine the man page for
-      <command>dhcpcd</command>.</para>
-
-      <note>
-        <para id="dhcpcd-config3">The default behavior of
-        <command>dhcpcd</command> is to overwrite (after making backup copies)
-        <filename>/etc/resolv.conf</filename>, <filename>/etc/yp.conf</filename> and
-        <filename>/etc/ntp.conf</filename> with new files containing information from
-        the DHCP server. If this is undesirable, review the
-        <command>dhcpcd</command> man page for switches to add to the
-        <envar>DHCP_START</envar> value.</para>
-      </note>
-
-      <indexterm zone="dhcpcd dhcpcd-config3">
-        <primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary>
-      </indexterm>
-
-      <indexterm zone="dhcpcd dhcpcd-config3">
-        <primary sortas="e-etc-yp.conf">/etc/yp.conf</primary>
-      </indexterm>
-
-      <indexterm zone="dhcpcd dhcpcd-config3">
-        <primary sortas="e-etc-ntp.conf">/etc/ntp.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>dhcpcd</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dhcpcd-prog">
-        <term><command>dhcpcd</command></term>
-        <listitem>
-          <para>is an implementation of the DHCP client specified
-          in RFC2131 (when -r option is not specified) and RFC1541
-          (when -r option is specified).</para>
-          <indexterm zone="dhcpcd dhcpcd-prog">
-            <primary sortas="b-dhcpcd">dhcpcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: nnect/dialup/dialup.xml
===================================================================
--- connect/dialup/dialup.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<chapter id="connect-dialup">
-  <?dbhtml filename="dialup.html"?>
-
-  <title>Dial-up Networking</title>
-
-  <para>This chapter provides utilities for system interaction with a modem.</para>
-
-  <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: nnect/dialup/ppp.xml
===================================================================
--- connect/dialup/ppp.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ 	(revision )
@@ -1,572 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY ppp-download-http "http://samba.org/ftp/ppp/ppp-&ppp-version;.tar.gz">
-  <!ENTITY ppp-download-ftp  "&gentoo-ftp-repo;/ppp-&ppp-version;.tar.gz">
-  <!ENTITY ppp-md5sum        "183800762e266132218b204dfb428d29">
-  <!ENTITY ppp-size          "673 KB">
-  <!ENTITY ppp-buildsize     "5.6 MB">
-  <!ENTITY ppp-time          "0.1 SBU">
-]>
-
-<sect1 id="ppp" xreflabel="PPP-&ppp-version;">
-  <?dbhtml filename="ppp.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>PPP-&ppp-version;</title>
-
-  <indexterm zone="ppp">
-    <primary sortas="a-PPP">PPP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PPP</title>
-
-    <para>The <application>PPP</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 PPPoE connection to an ISP.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <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 MD5 sum: &ppp-md5sum;</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>
-
-    <bridgehead renderas="sect3">PPP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libpcap"/> (needed to do PPP filtering),
-    <xref linkend="linux-pam"/> (to authenticate incoming calls using PAM),
-    and <ulink url="http://linux-atm.sourceforge.net/">Linux ATM</ulink> (to
-    build the pppoatm.so plugin)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/PPP"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PPP</title>
-
-    <note id="ppp-kernel">
-      <para><application>PPP</application> support (CONFIG_PPP),
-      the asynchronous line discipline (CONFIG_PPP_ASYNC), the
-      driver for your serial port device and/or the PPP over Ethernet
-      (PPPoE) protocol driver (CONGIG_PPPOE) must be compiled into the
-      kernel or loaded as kernel modules.
-      Udev doesn't load the ppp_generic and pppoe modules automatically, they
-      must be mentioned in the <filename>/etc/sysconfig/modules</filename>
-      file.</para>
-    </note>
-
-    <indexterm zone="ppp ppp-kernel">
-      <primary sortas="d-PPP-support">PPP support</primary>
-    </indexterm>
-
-    <para>Create (as <systemitem class="username">root</systemitem>)
-    the group for users who may run <application>PPP</application>:</para>
-
-<screen role="root"><userinput>groupadd -g 52 pppusers</userinput></screen>
-
-    <para>Install <application>PPP</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-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 &amp;&amp;
-<!-- FIXME: is "make install-etcppp" needed for KPPP/WvDial?
-The example configuration below overwrites two of three files, and
-already includes the "lock" option in each peer file
--->make install-etcppp &amp;&amp;
-install -m755 scripts/{pon,poff,plog} /usr/bin &amp;&amp;
-instal -m644 scripts/pon.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>make install-etcppp</command>: This command puts example
-    configuration files in <filename class="directory">/etc/ppp</filename>.</para>
-
-<!-- FIXME: the three options below are taken from pppd/Makefile.linux file.
-     They have not been tested. There are other options, such as USE_SRP=y,
-     that cannot work (in this case, because libsrp is not available from
-     anywhere) - Alexander E. Patrakov -->
-
-    <para><parameter>USE_PAM=y</parameter>: Add this argument to the
-    <command>make</command> command to compile in support for PAM, usually
-    needed for authenticating inbound calls against a central database.</para>
-
-    <para><parameter>HAVE_INET6=y</parameter>: Add this argument to the
-    <command>make</command> command to compile in support for IPv6.</para>
-
-    <para><parameter>CBCP=y</parameter>: Add this argument to the
-    <command>make</command> command to compile in support for
-    Microsoft proprietary Callback Control Protocol.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring PPP</title>
-
-    <sect3 id="ppp-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/ppp/*</filename></para>
-
-      <indexterm zone="ppp ppp-config">
-        <primary sortas="e-etc-ppp-star">/etc/ppp/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The <application>PPP</application> daemon requires some
-      configuration. The main trick is scripting the connection.
-      For dialup and GPRS connections, this can be done
-      either using the <command>chat</command> program which comes with
-      this package, or by using external tools such as <xref linkend="wvdial"/>
-      or <application>KPPP</application> from
-      <xref linkend="kdenetwork"/>. The text below explains how to set up
-      PPPoE, dialup and GPRS connections using only tools provided with
-      the <application>PPP</application> package. All configuration steps
-      in this section are executed as
-      <systemitem class="username">root</systemitem> user.</para>
-
-    <sect4>
-      <title>Setting the passwords</title>
-
-      <warning><para>Instructions in this section result in your password
-      appearing on the screen in a visible clear-text form. Make sure that
-      nobody else looks at the screen.</para></warning>
-
-      <para>Passwords are stored in <filename>/etc/ppp/pap-secrets</filename>
-      and <filename>/etc/ppp/chap-secrets</filename> files, depending on the
-      authentication method used by the ISP. If in doubt, place the password
-      into both files. E.g., if the username given by the ISP is
-      <quote>jdoe</quote>, the password is <quote>guessit</quote>, the
-      ISP uses PAP and the user wants to name this account
-      <quote>dialup</quote> in order to distinguish it from other PPP accounts,
-      the following file has to be created:</para>
-<screen role="root"><userinput>touch /etc/ppp/pap-secrets
-chmod 600 /etc/ppp/pap-secrets
-cat &gt;&gt;/etc/ppp/pap-secrets &lt;&lt;"EOF"</userinput>
-<literal># username      remotename    password        IP for the peer
-jdoe            dialup        guessit         *</literal>
-<userinput>EOF</userinput></screen>
-    </sect4>
-
-    <sect4>
-      <title>DNS Server Configuration</title>
-
-      <para>If you don't run your own caching DNS server, create a simple
-      <command>ip-up</command> script (to be called by <command>pppd</command>
-      automatically once the connection is brought up) that populates the
-      <filename>/etc/resolv.conf</filename> file with nameservers specified
-      by the ISP.</para>
-<screen role="root"><userinput>cat &gt;/etc/ppp/ip-up &lt;&lt;"EOF"</userinput>
-<literal>#!/bin/sh
-if [ "$USEPEERDNS" = "1" ] &amp;&amp; [ -s /etc/ppp/resolv.conf ]
-then
-        install -m 644 /etc/ppp/resolv.conf /etc/resolv.conf
-fi</literal>
-<userinput>EOF
-chmod 755 /etc/ppp/ip-up</userinput></screen>
-      <para>If you use a caching DNS server such as <xref linkend="bind"/>
-      or <ulink url="http://www.phys.uu.nl/~rombouts/pdnsd.html">Pdnsd</ulink>,
-      the script above is wrong for you. In such case, write your
-      own script that tells your caching nameserver to forward queries to
-      upstream DNS servers specified in the $DNS1 and $DNS2 environment
-      variables.</para>
-      <!-- FIXME: write the replacement script that works with Bind -->
-    </sect4>
-
-    <sect4>
-      <title>Dialup Modem Connection</title>
-<!-- This section has been tested with various ISPs in Yekaterinburg,
-     Russia using Lucent WinModem. I cannot test it anymore, because
-     there is no free PCI slot for the modem in my new computer. However,
-     it is similar enough to GPRS for me to be sure that it still works,
-     and nobody complained about non-working dialup on the LFS LiveCD.
-     - Alexander E. Patrakov -->
-
-      <para>Dialup connections are established with the help of a modem
-      connected to a computer and the telephone line. The modem dials a
-      telephone number of the ISP's modem, and they exchange data using
-      the signal frequencies 300-4000 Hz. Typical data transfer
-      rate is 40-50 kilobits per second, and the gateway ping time
-      (latency) is up to 300-400 ms. In order to configure the
-      dialup connection, it is required to know the telephone number of
-      the ISP's modem pool, the username and the password.</para>
-
-      <para>In order to configure a dialup connection, two files have to
-      be created: a chat script that automates the connection procedure
-      (common for all dialup accounts), and a peer file that provides
-      configuration information about a specific connection to
-      <command>pppd</command>:</para>
-<screen role="root"><userinput>cat &gt;/etc/ppp/dialup.chat &lt;&lt;"EOF"</userinput>
-<literal>ABORT BUSY ABORT 'NO CARRIER' ABORT VOICE ABORT 'NO DIALTONE'
-ABORT 'NO DIAL TONE' ABORT 'NO ANSWER' ABORT DELAYED
-ABORT ERROR ABORT BLACKLISTED
-
-TIMEOUT 5
-'' AT
-# \T is the phone number, passed from /etc/ppp/peers/<replaceable>dialup</replaceable>
-OK-+++\dATH0-OK ATD\T
-TIMEOUT 75
-CONNECT \d\c</literal>
-<userinput>EOF
-
-cat &gt;/etc/ppp/peers/<replaceable>dialup</replaceable> &lt;&lt;"EOF"</userinput>
-<literal># Your username at the ISP
-user "<replaceable>jdoe</replaceable>"
-# What should be in the second column in /etc/ppp/*-secrets
-remotename "<replaceable>dialup</replaceable>"
-# Replace <replaceable>TTTTTTT</replaceable> with the ISP phone number
-connect "/usr/sbin/chat -T <replaceable>TTTTTTT</replaceable> -f /etc/ppp/dialup.chat"
-
-# Specify your modem serial port and speed below
-<replaceable>/dev/ttyS0</replaceable>
-<replaceable>115200</replaceable>
-
-# The settings below usually don't need to be changed
-updetach
-noauth
-hide-password
-debug
-lock
-defaultroute
-noipdefault
-usepeerdns</literal>
-<userinput>EOF</userinput></screen>
-
-      <para>The first three lines of the
-      <filename>/etc/ppp/dialup.chat</filename> file abort the script when
-      it receives an indication of an error from the modem. Then the timeout
-      is set to 5 seconds and the script checks that the modem responds to
-      the dummy AT command at all. If not, measures are taken to dewedge it
-      (by interrupting the data transfer and going on hook). Then the
-      telephone number is dialed, and the script waits for the answer for
-      75 seconds. The serial connection is considered established when the
-      modem sends the string CONNECT.</para>
-
-    </sect4>
-
-    <sect4>
-      <title>GPRS and EDGE Connections</title>
-<!-- This section has been tested with GPRS service from MOTIV in
-     Yekaterinburg, Russia. According to forum messages, the procedure
-     also works with EDGE, but my cellular phone (Motorola C350) does not
-     support EDGE. - Alexander E. Patrakov -->
-
-      <para>GPRS and EDGE connections are established with the help of a
-      cellular phone connected to a computer via serial or USB cable, or
-      using Bluetooth.
-      The phone exchanges data packets with the nearest base station,
-      which can be up to 35 kilometers away.
-
-      <!-- FIXME: watch for new standards! SkyLink is already offering
-           3.1 megabits per second with CDMA mobile phones, and
-           the configuration below doesn't work. It is reported that
-           a regular dialup setup with the telephone number "#777",
-           username "mobile" and password "internet" works with SkyLink. -->
-
-      The maximum possible data transfer rate is 170 kilobits per second
-      for GPRS and 474 kilobits per second for EDGE, but many cellular
-      operators impose lower limits, such as 64 kilobits per second. The
-      gateway ping time is 900 ms for GPRS, which makes playing many online
-      games impossible and causes connection to ICQ to be unreliable.
-      In order to configure a GPRS or EDGE connection,
-      it is required to know the access point name (APN) and, rarely, the
-      username and the password.
-      In most cases, billing is based on the telephone number, and the
-      username/password pair is not needed, as assumed in the example
-      below.</para>
-
-      <para>In order to configure a GPRS connection, two files have to
-      be created: a chat script that automates the connection procedure
-      (common for all GPRS accounts), and a peer file that provides
-      configuration information about a specific connection to
-      <command>pppd</command>:</para>
-<screen role="root"><userinput>cat &gt;/etc/ppp/gprs.chat &lt;&lt;"EOF"</userinput>
-<literal>ABORT BUSY ABORT 'NO CARRIER' ABORT VOICE ABORT 'NO DIALTONE'
-ABORT 'NO DIAL TONE' ABORT 'NO ANSWER' ABORT DELAYED
-ABORT ERROR ABORT BLACKLISTED
-
-TIMEOUT 5
-'' AT
-OK-+++\dATH0-OK ATZ
-# \T is the APN, passed from /etc/ppp/peers/<replaceable>gprs</replaceable>
-# This example stores the APN as profile #1 in the phone.
-# The "telephone number", *99***&lt;profile_number&gt;#, is always the same.
-# If you want to store this as profile #2, change 1 to 2 in the
-# following two lines.
-OK AT+CGDCONT=<replaceable>1</replaceable>,"IP","\T"
-OK "ATD*99***<replaceable>1</replaceable>#"
-CONNECT \d\c</literal>
-<userinput>EOF
-
-cat &gt;/etc/ppp/peers/<replaceable>gprs</replaceable> &lt;&lt;"EOF"</userinput>
-<literal># Replace <replaceable>inet.example.com</replaceable> with the proper APN for your provider
-connect "/usr/sbin/chat -T <replaceable>inet.example.com</replaceable> -f /etc/ppp/gprs.chat"
-
-# Specify your cellphone serial port and speed below
-# Note: you must manually send some vendor-specific AT commands
-# to certain old cellular phones (such as Sony-Ericsson T200)
-# in order to achieve connection speed more than 9600 bits ber second.
-<replaceable>/dev/ttyS1</replaceable>
-<replaceable>115200</replaceable>
-
-# The settings below usually don't need to be changed
-noccp
-noauth
-updetach
-debug
-lock
-defaultroute
-noipdefault
-usepeerdns</literal>
-<userinput>EOF</userinput></screen>
-    </sect4>
-
-    <sect4>
-      <title>PPPoE connections</title>
-
-      <!-- This section has been tested with the "USI" ISP in Yekaterinburg,
-      Russia. Other editors can test it as described in
-      http://linuxfromscratch.org/pipermail/blfs-dev/2008-March/018290.html
-      - Alexander E. Patrakov -->
-
-      <para>PPPoE connections are established over Ethernet, typically between
-      a computer and an ADSL router (usually installed in the same room)
-      that forwards the packets down the telephone line using frequencies
-      25-2500 kHz, thus not interfering with voice calls. Although the router
-      can, in theory, forward any Ethernet packet, PPP encapsulation is used
-      for password-based authentication, so that the ISP can limit the
-      bandwidth and charge money according to the chosen tariff. The maximum
-      data transfer rate on ADSL is 24 megabits per second, and the gateway
-      ping time is typically less than 10 ms. In order to configure a PPPoE
-      connection, it is required to know the username, the password, and,
-      sometimes, the service name and/or the access concentrator name.</para>
-
-      <para>In order to configure a PPPoE connection, only the peer file
-      has to be created:</para>
-<screen role="root"><userinput>cat &gt;/etc/ppp/peers/adsl &lt;&lt;"EOF"</userinput>
-<literal>plugin rp-pppoe.so
-# Ethernet interface name
-<replaceable>eth0</replaceable>
-# Your username at the ISP
-user "<replaceable>jdoe</replaceable>"
-# What should be in the second column in /etc/ppp/*-secrets
-remotename "<replaceable>adsl</replaceable>"
-# If needed, specify the service and the access concentrator name
-# rp_pppoe_service "<replaceable>internet</replaceable>"
-# rp_pppoe_ac "<replaceable>ac1</replaceable>"
-
-# The settings below usually don't need to be changed
-noauth
-hide-password
-updetach
-debug
-defaultroute
-noipdefault
-usepeerdns</literal>
-<userinput>EOF</userinput></screen>
-    </sect4>
-
-    <sect4>
-      <title>Establishing the connection manually</title>
-
-      <para>In order to establish a PPP connection described by the
-      <filename>/etc/ppp/peers/<replaceable>peername</replaceable></filename>
-      file, run, as root or as a member of the
-      <systemitem class="groupname">pppusers</systemitem> group:</para>
-<screen><userinput>pon <replaceable>peername</replaceable></userinput></screen>
-
-      <para>In order to tear the connection down, run:</para>
-<screen><userinput>poff <replaceable>peername</replaceable></userinput></screen>
-
-    </sect4>
-
-    <sect4>
-      <title>Bringing up PPPoE connection at boot time</title>
-      <para>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>pon</command> command,
-      as described above. If you wish your PPPoE connection to be brought
-      up at boot time, run:</para>
-
-<screen role='root'><userinput>make install-service-pppoe</userinput></screen>
-
-      <para>The above command installs the <filename>pppoe</filename>
-      service script and the <filename>/etc/ppp/peers/pppoe</filename>
-      file with some settings that make sense for most PPPoE connections.
-      The bootscript calls <command>pppd</command> with the the following
-      options:</para>
-
-<screen>pppd call pppoe ${1} linkname ${1} ${PPP_OPTS}</screen>
-
-      <para>Here <quote>${1}</quote> is the network interface name,
-      <quote>linkname ${1}</quote> is added for creation of the
-      <filename>/var/run/ppp-${1}.pid</filename> file with the
-      <command>pppd</command> process ID (to be used when bringing
-      the connection down), and the <quote>${PPP_OPTS}</quote> variable
-      contains user-specified options such as <quote>user</quote> and
-      <quote>remotename</quote>.</para>
-
-      <para>Now create the config file for use with the <filename>pppoe</filename>
-      service script:</para>
-
-<screen role='root'><userinput>install -v -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"
-PPP_OPTS="user <replaceable>jdoe</replaceable> remotename <replaceable>adsl</replaceable>"</literal>
-EOF</userinput></screen>
-
-      <note><para>Instead of specifying additional options in the $PPP_OPTS
-      variable, you can also edit the <filename>/etc/ppp/peers/pppoe</filename>
-      file, but then your configuration will be lost when upgrading
-      BLFS bootscripts.</para></note>
-
-    </sect4>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>chat, pon, poff, plog, pppd, pppdump, pppoe-discovery and pppstats</seg>
-        <seg>Several plugin modules installed in
-        <filename class='directory'>/usr/lib/pppd/&ppp-version;</filename></seg>
-        <seg>/etc/ppp, /usr/include/pppd and /usr/lib/pppd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chat">
-        <term><command>chat</command></term>
-        <listitem>
-          <para>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 (PPPD) and the remote
-          <command>pppd</command> process.</para>
-          <indexterm zone="ppp chat">
-            <primary sortas="b-chat">chat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pon">
-        <term><command>pon</command></term>
-        <listitem>
-          <para>is the script that establishes a PPP connection</para>
-          <indexterm zone="ppp pon">
-            <primary sortas="b-pon">pon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="poff">
-        <term><command>poff</command></term>
-        <listitem>
-          <para>is the script that tears a PPP connection down.</para>
-          <indexterm zone="ppp poff">
-            <primary sortas="b-poff">poff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="plog">
-        <term><command>plog</command></term>
-        <listitem>
-          <para>is a script that prints the tail of the PPP log.</para>
-          <indexterm zone="ppp plog">
-            <primary sortas="b-plog">plog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="pppd">
-        <term><command>pppd</command></term>
-        <listitem>
-          <para>is the Point to Point Protocol daemon.</para>
-          <indexterm zone="ppp pppd">
-            <primary sortas="b-pppd">pppd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pppdump">
-        <term><command>pppdump</command></term>
-        <listitem>
-          <para>is used to convert
-          <application>PPP</application> record files to a readable
-          format.</para>
-          <indexterm zone="ppp pppdump">
-            <primary sortas="b-pppdump">pppdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pppstats">
-        <term><command>pppstats</command></term>
-        <listitem>
-          <para>is used to print
-          <application>PPP</application> statistics.</para>
-          <indexterm zone="ppp pppstats">
-            <primary sortas="b-pppstats">pppstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: nnect/dialup/wvdial.xml
===================================================================
--- connect/dialup/wvdial.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ 	(revision )
@@ -1,193 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY wvdial-download-http "http://open.nit.ca/download/wvdial-&wvdial-version;.tar.gz">
-  <!ENTITY wvdial-download-ftp  "ftp://ftp.us.debian.org/debian/pool/main/w/wvdial/wvdial_&wvdial-version;.orig.tar.gz">
-  <!ENTITY wvdial-md5sum        "8648c044305fc66ee33ecc55d36f8c8b">
-  <!ENTITY wvdial-size          "66 KB">
-  <!ENTITY wvdial-buildsize     "2.7 MB">
-  <!ENTITY wvdial-time          "0.06 SBU">
-]>
-
-<sect1 id="wvdial" xreflabel="WvDial-&wvdial-version;">
-  <?dbhtml filename="wvdial.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>WvDial-&wvdial-version;</title>
-
-  <indexterm zone="wvdial">
-    <primary sortas="a-WvDial">WvDial</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WvDial</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>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <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 MD5 sum: &wvdial-md5sum;</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>
-
-    <bridgehead renderas="sect3">WvDial Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="wvstreams"/> and
-    <xref linkend="ppp"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/WvDial"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WvDial</title>
-
-    <para>Install <application>WvDial</application> by running the following
-    commands:</para>
-
-<screen><userinput>make PREFIX=/usr</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make PREFIX=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring WvDial</title>
-
-    <sect3 id="wvdial-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/wvdial.conf</filename> and
-      <filename>/etc/ppp/peers/*</filename></para>
-
-      <indexterm zone="wvdial wvdial-config">
-        <primary sortas="e-etc-wvdial.conf">/etc/wvdial.conf</primary>
-      </indexterm>
-
-      <indexterm zone="wvdial wvdial-config">
-        <primary sortas="e-etc-ppp-peers">/etc/ppp/peers/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Perform the following two commands as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>touch /etc/wvdial.conf &amp;&amp;
-wvdialconf /etc/wvdial.conf</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
-      ISP's phone number, login name and password into the
-      <filename>/etc/wvdial.conf</filename> file.</para>
-
-      <para>You then start <command>wvdial</command> with:</para>
-
-<screen><userinput>wvdial</userinput></screen>
-
-      <para>For more information, examine the <command>wvdialconf</command>,
-      <filename>wvdial.conf</filename> and <command>wvdial</command> man
-      pages.</para>
-
-      <!-- Commented out 20060401 as the link is broken
-      Also, have a look at <ulink
-      url="http://www.electronicschat.org/nonroot-dialout/index.html">the
-      Non-Root Dial Out HOWTO</ulink> if you want to give non-root users
-      access to <command>wvdial</command>.</para> -->
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>wvdial and wvdialconf</seg>
-        <seg>None</seg>
-        <seg>/etc/ppp/peers</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wvdial-prog">
-        <term><command>wvdial</command></term>
-        <listitem>
-          <para>starts a PPP connection.</para>
-          <indexterm zone="wvdial wvdial-prog">
-            <primary sortas="b-wvdial">wvdial</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wvdialconf">
-        <term><command>wvdialconf</command></term>
-        <listitem>
-          <para>automates the configuration of
-          <command>wvdial</command>.</para>
-          <indexterm zone="wvdial wvdialconf">
-            <primary sortas="b-wvdialconf">wvdialconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: nnect/other/other.xml
===================================================================
--- connect/other/other.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<chapter id="connect-other">
-  <?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 the information becomes
-  available.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pppoe.xml"/>
-
-</chapter>
Index: nnect/other/pppoe.xml
===================================================================
--- connect/other/pppoe.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ 	(revision )
@@ -1,344 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pppoe-download-http "http://www.roaringpenguin.com/files/download/rp-pppoe-&pppoe-version;.tar.gz">
-  <!ENTITY pppoe-download-ftp  " ">
-  <!ENTITY pppoe-md5sum        "0e32760f498f9cde44081ee6aafc823b">
-  <!ENTITY pppoe-size          "212 KB">
-  <!ENTITY pppoe-buildsize     "2.4 MB">
-  <!ENTITY pppoe-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="pppoe" xreflabel="RP-PPPoE-&pppoe-version;">
-  <?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 role="required"><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> instead: <ulink
-    url="&patch-root;/rp-pppoe-&pppoe-version;-iproute2-1.patch"/>)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/RP-PPPoE"/></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 recommended 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>
-
-    <!-- Commenting out for now as LFS no longer moves this file to /bin,
-         therefore we don't need this hack
-    <para>Fix the location of the logger executable in several PPPoE scripts:</para>
-
-<screen><userinput>sed -i s%/usr/bin/logger%/bin/logger% \
-    scripts/pppoe-{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</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 the
-    package 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>pppoe-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>pppoe-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>pppoe-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="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 -v /etc/sysconfig/network-devices/ifconfig.eth0/*</userinput></screen>
-      </note>
-
-<screen role='root'><userinput>install -v -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>pppoe-connect, pppoe-setup, pppoe-start, pppoe-status, pppoe-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="pppoe-connect">
-        <term><command>pppoe-connect</command></term>
-        <listitem>
-          <para>is a shell script which manages an PPPoE
-          connection using the user-space PPPoE client.</para>
-          <indexterm zone="pppoe pppoe-connect">
-            <primary sortas="b-pppoe-connect">pppoe-connect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pppoe-setup">
-        <term><command>pppoe-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 pppoe-setup">
-            <primary sortas="b-pppoe-setup">pppoe-setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pppoe-start">
-        <term><command>pppoe-start</command></term>
-        <listitem>
-          <para>starts the client using the options specified in
-          <filename>/etc/ppp/pppoe.conf</filename>.</para>
-          <indexterm zone="pppoe pppoe-start">
-            <primary sortas="b-pppoe-start">pppoe-start</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pppoe-status">
-        <term><command>pppoe-status</command></term>
-        <listitem>
-          <para>displays the status of the PPPoE
-          connection.</para>
-          <indexterm zone="pppoe pppoe-status">
-            <primary sortas="b-pppoe-status">pppoe-status</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pppoe-stop">
-        <term><command>pppoe-stop</command></term>
-        <listitem>
-          <para>stops the client.</para>
-          <indexterm zone="pppoe pppoe-stop">
-            <primary sortas="b-pppoe-stop">pppoe-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>
Index: general.ent
===================================================================
--- general.ent	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ general.ent	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "17">                   <!-- Always 2 digits -->
+<!ENTITY day          "18">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
Index: index.xml
===================================================================
--- index.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ index.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -19,5 +19,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="postlfs/postlfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="general/general.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="connect/connect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/basicnet.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="server/server.xml"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ introduction/welcome/changelog.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -43,4 +43,16 @@
 
     <listitem>
+      <para>March 18th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[alexander] - Removed WvDial, WvStreams and RP-PPPoE, as
+          alternative instructions are available on the PPP page. Moved the
+          remaining packages from the Connecting to a Network part to a
+          chapter with the same name in the Basic Networking part.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 17th, 2008</para>
       <itemizedlist>
@@ -139,5 +151,5 @@
       </itemizedlist>
     </listitem>
-    
+
     <listitem>
       <para>March 12th, 2008</para>
@@ -241,6 +253,6 @@
         <listitem>
           <para>[ken] - Updated to gnumeric-1.8.1, with goffice-0.6.1,
-	  libgsf-1.14.7, and warning that gnucash-2.2.0 needs an older
-	  version of goffice.</para>
+          libgsf-1.14.7, and warning that gnucash-2.2.0 needs an older
+          version of goffice.</para>
         </listitem>
         <listitem>
Index: introduction/welcome/which.xml
===================================================================
--- introduction/welcome/which.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ introduction/welcome/which.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -49,10 +49,8 @@
   what it needs.</para>
 
-  <para>Likewise, most people will probably want to look at the <xref
-  linkend="connect"/> and <xref linkend="basicnet"/> parts.  The first of
-  these deals with connecting to the Internet or your LAN
-  using a variety of methods such as DHCP
-  (<xref linkend="connect-dhcp"/>) and Dial-Up Connections (<xref
-  linkend="connect-dialup"/>).  The second of these parts deals with items
+  <para>Likewise, most people will probably want to look at the
+  <xref linkend="basicnet"/> part.  It deals with connecting to the Internet
+  or your LAN (<xref linkend="basicnet-connect"/>)
+  using a variety of methods such as DHCP and PPP, and with items
   such as Networking Libraries (<xref linkend="basicnet-netlibs"/>) and various
   basic networking programs and utilities.</para>
Index: server/other/dhcp.xml
===================================================================
--- server/other/dhcp.xml	(revision 3b03fd4470dd4c1506ba4e354810598ff59745d5)
+++ server/other/dhcp.xml	(revision a3244038eed7345bb6ed810f1eb11d3db0383d98)
@@ -165,5 +165,5 @@
 
       <para>Information on configuring the DHCP client can be
-      found in <xref linkend="connect-dhcp"/>.</para>
+      found in <xref linkend="basicnet-connect"/>.</para>
 
       <para>Note that you only need the DHCP server if you want to issue
