r3337 - in trunk/BOOK: general/prog gnome/core gnome/otherlibs kde/add multimedia/audioutils multimedia/cdwriteutils multimedia/libdriv multimedia/videoutils postlfs/security postlfs/shells pst/sgml pst/typesetting server/other x/wm xsoft/office xsoft/suites

randy at linuxfromscratch.org randy at linuxfromscratch.org
Tue Jan 25 11:21:28 PST 2005


Author: randy
Date: 2005-01-25 12:21:25 -0700 (Tue, 25 Jan 2005)
New Revision: 3337

Modified:
   trunk/BOOK/general/prog/gcc.xml
   trunk/BOOK/general/prog/j2sdk.xml
   trunk/BOOK/general/prog/pdl.xml
   trunk/BOOK/gnome/core/gnome-vfs.xml
   trunk/BOOK/gnome/core/nautilus.xml
   trunk/BOOK/gnome/otherlibs/gnome-vfs1.xml
   trunk/BOOK/kde/add/kdemultimedia.xml
   trunk/BOOK/multimedia/audioutils/cdparanoia.xml
   trunk/BOOK/multimedia/audioutils/mpg123.xml
   trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml
   trunk/BOOK/multimedia/libdriv/gst-plugins.xml
   trunk/BOOK/multimedia/libdriv/xine-lib.xml
   trunk/BOOK/multimedia/videoutils/ffmpeg.xml
   trunk/BOOK/multimedia/videoutils/mplayer.xml
   trunk/BOOK/multimedia/videoutils/transcode.xml
   trunk/BOOK/postlfs/security/stunnel.xml
   trunk/BOOK/postlfs/shells/ash.xml
   trunk/BOOK/postlfs/shells/tcsh.xml
   trunk/BOOK/postlfs/shells/zsh.xml
   trunk/BOOK/pst/sgml/docbook-utils.xml
   trunk/BOOK/pst/typesetting/jadetex.xml
   trunk/BOOK/server/other/bind.xml
   trunk/BOOK/server/other/samba3.xml
   trunk/BOOK/x/wm/fluxbox.xml
   trunk/BOOK/xsoft/office/abiword.xml
   trunk/BOOK/xsoft/suites/openoffice.xml
Log:
Final round of renaming the package-name entities

Modified: trunk/BOOK/general/prog/gcc.xml
===================================================================
--- trunk/BOOK/general/prog/gcc.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/general/prog/gcc.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -94,7 +94,7 @@
 <sect3><title><application><acronym>GNAT</acronym></application> 
 dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="tcsh-package"/></para></sect4>
+<para><xref linkend="tcsh"/></para></sect4>
 </sect3>
 
 </sect2>

Modified: trunk/BOOK/general/prog/j2sdk.xml
===================================================================
--- trunk/BOOK/general/prog/j2sdk.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/general/prog/j2sdk.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -85,7 +85,7 @@
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-remove_fixed_paths-1.patch"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-static_cxx-1.patch"/></para></listitem>
 <listitem><para><ulink url="&patch-root;/j2sdk-&j2sdk-src-version;-ash-1.patch"/> 
-(Only required if /bin/sh is symlinked to <xref linkend="ash-package"/>)</para></listitem>
+(Only required if /bin/sh is symlinked to <xref linkend="ash"/>)</para></listitem>
 </itemizedlist>
 </sect3>
 
@@ -93,7 +93,7 @@
 <sect4><title>Required</title>
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
 <xref linkend="zip"/>, <xref linkend="unzip"/>, <xref linkend="cpio"/>, 
-<xref linkend="alsa"/>, <xref linkend="tcsh-package"/> and 
+<xref linkend="alsa"/>, <xref linkend="tcsh"/> and 
 <xref linkend="gcc3"/></para>
 </sect4>
 </sect3>

Modified: trunk/BOOK/general/prog/pdl.xml
===================================================================
--- trunk/BOOK/general/prog/pdl.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/general/prog/pdl.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -12,14 +12,14 @@
 <!ENTITY pdl-time          "2.56 SBU">
 ]>
 
-<sect1 id="pdl-package" xreflabel="PDL">
+<sect1 id="pdl" xreflabel="PDL">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="pdl.html" ?>
 <title><application><acronym>PDL</acronym></application>-&pdl-version;</title>
-<indexterm zone="pdl-package">
+<indexterm zone="pdl">
 <primary sortas="a-PDL">PDL</primary></indexterm>
 
 <sect2>
@@ -420,9 +420,9 @@
 <sect3 id="pdl-config"><title>Config files</title>
 <para><filename>~/.perldlrc</filename> and 
 <filename>local.perldlrc</filename> in the current directory</para>
-<indexterm zone="pdl-package pdl-config">
+<indexterm zone="pdl pdl-config">
 <primary sortas="e-AA.perldlrc">~/.perldlrc</primary></indexterm>
-<indexterm zone="pdl-package pdl-config">
+<indexterm zone="pdl pdl-config">
 <primary sortas="e-local.perldlrc">local.perldlrc</primary></indexterm>
 </sect3>
 
@@ -453,12 +453,12 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="pdl">
+<varlistentry id="pdl-prog">
 <term><command>pdl</command></term>
 <listitem><para>is a binary program called from 
 <application><acronym>PDL</acronym></application> scripts which is used to
 interface <command>perldl</command>.</para>
-<indexterm zone="pdl-package pdl">
+<indexterm zone="pdl pdl-prog">
 <primary sortas="b-pdl">pdl</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -467,7 +467,7 @@
 <term><command>pdldoc</command></term>
 <listitem><para>is a shell interface to
 <application><acronym>PDL</acronym></application> documentation.</para>
-<indexterm zone="pdl-package pdldoc">
+<indexterm zone="pdl pdldoc">
 <primary sortas="b-pdldoc">pdldoc</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -477,7 +477,7 @@
 <listitem><para>is a simple shell (written in
 <application><acronym>Perl</acronym></application>) for interactive use of
 <application><acronym>PDL</acronym></application>.</para>
-<indexterm zone="pdl-package perldl">
+<indexterm zone="pdl perldl">
 <primary sortas="b-perldl">perldl</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -486,7 +486,7 @@
 <term><command>pptemplate</command></term>
 <listitem><para>is a script to generate <filename>Makefile.PL</filename> 
 and <acronym>PP</acronym> file skeletons.</para>
