* Fixed various networking inaccuracies

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3941 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

4 files changed, 42 insertions, 33 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fe40c9e28..883384417 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -79,6 +79,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>July 15, 2004 [matt]: Fixed various networking inaccuracies
+(Kevin P. Fleming)</para></listitem>
+
 <listitem><para>July 14, 2004 [matt]: Upgraded to lfs-bootscripts-2.2.0.</para>
 </listitem>
 
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 0b402bd9b..4b4c3596b 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -7,11 +7,13 @@
   <title>Iproute2-&iproute2-version;</title>
 <?dbhtml filename="iproute2.html"?>
   <indexterm zone="ch-system-iproute2">
-    <primary sortas="a-IProute2">IProute2</primary>
+    <primary sortas="a-iproute2">iproute2</primary>
   </indexterm>
   <sect2 role="package">
     <title/>
-    <para>The IPRoute2 package contains programs for basic networking.</para>
+    <para>The iproute2 package contains programs for basic and advanced
+          IPV4-based networking.
+    </para>
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
       <segtitle>&diskspace;</segtitle>
@@ -21,26 +23,26 @@
       </seglistitem>
     </segmentedlist>
     <segmentedlist>
-      <segtitle>IPRoute2 installation depends on</segtitle>
+      <segtitle>iproute2 installation depends on</segtitle>
       <seglistitem>
         <seg>sed, GCC, Glibc, Make, Linux-Headers</seg>
       </seglistitem>
     </segmentedlist>
   </sect2>
   <sect2 role="installation">
-    <title>Installation of IProute2</title>
-    <para>The <command>arp</command> binary included in this package is
-          dependent on Berkeley-DB.  As <command>arp</command> is not a very
+    <title>Installation of iproute2</title>
+    <para>The <command>arpd</command> binary included in this package is
+          dependent on Berkeley DB.  As <command>arpd</command> is not a very
           common requirement on a base Linux system we remove the dependency on
-          Berkeley-DB by applying the patch using the command below.  If you
-          need the <command>arp</command> binary, then instructions for
-          compiling Berkeley-DB can be found in the <ulink
+          Berkeley DB by applying the patch using the command below.  If you
+          need the <command>arpd</command> binary, then instructions for
+          compiling Berkeley DB can be found in the <ulink
           url="http://www.linuxfromscratch.org/blfs/view/cvs/content/databases.html#db">BLFS book</ulink>.
     </para>
 
     <screen><userinput>patch -Np1 -i ../iproute2-&iproute2-version;-remove_db-1.patch</userinput></screen>
 
-    <para>Prepare IProute2 for compilation:</para>
+    <para>Prepare iproute2 for compilation:</para>
     <screen> <userinput>./configure </userinput></screen>
 
     <para>Compile the package:</para>
@@ -53,7 +55,7 @@
   </sect2>
 
   <sect2 id="contents-iproute2" role="content">
-    <title>Contents of IPRoute2</title>
+    <title>Contents of iproute2</title>
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <seglistitem>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 3113aec58..8ccb09318 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -27,7 +27,7 @@ run-level directories
 the files in the <filename class="directory">/etc/sysconfig/network-devices</filename> directory. This
 directory should contain subdirectories in the form of
 <filename>ifconfig.xyz</filename>, where <quote>xyz</quote> is a network
-interface name (such as eth0 or eth0:1)</para>
+interface name (such as eth0)</para>
 
 <para>If you decide to rename or move this
 <filename class="directory">/etc/sysconfig/network-devices</filename> directory,
@@ -45,25 +45,26 @@ ONBOOT=yes
 SERVICE=ipv4-static
 IP=192.168.1.1
 GATEWAY=192.168.1.2
-NETMASK=24
+PREFIX=24
 BROADCAST=192.168.1.255
 EOF</userinput></screen>
 
-<para>Of course, the values of those variables have to be changed 
-in every file to match the proper setup. If the ONBOOT variable is set
-to <quote>yes</quote>, the network script will bring up the equivalent NIC (Network Interface Card)
- during the booting of the system.
-If set to anything but <quote>yes</quote>, the equivalent NIC will be ignored by the network script
-and not brought up.</para>
+<para>Of course, the values of those variables have to be changed in every file
+to match the proper setup. If the ONBOOT variable is set to <quote>yes</quote>,
+the network script will bring up the equivalent interface during the booting of
+the system.  If set to anything but <quote>yes</quote>, the equivalent interface
+will be ignored by the network script and not brought up.</para>
 
-<para>The SERVICE entry defines the method of obtaining the IP address.
-The LFS bootscripts have a modular IP assignment format, and by creating
-additional files in <filename class="directory">/etc/sysconfig/network-devices/services</filename>, you can allow
-other IP assignment methods.  This would commonly be used if you need DHCP,
-which is addressed in the BLFS book.</para>
+<para>The SERVICE entry defines the method of obtaining the IP address.  The LFS
+bootscripts have a modular IP assignment format, and by creating additional
+files in
+<filename class="directory">/etc/sysconfig/network-devices/services</filename>,
+you can allow other IP assignment methods.  This would commonly be used if you
+need DHCP, which is addressed in the BLFS book.</para>
 
 <para>Of course, GATEWAY should contain the IP of your default gateway, if you
-have one. If not, then comment out the variable entirely.</para>
+have one. If not, then don't include the GATEWAY line in the configuration
+file.</para>
 
 </sect2>
 
@@ -73,9 +74,10 @@ have one. If not, then comment out the variable entirely.</para>
 
 <para>If you're going to be connected to the Internet then most likely you'll
 need some means of DNS name resolution to resolve Internet domain names to IP
-addresses. This is best achieved by placing the IP address of your DNS, available from your ISP (Internet Service Provider) or network administrator,
-into <filename>/etc/resolv.conf</filename>. Create the file by running the
-following:</para>
+addresses. This is best achieved by placing the IP address of your assigned DNS
+resolver, available from your ISP (Internet Service Provider) or network
+administrator, into <filename>/etc/resolv.conf</filename>. Create the file by
+running the following:</para>
 
 <screen><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
 # Begin /etc/resolv.conf
@@ -86,9 +88,11 @@ nameserver <replaceable>[IP address of your nameserver]</replaceable>
 # End /etc/resolv.conf
 EOF</userinput></screen>
 
-<para>Of course, replace <replaceable>[IP address of your nameserver]</replaceable> with the IP
-address of the DNS most appropriate for your setup. There will often be
-more than one entry (requirements demand secondary servers for fallback capability). The IP address may even be a router on your local network.</para>
+<para>Of course, replace
+<replaceable>[IP address of your nameserver]</replaceable> with the IP address
+of the DNS resolver assigned for your use. There will often be more than one
+entry (requirements demand secondary servers for fallback capability). The IP
+address may even be a router on your local network.</para>
 
 </sect2>
 
diff --git a/general.ent b/general.ent
index 834c66988..8e4442efd 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20040714">
-<!ENTITY releasedate "July 14, 2004">
+<!ENTITY version "SVN-20040715">
+<!ENTITY releasedate "July 15, 2004">
 <!ENTITY milestone "6.0">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">