Apply trunk changes

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

chapter05/binutils-pass1.xml

@@ -9,7 +9,7 @@
   <?dbhtml filename="binutils-pass1.html"?>
 
   <sect1info condition="script">
-    <productname>binutils</productname>
+    <productname>binutils-pass1</productname>
     <productnumber>&binutils-version;</productnumber>
     <address>&binutils-url;</address>
   </sect1info>

chapter05/binutils-pass2.xml

@@ -9,7 +9,7 @@
   <?dbhtml filename="binutils-pass2.html"?>
 
   <sect1info condition="script">
-    <productname>binutils</productname>
+    <productname>binutils-pass2</productname>
     <productnumber>&binutils-version;</productnumber>
     <address>&binutils-url;</address>
   </sect1info>

chapter05/gcc-pass1.xml

@@ -9,7 +9,7 @@
   <?dbhtml filename="gcc-pass1.html"?>
 
   <sect1info condition="script">
-    <productname>gcc</productname>
+    <productname>gcc-pass1</productname>
     <productnumber>&gcc-version;</productnumber>
     <address>&gcc-url;</address>
   </sect1info>

chapter05/gcc-pass2.xml

@@ -9,7 +9,7 @@
   <?dbhtml filename="gcc-pass2.html"?>
 
   <sect1info condition="script">
-    <productname>gcc</productname>
+    <productname>gcc-pass2</productname>
     <productnumber>&gcc-version;</productnumber>
     <address>&gcc-url;</address>
   </sect1info>

chapter05/libstdc++.xml

@@ -9,7 +9,7 @@
   <?dbhtml filename="gcc-libstdc++.html"?>
 
   <sect1info condition="script">
-    <productname>gcc</productname>
+    <productname>gcc-libstdc++</productname>
     <productnumber>&gcc-version;</productnumber>
     <address>&gcc-url;</address>
   </sect1info>

chapter05/linux-headers.xml

@@ -9,7 +9,7 @@
   <?dbhtml filename="linux-headers.html"?>
 
   <sect1info condition="script">
-    <productname>linux</productname>
+    <productname>linux-headers</productname>
     <productnumber>&linux-version;</productnumber>
     <address>&linux-url;</address>
   </sect1info>

chapter05/python.xml

@@ -43,6 +43,13 @@
   <sect2 role="installation">
     <title>Installation of Python</title>
 
+    <note>
+      <para>There are two package files whose name starts with
+      <quote>python</quote>. The one to extract from is
+      <filename>Python-&python-version;.tar.xz</filename> (notice the
+      uppercase first letter).</para>
+    </note>
+
     <para>This package first builds the Python interpreter, then some
     standard Python modules. The main script for building modules is
     written in Python, and uses hard-coded paths to the host <filename

chapter06/linux-headers.xml

@@ -9,7 +9,7 @@
   <?dbhtml filename="linux-headers.html"?>
 
   <sect1info condition="script">
-    <productname>linux</productname>
+    <productname>linux-headers</productname>
     <productnumber>&linux-version;</productnumber>
     <address>&linux-url;</address>
   </sect1info>

chapter06/pkgconfig.xml

@@ -9,7 +9,7 @@
   <?dbhtml filename="pkg-config.html"?>
 
   <sect1info condition="script">
-    <productname>pkgconfig</productname>
+    <productname>pkg-config</productname>
     <productnumber>&pkgconfig-version;</productnumber>
     <address>&pkgconfig-url;</address>
   </sect1info>

chapter07/bootscripts.xml

@@ -9,7 +9,7 @@
   <?dbhtml filename="bootscripts.html"?>
 
   <sect1info condition="script">
-    <productname>lfs-bootscripts</productname>
+    <productname>bootscripts</productname>
     <productnumber>&lfs-bootscripts-version;</productnumber>
     <address>&lfs-bootscripts-url;</address>
   </sect1info>

chapter08/kernel.xml

@@ -9,7 +9,7 @@
   <?dbhtml filename="kernel.html"?>
 
   <sect1info condition="script">
-    <productname>linux</productname>
+    <productname>kernel</productname>
     <productnumber>&linux-version;</productnumber>
     <address>&linux-url;</address>
   </sect1info>