-<indexterm zone="pdl-package pptemplate">
+<indexterm zone="pdl pptemplate">
 <primary sortas="b-pptemplate">pptemplate</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/gnome/core/gnome-vfs.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-vfs.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/gnome/core/gnome-vfs.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -55,7 +55,7 @@
 
 <sect4><title>Optional</title>
 <para><xref linkend="samba3"/>, 
-<xref linkend="cdparanoia-package"/>,
+<xref linkend="cdparanoia"/>,
 <xref linkend="fam"/>,
 <xref linkend="gtk-doc"/>,
 <xref linkend="openssh"/>,

Modified: trunk/BOOK/gnome/core/nautilus.xml
===================================================================
--- trunk/BOOK/gnome/core/nautilus.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/gnome/core/nautilus.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -60,7 +60,7 @@
 <para><xref linkend="startup-notification"/>, 
 <xref linkend="libgsf"/>, 
 <xref linkend="libcroco"/>, 
-<xref linkend="cdparanoia-package"/>, 
+<xref linkend="cdparanoia"/>, 
 <xref linkend="libjpeg"/>, 
 <xref linkend="docbook-utils"/>, 
 <ulink url="http://ftp.gnome.org/pub/GNOME/sources/medusa/0.5/">medusa</ulink> 

Modified: trunk/BOOK/gnome/otherlibs/gnome-vfs1.xml
===================================================================
--- trunk/BOOK/gnome/otherlibs/gnome-vfs1.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/gnome/otherlibs/gnome-vfs1.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -63,7 +63,7 @@
 <xref linkend="GConf1"/>, 
 <xref linkend="bonobo14"/>, 
 <xref linkend="openssl"/>, 
-<xref linkend="cdparanoia-package"/>, 
+<xref linkend="cdparanoia"/>, 
 <xref linkend="gtk-doc"/> and 
 <xref linkend="docbook-utils"/></para>
 </sect4>

Modified: trunk/BOOK/kde/add/kdemultimedia.xml
===================================================================
--- trunk/BOOK/kde/add/kdemultimedia.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/kde/add/kdemultimedia.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -50,7 +50,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="cdparanoia-package"/>, 
+<para><xref linkend="cdparanoia"/>, 
 <xref linkend="lame"/>,
 <xref linkend="audiofile"/>,
 <xref linkend="libogg"/>,

Modified: trunk/BOOK/multimedia/audioutils/cdparanoia.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/cdparanoia.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/multimedia/audioutils/cdparanoia.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -10,14 +10,14 @@
   <!ENTITY CDParanoia-time          "0.12 SBU">
 ]>
 
-<sect1 id="cdparanoia-package" xreflabel="CDParanoia-&CDParanoia-version;">
+<sect1 id="cdparanoia" xreflabel="CDParanoia-&CDParanoia-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="cdparanoia.html"?>
 <title>CDParanoia-&CDParanoia-version;</title>
-<indexterm zone="cdparanoia-package">
+<indexterm zone="cdparanoia">
 <primary sortas="a-CDParanoia">CDParanoia</primary></indexterm>
 
 <sect2>
@@ -103,11 +103,11 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="cdparanoia">
+<varlistentry id="cdparanoia-prog">
 <term><command>cdparanoia</command></term>
 <listitem><para>is used for 'ripping' an audio-cd. Ripping is the process of 
 digitally extracting music from an audio-cd.</para>
-<indexterm zone="cdparanoia-package cdparanoia">
+<indexterm zone="cdparanoia cdparanoia-prog">
 <primary sortas="b-cdparanoia">cdparanoia</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -117,7 +117,7 @@
 <listitem><para>contains functions used by <command>cdparanoia</command>, as 
 well as other packages, which can automatically identify if a 
 <acronym>CD</acronym> device is <acronym>CDDA</acronym> compatible.</para>
-<indexterm zone="cdparanoia-package libcdda_interface">
+<indexterm zone="cdparanoia libcdda_interface">
 <primary sortas="c-libcdda_interface">libcdda_interface.[so,a]</primary>
 </indexterm></listitem>
 </varlistentry>
@@ -127,7 +127,7 @@
 <listitem><para>contains functions used by <command>cdparanoia</command>, as 
 well as other packages, which provide data verification, synchronization, 
 error handling and scratch reconstruction capability.</para>
-<indexterm zone="cdparanoia-package libcdda_paranoia">
+<indexterm zone="cdparanoia libcdda_paranoia">
 <primary sortas="c-libcdda_paranoia">libcdda_paranoia.[so,a]</primary>
 </indexterm></listitem>
 </varlistentry>

Modified: trunk/BOOK/multimedia/audioutils/mpg123.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/mpg123.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/multimedia/audioutils/mpg123.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -10,14 +10,14 @@
   <!ENTITY mpg123-time          "0.08 SBU">
 ]>
 
-<sect1 id="mpg123-package" xreflabel="mpg123-&mpg123-version;">
+<sect1 id="mpg123" xreflabel="mpg123-&mpg123-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="mpg123.html"?>
 <title>mpg123-&mpg123-version;</title>
-<indexterm zone="mpg123-package">
+<indexterm zone="mpg123">
 <primary sortas="a-Mpg123">Mpg123</primary></indexterm>
 
 <sect2>
@@ -75,11 +75,11 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="mpg123">
+<varlistentry id="mpg123-prog">
 <term><command>mpg123</command></term>
 <listitem><para>is used for playing <filename>MP3</filename> files via the 
 console.</para>
-<indexterm zone="mpg123-package mpg123">
+<indexterm zone="mpg123 mpg123-prog">
 <primary sortas="b-mpg123">mpg123</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -10,14 +10,14 @@
   <!ENTITY cdrdao-time          "1.47 SBU (includes building <command>gcdmaster</command>)">
 ]>
 
-<sect1 id="cdrdao-package" xreflabel="Cdrdao-&cdrdao-version;">
+<sect1 id="cdrdao" xreflabel="Cdrdao-&cdrdao-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="cdrdao.html"?>
 <title>Cdrdao-&cdrdao-version;</title>
-<indexterm zone="cdrdao-package">
+<indexterm zone="cdrdao">
 <primary sortas="a-Cdrdao">Cdrdao</primary></indexterm>
 
 <sect2>
