diff --git a/connect/connect.xml b/connect/connect.xml
index 0cffe2d3b5..62d4e4ac9e 100644
--- a/connect/connect.xml
+++ b/connect/connect.xml
@@ -2,10 +2,10 @@
Connecting to a Network
-The LFS book covers setting up networking with a static
-IP. There are however, other methods which are used to connect to networks and
-importantly the internet. We cover the most popular methods in this
-chapter.
+The LFS book covers setting up networking
+with a static IP. There are however, other methods which
+are used to connect to networks and importantly the internet. We cover the
+most popular methods in this chapter.
&connect-dialup;
&connect-dhcp;
diff --git a/connect/dhcp/bootscripts.xml b/connect/dhcp/bootscripts.xml
index cd22e3992a..7201276355 100644
--- a/connect/dhcp/bootscripts.xml
+++ b/connect/dhcp/bootscripts.xml
@@ -1,6 +1,6 @@
-Configuring the LFS bootscripts to support DHCP clients
+Configuring the LFS bootscripts to support DHCP clients
Config files
/etc/sysconfig/network,
@@ -12,33 +12,36 @@
Configuration Information
Note that on this and the following pages, we
-use eth0 as the example interface.
+use eth0 as the example interface.
If you want to configure a different (or more than one) interface, simply
-replace eth0 with the interface you wish to use.
+replace eth0 with the interface you wish to
+use.
-These instructions will convert the configuration files from LFS
-(a static configuration) to a configuration using the DHCP protocol.
-Note that static and DHCP-based interfaces can co-exist on a LFS system. To
-do this, you should only make the alterations to those interfaces which
-need to support DHCP. All of the instructions on this page are applicable
-no matter which DHCP client you intend to use.
+These instructions will convert the configuration files from
+LFS (a static configuration) to a configuration using the
+DHCP protocol. Note that static and
+DHCP-based interfaces can co-exist on a
+LFS system. To do this, you should only make the
+alterations to those interfaces which need to support
+DHCP. All of the instructions on this page are applicable
+no matter which DHCP client you intend to use.
If the interface you intend to use as your default gateway is going to
-use DHCP, the first step is to remove the GATEWAY and
-GATEWAY_IF variables
+use DHCP, the first step is to remove the GATEWAY
+ and GATEWAY_IF variables
from /etc/sysconfig/network. This will only need to be
done once.
-cd /etc/sysconfig &&
+cd /etc/sysconfig &&
cp network network.bak &&
-sed "s/GATEWAY/# GATEWAY/" network.bak > network
+sed "s/GATEWAY/# GATEWAY/" network.bak > network
You then need to create scripts which will override the default
-network scripts and provide DHCP support. These two scripts are generic and
-so for use with both DHCP clients. First, the
-ifup-eth0 script:
+network scripts and provide DHCP support. These two scripts
+are generic and so for use with both DHCP clients. First,
+the ifup-eth0 script:
-cat > /etc/sysconfig/network-devices/ifup-eth0 << "EOF"
+cat > /etc/sysconfig/network-devices/ifup-eth0 << "EOF"
#!/bin/sh
source /etc/sysconfig/rc || exit
@@ -48,11 +51,11 @@ source $network_devices/ifconfig.eth0 || exit
echo "Bringing up the eth0 interface..."
modprobe eth0
loadproc $DHCP_PROG $DHCP_START
-EOF
+EOF
Then the ifdown-eth0 script:
-cat > /etc/sysconfig/network-devices/ifdown-eth0 << "EOF"
+cat > /etc/sysconfig/network-devices/ifdown-eth0 << "EOF"
#!/bin/sh
source /etc/sysconfig/rc || exit
@@ -62,12 +65,12 @@ source $network_devices/ifconfig.eth0 || exit
echo "Bringing down the eth0 interface..."
$DHCP_PROG $DHCP_STOP
evaluate_retval
-EOF
+EOF
Finally, we need to make these scripts executable:
-chmod 755 /etc/sysconfig/network-devices/ifup-eth0 &&
-chmod 755 /etc/sysconfig/network-devices/ifdown-eth0
+chmod 755 /etc/sysconfig/network-devices/ifup-eth0 &&
+chmod 755 /etc/sysconfig/network-devices/ifdown-eth0
diff --git a/connect/dhcp/dhcp-client.xml b/connect/dhcp/dhcp-client.xml
index ed68616ca9..b1bb2be48e 100644
--- a/connect/dhcp/dhcp-client.xml
+++ b/connect/dhcp/dhcp-client.xml
@@ -2,19 +2,20 @@
dhcp-&dhcp-version;
-The dhcp package comes with both a client (called dhclient) and a
-server program for using DHCP. If you want to install this package,
+The dhcp package comes with both a client
+(called dhclient) and a server program for using
+DHCP. If you want to install this package,
the instructions can be found at .
Note that if you only want to use the client, you
do not 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
+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
-(dhclient).
+(dhclient).
-To configure dhclient, you need to create two files,
+To configure dhclient, you need to create two files,
/etc/sysconfig/network-devices/ifconfig.eth0 and
/etc/dhclient.conf.
@@ -22,22 +23,22 @@ package, return here for information on how to configure the client
file with the following commands (note that this will overwrite any
existing file):
-cd /etc/sysconfig/network-devices &&
-cat > /etc/sysconfig/network-devices/ifconfig.eth0 << "EOF"
+cd /etc/sysconfig/network-devices &&
+cat > /etc/sysconfig/network-devices/ifconfig.eth0 << "EOF"
ONBOOT=yes
DHCP_PROG=/sbin/dhclient
DHCP_START=<appropriate start parameters>
DHCP_STOP=-r
-EOF
+EOF
For more information on the appropriate
DHCP_START and DHCP_STOP
-values, examine the man page for dhclient.
+values, examine the man page for dhclient.
Next, you should then create
the /etc/dhclient.conf using the following command:
-cat > /etc/dhclient.conf << "EOF"
+cat > /etc/dhclient.conf << "EOF"
# dhclient.conf
interface "eth0"{
@@ -47,6 +48,6 @@ request subnet-mask, broadcast-address, time-offset, routers,
require subnet-mask, domain-name-servers;
}
# end dhclient.conf
-EOF
+EOF
diff --git a/connect/dhcp/dhcp.xml b/connect/dhcp/dhcp.xml
index a77e7fdee6..a06e07dbe5 100644
--- a/connect/dhcp/dhcp.xml
+++ b/connect/dhcp/dhcp.xml
@@ -1,20 +1,22 @@
-DHCP Clients
+DHCP Clients
-DHCP stands for Dynamic Host Configuration Protocol. It is a
-protocol which is 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.
+DHCP stands for Dynamic Host Configuration Protocol.
+It is a protocol which is 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.
-We currently provide installation instructions for two DHCP
-clients, dhclient (from the dhcp package) and dhcpcd. We begin with a page
-which shows how to alter the LFS bootscripts for generic DHCP support.
-We then present the two sets of installation instructions which also discuss
+We currently provide installation instructions for two
+DHCP clients, dhclient (from the
+dhcp package) and dhcpcd. We
+begin with a page which shows how to alter the LFS
+bootscripts for generic DHCP support. We then present the
+two sets of installation instructions which also discuss
how to create an appropriate configuration file to work with the
-DHCP client of your choice.
+DHCP client of your choice.
&connect-dhcp-bootscripts;
&connect-dhcp-client;
diff --git a/connect/dialup/ppp/ppp-config.xml b/connect/dialup/ppp/ppp-config.xml
index 6e28d8fb42..7c910f6f4a 100644
--- a/connect/dialup/ppp/ppp-config.xml
+++ b/connect/dialup/ppp/ppp-config.xml
@@ -1,5 +1,5 @@
-Configuring ppp
+Configuring ppp
Config files
/etc/ppp/*
@@ -8,7 +8,7 @@
Configuration Information
The ppp daemon itself requires very little configuration. The
-main trick is script the connection. This can be done either using the
+main trick is scripting the connection. This can be done either using the
chat program which comes with this package or by using .
diff --git a/connect/dialup/ppp/ppp-desc.xml b/connect/dialup/ppp/ppp-desc.xml
index f731dfd840..874a8fef2c 100644
--- a/connect/dialup/ppp/ppp-desc.xml
+++ b/connect/dialup/ppp/ppp-desc.xml
@@ -1,29 +1,33 @@
Contents
-The ppp package contains the chat,
-pppd, pppdump and
-pppstats programs.
+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.
+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.
+pppd is the Point to Point Protocol daemon.
pppdump
-pppdump is used to convert PPP record files
+pppdump is used to convert
+PPP record files
to a readable format.
pppstats
-pppstats is used to print PPP statistics.
+pppstats is used to print
+PPP statistics.
diff --git a/connect/dialup/ppp/ppp-inst.xml b/connect/dialup/ppp/ppp-inst.xml
index 94274e4c23..3fa7a586ec 100644
--- a/connect/dialup/ppp/ppp-inst.xml
+++ b/connect/dialup/ppp/ppp-inst.xml
@@ -1,11 +1,15 @@
-Installation of ppp
+Installation of ppp
-Install ppp by running the following commands:
+PPP support must be compiled into the
+kernel or available as a kernel module.
-./configure &&
+Install ppp by running the following commands:
+
+
+./configure &&
make &&
-make install
+make install
diff --git a/connect/dialup/ppp/ppp-intro.xml b/connect/dialup/ppp/ppp-intro.xml
index 7e4c76e5bb..a8af19d46e 100644
--- a/connect/dialup/ppp/ppp-intro.xml
+++ b/connect/dialup/ppp/ppp-intro.xml
@@ -1,17 +1,26 @@
-Introduction to ppp
+Introduction to ppp
-Download location (HTTP):
-Download location (FTP):
-Version used: &ppp-version;
-Package size: &ppp-size;
-Estimated Disk space required: &ppp-buildsize;
-
-The ppp package contains the pppd daemon and the chat program.
+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 connection to an ISP.
+the Internet via a dial-up 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;
+
+
+
diff --git a/connect/dialup/ppp/ppp.ent b/connect/dialup/ppp/ppp.ent
index cae27e0a9c..5f3836e18a 100644
--- a/connect/dialup/ppp/ppp.ent
+++ b/connect/dialup/ppp/ppp.ent
@@ -8,3 +8,4 @@
+