diff --git a/connect/connect.xml b/connect/connect.xml
index 4ef67c0a1f..4ac203eaf8 100644
--- a/connect/connect.xml
+++ b/connect/connect.xml
@@ -1,3 +1,10 @@
+
+
+ %general-entities;
+]>
+
Connecting to a Network
@@ -8,8 +15,8 @@ by connecting to a LAN with a static
a LAN and other networks (such as the Internet). We cover
the most popular methods in this chapter.
-&connect-dialup;
-&connect-dhcp;
-&connect-other;
+
+
+
diff --git a/connect/dhcp/dhcp-client.xml b/connect/dhcp/dhcp-client.xml
index 8cb0498609..300e8ed586 100644
--- a/connect/dhcp/dhcp-client.xml
+++ b/connect/dhcp/dhcp-client.xml
@@ -1,3 +1,10 @@
+
+
+ %general-entities;
+]>
+
DHCP-&dhcp-version;
diff --git a/connect/dhcp/dhcp.xml b/connect/dhcp/dhcp.xml
index 0b71831eb1..c123c55b81 100644
--- a/connect/dhcp/dhcp.xml
+++ b/connect/dhcp/dhcp.xml
@@ -1,3 +1,10 @@
+
+
+ %general-entities;
+]>
+
<acronym>DHCP</acronym> Clients
@@ -18,7 +25,7 @@ to create an appropriate service script to work with the
network bootscript and the DHCP
client of your choice.
-&connect-dhcp-client;
-&dhcpcd;
+
+
diff --git a/connect/dhcp/dhcpcd.xml b/connect/dhcp/dhcpcd.xml
index c1df4403d8..4fdea4adcb 100644
--- a/connect/dhcp/dhcpcd.xml
+++ b/connect/dhcp/dhcpcd.xml
@@ -1,12 +1,160 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+]>
+
dhcpcd-&dhcpcd-version;
-&dhcpcd-intro;
-&dhcpcd-inst;
-&dhcpcd-exp;
-&dhcpcd-config;
-&dhcpcd-desc;
+
+Introduction to <application>dhcpcd</application>
+
+The dhcpcd package contains the
+dhcpcd client. This is useful for connecting your computer
+to a network which uses DHCP to assign network addresses.
+
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &dhcpcd-size;
+Estimated Disk space required:
+&dhcpcd-buildsize;
+Estimated build time:
+&dhcpcd-time;
+
+
+Additional downloads
+
+Required patch:
+
+
+
+
+
+
+
+
+Installation of <application>dhcpcd</application>
+
+Install dhcpcd by running the following
+commands:
+
+patch -Np1 -i ../dhcpcd-&dhcpcd-version;-fhs-1.patch &&
+./configure --prefix="" --sysconfdir=/var/lib \
+--mandir=/usr/share/man &&
+make &&
+make install
+
+
+
+
+
+Command explanations
+
+patch -Np1 -i ../dhcpcd-&dhcpcd-version;-fhs-1.patch
+: Dhcpcd unpatched puts all configuration
+and temporary files in /etc/dhcpc. This becomes very
+annoying when dhcpcd tells you it's running and it's
+not. You look in /var/run for
+the PID file, but it's not
+there, the PID file that needs deleting is in
+/etc/dhcpc.
+This patch brings this program into FHS compliance, but more
+importantly, puts files where you expect them to be.
+
+--prefix="": There may be a good reason for
+abandoning the normal BLFS convention of using
+--prefix=/usr here. If you are installing
+DHCP, it is likely that it is
+required during the boot process and
+/usr may be network
+mounted, in which case dhcpcd wouldn't be available due to
+being on the network! Therefore, depending on your situation, you may want it
+to be installed in /sbin or
+/usr/sbin. This command installs to
+/sbin.
+
+--sysconfdir=/var/lib: This command installs
+configuration files in the /var/lib
+directory.
+
+--mandir=/usr/share/man: This command
+installs the man pages to the /usr/share/man
+directory.
+
+
+
+
+Configuring <application>dhcpcd</application>
+
+Config files
+/var/lib/dhcpc/*
+
+Configuration Information
+
+To configure dhcpcd, you need to first install
+the network service script,
+/etc/sysconfig/network-devices/services/dhcpcd
+included in the package.
+
+make install-service-dhcpcd
+
+Now create the ifconfig.eth0 configuration
+file using the following commands. Adjust appropriately for additional
+interfaces.
+
+Note: This will overwrite any existing file.
+
+cat > /etc/sysconfig/network-devices/ifconfig.eth0 << "EOF"
+ONBOOT=yes
+DHCP_START="[insert appropriate start options here]"
+DHCP_STOP="-k [insert other stop options here]"
+SERVICE=dhcpcd
+EOF
+
+For more information on the appropriate
+DHCP_START and DHCP_STOP
+values, examine the man page for dhcpcd.
+
+Finally, if the DHCP configured interface is
+used as your default gateway, you should remove the GATEWAY and GATEWAY_IF
+variables from /etc/sysconfig/network:
+
+sed -i "s/GATEWAY/#&/" /etc/sysconfig/network
+
+
+
+
+
+
+Contents
+
+The dhcpcd package contains dhcpcd.
+
+
+
+Description
+
+dhcpcd
+dhcpcd is an implementation of the DHCP
+ client specified in RFC2131 and
+RFC1541 (depending on which options are specified).
+
+
+
diff --git a/connect/dialup/dialup.xml b/connect/dialup/dialup.xml
index 95bc658b8a..02c9bd97b9 100644
--- a/connect/dialup/dialup.xml
+++ b/connect/dialup/dialup.xml
@@ -1,8 +1,15 @@
+
+
+ %general-entities;
+]>
+
Dial-up networking
-&ppp;
-&wvdial;
+
+
diff --git a/connect/dialup/ppp.xml b/connect/dialup/ppp.xml
index f7f9482110..f197910435 100644
--- a/connect/dialup/ppp.xml
+++ b/connect/dialup/ppp.xml
@@ -1,11 +1,122 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+]>
+
PPP-&ppp-version;
-&ppp-intro;
-&ppp-inst;
-&ppp-config;
-&ppp-desc;
+
+Introduction to <application><acronym>PPP</acronym></application>
+
+The PPP package contains
+the pppd daemon and the chat 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.
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &ppp-size;
+Estimated Disk space required:
+&ppp-buildsize;
+Estimated build time:
+&ppp-time;
+
+
+Additional downloads
+
+Required patch:
+
+
+
+
+<application>ppp</application> dependencies
+Required
+
+
+
+
+
+
+Installation of <application><acronym>PPP</acronym></application>
+
+PPP support must be
+compiled into the kernel or available as a kernel module.
+
+Install PPP by running the
+following commands:
+
+patch -Np1 -i ../ppp-&ppp-version;-nobpf-3.patch &&
+./configure &&
+make ETCDIR=/etc/ppp &&
+make ETCDIR=/etc/ppp install
+
+
+
+
+Configuring <application><acronym>PPP</acronym></application>
+
+Config files
+/etc/ppp/*
+
+
+Configuration Information
+
+The PPP daemon
+requires very little configuration. The main trick is scripting the
+connection. This can be done either using the chat program which comes with
+this package or by using .
+
+
+
+
+
+Contents
+
+The PPP package contains
+the chat,
+pppd, pppdump and
+pppstats programs.
+
+
+
+Description
+
+chat
+The chat program defines a conversational exchange
+between the computer and the modem. Its primary purpose is to establish the
+connection between the Point-to-Point Protocol Daemon
+(PPPD) and the remote's pppd process.
+
+
+pppd
+pppd is the Point to Point Protocol daemon.
+
+pppdump
+pppdump is used to convert
+PPP record files
+to a readable format.
+
+pppstats
+pppstats is used to print
+PPP statistics.
+
+
diff --git a/connect/dialup/wvdial.xml b/connect/dialup/wvdial.xml
index 54e3b5e100..a08ae646c8 100644
--- a/connect/dialup/wvdial.xml
+++ b/connect/dialup/wvdial.xml
@@ -1,11 +1,98 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+]>
+
WvDial-&wvdial-version;
-&wvdial-intro;
-&wvdial-inst;
-&wvdial-config;
-&wvdial-desc;
+
+Introduction to <application>WvDial</application>
+
+The WvDial package contains a no-nonsense,
+quick and easy to use alternative to chat and
+pppd scripts. If you simply want to dial a modem
+without the fuss and hassle of chat issues, then you'll
+want this.
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &wvdial-size;
+Estimated Disk space required: &wvdial-buildsize;
+Estimated build time: &wvdial-time;
+
+
+<application>WvDial</application> dependencies
+Required
+ and
+
+
+
+
+
+
+Installation of <application>WvDial</application>
+
+Install WvDial by running the following commands:
+
+make PREFIX=/usr &&
+make PREFIX=/usr install
+
+
+
+
+Configuring <application>WvDial</application>
+
+Config files
+/etc/wvdial.conf,
+/etc/ppp/peers/*
+
+Configuration Information
+
+touch /etc/wvdial.conf &&
+wvdialconf /etc/wvdial.conf
+wvdialconf 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
+/etc/wvdial.conf file.
+
+You then start wvdial with:
+wvdial
+
+For more information, examine the wvdialconf, wvdial.conf and wvdial man pages.
+
+
+
+
+
+
+Contents
+
+The WvDial package contains the
+wvdial and wvdialconf programs.
+
+
+
+Description
+
+wvdial
+Starts a PPP connection.
+
+wvdialconf
+Automates the configuration of wvdial.
+
+
diff --git a/connect/other/other.xml b/connect/other/other.xml
index be7fc842b4..df18a4d874 100644
--- a/connect/other/other.xml
+++ b/connect/other/other.xml
@@ -1,3 +1,10 @@
+
+
+ %general-entities;
+]>
+
Other Connections
@@ -8,7 +15,6 @@
for ISDN (or others as the need arises) are always welcome
and will be included in future books, if available.
-
-&pppoe;
+
diff --git a/connect/other/pppoe.xml b/connect/other/pppoe.xml
index 817e3807fa..579781eacb 100644
--- a/connect/other/pppoe.xml
+++ b/connect/other/pppoe.xml
@@ -1,12 +1,177 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+]>
+
RP-PPPoE-&pppoe-version;
-&pppoe-intro;
-&pppoe-inst;
-&pppoe-exp;
-&pppoe-config;
-&pppoe-desc;
+
+Introduction to <application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application>
+
+The Roaring Penguin PPPoE
+package contains both a client and a server component that works with the
+client. The client allows you to connect to large networks that use the
+PPPoE protocol, common among ADSL
+providers. The server component runs alongside the client,
+allowing you to configure other clients that send out a configuration
+request.
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &pppoe-size;
+Estimated Disk space required:
+&pppoe-buildsize;
+Estimated build time:
+&pppoe-time;
+
+
+<application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application> dependencies
+Required
+
+
+
+
+
+
+
+Installation of <application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application>
+
+Note: If you plan on using kernel-mode PPPoE,
+this package is no longer explicitly needed. However, it is recomended
+for ease of configuration. Additional information about kernel mode
+PPPoE can be found in
+rp-pppoe-&pppoe-version;/doc/KERNEL-MODE-PPPOE.
+
+Install RP-PPPoE by running
+the following commands:
+
+cd src &&
+./configure &&
+make &&
+make install
+
+
+
+
+Command explanations
+
+These are the standard installation commands that will install into
+the /usr prefix. You can optionally use the
+go script in the root of the source tree, to
+run the same commands, which are then immediately followed by the
+adsl-setup script.
+
+
+
+
+Configuring <application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application>
+
+Config files
+/etc/ppp/pppoe.conf,
+/etc/ppp/firewall-standalone,
+/etc/ppp/firewall-masq,
+/etc/ppp/pppoe-server-options,
+/etc/resolv.conf,
+/etc/ppp/pap-seecrets,
+/etc/ppp/chap-secrets
+
+Configuration Information
+
+To configure RP-PPPoE
+ after installation, you should run the adsl-setup
+ script.
+
+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
+adsl-start script.
+
+Optionally install the
+/etc/sysconfig/network-devices/services/pppoe service
+script included with the
+package.
+
+make install-service-pppoe
+
+Now create the config file for use with the pppoe
+service script:
+
+cat > /etc/sysconfig/network-devices/ifconfig.pppoe << "EOF"
+ONBOOT=yes
+SERVICE=pppoe
+EOF
+
+Also, if you had previously configured the network interface that will now
+use PPPoE, you should remove the interface configuration
+files for that interface:
+/etc/sysconfig/network-devices/ifconfig.eth<X>
+.
+
+
+
+
+
+
+Contents
+
+The RP-PPPoE package
+contains adsl-setup, adsl-start,
+adsl-status, adsl-stop,
+pppoe, pppoe-relay, pppoe-server
+ and pppoe-sniff.
+
+
+
+Description
+
+adsl-setup
+A script for configuring the client. Configuration is then stored
+in /etc/ppp/pppoe.conf.
+
+adsl-start
+adsl-start starts the client using the options
+specified in /etc/ppp/pppoe.conf.
+
+adsl-status
+adsl-status displays the status of the
+ADSL connection.
+
+adsl-stop
+adsl-stop stops the client.
+
+pppoe
+This is the client itself. Generally it should not be started on its
+own.
+
+pppoe-relay
+pppoe-relay starts the server relay agent.
+
+pppoe-server
+pppoe-server starts the server component.
+
+pppoe-sniff
+A small network sniffer designed to assist in setting PPPOE_EXTRA
+ settings.
+
+
diff --git a/general.ent b/general.ent
index d97d09690e..231337a199 100644
--- a/general.ent
+++ b/general.ent
@@ -48,5 +48,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/index.xml b/index.xml
index bbcbc11b9f..9f70acbfea 100644
--- a/index.xml
+++ b/index.xml
@@ -30,7 +30,7 @@
%introduction;
%postlfs; -->
%general;
-%connect;
+
%basicnet;
%server;
%content;
@@ -56,7 +56,8 @@
&general;
-&connect;
+
+
&basicnet;
&server;
&content;