@@ -113,12 +113,12 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="cdrdao">
+<varlistentry id="cdrdao-prog">
 <term><command>cdrdao</command></term>
 <listitem><para>records audio or data <acronym>CD</acronym>-Rs in disk-at-once 
 (<acronym>DAO</acronym>) mode based on a textual description of the 
 <acronym>CD</acronym> contents.</para>
-<indexterm zone="cdrdao-package cdrdao">
+<indexterm zone="cdrdao cdrdao-prog">
 <primary sortas="b-cdrdao">cdrdao</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -127,7 +127,7 @@
 <term><command>cue2toc</command></term>
 <listitem><para>converts <acronym>CUE</acronym> to <acronym>TOC</acronym> 
 format for audio <acronym>CD</acronym>s.</para>
-<indexterm zone="cdrdao-package cue2toc">
+<indexterm zone="cdrdao cue2toc">
 <primary sortas="b-cue2toc">cue2toc</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -136,7 +136,7 @@
 <term><command>gcdmaster</command></term>
 <listitem><para>is a graphical front end to <command>cdrdao</command> for 
 composing audio <acronym>CD</acronym>s.</para>
-<indexterm zone="cdrdao-package gcdmaster">
+<indexterm zone="cdrdao gcdmaster">
 <primary sortas="b-gcdmaster">gcdmaster</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -145,7 +145,7 @@
 <term><command>toc2cddb</command></term>
 <listitem><para>converts a <application>Cdrdao</application> 
 <acronym>TOC</acronym> file into a cddb file and prints it to stdout.</para>
-<indexterm zone="cdrdao-package toc2cddb">
+<indexterm zone="cdrdao toc2cddb">
 <primary sortas="b-toc2cddb">toc2cddb</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -154,7 +154,7 @@
 <term><command>toc2cue</command></term>
 <listitem><para>converts <acronym>TOC</acronym> to <acronym>CUE</acronym> 
 format for audio <acronym>CD</acronym>s.</para>
-<indexterm zone="cdrdao-package toc2cue">
+<indexterm zone="cdrdao toc2cue">
 <primary sortas="b-toc2cue">toc2cue</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -164,7 +164,7 @@
 <listitem><para>converts an audio <acronym>CD</acronym>
 disk image (<filename>.toc</filename> file) to MP3 files (requires 
 <xref linkend="lame"/> to build).</para>
-<indexterm zone="cdrdao-package toc2mp3">
+<indexterm zone="cdrdao toc2mp3">
 <primary sortas="b-toc2mp3">toc2mp3</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/multimedia/libdriv/gst-plugins.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/gst-plugins.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/multimedia/libdriv/gst-plugins.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -50,7 +50,7 @@
 
 <sect4><title>Optional utilities (graphics, compression, misc.)</title>
 <para><xref linkend="aalib"/>, 
-<xref linkend="cdparanoia-package"/>, 
+<xref linkend="cdparanoia"/>, 
 <xref linkend="freetype2"/>, 
 <xref linkend="GConf"/>, 
 <xref linkend="gtk2"/>, 

Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -56,7 +56,7 @@
 
 <sect4><title>Optional</title>
 <para><xref linkend="pkgconfig"/>, 
-<xref linkend="ffmpeg-package"/>, 
+<xref linkend="ffmpeg"/>, 
 <xref linkend="aalib"/>, 
 <xref linkend="libmng"/>, 
 <xref linkend="sdl"/>, 

Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -10,14 +10,14 @@
   <!ENTITY ffmpeg-time          "0.87 SBU">
 ]>
 
-<sect1 id="ffmpeg-package" xreflabel="FFmpeg-&ffmpeg-version;">
+<sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="ffmpeg.html"?>
 <title>FFmpeg-&ffmpeg-version;</title>
-<indexterm zone="ffmpeg-package">
+<indexterm zone="ffmpeg">
 <primary sortas="a-FFmpeg">FFmpeg</primary></indexterm>
 
 <sect2>
@@ -132,11 +132,11 @@
 <para><filename>/etc/ffserver.conf</filename> and 
 <filename>~/.ffmpeg/ffserver-config</filename></para>
 
-<indexterm zone="ffmpeg-package ffmpeg-config">
+<indexterm zone="ffmpeg ffmpeg-config">
 <primary 
 sortas="e-AA.ffmpeg-ffserver-config">~/.ffmpeg/ffserver-config</primary>
 </indexterm>
-<indexterm zone="ffmpeg-package ffmpeg-config">
+<indexterm zone="ffmpeg ffmpeg-config">
 <primary sortas="e-etc-ffserver.conf">/etc/ffserver.conf</primary>
 </indexterm>
 
@@ -166,11 +166,11 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="ffmpeg">
+<varlistentry id="ffmpeg-prog">
 <term><command>ffmpeg</command></term>
 <listitem><para>is a command-line tool to convert video files, network streams 
 and input from a <acronym>TV</acronym> card to several video formats.</para>
-<indexterm zone="ffmpeg-package ffmpeg">
+<indexterm zone="ffmpeg ffmpeg-prog">
 <primary sortas="b-ffmpeg">ffmpeg</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -180,7 +180,7 @@
 <listitem><para>is a very simple and portable media player using the 
 <filename>ffmpeg</filename> libraries and the <acronym>SDL</acronym> 
 library.</para>
-<indexterm zone="ffmpeg-package ffplay">
+<indexterm zone="ffmpeg ffplay">
 <primary sortas="b-ffplay">ffplay</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -190,7 +190,7 @@
 <listitem><para>is a streaming server for everything that 
 <command>ffmpeg</command> could use as input (files, streams, TV card input, 
 webcam, etc.).</para>
-<indexterm zone="ffmpeg-package ffserver">
+<indexterm zone="ffmpeg ffserver">
 <primary sortas="b-ffserver">ffserver</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -199,7 +199,7 @@
 <term><filename class='libraryfile'>libavcodec.so</filename></term>
 <listitem><para>is a library containing the <application>FFmpeg</application> 
 codecs (both encoding and decoding).</para>
