Updates

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

Attic/appendixc/fileutils-patch.xml

@@ -1,6 +1,6 @@
 File Utils Patch (&fileutils-version;):
-<ulink url="&ftp-cvs;/">
-&ftp-cvs;/</ulink>
-<ulink url="&http-cvs;/">
-&http-cvs;/</ulink>
+<ulink url="&ftp;/">
+&ftp;/</ulink>
+<ulink url="&http;/">
+&http;/</ulink>
 

Attic/appendixc/findutils-patch.xml

@@ -1,6 +1,6 @@
 Find Utils Patch (&findutils-version;):
-<ulink url="&ftp-common;/">
-&ftp-common;/</ulink>
-<ulink url="&http-common;/">
-&http-common;/</ulink>
+<ulink url="&ftp;/">
+&ftp;/</ulink>
+<ulink url="&http;/">
+&http;/</ulink>
 

Attic/appendixc/gzip-patch.xml

@@ -1,6 +1,6 @@
 Gzip Patch (&gzip-version;):
-<ulink url="&ftp-common;/">
-&ftp-common;/</ulink>
-<ulink url="&http-common;/">
-&http-common;/</ulink>
+<ulink url="&ftp;/">
+&ftp;/</ulink>
+<ulink url="&http;/">
+&http;/</ulink>
 

Attic/appendixc/makedev.xml

@@ -1,6 +1,6 @@
 MAKEDEV:
-<ulink url="&ftp-cvs;/">
-&ftp-cvs;/</ulink>
-<ulink url="&http-cvs;/">
-&http-cvs;/</ulink>
+<ulink url="&ftp;/">
+&ftp;/</ulink>
+<ulink url="&http;/">
+&http;/</ulink>
 

Attic/appendixc/shadowpwd-patch.xml

@@ -1,6 +1,6 @@
 Shadow Password Suite Patch (&shadow-version;):
-<ulink url="&ftp-cvs;/">
-&ftp-cvs;/</ulink>
-<ulink url="&http-cvs;/">
-&http-cvs;/</ulink>
+<ulink url="&ftp;/">
+&ftp;/</ulink>
+<ulink url="&http;/">
+&http;/</ulink>
 

Attic/appendixc/sysvinit-patch.xml

@@ -1,6 +1,6 @@
 Sysvinit Patch (&sysvinit-version;):
-<ulink url="&ftp-common;/">
-&ftp-common;/</ulink>
-<ulink url="&http-common;/">
-&http-common;/</ulink>
+<ulink url="&ftp;/">
+&ftp;/</ulink>
+<ulink url="&http;/">
+&http;/</ulink>
 

appendixa/appendixa.xml

@@ -50,7 +50,7 @@
 &aa-utillinux;
 &aa-kbd;
 &aa-manpages;
-&aa-ns-netkitbase;
-&aa-ns-nettools;
+&aa-netkitbase;
+&aa-nettools;
 
 </appendix>

appendixa/netkitbase.xml

@@ -1,7 +1,7 @@
 <sect1 id="aa-ns-netkitbase">
 <title>Netkit-base</title>
 
-&aa-ns-netkitbase-desc;
+&aa-netkitbase-desc;
 
 </sect1>
 

appendixa/nettools.xml

@@ -1,7 +1,7 @@
 <sect1 id="aa-ns-nettools">
 <title>Net-tools</title>
 
-&aa-ns-nettools-desc;
+&aa-nettools-desc;
 
 </sect1>
 

book/book.xml

@@ -4,4 +4,4 @@
 
 &part1;
 &part2;
-<!--&part3;-->
+&part3;

chapter06/netkitbase.xml

@@ -1,25 +1,8 @@
-<sect2>
+<sect1 id="ch09-netkitbase">
 <title>Installing Netkit-base</title>
 
-<para>
-Install Netkit-base by running the following commands:
-</para>
+&c9-netkitbase-inst;
+&aa-netkitbase-desc;
 
-<blockquote><literallayout>
-        
-	<userinput>./configure &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd etc.sample &amp;&amp;</userinput>
-	<userinput>cp services protocols /etc</userinput>
-
-</literallayout></blockquote>
-
-<para>
-There are other files in the <filename
-class="directory">etc.sample</filename> directory which might be of
-interest to the user.
-</para>
-
-</sect2>
+</sect1>
 

