diff --git a/connect/other/pppoe.xml b/connect/other/pppoe.xml
index f36186c186..38ca6a4a82 100644
--- a/connect/other/pppoe.xml
+++ b/connect/other/pppoe.xml
@@ -4,8 +4,9 @@
%general-entities;
-
-
+
+
+
@@ -18,6 +19,8 @@
RP-PPPoE-&pppoe-version;
+
+RP-PPPoE
Introduction to
@@ -37,6 +40,7 @@ request.
url="&pppoe-download-http;"/>
Download (FTP):
+Download MD5 sum: &pppoe-md5sum;
Download size: &pppoe-size;
Estimated disk space required:
&pppoe-buildsize;
@@ -44,28 +48,32 @@ url="&pppoe-download-ftp;"/>
&pppoe-time;
-RP-PPPoE
+
+RP-PPPoE
dependencies
Required
and
(you may omit
Net-tools by using the following patch to
-utilize IPRoute2: IPRoute2: )
-
+
Installation of
-RP-PPPoE
+RP-PPPoE
+
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.
+
+Kernel-mode PPPoE
Install
RP-PPPoE by
@@ -73,8 +81,11 @@ running the following commands:
cd src &&
./configure &&
-make &&
-make install
+make
+
+Now, as the root user:
+
+make install
@@ -91,16 +102,39 @@ run the same commands, which are then immediately followed by the
Configuring
-RP-PPPoE
+RP-PPPoE
+
-Config files
+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
+/etc/ppp/pap-secrets,
+/etc/ppp/chap-secrets
+/etc/ppp/pppoe.conf
+
+/etc/ppp/firewall-standalone
+
+/etc/ppp/firewall-masq
+
+/etc/ppp/pppoe-server-options
+
+/etc/resolv.conf
+
+/etc/ppp/pap-secrets
+
+/etc/ppp/chap-secrets
+
+
Configuration Information
@@ -118,25 +152,31 @@ 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
+Optionally install the
/etc/sysconfig/network-devices/services/pppoe service
script included with the
-package.
+package (as user root).
+
+pppoe (service script)
+
-make install-service-pppoe
+make install-service-pppoe
-Now create the config file for use with the pppoe
-service script:
+Now create the config file for use with the
+pppoe service script (as user root):
+
+/etc/sysconfig/.../pppoe
+
If you have previously configured the network interface that
will now use PPPoE, you should remove the interface
-configuration files for that interface:
+configuration files for that interface (as user root):
-rm
+rm
/etc/sysconfig/network-devices/ifconfig.eth0/*
-install -d /etc/sysconfig/network-devices/ifconfig.eth0 &&
+install -d /etc/sysconfig/network-devices/ifconfig.eth0 &&
cat > /etc/sysconfig/network-devices/ifconfig.eth0/pppoe << "EOF"
ONBOOT="yes"
SERVICE="pppoe"
@@ -151,47 +191,101 @@ mode pppoe is described here. -->
Contents
-The
-RP-PPPoE
-package contains adsl-setup, adsl-start,
-adsl-status, adsl-stop,
-pppoe, pppoe-relay, pppoe-server
- and pppoe-sniff.
+
+Installed Programs
+Installed Libraries
+Installed Directories
-
+
+adsl-connect, adsl-setup, adsl-start, adsl-status, adsl-stop, pppoe,
+pppoe-relay, pppoe-server and pppoe-sniff
+None
+/etc/ppp/plugins and /usr/share/doc/rp-pppoe-&pppoe-version;
+
+
-Description
+
+Short Descriptions
+
-adsl-setup
-A script for configuring the client. Configuration is then stored
-in /etc/ppp/pppoe.conf.
+
+adsl-connect
+is a shell script which manages an ADSL
+connection using the user-space PPPoE client.
+
+adsl-connect
+
+
-adsl-start
-adsl-start starts the client using the options
-specified in /etc/ppp/pppoe.conf.
+
+adsl-setup
+is a script for configuring the client. Configuration is
+then stored in /etc/ppp/pppoe.conf.
+
+adsl-setup
+
+
-adsl-status
-adsl-status displays the status of the
-ADSL connection.
+
+adsl-start
+starts the client using the options specified in
+/etc/ppp/pppoe.conf.
+
+adsl-start
+
+
-adsl-stop
-adsl-stop stops the client.
+
+adsl-status
+displays the status of the ADSL
+connection.
+
+adsl-status
+
+
-pppoe
-This is the client itself. Generally it should not be started on its
-own.
+
+adsl-stop
+stops the client.
+
+adsl-stop
+
+
-pppoe-relay
-pppoe-relay starts the server relay
-agent.
+
+pppoe
+is the client program. Generally it should not be started on
+its own.
+
+pppoe
+
+
-pppoe-server
-pppoe-server starts the server
-component.
+
+pppoe-relay
+starts the server relay agent.
+
+pppoe-relay
+
+
-pppoe-sniff
-A small network sniffer designed to assist in setting
-PPPOE_EXTRA settings.
+
+pppoe-server
+starts the server component.
+
+pppoe-server
+
+
+
+
+pppoe-sniff
+is a small network sniffer designed to assist in setting
+PPPOE_EXTRA settings.
+
+pppoe-sniff
+
+
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 0024ebd92f..17e24b5ddf 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -22,8 +22,8 @@ who wrote what.
-February 10th, 2005 [randy]: Updated to
-WvStreams-4.0.1
+February 10th, 2005 [randy]: Updated to WvStreams-4.0.1;
+Fixed broken download URLs in RP-PPPoE instructions
February 9th, 2005 [larry]: Updated MIT krb5 to krb-1.4,
incorporated offical patches for autofs and moved cracklib to required in