-<indexterm zone="ffmpeg-package libavcodec">
+<indexterm zone="ffmpeg libavcodec">
 <primary sortas="c-libavcodec">libavcodec.so</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -209,7 +209,7 @@
 <listitem><para>is a library containing the file formats handling (mux and 
 demux code for several formats) used by <command>ffplay</command> as well as 
 allowing the generation of  audio or video streams.</para>
-<indexterm zone="ffmpeg-package libavformat">
+<indexterm zone="ffmpeg libavformat">
 <primary sortas="c-libavformat">libavformat.so</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -14,14 +14,14 @@
   <!ENTITY mplayer-default-font  "font-arial-iso-8859-1">
 ]>
 
-<sect1 id="mplayer-package" xreflabel="MPlayer-&mplayer-version;">
+<sect1 id="mplayer" xreflabel="MPlayer-&mplayer-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="mplayer.html"?>
 <title><application>MPlayer</application>-&mplayer-version;</title>
-<indexterm zone="mplayer-package">
+<indexterm zone="mplayer">
 <primary sortas="a-MPlayer">MPlayer</primary></indexterm>
 
 <sect2>
@@ -95,7 +95,7 @@
 
 <sect3><title><application>MPlayer</application> dependencies</title>
 <sect4><title>Optional input drivers and libraries</title>
-<para><xref linkend="cdparanoia-package"/>, 
+<para><xref linkend="cdparanoia"/>, 
 <xref linkend="libdv"/>, 
 <xref linkend="libdvdread"/>, 
 <xref linkend="samba3"/>, 
