Index: basicnet/netprogs/ncpfs.xml
===================================================================
--- basicnet/netprogs/ncpfs.xml	(revision 68df39bf61e5b6d202ad762d1b52f5f2dfc8eb48)
+++ basicnet/netprogs/ncpfs.xml	(revision afa198d324ae5623ace8a15afacb65c4d06c7a5e)
@@ -134,18 +134,13 @@
 <screen><userinput><command>make install-service-ipx</command></userinput></screen>
 
-<para>Next install the configurations script,
-<filename>ifconfig.ipx0</filename>.  The configuration assumes 
-<acronym>IPX</acronym> will be set up on 
-<emphasis role="strong">eth0</emphasis>  
-and the network frame type is 802.2.  You should confirm that these are 
-the correct settings and adjust as necessary.</para>
+<para>Next install the 
+<filename>/etc/sysconfig/network-devices/ifconfig.eth0/ipx</filename>
+configuration file with the following commands:</para>
 
-<para><emphasis>Note</emphasis>: This will overwrite any existing file.</para>
-
-<screen><userinput><command>cat &gt; /etc/sysconfig/network-devices/ifconfig.ipx0 &lt;&lt; "EOF"</command>
-ONBOOT=yes
-SERVICE=ipx
-IPXDEV=eth0
-FRAME=802.2
+<screen><userinput><command>install -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
+cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/ipx &lt;&lt; "EOF"</command>
+ONBOOT="yes"
+SERVICE="ipx"
+FRAME="<replaceable>[802.2]</replaceable>"
 <command>EOF</command></userinput></screen>
 
Index: connect/dhcp/dhcp-client.xml
===================================================================
--- connect/dhcp/dhcp-client.xml	(revision 68df39bf61e5b6d202ad762d1b52f5f2dfc8eb48)
+++ connect/dhcp/dhcp-client.xml	(revision afa198d324ae5623ace8a15afacb65c4d06c7a5e)
@@ -30,15 +30,15 @@
 <screen><userinput><command>make install-service-dhclient</command></userinput></screen>
 
-<para>Next, create the <filename>ifconfig.eth0</filename>
-file with the following commands.  Adjust as necessary for additional
-interfaces.</para>
+<para>Next, create the 
+<filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhclient</filename>
+configuration file with the following commands.  Adjust as necessary for 
+additional interfaces.</para>
 
-<para><emphasis>Note</emphasis>: this will overwrite any existing file.</para>
-
-<screen><userinput><command>cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0 &lt;&lt; "EOF"</command>
-ONBOOT=yes
-DHCP_START="<replaceable>[place appropriate start parameters here]</replaceable>"
-DHCP_STOP="-r <replaceable>[add additional stop parameters here]</replaceable>"
-SERVICE=dhclient
+<screen><userinput><command>install -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
+cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/dhclient &lt;&lt; "EOF"</command>
+ONBOOT="yes"
+SERVICE="dhclient"
+DHCP_START="-q <replaceable>[add additional start parameters here]</replaceable>"
+DHCP_STOP="-q -r <replaceable>[add additional stop parameters here]</replaceable>"
 <command>EOF</command></userinput></screen>
 
@@ -47,7 +47,10 @@
 values, examine the man page for <command>dhclient</command>.</para>
 
-<para> You should then create 
-<filename>/etc/dhclient.conf</filename> using the following
-commands.  Append to the file if you have more than one interface:</para>
+<para>Finally, you should create the 
+<filename>/etc/dhclient.conf</filename> file using the following
+commands:</para>  
+
+<note>You'll need to add a second interface definition to the file if you 
+have more than one interface.</note>
 
 <screen><userinput><command>cat &gt; /etc/dhclient.conf &lt;&lt; "EOF"</command>
@@ -63,9 +66,3 @@
 <command>EOF</command></userinput></screen>
 
-<para>Finally, if the <acronym>DHCP</acronym> configured interface is
-used as your default gateway, you should remove the GATEWAY and GATEWAY_IF 
-variables from <filename>/etc/sysconfig/network</filename>: </para>
-
-<screen><userinput><command>sed -i "s/GATEWAY/#GATEWAY/" /etc/sysconfig/network</command></userinput></screen>
-
 </sect1>
Index: connect/dhcp/dhcpcd.xml
===================================================================
--- connect/dhcp/dhcpcd.xml	(revision 68df39bf61e5b6d202ad762d1b52f5f2dfc8eb48)
+++ connect/dhcp/dhcpcd.xml	(revision afa198d324ae5623ace8a15afacb65c4d06c7a5e)
@@ -111,23 +111,15 @@
 <screen><userinput><command>make install-service-dhcpcd</command></userinput></screen>
 
