X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=README.pppoe;h=2909e1310a31f23f62719bc97cd0538084240704;hp=2094a96b692cc10a2db888f2d5b48f390c8eb4d5;hb=f1a34da3b2f5336e4993a729e5ac2130d0e0595a;hpb=dbfeebc9adcf76a50c1d4e9035d5d481914edb43

diff --git a/README.pppoe b/README.pppoe
index 2094a96..2909e13 100644
--- a/README.pppoe
+++ b/README.pppoe
@@ -5,12 +5,13 @@
 		8 August 2001
 
 		for ppp-2.4.2
+		Updated for ppp-2.4.5 by Paul Mackerras, Sep 08
 
 1. Introduction
 ---------------
 
 This document describes the support for PPP over Ethernet (PPPoE)
-included with this packages.  It is assumed that the reader is
+included with this package.  It is assumed that the reader is
 familiar with Linux PPP (as it pertains to tty/modem-based
 connections).  In particular, users of PPP in the Linux 2.2 series
 kernels should ensure they are familiar with the changes to the PPP
@@ -19,7 +20,7 @@ PPPoE features.
 
 If you are not familiar with PPP, I recommend looking at other
 packages which include end-user configuration tools, such as Roaring
-Penguin (http://www.roaringpenguin.com/pppoe)
+Penguin (http://www.roaringpenguin.com/pppoe).
 
 PPPoE is a protocol typically used by *DSL providers to manage IP
 addresses and authenticate users.  Essentially, PPPoE provides for a
@@ -32,7 +33,7 @@ received from the PPPoE layer just as if the link was a serial line
 
 With this in mind, the goal of the implementation of PPPoE support in
 Linux is to allow users to simply specify that the device they intend
-to use for the PPP connection is an ethernet device (i.e. "eth0") and
+to use for the PPP connection is an ethernet device (e.g. "eth0") and
 the rest of the system should function as usual.
 
 2. Using PPPoE
@@ -42,10 +43,8 @@ This section is a quick guide for getting PPPoE working, to allow one
 to connect to their ISP who is providing PPPoE based services.
 
 1.  Enable "Prompt for development and/or incomplete code/drivers" and
-    "PPP over Ethernet" in your kernel configuration.  If you choose to
-    use the PPP over Ethernet driver as a module adding "alias
-    net-pf-24 pppoe" to /etc/modules.conf will enable auto-loading
-    of the modules.
+    "PPP over Ethernet" in your kernel configuration.  Most distributions
+    will include the kernel PPPoE module by default.
 
 2.  Compile and install your kernel.
 
@@ -53,7 +52,7 @@ to connect to their ISP who is providing PPPoE based services.
 
 4.  Add the following line to /etc/ppp/options:
 
-    plugin rp-pppoe.so
+    plugin pppoe.so
 
     The effect of this line is simply to make "eth0", "eth1",
     ....,"ethx" all valid device names for pppd (just like ttyS0,
@@ -73,9 +72,9 @@ Do not include any compression or flow control options in your PPPoE
 configuration.  They will be ignored.
 
 Again, here it is assumed that the reader is familiar with the general
-process of configuring PPP.  The step outlined here refer only to the
+process of configuring PPP.  The steps outlined here refer only to the
 steps and configuration options which are PPPoE specific, and it is
-assumed that the reader will configured other aspects of the system
+assumed that the reader will also configure other aspects of the system
 (e.g. PAP authentication parameters).
 
 3.  Advanced Functionality