@@ -321,9 +321,9 @@
 <sect3 id="mplayer-config"><title>Config files</title>
 <para><filename>/etc/mplayer/*</filename>, 
 <filename>~/.mplayer/*</filename></para>
-<indexterm zone="mplayer-package mplayer-config">
+<indexterm zone="mplayer mplayer-config">
 <primary sortas="e-AA.mplayer">~/.mplayer/*</primary></indexterm>
-<indexterm zone="mplayer-package mplayer-config">
+<indexterm zone="mplayer mplayer-config">
 <primary sortas="e-etc-mplayer">/etc/mplayer/*</primary></indexterm>
 </sect3>
 
@@ -363,18 +363,18 @@
 <listitem><para>is a symlink to <command>mplayer</command> which brings up 
 the graphical user interface component of 
 <application>MPlayer</application>.</para>
-<indexterm zone="mplayer-package gmplayer">
+<indexterm zone="mplayer gmplayer">
 <primary sortas="b-gmplayer">gmplayer</primary></indexterm>
 </listitem>
 </varlistentry>
 
-<varlistentry id="mplayer">
+<varlistentry id="mplayer-prog">
 <term><command>mplayer</command></term>
 <listitem><para> manages the input formats, the <acronym>CODEC</acronym>s and 
 the output formats to play video files, <acronym>DVD</acronym>s, 
 (S)<acronym>VCD</acronym>s or network streams containing audio and/or video 
 information on your system.</para>
-<indexterm zone="mplayer-package mplayer">
+<indexterm zone="mplayer mplayer-prog">
 <primary sortas="b-mplayer">mplayer</primary></indexterm>
 
 <para>Examples:</para>
@@ -398,7 +398,7 @@
 <acronym>CODEC</acronym> in
 <filename class='libraryfile'>libavcodec</filename> with
 <acronym>PCM</acronym>/MP3/VBRMP3 audio.</para>
-<indexterm zone="mplayer-package mencoder">
+<indexterm zone="mplayer mencoder">
 <primary sortas="b-mencoder">mencoder</primary></indexterm>
 
 <para>Example:</para>
@@ -424,7 +424,7 @@
 <term><filename class='libraryfile'>libdha.so</filename></term>
 <listitem><para>contains functions used by the 
 <application>MPlayer</application> programs.</para>
-<indexterm zone="mplayer-package libdha">
+<indexterm zone="mplayer libdha">
 <primary sortas="c-libdha">libdha.so</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -433,7 +433,7 @@
 <term><filename class='libraryfile'>libpostproc.so</filename></term>
 <listitem><para>is a post-processing filter library used by the 
 <application>MPlayer</application> programs and other packages.</para>
-<indexterm zone="mplayer-package libpostproc">
+<indexterm zone="mplayer libpostproc">
 <primary sortas="c-libpostproc">libpostproc.so</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/multimedia/videoutils/transcode.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/transcode.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/multimedia/videoutils/transcode.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -11,14 +11,14 @@
   <!ENTITY transcode-time          "1.69 SBU">
 ]>
 
-<sect1 id="transcode-package" xreflabel="Transcode-&transcode-version;">
+<sect1 id="transcode" xreflabel="Transcode-&transcode-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="transcode.html"?>
 <title><application>Transcode</application>-&transcode-version;</title>
-<indexterm zone="transcode-package">
+<indexterm zone="transcode">
 <primary sortas="a-Transcode">Transcode</primary></indexterm>
 
 <sect2>
@@ -63,7 +63,7 @@
 
 <sect3><title><application>Transcode</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="ffmpeg-package"/></para>
+<para><xref linkend="ffmpeg"/></para>
 </sect4>
 
 <sect4><title>Recommended</title>
@@ -97,7 +97,7 @@
 <ulink url="http://loci.cs.utk.edu/">LoRS/IBP</ulink></para>
 
 <para>Though <application>Transcode</application> has no compile-time 
-requirement for <xref linkend="mplayer-package"/>'s shared post-processing 
+requirement for <xref linkend="mplayer"/>'s shared post-processing 
 library, <application>Transcode</application> can use it at run-time.</para>
 </sect4>
 </sect3>
@@ -162,7 +162,7 @@
 <term><command>avicodec</command></term>
 <listitem><para>indicates or changes the <acronym>FOURCC</acronym> 
 <acronym>CODEC</acronym> flag in an <acronym>AVI</acronym> file.</para>
-<indexterm zone="transcode-package avicodec">
+<indexterm zone="transcode avicodec">
 <primary sortas="b-avicodec">avicodec</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -172,7 +172,7 @@
 <listitem><para>dumps audio or video stream of a given <acronym>AVI</acronym> 
 file to stdout (for <acronym>AVI</acronym> conversion or extraction of audio 
 streams).</para>
-<indexterm zone="transcode-package avidump">
+<indexterm zone="transcode avidump">
 <primary sortas="b-avidump">avidump</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -180,7 +180,7 @@
 <varlistentry id="avifix">
 <term><command>avifix</command></term>
 <listitem><para>fixes the header of an <acronym>AVI</acronym> file.</para>
-<indexterm zone="transcode-package avifix">
+<indexterm zone="transcode avifix">
 <primary sortas="b-avifix">avifix</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -189,7 +189,7 @@
 <term><command>aviindex</command></term>
 <listitem><para>writes a text file describing the index of an 
 <acronym>AVI</acronym> file.</para>
-<indexterm zone="transcode-package aviindex">
+<indexterm zone="transcode aviindex">
 <primary sortas="b-aviindex">aviindex</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -199,7 +199,7 @@
 <listitem><para> merges <acronym>AVI</acronym> files of the same format. Do 
 not try to merge <acronym>AVI</acronym> files of different formats, it will 
 most likely result in errors (and format means same bitrates, too!).</para>
-<indexterm zone="transcode-package avimerge">
+<indexterm zone="transcode avimerge">
 <primary sortas="b-avimerge">avimerge</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -207,7 +207,7 @@
 <varlistentry id="avisplit">
 <term><command>avisplit</command></term>
 <listitem><para>splits <acronym>AVI</acronym> files into multiple files.</para>
-<indexterm zone="transcode-package avisplit">
+<indexterm zone="transcode avisplit">
 <primary sortas="b-avisplit">avisplit</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -216,7 +216,7 @@
 <term><command>avisync</command></term>
 <listitem><para>can shift audio in <acronym>AVI</acronym> files for better 
 synchronizing of the audio and video data signal.</para>
-<indexterm zone="transcode-package avisync">
+<indexterm zone="transcode avisync">
 <primary sortas="b-avisync">avisync</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -225,7 +225,7 @@
 <term><command>tccat</command></term>
 <listitem><para>concatenates input files using the input plugins of 
 <application>Transcode</application>.</para>
-<indexterm zone="transcode-package tccat">
+<indexterm zone="transcode tccat">
 <primary sortas="b-tccat">tccat</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -234,7 +234,7 @@
 <term><command>tcdecode</command></term>
 <listitem><para>is used to decode input files to raw video and 
 <acronym>PCM</acronym> audio streams.</para>
-<indexterm zone="transcode-package tcdecode">
+<indexterm zone="transcode tcdecode">
 <primary sortas="b-tcdecode">tcdecode</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -243,7 +243,7 @@
 <term><command>tcdemux</command></term>
 <listitem><para>demultiplexes (separates) audio/video input that contains 
 multiple streams, e.g., <acronym>VOB</acronym> files.</para>
-<indexterm zone="transcode-package tcdemux">
+<indexterm zone="transcode tcdemux">
 <primary sortas="b-tcdemux">tcdemux</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -252,7 +252,7 @@
 <term><command>tcextract</command></term>
 <listitem><para>grabs single streams from a file containing multiple 
 streams.</para>
-<indexterm zone="transcode-package tcextract">
+<indexterm zone="transcode tcextract">
 <primary sortas="b-tcextract">tcextract</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -261,7 +261,7 @@
 <term><command>tcframe</command></term>
 <listitem><para>processes single video frames for different color encodings 
 (<acronym>RGB</acronym> >-< <acronym>YUV</acronym> or similar).</para>
-<indexterm zone="transcode-package tcframe">
+<indexterm zone="transcode tcframe">
 <primary sortas="b-tcframe">tcframe</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -270,7 +270,7 @@
 <term><command>tcmodinfo</command></term>
 <listitem><para>loads a supplied <application>Transcode</application> filter 
 module and prints its parameters.</para>
-<indexterm zone="transcode-package tcmodinfo">
+<indexterm zone="transcode tcmodinfo">
 <primary sortas="b-tcmodinfo">tcmodinfo</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -279,7 +279,7 @@
 <term><command>tcmp3cut</command></term>
 <listitem><para>is a tool which can cut <acronym>MP3</acronym> streams at 
 milliseconds positions.</para>
-<indexterm zone="transcode-package tcmp3cut">
+<indexterm zone="transcode tcmp3cut">
 <primary sortas="b-tcmp3cut">tcmp3cut</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -287,7 +287,7 @@
 <varlistentry id="tcprobe">
 <term><command>tcprobe</command></term>
 <listitem><para>prints information about the input file format.</para>
-<indexterm zone="transcode-package tcprobe">
+<indexterm zone="transcode tcprobe">
 <primary sortas="b-tcprobe">tcprobe</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -296,7 +296,7 @@
 <term><command>tcrequant</command></term>
 <listitem><para>is a tool which can requantize an <acronym>MPEG</acronym>-2 
 elementary stream.</para>
-<indexterm zone="transcode-package tcrequant">
+<indexterm zone="transcode tcrequant">
 <primary sortas="b-tcrequant">tcrequant</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -304,7 +304,7 @@
 <varlistentry id="tcscan">
 <term><command>tcscan</command></term>
 <listitem><para> performs several measurements on the given input data.</para>
-<indexterm zone="transcode-package tcscan">
+<indexterm zone="transcode tcscan">
 <primary sortas="b-tcscan">tcscan</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -313,18 +313,18 @@
 <term><command>tcxmlcheck</command></term>
 <listitem><para> checks information in a <acronym>SMIL</acronym> input 
 file.</para>
-<indexterm zone="transcode-package tcxmlcheck">
+<indexterm zone="transcode tcxmlcheck">
 <primary sortas="b-tcxmlcheck">tcxmlcheck</primary></indexterm>
 </listitem>
 </varlistentry>
 
-<varlistentry id="transcode">
+<varlistentry id="transcode-prog">
 <term><command>transcode</command></term>
 <listitem><para>is the encoder's user interface that handles the plugins and 
 other programs, being the glue between the modules. There are several well 
 documented usage examples on both the homepage and the documentation included 
 in the package.</para>
-<indexterm zone="transcode-package transcode">
+<indexterm zone="transcode transcode-prog">
 <primary sortas="b-transcode">transcode</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/postlfs/security/stunnel.xml
===================================================================
--- trunk/BOOK/postlfs/security/stunnel.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/postlfs/security/stunnel.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -11,14 +11,14 @@
   <!ENTITY stunnel-time          "0.11 SBU">
 ]>
 
-<sect1 id="stunnel-package" xreflabel="Stunnel-&stunnel-version;">
+<sect1 id="stunnel" xreflabel="Stunnel-&stunnel-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="stunnel.html"?>
 <title>Stunnel-&stunnel-version;</title>
-<indexterm zone="stunnel-package">
+<indexterm zone="stunnel">
 <primary sortas="a-Stunnel">Stunnel</primary></indexterm>
 
 <sect2>
@@ -127,7 +127,7 @@
 
 <sect3 id="stunnel-config"><title>Config files</title>
 <para><filename>/etc/stunnel/stunnel.conf</filename></para>
-<indexterm zone="stunnel-package stunnel-config">
+<indexterm zone="stunnel stunnel-config">
 <primary sortas="e-etc-stunnel-stunnel.conf">/etc/stunnel/stunnel.conf</primary>
 </indexterm>
 </sect3>
@@ -172,7 +172,7 @@
 daemon when the system is rebooted, install the 
 <filename>/etc/rc.d/init.d/stunnel</filename> bootscript from the 
 <xref linkend="intro-important-bootscripts"/> package.</para>
-<indexterm zone="stunnel-package stunnel.init">
+<indexterm zone="stunnel stunnel.init">
 <primary sortas="f-stunnel.init">stunnel</primary></indexterm>
 
 <screen><userinput><command>make install-stunnel</command></userinput></screen>
@@ -189,20 +189,20 @@
 <seglistitem>
 <seg>stunnel and stunnel3</seg>
 <seg>libstunnel.so</seg>
-<seg>/etc/stunnel, /var/lib/stunnel and 
-/usr/share/doc/stunnel</seg></seglistitem>
+<seg>/etc/stunnel, /var/lib/stunnel and /usr/share/doc/stunnel</seg>
+</seglistitem>
 </segmentedlist>
 
 <variablelist>
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="stunnel">
+<varlistentry id="stunnel-prog">
 <term><command>stunnel</command></term>
 <listitem><para> is a program designed to work as an <acronym>SSL</acronym> 
 encryption wrapper between remote clients and local
 (<command>[x]inetd</command>-startable) or remote servers.</para>
-<indexterm zone="stunnel-package stunnel">
+<indexterm zone="stunnel stunnel-prog">
 <primary sortas="b-stunnel">stunnel</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -212,7 +212,7 @@
 <listitem><para>is a <application>Perl</application> wrapper script to use 
 <command>stunnel</command> 3.x syntax with <command>stunnel</command> 
 >=4.05.</para>
-<indexterm zone="stunnel-package stunnel3">
+<indexterm zone="stunnel stunnel3">
 <primary sortas="b-stunnel3">stunnel3</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -221,7 +221,7 @@
 <term><filename class='libraryfile'>libstunnel.so</filename></term>
 <listitem><para> contains the <acronym>API</acronym> functions required by 
 <application>Stunnel</application>.</para>
-<indexterm zone="stunnel-package libstunnel">
+<indexterm zone="stunnel libstunnel">
 <primary sortas="c-libstunnel">libstunnel.so</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/postlfs/shells/ash.xml
===================================================================
--- trunk/BOOK/postlfs/shells/ash.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/postlfs/shells/ash.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -12,15 +12,15 @@
 <!ENTITY ash-time "0.06 SBU">
 ]>
 
-<sect1 id="ash-package" xreflabel="ASH-&ash-version;">
+<sect1 id="ash" xreflabel="ASH-&ash-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="ash.html"?>
 <title>ASH-&ash-version;</title>
-<indexterm zone="ash-package">
-<primary sortas="a-ASH-package">ASH</primary></indexterm>
+<indexterm zone="ash">
+<primary sortas="a-ASH">ASH</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>ASH</application></title>
@@ -83,9 +83,9 @@
 <filename>/etc/profile</filename> and 
 <filename>$HOME/.profile</filename></para>
 
-<indexterm zone="ash-package ash-config">
+<indexterm zone="ash ash-config">
 <primary sortas="e-etc-profile">/etc/profile</primary></indexterm>
-<indexterm zone="ash-package ash-config">
+<indexterm zone="ash ash-config">
 <primary sortas="e-AHOME-.profile">$HOME/.profile</primary></indexterm>
 </sect3>
 
@@ -104,10 +104,10 @@
 <bridgehead renderas="sect3">Short Description</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="ash">
+<varlistentry id="ash-prog">
 <term><command>ash</command></term>
 <listitem><para>is a <command>sh</command>-compliant shell.</para>
-<indexterm zone="ash-package ash">
+<indexterm zone="ash ash-prog">
 <primary sortas="b-ash">ash</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/postlfs/shells/tcsh.xml
===================================================================
--- trunk/BOOK/postlfs/shells/tcsh.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/postlfs/shells/tcsh.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -12,14 +12,14 @@
   <!ENTITY tcsh-md5sum        "11c0c9c9148652dc01270c4880d1cc6e">
 ]>
 
-<sect1 id="tcsh-package" xreflabel="Tcsh-&tcsh-version;">
+<sect1 id="tcsh" xreflabel="Tcsh-&tcsh-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="tcsh.html"?>
 <title>Tcsh-&tcsh-version;</title>
-<indexterm zone="tcsh-package">
+<indexterm zone="tcsh">
 <primary sortas="a-Tcsh">Tcsh</primary></indexterm>
 
 <sect2>
@@ -87,23 +87,23 @@
 <filename>~/.logout</filename>. More information on these files can be 
 found in the <filename>tcsh(1)</filename> man page.</para>
 
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-etc-csh.cshrc">/etc/csh.cshrc</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-etc-csh.login">/etc/csh.login</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-etc-csh.logout">/etc/csh.logout</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.tcshrc">~/.tcshrc</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.cshrc">~/.cshrc</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.history">~/.history</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.cshdirs">~/.cshdirs</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.login">~/.login</primary></indexterm>
-<indexterm zone="tcsh-package tcsh-config">
+<indexterm zone="tcsh tcsh-config">
 <primary sortas="e-AA.logout">~/.logout</primary></indexterm>
 </sect3>
 
@@ -123,12 +123,12 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="tcsh">
+<varlistentry id="tcsh-prog">
 <term><command>tcsh</command></term>
 <listitem><para>is an enhanced but completely compatible version of the 
 Berkeley Unix C shell, <command>csh</command>. It is usable as both an 
 interactive shell and a script processor.</para>
-<indexterm zone="tcsh-package tcsh">
+<indexterm zone="tcsh tcsh-prog">
 <primary sortas="b-tcsh">tcsh</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/postlfs/shells/zsh.xml
===================================================================
--- trunk/BOOK/postlfs/shells/zsh.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/postlfs/shells/zsh.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -12,14 +12,14 @@
   <!ENTITY zsh-md5sum         "b59ef34b8de288d5fd16f842451125c8">
 ]>
 
-<sect1 id="zsh-package" xreflabel="ZSH-&zsh-version;">
+<sect1 id="zsh" xreflabel="ZSH-&zsh-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="zsh.html"?>
 <title>ZSH-&zsh-version;</title>
-<indexterm zone="zsh-package">
+<indexterm zone="zsh">
 <primary sortas="a-ZSH">ZSH</primary></indexterm>
 
 <sect2>
@@ -78,15 +78,15 @@
 <filename>/etc/zlogout</filename>. You can find more information on these in 
 the <filename>zsh(1)</filename> and related man pages.</para>
 
-<indexterm zone="zsh-package zsh-config">
+<indexterm zone="zsh zsh-config">
 <primary sortas="e-etc-zshenv">/etc/zshenv</primary></indexterm>
-<indexterm zone="zsh-package zsh-config">
+<indexterm zone="zsh zsh-config">
 <primary sortas="e-etc-zprofile">/etc/zprofile</primary></indexterm>
-<indexterm zone="zsh-package zsh-config">
+<indexterm zone="zsh zsh-config">
 <primary sortas="e-etc-zshrc">/etc/zshrc</primary></indexterm>
-<indexterm zone="zsh-package zsh-config">
+<indexterm zone="zsh zsh-config">
 <primary sortas="e-etc-zlogin">/etc/zlogin</primary></indexterm>
-<indexterm zone="zsh-package zsh-config">
+<indexterm zone="zsh zsh-config">
 <primary sortas="e-etc-zlogout">/etc/zlogout</primary></indexterm>
 </sect3>
 
@@ -106,12 +106,12 @@
 <bridgehead renderas="sect3">Short Description</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="zsh">
+<varlistentry id="zsh-prog">
 <term><command>zsh</command></term>
 <listitem><para>is a shell which has command-line editing, built-in spelling 
 correction, programmable command completion, shell functions (with 
 autoloading), a history mechanism, and a host of other features.</para>
-<indexterm zone="zsh-package zsh">
+<indexterm zone="zsh zsh-prog">
 <primary sortas="b-zsh">zsh</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/pst/sgml/docbook-utils.xml
===================================================================
--- trunk/BOOK/pst/sgml/docbook-utils.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/pst/sgml/docbook-utils.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -48,7 +48,7 @@
 <xref linkend="sgml-dtd-3"/></para></sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="jadetex-package"/> (for conversion to 
+<para><xref linkend="jadetex"/> (for conversion to 
 <acronym>DVI</acronym>, <acronym>PS</acronym> and <acronym>PDF</acronym>), 
 <xref linkend="perl-modules"/>: SGMLSpm-&SGMLSpm-version; (for conversion to 
 man and texinfo), and  

Modified: trunk/BOOK/pst/typesetting/jadetex.xml
===================================================================
--- trunk/BOOK/pst/typesetting/jadetex.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/pst/typesetting/jadetex.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -11,14 +11,14 @@
   <!ENTITY jadetex-time          ".11 SBU">
 ]>
 
-<sect1 id="jadetex-package" xreflabel="JadeTeX-&jadetex-version;">
+<sect1 id="jadetex" xreflabel="JadeTeX-&jadetex-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="jadetex.html"?>
 <title>JadeTeX-&jadetex-version;</title>
-<indexterm zone="jadetex-package">
+<indexterm zone="jadetex">
 <primary sortas="a-JadeTeX">JadeTeX</primary></indexterm>
 
 <sect2>
@@ -185,12 +185,12 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="jadetex">
+<varlistentry id="jadetex-prog">
 <term><command>jadetex</command></term>
 <listitem><para>transforms LaTeX macros created by 
 <application>OpenJade</application> into <acronym>DVI</acronym>/PostScript 
 forms.</para>
-<indexterm zone="jadetex-package jadetex">
+<indexterm zone="jadetex jadetex-prog">
 <primary sortas="b-jadetex">jadetex</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -200,7 +200,7 @@
 <listitem><para>transforms LaTeX macros created by
 <application>OpenJade</application> into Portable Document Format
 (<acronym>PDF</acronym>) forms.</para>
-<indexterm zone="jadetex-package pdfjadetex">
+<indexterm zone="jadetex pdfjadetex">
 <primary sortas="b-pdfjadetex">pdfjadetex</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/server/other/bind.xml
===================================================================
--- trunk/BOOK/server/other/bind.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/server/other/bind.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -55,7 +55,7 @@
 
 <sect4><title>Optional (to [re]build documentation)</title>
 <para><xref linkend="openjade"/>, 
-<xref linkend="jadetex-package"/>, 
+<xref linkend="jadetex"/>, 
 <xref linkend="docbook-dsssl"/></para>
 </sect4>
 </sect3>

Modified: trunk/BOOK/server/other/samba3.xml
===================================================================
--- trunk/BOOK/server/other/samba3.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/server/other/samba3.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -60,7 +60,7 @@
 <xref linkend="python"/>, 
 <xref linkend="xinetd"/>, 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink> and 
-<xref linkend="stunnel-package"/> (used to encrypt access to SWAT)</para>
+<xref linkend="stunnel"/> (used to encrypt access to SWAT)</para>
 </sect4>
 </sect3>
 

Modified: trunk/BOOK/x/wm/fluxbox.xml
===================================================================
--- trunk/BOOK/x/wm/fluxbox.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/x/wm/fluxbox.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -11,14 +11,14 @@
   <!ENTITY fluxbox-time          "1.28 SBU">
 ]>
 
-<sect1 id="fluxbox-package" xreflabel="Fluxbox-&fluxbox-version;">
+<sect1 id="fluxbox" xreflabel="Fluxbox-&fluxbox-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="fluxbox.html" ?>
 <title>Fluxbox-&fluxbox-version;</title>
-<indexterm zone="fluxbox-package"><primary
+<indexterm zone="fluxbox"><primary
 sortas="a-Fluxbox">Fluxbox</primary></indexterm>
 
 <sect2>
@@ -66,11 +66,11 @@
 <para><filename>~/.fluxbox/init</filename>,
 <filename>~/.fluxbox/keys</filename>,
 <filename>~/.fluxbox/menu</filename></para>
-<indexterm zone="fluxbox-package fluxbox-config">
+<indexterm zone="fluxbox fluxbox-config">
 <primary sortas="e-AA.fluxbox-init">~/.fluxbox/init</primary></indexterm>
-<indexterm zone="fluxbox-package fluxbox-config">
+<indexterm zone="fluxbox fluxbox-config">
 <primary sortas="e-AA.fluxbox-keys">~/.fluxbox/keys</primary></indexterm>
-<indexterm zone="fluxbox-package fluxbox-config">
+<indexterm zone="fluxbox fluxbox-config">
 <primary sortas="e-AA.fluxbox-menu">~/.fluxbox/menu</primary></indexterm>
 </sect3>
 
@@ -110,11 +110,11 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="fluxbox">
+<varlistentry id="fluxbox-prog">
 <term><command>fluxbox</command></term>
 <listitem><para>is a window manager for <application>X11</application> based 
 on <application>Blackbox</application> 0.61.0.</para>
-<indexterm zone="fluxbox-package fluxbox">
+<indexterm zone="fluxbox fluxbox-prog">
 <primary sortas="b-fluxbox">fluxbox</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -125,7 +125,7 @@
 It needs <command>display</command>, <command>Esetroot</command>,
 <command>wmsetbg</command>, <command>xv</command>,
 <command>qiv</command> or <command>xsri</command> to be used.</para>
-<indexterm zone="fluxbox-package fbsetbg">
+<indexterm zone="fluxbox fbsetbg">
 <primary sortas="b-fbsetbg">fbsetbg</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -134,7 +134,7 @@
 <term><command>bsetroot</command></term>
 <listitem><para>is a <application>Blackbox</application> 
 utility to change root window appearance.</para>
-<indexterm zone="fluxbox-package bsetroot">
+<indexterm zone="fluxbox bsetroot">
 <primary sortas="b-bsetroot">bsetroot</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -142,7 +142,7 @@
 <varlistentry id="fluxbox-generate">
 <term><command>fluxbox-generate_menu</command></term>
 <listitem><para> is a menu maker utility.</para>
-<indexterm zone="fluxbox-package fluxbox-generate">
+<indexterm zone="fluxbox fluxbox-generate">
 <primary sortas="b-fluxbox-generate">fluxbox-generate_menu</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -152,7 +152,7 @@
 <listitem><para> is a session startup script that
 allows for command executions prior to <command>fluxbox</command> 
 starting.</para>
-<indexterm zone="fluxbox-package startfluxbox">
+<indexterm zone="fluxbox startfluxbox">
 <primary sortas="b-startfluxbox">startfluxbox</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -160,7 +160,7 @@
 <varlistentry id="fbrun">
 <term><command>fbrun</command></term>
 <listitem><para> displays a run dialog window.</para>
-<indexterm zone="fluxbox-package fbrun">
+<indexterm zone="fluxbox fbrun">
 <primary sortas="b-fbrun">fbrun</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/xsoft/office/abiword.xml
===================================================================
--- trunk/BOOK/xsoft/office/abiword.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/xsoft/office/abiword.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -12,14 +12,14 @@
   <!ENTITY AbiWord-time          "1.97 SBU">
 ]>
 
-<sect1 id="abiword-package" xreflabel="AbiWord-&AbiWord-version;">
+<sect1 id="abiword" xreflabel="AbiWord-&AbiWord-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="AbiWord.html" ?>
 <title>AbiWord-&AbiWord-version;</title>
-<indexterm zone="abiword-package">
+<indexterm zone="abiword">
 <primary sortas="a-AbiWord">AbiWord</primary></indexterm>
 
 <sect2>
@@ -128,11 +128,11 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="abiword">
+<varlistentry id="abiword-prog">
 <term><command>abiword</command></term>
 <listitem><para>is a symbolic link to the main <command>AbiWord-2.2</command> 
 executable.</para>
-<indexterm zone="abiword-package abiword">
+<indexterm zone="abiword abiword-prog">
 <primary sortas="g-abiword">abiword</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -140,7 +140,7 @@
 <varlistentry id="AbiWord-2.2">
 <term><command>AbiWord-2.2</command></term>
 <listitem><para>is the word-processing program executable.</para>
-<indexterm zone="abiword-package AbiWord-2.2">
+<indexterm zone="abiword AbiWord-2.2">
 <primary sortas="b-AbiWord-2.2">AbiWord-2.2</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -150,7 +150,7 @@
 <listitem><para>generates support files required by 
 <application>AbiWord</application> for each TrueType font in a
 given directory.</para>
-<indexterm zone="abiword-package ttfadmin.sh">
+<indexterm zone="abiword ttfadmin.sh">
 <primary sortas="b-ttfadmin.sh">ttfadmin.sh</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -158,7 +158,7 @@
 <varlistentry id="ttftool">
 <term><command>ttftool</command></term>
 <listitem><para>is a utility for processing TrueType fonts.</para>
-<indexterm zone="abiword-package ttftool">
+<indexterm zone="abiword ttftool">
 <primary sortas="b-ttftool">ttftool</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/xsoft/suites/openoffice.xml
===================================================================
--- trunk/BOOK/xsoft/suites/openoffice.xml	2005-01-25 16:48:26 UTC (rev 3336)
+++ trunk/BOOK/xsoft/suites/openoffice.xml	2005-01-25 19:21:25 UTC (rev 3337)
@@ -96,7 +96,7 @@
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
 <xref linkend="zip"/>, 
 <xref linkend="unzip"/>, 
-<xref linkend="tcsh-package"/>, 
+<xref linkend="tcsh"/>, 
 <xref linkend="which"/> and 
 <xref linkend="gcc3"/>.</para>
 </sect4>




More information about the blfs-book mailing list