removed the ldso section (and all references to it in the appendixes) and

replaced that by a patch to man-pages (and added references to it in all
appendixes)


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

14 files changed, 23 insertions, 53 deletions

diff --git a/Attic/appendixc/ldso.xml b/Attic/appendixc/ldso.xml
deleted file mode 100644
index e482df013..000000000
--- a/Attic/appendixc/ldso.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-Ld.so (&ld.so-version;):
-<ulink url="ftp://ftp.ods.com/pub/linux/">
-ftp://ftp.ods.com/pub/linux/</ulink>
-
diff --git a/Attic/appendixc/manpages-patch.xml b/Attic/appendixc/manpages-patch.xml
new file mode 100644
index 000000000..3c32cd6dd
--- /dev/null
+++ b/Attic/appendixc/manpages-patch.xml
@@ -0,0 +1,6 @@
+Man-pages Patch (&man-pages-version;):
+<ulink url="&ftp;/">
+&ftp;/</ulink>
+<ulink url="&http;/">
+&http;/</ulink>
+
diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml
index a1ee05fdd..f7f876821 100644
--- a/Attic/appendixc/packages.xml
+++ b/Attic/appendixc/packages.xml
@@ -51,7 +51,6 @@ package quicker.
 &ac-kbd;
 &ac-e2fsprogs;
 &ac-ed;
-&ac-ldso;
 &ac-lilo;
 &ac-modutils;
 &ac-vim;
@@ -65,6 +64,7 @@ package quicker.
 &ac-sysvinit-patch;
 &ac-utillinux;
 &ac-manpages;
+&ac-manpages-patch;
 &ac-netkitbase;
 &ac-nettools;
 </literallayout>
diff --git a/appendixa/appendixa.xml b/appendixa/appendixa.xml
index e18e92084..84cb3b921 100644
--- a/appendixa/appendixa.xml
+++ b/appendixa/appendixa.xml
@@ -30,7 +30,6 @@
 &aa-gettext;
 &aa-grep;
 &aa-gzip;
-&aa-ldso;
 &aa-libtool;
 &aa-bin86;
 &aa-lilo;
diff --git a/appendixa/ldso-desc.xml b/appendixa/ldso-desc.xml
deleted file mode 100644
index cac7cbeee..000000000
--- a/appendixa/ldso-desc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<sect2><title>Contents</title>
-
-<para>
-From the Ld.so package we're using the ldconfig and ldd man pages only.
-The ldconfig and ldd binaries themselves come with Glibc.
-</para>
-
-</sect2>
-
diff --git a/appendixa/ldso.xml b/appendixa/ldso.xml
deleted file mode 100644
index 60c1fdb7d..000000000
--- a/appendixa/ldso.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<sect1 id="aa-ldso">
-<title>Ld.so</title>
-
-&aa-ldso-desc;
-
-</sect1>
-
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 56bd44c01..d4a670418 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -186,6 +186,11 @@ so they can't be stripped.
 </para></listitem>
 
 <listitem><para>
+Chapter 6: Removed the ld.so section since we only used the man pages and
+replaced it with a patch to man-pages.
+</para></listitem>
+
+<listitem><para>
 Chapter 7: Fixed the delays in the killproc function in the functions
 script. Now, after kill, first check PIDs, then sleep 2 if needed. More
 details can be read in the comments in the script itself.
diff --git a/chapter04/manpages-patch.xml b/chapter04/manpages-patch.xml
new file mode 100644
index 000000000..d23cfbae4
--- /dev/null
+++ b/chapter04/manpages-patch.xml
@@ -0,0 +1,6 @@
+Man-pages Patch (&man-pages-version;) 3.2 KB:
+<ulink url="&ftp;/man-pages-&man-pages-version;.patch.bz2">
+	&ftp;/man-pages-&man-pages-version;.patch.bz2</ulink>
+<ulink url="&http;/man-pages-&man-pages-version;.patch.bz2">
+	&http;/man-pages-&man-pages-version;.patch.bz2</ulink>
+
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index 1686900f4..057fa90b2 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -28,6 +28,7 @@
 &c3-glibc;
 &c3-glibc-threads;
 &c3-manpages;
+&c3-manpages-patch;
 &c3-ed;
 &c3-patch;
 &c3-findutils;
@@ -49,7 +50,6 @@
 &c3-bin86;
 &c3-kbd;
 &c3-e2fsprogs;
-&c3-ldso;
 &c3-lilo;
 &c3-modutils;
 &c3-procinfo;
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index cf197bd06..cd208ee5d 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -39,7 +39,6 @@
 &c6-fileutils;
 &c6-grep;
 &c6-gzip;
-&c6-ldso;
 &c6-lilo;
 &c6-make;
 &c6-modutils;
diff --git a/chapter06/ldso-inst.xml b/chapter06/ldso-inst.xml
deleted file mode 100644
index 011a87251..000000000
--- a/chapter06/ldso-inst.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<sect2>
-<title>Installation of Ld.so</title>
-
-<para>
-Install Ld.so by running the following commands:
-</para>
-
-<blockquote><literallayout>
-	<userinput>cd man &amp;&amp;</userinput>
-	<userinput>cp ldd.1 /usr/share/man/man1 &amp;&amp;</userinput>
-	<userinput>cp *.8 /usr/share/man/man8</userinput>
-</literallayout></blockquote>
-
-</sect2>
-
diff --git a/chapter06/ldso.xml b/chapter06/ldso.xml
deleted file mode 100644
index 670f3bc2b..000000000
--- a/chapter06/ldso.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<sect1 id="ch06-ldso">
-<title>Installing Ld.so</title>
-
-&c6-ldso-inst;
-&aa-ldso-desc;
-
-</sect1>
diff --git a/chapter06/manpages-inst.xml b/chapter06/manpages-inst.xml
index e7fade0d6..cf0fbd8bb 100644
--- a/chapter06/manpages-inst.xml
+++ b/chapter06/manpages-inst.xml
@@ -6,6 +6,8 @@ Install Man-pages by running the following command:
 </para>
 
 <blockquote><literallayout>
