From 7ec7f68894d1951b8f06c0b0d6cb00895833a0a3 Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Wed, 27 May 2009 05:17:39 +0000
Subject: [PATCH] Split the Linux API Headers index terms into individual
 entries rather than one long line. Fixes excessive long lines in the Index.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8930 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml     |  7 +++
 chapter06/linux-headers.xml | 91 +++++++++++++++++++++++++++++++++----
 2 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d874a6596..2ddcca015 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,11 +40,18 @@
     <listitem>
       <para>2009-05-26</para>
       <itemizedlist>
+        <listitem>
+          <para>[gerard] - Split the Linux API Headers index terms into
+          individual entries rather than one long line. Fixes excessive
+          long lines in the Index.</para>
+        </listitem>
+
         <listitem>
           <para>[bdubbs] - Update Chapter 5 glibc wording concerning 
           locales.  
           Fixes <ulink url="&lfs-ticket-root;2410">#2410</ulink>.</para>
         </listitem>
+
         <listitem>
           <para>[gerard] - Removed <quote>From Power Up To Bash Prompt</quote>
           reference. Fixes <ulink url="&lfs-ticket-root;2409">#2409</ulink>.</para>
diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index 041e680c3..1a0f291a7 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -69,7 +69,10 @@ cp -rv dest/include/* /usr/include</userinput></screen>
       <segtitle>Installed headers</segtitle>
 
       <seglistitem>
-        <seg>/usr/include/{asm{,-generic},drm,linux,mtd,rdma,sound,video}/*.h</seg>
+        <seg>/usr/include/asm/*.h, /usr/include/asm-generic/*.h,
+        /usr/include/drm/*.h, /usr/include/linux/*.h, /usr/include/mtd/*.h,
+        /usr/include/rdma/*.h, /usr/include/sound/*.h,
+        /usr/include/video/*.h</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -78,17 +81,85 @@ cp -rv dest/include/* /usr/include</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="linux-headers">
-        <term><filename class="headerfile">/usr/include/{asm{,-generic},drm,linux,mtd,rdma,sound,video}/*.h</filename></term>
+      <varlistentry id="asm">
+        <term><filename class="headerfile">/usr/include/asm/*.h</filename></term>
         <listitem>
-          <para>The Linux API headers</para>
-          <indexterm zone="ch-system-linux-headers">
-            <!-- No /*.h here to prevent a PDF line overflow -->
-            <primary sortas="e-/usr/include/{asm{,-generic},drm,linux,mtd,rdma,sound,video}">/usr/include/{asm{,-generic},drm,linux,mtd,
-rdma,sound,video}/*.h</primary>
-          </indexterm>
+         <para>The Linux API ASM Headers</para>
+         <indexterm zone="ch-system-linux-headers asm">
+          <primary sortas="e-/usr/include/asm/*.h">/usr/include/asm/*.h</primary>
+         </indexterm>
         </listitem>
-      </varlistentry>
+       </varlistentry> 
+
+      <varlistentry id="asm-generic">
+        <term><filename class="headerfile">/usr/include/asm-generic/*.h</filename></term>
+        <listitem>
+         <para>The Linux API ASM Generic Headers</para>
+         <indexterm zone="ch-system-linux-headers asm-generic">
+          <primary sortas="e-/usr/include/asm-generic/*.h">/usr/include/asm-generic/*.h</primary>
+         </indexterm>
+        </listitem>
+       </varlistentry> 
+
+      <varlistentry id="drm">
+        <term><filename class="headerfile">/usr/include/drm/*.h</filename></term>
+        <listitem>
+         <para>The Linux API DRM Headers</para>
+         <indexterm zone="ch-system-linux-headers drm">
+          <primary sortas="e-/usr/include/drm/*.h">/usr/include/drm/*.h</primary>
+         </indexterm>
+        </listitem>
+       </varlistentry> 
+
+      <varlistentry id="linux">
+        <term><filename class="headerfile">/usr/include/linux/*.h</filename></term>
+        <listitem>
+         <para>The Linux API Linux Headers</para>
+         <indexterm zone="ch-system-linux-headers linux">
+          <primary sortas="e-/usr/include/linux/*.h">/usr/include/linux/*.h</primary>
+         </indexterm>
+        </listitem>
+       </varlistentry> 
+
+      <varlistentry id="mtd">
+        <term><filename class="headerfile">/usr/include/mtd/*.h</filename></term>
+        <listitem>
+         <para>The Linux API MTD Headers</para>
+         <indexterm zone="ch-system-linux-headers mtd">
+          <primary sortas="e-/usr/include/mtd/*.h">/usr/include/mtd/*.h</primary>
+         </indexterm>
+        </listitem>
+       </varlistentry> 
+
+      <varlistentry id="rdma">
+        <term><filename class="headerfile">/usr/include/rdma/*.h</filename></term>
+        <listitem>
+         <para>The Linux API RDMA Headers</para>
+         <indexterm zone="ch-system-linux-headers rdma">
+          <primary sortas="e-/usr/include/rdma/*.h">/usr/include/rdma/*.h</primary>
+         </indexterm>
+        </listitem>
+       </varlistentry> 
+
+      <varlistentry id="sound">
+        <term><filename class="headerfile">/usr/include/sound/*.h</filename></term>
+        <listitem>
+         <para>The Linux API Sound Headers</para>
+         <indexterm zone="ch-system-linux-headers sound">
+          <primary sortas="e-/usr/include/sound/*.h">/usr/include/sound/*.h</primary>
+         </indexterm>
+        </listitem>
+       </varlistentry> 
+
+      <varlistentry id="video">
+        <term><filename class="headerfile">/usr/include/video/*.h</filename></term>
+        <listitem>
+         <para>The Linux API Video Headers</para>
+         <indexterm zone="ch-system-linux-headers video">
+          <primary sortas="e-/usr/include/video/*.h">/usr/include/video/*.h</primary>
+         </indexterm>
+        </listitem>
+       </varlistentry> 
 
     </variablelist>