chapter06/nettools.xml

@@ -1,21 +1,8 @@
-<sect2>
+<sect1 id="ch09-nettools">
 <title>Installing Net-tools</title>
 
-<para>
-The <filename>Makefile</filename> file CFLAGS variable has to be edited
-if compiler optimizations should be added.
-</para>
+&c9-nettools-inst;
+&aa-nettools-desc;
 
-<para>
-Install Net-tools by running the following commands:
-</para>
-
-<blockquote><literallayout>
-
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install</userinput>
-
-</literallayout></blockquote>
-
-</sect2>
+</sect1>
 

chapter07/chapter9.xml

@@ -2,7 +2,8 @@
 <title>Setting up basic networking</title>
 
 &c9-introduction;
-&c9-networksoftware;
+&c9-netkitbase;
+&c9-nettools;
 &c9-localnet;
 &c9-network;
 &c9-hosts;

chapter07/ethnet.xml

@@ -162,7 +162,7 @@ Now, new files are created in that directory containing the following.
 This creates a sample file ifcfg-eth0:
 </para>
 
-<blockquote><literallayout>
+<literallayout>
 
 <userinput>cat &gt; /etc/sysconfig/network-scripts/ifcfg-eth0
 	&lt;&lt; EOF</userinput>
@@ -173,7 +173,7 @@ NETMASK=255.255.255.0
 BROADCAST=192.168.1.255
 <userinput>EOF</userinput>
 
-</literallayout></blockquote>
+</literallayout>
 
 <para>
 Of course, the values of those four variables have to be changed 

index.xml

@@ -330,9 +330,10 @@
 
 <!ENTITY chapter9 SYSTEM "intel/chapter9/chapter9.xml">
 <!ENTITY c9-introduction SYSTEM "intel/chapter9/introduction.xml">
-<!ENTITY c9-networksoftware SYSTEM "intel/chapter9/networksoftware.xml">
-<!ENTITY c9-ns-netkitbase SYSTEM "intel/chapter9/netkitbase.xml">
-<!ENTITY c9-ns-nettools SYSTEM "intel/chapter9/nettools.xml">
+<!ENTITY c9-netkitbase SYSTEM "intel/chapter9/netkitbase.xml">
+<!ENTITY c9-netkitbase-inst SYSTEM "intel/chapter9/netkitbase-inst.xml">
+<!ENTITY c9-nettools-inst SYSTEM "intel/chapter9/nettools-inst.xml">
+<!ENTITY c9-nettools SYSTEM "intel/chapter9/nettools.xml">
 <!ENTITY c9-localnet SYSTEM "intel/chapter9/localnet.xml">
 <!ENTITY c9-localnet-symperm SYSTEM "intel/chapter9/localnet-symperm.xml">
 <!ENTITY c9-network SYSTEM "intel/chapter9/network.xml">
@@ -444,10 +445,10 @@
 <!ENTITY aa-kbd-desc SYSTEM "intel/appendixa/kbd-desc.xml">
 <!ENTITY aa-manpages SYSTEM "intel/appendixa/manpages.xml">
 <!ENTITY aa-manpages-desc SYSTEM "intel/appendixa/manpages-desc.xml">
-<!ENTITY aa-ns-netkitbase SYSTEM "intel/appendixa/netkitbase.xml">
-<!ENTITY aa-ns-netkitbase-desc SYSTEM "intel/appendixa/netkitbase-desc.xml">
-<!ENTITY aa-ns-nettools SYSTEM "intel/appendixa/nettools.xml">
-<!ENTITY aa-ns-nettools-desc SYSTEM "intel/appendixa/nettools-desc.xml">
+<!ENTITY aa-netkitbase SYSTEM "intel/appendixa/netkitbase.xml">
+<!ENTITY aa-netkitbase-desc SYSTEM "intel/appendixa/netkitbase-desc.xml">
+<!ENTITY aa-nettools SYSTEM "intel/appendixa/nettools.xml">
+<!ENTITY aa-nettools-desc SYSTEM "intel/appendixa/nettools-desc.xml">
 
 <!ENTITY appendixb SYSTEM "intel/appendixb/appendixb.xml">
 <!ENTITY ab-introduction SYSTEM "intel/appendixb/introduction.xml">