+	<userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch
+		&amp;&amp;</userinput>
 	<userinput>make install</userinput>
 </literallayout></blockquote>
 
diff --git a/index.xml b/index.xml
index dedc3d8c0..52b41e039 100644
--- a/index.xml
+++ b/index.xml
@@ -92,6 +92,7 @@
 <!ENTITY c3-glibc SYSTEM "intel/chapter3/glibc.xml">
 <!ENTITY c3-glibc-threads SYSTEM "intel/chapter3/glibc-threads.xml">
 <!ENTITY c3-manpages SYSTEM "intel/chapter3/manpages.xml">
+<!ENTITY c3-manpages-patch SYSTEM "intel/chapter3/manpages-patch.xml">
 <!ENTITY c3-ed SYSTEM "intel/chapter3/ed.xml">
 <!ENTITY c3-patch SYSTEM "intel/chapter3/patch.xml">
 <!ENTITY c3-findutils SYSTEM "intel/chapter3/findutils.xml">
@@ -113,7 +114,6 @@
 <!ENTITY c3-bin86 SYSTEM "intel/chapter3/bin86.xml">
 <!ENTITY c3-kbd SYSTEM "intel/chapter3/kbd.xml">
 <!ENTITY c3-e2fsprogs SYSTEM "intel/chapter3/e2fsprogs.xml">
-<!ENTITY c3-ldso SYSTEM "intel/chapter3/ldso.xml">
 <!ENTITY c3-lilo SYSTEM "intel/chapter3/lilo.xml">
 <!ENTITY c3-modutils SYSTEM "intel/chapter3/modutils.xml">
 <!ENTITY c3-procinfo SYSTEM "intel/chapter3/procinfo.xml">
@@ -245,8 +245,6 @@
 <!ENTITY c6-groff-inst SYSTEM "intel/chapter6/groff-inst.xml">
 <!ENTITY c6-gzip SYSTEM "intel/chapter6/gzip.xml">
 <!ENTITY c6-gzip-inst SYSTEM "intel/chapter6/gzip-inst.xml">
-<!ENTITY c6-ldso SYSTEM "intel/chapter6/ldso.xml">
-<!ENTITY c6-ldso-inst SYSTEM "intel/chapter6/ldso-inst.xml">
 <!ENTITY c6-libtool SYSTEM "intel/chapter6/libtool.xml">
 <!ENTITY c6-libtool-inst SYSTEM "intel/chapter6/libtool-inst.xml">
 <!ENTITY c6-bin86 SYSTEM "intel/chapter6/bin86.xml">
@@ -404,8 +402,6 @@
 <!ENTITY aa-groff-desc SYSTEM "intel/appendixa/groff-desc.xml">
 <!ENTITY aa-gzip SYSTEM "intel/appendixa/gzip.xml">
 <!ENTITY aa-gzip-desc SYSTEM "intel/appendixa/gzip-desc.xml">
-<!ENTITY aa-ldso SYSTEM "intel/appendixa/ldso.xml">
-<!ENTITY aa-ldso-desc SYSTEM "intel/appendixa/ldso-desc.xml">
 <!ENTITY aa-libtool SYSTEM "intel/appendixa/libtool.xml">
 <!ENTITY aa-libtool-desc SYSTEM "intel/appendixa/libtool-desc.xml">
 <!ENTITY aa-bin86 SYSTEM "intel/appendixa/bin86.xml">
@@ -485,6 +481,7 @@
 <!ENTITY ac-glibc SYSTEM "intel/appendixc/glibc.xml">
 <!ENTITY ac-glibc-threads SYSTEM "intel/appendixc/glibc-threads.xml">
 <!ENTITY ac-manpages SYSTEM "intel/appendixc/manpages.xml">
+<!ENTITY ac-manpages-patch SYSTEM "intel/appendixc/manpages-patch.xml">
 <!ENTITY ac-ed SYSTEM "intel/appendixc/ed.xml">
 <!ENTITY ac-patch SYSTEM "intel/appendixc/patch.xml">
 <!ENTITY ac-findutils SYSTEM "intel/appendixc/findutils.xml">
@@ -506,7 +503,6 @@
 <!ENTITY ac-bin86 SYSTEM "intel/appendixc/bin86.xml">
 <!ENTITY ac-kbd SYSTEM "intel/appendixc/kbd.xml">
 <!ENTITY ac-e2fsprogs SYSTEM "intel/appendixc/e2fsprogs.xml">
-<!ENTITY ac-ldso SYSTEM "intel/appendixc/ldso.xml">
 <!ENTITY ac-lilo SYSTEM "intel/appendixc/lilo.xml">
 <!ENTITY ac-modutils SYSTEM "intel/appendixc/modutils.xml">
 <!ENTITY ac-procinfo SYSTEM "intel/appendixc/procinfo.xml">
@@ -559,7 +555,6 @@
 <!ENTITY bin86-version "0.15.5">
 <!ENTITY kbd-version "1.05">
 <!ENTITY e2fsprogs-version "1.19">
-<!ENTITY ld.so-version "1.9.11">
 <!ENTITY lilo-version "21.7.3">
 <!ENTITY modutils-version "2.4.6">
 <!ENTITY procinfo-version "18">