Documentation update (#129232)

Package-Manager: portage-2.0.54

1 files changed, 13 insertions, 9 deletions

diff --git a/net-dialup/speedtouch-usb/files/README b/net-dialup/speedtouch-usb/files/README
index d72174bc3b9e..a0abc6622c58 100644
--- a/net-dialup/speedtouch-usb/files/README
+++ b/net-dialup/speedtouch-usb/files/README
@@ -26,7 +26,7 @@ Add the following lines from the appropriate section below to
 
 a) PPPoATM configuration:
 
-config_ppp0=( 'ppp' )  # Runs /lib/rcscripts/net.modules.d/pppd
+config_ppp0=( 'ppp' )  # Runs /lib/rcscripts/net.modules.d/pppd.sh
 link_ppp0='/dev/null'  # Not required by PPPoA links, but must be specified
 # The 2 numbers represent the VPI & VCI of your ISP, and they are separated
 # by a dot. Choose here, or ask your ISP:
@@ -34,7 +34,7 @@ link_ppp0='/dev/null'  # Not required by PPPoA links, but must be specified
 plugins_ppp0=( 'pppoa 0.38' ) 
 # 'man pppd' shows other options. Compression is disabled because it is
 # rarely taken advantage of, and may interfere with the connection.
-# Add option 'usepeerdns' to populate /etc/ppp/resolv.conf
+# Add option 'usepeerdns' to populate /etc/resolv.conf
 pppd_ppp0=( updetach debug defaultroute noaccomp nobsdcomp noccp
 	nodeflate nopcomp novj novjccomp )
 username_ppp0='username@isp.com'  # E.g. 'fredbloggs@hg5.btclick.com'
@@ -44,21 +44,21 @@ password_ppp0='password'  # ADSL password, assigned by your ISP
 # before starting the PPP daemon:
 function preup() {
 	if [[ "$1" = "ppp0" ]] ; then
-		modprobe -q pppoatm
 		modprobe -q speedtch
+		return 0
 	fi
 }
 
 
 b) PPPoE configuration:
 
-config_ppp0=( 'ppp' )  # Runs /lib/rcscripts/net.modules.d/pppd
+config_ppp0=( 'ppp' )  # Runs /lib/rcscripts/net.modules.d/pppd.sh
 # The name of the Ethernet interface over which PPPoE links
 link_ppp0='nas0' # Must correspond to the -c option of the br2684ctl utility
 plugins_ppp0=( pppoe ) 
 # 'man pppd' shows other options. Compression is disabled because it is
 # rarely taken advantage of, and may interfere with the connection.
-# Add option 'usepeerdns' to populate /etc/ppp/resolv.conf
+# Add option 'usepeerdns' to populate /etc/resolv.conf
 pppd_ppp0=( updetach debug defaultroute noaccomp nobsdcomp noccp
 	nodeflate nopcomp novj novjccomp )
 username_ppp0='username@isp.com'  # E.g. 'fredbloggs@hg5.btclick.com'
@@ -89,6 +89,10 @@ function postdown() {
 }
 
 
+
+Configuration continued
+=======================
+
 Create a symlink for the new network interface, for it to be enabled by
 baselayout:
   cd /etc/init.d && ln -sfn net.lo net.ppp0
@@ -125,7 +129,7 @@ are present.
 Note that in the list below, "[*]" means that the option is compiled
 into the kernel, whereas "[M]" means that the option can either be
 compiled into the kernel, or as a module. Compiling them into the
-kernel is preferable, to guarantee that the modules are already loaded
+kernel is recommended, to guarantee that the modules are already loaded
 when they are needed, and it will improve the bootup time by a couple
 of seconds.
 
@@ -160,7 +164,7 @@ list includes the prerequisites, e.g. USB_SPEEDTOUCH depends on USB):
  Device Drivers  --->
   Network device support  --->
    [*] Network device support - CONFIG_NETDEVICES
-   [M] PPP (point-to-point protocol) support - CONFIG_PPP
+   [*] PPP (point-to-point protocol) support - CONFIG_PPP
    [M] PPP Deflate compression - CONFIG_PPP_DEFLATE (only useful if
         compression is supported - rare)
    [M] PPP BSD-Compress compression - CONFIG_PPP_BSDCOMP (only useful
@@ -216,8 +220,8 @@ pppd_ppp0. "man pppd" explains all the options in that file.
 
 If the ADSL connection seems to have worked, but no websites can be
 contacted, then check that /etc/resolv.conf is populated, and possibly
-add the "usepeerdns" option to pppd_ppp0, along with running:
-  ln -s /etc/resolv.conf /etc/ppp/resolv.conf
+add the "usepeerdns" option (to use the ISP's DNS) to pppd_ppp0 in
+/etc/conf.d/net
 
 If the problem is still not resolved, then describe the problem in the
 "discussion and bugs" tab at: