Ported r7249 and r7250 from trunk.

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

7 files changed, 36 insertions, 30 deletions

diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 52e8b75c5..8f3002c93 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -158,29 +158,23 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Grep (&grep-version;) - 520 KB:</term>
+<term>Glibc LibIDN add-on (&glibc-version;) - 100 KB:</term>
 <listitem>
-<para><ulink url="&gnu;grep/"/></para>
+<para><ulink url="&gnu;glibc/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term>Groff (&groff-version;) - 2,260 KB:</term>
+<term>Grep (&grep-version;) - 520 KB:</term>
 <listitem>
-<para><ulink url="&gnu;groff/"/></para>
+<para><ulink url="&gnu;grep/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term>Groff Debian Patch - 129 KB:</term>
+<term>Groff (&groff-version;) - 2,260 KB:</term>
 <listitem>
-<para><ulink url="http://ftp.debian.org/debian/pool/main/g/groff/&groff-debian-patch;"/></para>
-<note><para>Groff Debian Patch (&groff-version;-&groff-patchlevel;)
-may no longer be available at the
-listed location. The site administrators of the master download
-location occasionally remove older versions when new ones are
-released. There is no alternative download location yet.</para></note>
-<!-- Actually there's snapshot.debian.net, but they have hardware problems -->
+<para><ulink url="&gnu;groff/"/></para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 239a4c58e..8fd745110 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -93,6 +93,19 @@ needed to build an LFS system:</para>
 </varlistentry>
 
 <varlistentry>
+<term>Groff Debian Patch - 129 KB:</term>
+<listitem>
+<para><ulink url="http://ftp.debian.org/debian/pool/main/g/groff/&groff-debian-patch;"/></para>
+<note><para>Groff Debian Patch (&groff-version;-&groff-patchlevel;)
+may no longer be available at the
+listed location. The site administrators of the master download
+location occasionally remove older versions when new ones are
+released. There is no alternative download location yet.</para></note>
+<!-- Actually there's snapshot.debian.net, but they have hardware problems -->
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term>Gzip Security Patch - 2 KB:</term><listitem>
 <para><ulink url="&patches-root;&gzip-security_fix-patch;"/></para>
 </listitem>
@@ -155,16 +168,16 @@ needed to build an LFS system:</para>
 </varlistentry>
 
 <varlistentry>
-<term>Sysklogd 8-Bit Cleanness Patch - 1 KB:</term>
+<term>Shadow Configure Script Patch - 1KB:</term>
 <listitem>
-<para><ulink url="&lfs-root;patches/downloads/sysklogd/&sysklogd-8bit-patch;"/></para>
+<para><ulink url="&patches-root;&shadow-configure-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term>Shadow Configure Script Patch - 1KB:</term>
+<term>Sysklogd 8-Bit Cleanness Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;&shadow-configure-patch;"/></para>
+<para><ulink url="&lfs-root;patches/downloads/sysklogd/&sysklogd-8bit-patch;"/></para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 5d80c030a..c41b38cbc 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -180,9 +180,9 @@ while read F ; do
 done &amp;&amp;
 cp -rv man? /usr/share/man/es</userinput></screen>
 
-<note>The need to exclude the <filename>man7/iso_8859-7.7</filename> file
+<note><para>The need to exclude the <filename>man7/iso_8859-7.7</filename> file
 from the conversion process because it is already in ISO-8859-1 is a packaging
-bug in man-pages-es-1.55. Future versions should not require this workaround.</note>
+bug in man-pages-es-1.55. Future versions should not require this workaround.</para></note>
 
 </sect2>
 
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 2df394b7a..9e094c868 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -112,7 +112,7 @@ done &amp;&amp;
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen>
 
 <para>Finally, make sure that old applications that look for
-<filename class="libaryfile">-lcurses</filename> at build time are still
+<filename class="libraryfile">-lcurses</filename> at build time are still
 buildable:</para>
 
 <screen><userinput>echo "INPUT(-lncursesw)" &gt;/usr/lib/libcursesw.so &amp;&amp;
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index aecbe3ac8..bd21f2f32 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -84,8 +84,8 @@ tutorials. An English tutorial will be used instead.</para>
 <!-- Removal is used instead of conversion in order for the user to be able to
 painlessly revert his UTF-8 locale choice. -->
 
-<screen><userinput>rm -f /usr/share/vim/vim63/tutor/tutor.{gr,pl,ru,sk}
-rm -f /usr/share/vim/vim63/tutor/tutor.??.*</userinput></screen>
+<screen><userinput>rm -f /usr/share/vim/vim64/tutor/tutor.{gr,pl,ru,sk}
+rm -f /usr/share/vim/vim64/tutor/tutor.??.*</userinput></screen>
 
 <para>Many users are used to using <command>vi</command> instead of
 <command>vim</command>. To allow execution of <command>vim</command>
diff --git a/patches.ent b/patches.ent
index 1f4fafa50..fff66b690 100644
--- a/patches.ent
+++ b/patches.ent
@@ -39,16 +39,15 @@
 
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
 
-<!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch">
-
 <!ENTITY shadow-configure-patch "shadow-&shadow-version;-configure_fix-1.patch">
 
+<!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch">
 <!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch">
 
 <!ENTITY tar-gcc4_fix-patch "tar-&tar-version;-gcc4_fix_tests-1.patch">
 <!ENTITY tar-sparse_fix-patch "tar-&tar-version;-sparse_fix-1.patch">
 
-<!ENTITY texinfo-multibyte-patch "texinfo-&texinfo-version;-multibyte-2.patch">
-<!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-1.patch">
+<!ENTITY texinfo-multibyte-patch "texinfo-&texinfo-version;-multibyte-1.patch">
+<!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-2.patch">
 
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
diff --git a/stylesheets/xhtml/lfs-toc.xsl b/stylesheets/xhtml/lfs-toc.xsl
index 4fb845844..0a6f39d91 100644
--- a/stylesheets/xhtml/lfs-toc.xsl
+++ b/stylesheets/xhtml/lfs-toc.xsl
@@ -3,11 +3,11 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
                 version="1.0">
-                
+
     <!-- General settings -->
   <xsl:param name="generate.toc">
     appendix  nop
-    book      toc,title,figure,table,example,equation
+    book      toc,title
     chapter   nop
     part      toc
     preface   nop
@@ -26,7 +26,7 @@
   <xsl:param name="toc.section.depth">1</xsl:param>
 
   <xsl:param name="toc.max.depth">3</xsl:param>
-  
+
     <!-- Making the TOC -->
   <xsl:template name="make.toc">
     <xsl:param name="toc-context" select="."/>
@@ -46,7 +46,7 @@
       </div>
     </xsl:if>
   </xsl:template>
-  
+
     <!-- Making the subtocs -->
   <xsl:template name="subtoc">
     <xsl:param name="toc-context" select="."/>
@@ -70,7 +70,7 @@
       <xsl:call-template name="toc.line">
         <xsl:with-param name="toc-context" select="$toc-context"/>
       </xsl:call-template>
-      <xsl:if test="$toc.section.depth &gt; $depth and count($nodes)&gt;0 
+      <xsl:if test="$toc.section.depth &gt; $depth and count($nodes)&gt;0
               and $toc.max.depth &gt; $depth.from.context">
         <xsl:copy-of select="$subtoc"/>
       </xsl:if>