-<note><para>The default behavior of <command>dhcpcd</command> is to overwrite 
-(after making backup copies) <filename>/etc/resolv.conf</filename>, 
-<filename>/etc/yp.conf</filename> and <filename>/etc/ntp.conf</filename> with
-new files containing information from the <acronym>DHCP</acronym> server. If 
-this is undesirable, review the <command>dhcpcd</command> man page for 
-switches to add to the <command>dhcpcd</command> command in the network 
-service script.</para></note>
+<para>Finally, create the
+<filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd</filename> 
+configuration file using the following commands.  Adjust appropriately 
+for additional interfaces.</para>
 
-<para>Now create the <filename>ifconfig.eth0</filename> configuration
-file using the following commands.  Adjust appropriately for additional 
-interfaces.</para>
-
-<para><emphasis>Note:</emphasis> This will overwrite any existing file.</para>
-
-<screen><userinput><command>cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0 &lt;&lt; "EOF"</command>
-ONBOOT=yes
+<screen><userinput><command>install -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
+cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd &lt;&lt; "EOF"</command>
+ONBOOT="yes"
+SERVICE="dhcpcd"
 DHCP_START="<replaceable>[insert appropriate start options here]</replaceable>"
-DHCP_STOP="-k <replaceable>[insert other stop options here]</replaceable>"
-SERVICE=dhcpcd
+DHCP_STOP="-k <replaceable>[insert additional stop options here]</replaceable>"
 <command>EOF</command></userinput></screen>
 
@@ -136,9 +128,11 @@
 values, examine the man page for <command>dhcpcd</command>.</para>
 
-<para>Finally, if the <acronym>DHCP</acronym> configured interface is
-used as your default gateway, you should remove the GATEWAY and GATEWAY_IF
-variables from <filename>/etc/sysconfig/network</filename>: </para>
-
-<screen><userinput><command>sed -i "s/GATEWAY/#&amp;/" /etc/sysconfig/network</command></userinput></screen>
+<note>The default behavior of <command>dhcpcd</command> is to overwrite
+(after making backup copies) <filename>/etc/resolv.conf</filename>,
+<filename>/etc/yp.conf</filename> and <filename>/etc/ntp.conf</filename>
+with new files containing information from the <acronym>DHCP</acronym>
+server. If this is undesirable, review the <command>dhcpcd</command>
+man page for switches to add to the <envar>DHCP_START</envar>
+value.</note>
 
 </sect3>
Index: connect/other/pppoe.xml
===================================================================
--- connect/other/pppoe.xml	(revision 68df39bf61e5b6d202ad762d1b52f5f2dfc8eb48)
+++ connect/other/pppoe.xml	(revision afa198d324ae5623ace8a15afacb65c4d06c7a5e)
@@ -115,14 +115,19 @@
 service script:</para>
 
-<screen><userinput><command>cat &gt; /etc/sysconfig/network-devices/ifconfig.pppoe &lt;&lt; "EOF"</command>
-ONBOOT=yes
-SERVICE=pppoe
+<note>If you have previously configured the network interface that
+will now
+use <acronym>PPPoE</acronym>, you should remove the interface
+configuration
+files for that interface:
+<command><userinput>rm /etc/sysconfig/network-devices/ifconfig.eth0/*</userinput></command>.</note>
+
+<screen><userinput><command>install -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
+cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/pppoe &lt;&lt; "EOF"</command>
+ONBOOT="yes"
+SERVICE="pppoe"
 <command>EOF</command></userinput></screen>
 
-<para>Also, if you had previously configured the network interface that will now
-use <acronym>PPPoE</acronym>, you should remove the interface configuration
-files for that interface:
-<filename>/etc/sysconfig/network-devices/ifconfig.eth&lt;X&gt;
-</filename>.</para>
+<!-- A TYPE="[user/kernel]" will be added at a later date when kernel
+mode pppoe is described here. -->
 
 </sect3>
Index: general.ent
===================================================================
--- general.ent	(revision 68df39bf61e5b6d202ad762d1b52f5f2dfc8eb48)
+++ general.ent	(revision afa198d324ae5623ace8a15afacb65c4d06c7a5e)
@@ -7,5 +7,5 @@
 <!ENTITY blfs-version "cvs">                  <!-- cvs|[release #] -->
 <!ENTITY lfs-version  "testing">              <!-- stable|testing|unstable] -->
-<!ENTITY last-commit  "Wed Jul 28 00:45:00 MDT 2004"> <!-- Need to set up auto update for this -->
+<!ENTITY last-commit  "Wed Jul 28 22:52:00 MDT 2004"> <!-- Need to set up auto update for this -->
 
 <!ENTITY maintainer-fullname  "Bruce Dubbs">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 68df39bf61e5b6d202ad762d1b52f5f2dfc8eb48)
+++ introduction/welcome/changelog.xml	(revision afa198d324ae5623ace8a15afacb65c4d06c7a5e)
@@ -19,4 +19,7 @@
 <itemizedlist>
 
+<listitem><para>July 28th, 2004 [dj]: Changed instructions surrounding
+network scripts to match the new networking setup.</para></listitem>
+
 <listitem><para>July 28th, 2004 [randy]: Added flex patch and required
 dependency 'ed' to TeX instructions to build against LFS >5.1.1.</para>
