* Merged newxml into HEAD

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

1 files changed, 70 insertions, 13 deletions

diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index d1893c1f0..e6034e228 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -1,18 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-system-bzip2" xreflabel="Bzip2">
-<title>Installing Bzip2-&bzip2-version;</title>
-<?dbhtml filename="bzip2.html" dir="chapter06"?>
+<title>Bzip2-&bzip2-version;</title>
+<?dbhtml filename="bzip2.html"?>
+
+<indexterm zone="ch-system-bzip2"><primary sortas="a-Bzip2">Bzip2</primary></indexterm>
 
 <para>The Bzip2 package contains programs for compressing and decompressing
 files. On text files they achieve a much better compression than the
 traditional <command>gzip</command>.</para>
 
-<screen>&buildtime; &bzip2-time;
-&diskspace; &bzip2-compsize;</screen>
+<screen>&buildtime; 0.1 SBU
+&diskspace; 3.0 MB</screen>
+
+<para>Bzip2 installation depends on: Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Make.</para>
 
-&aa-bzip2-down;
-&aa-bzip2-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Bzip2</title>
@@ -32,15 +39,15 @@ against it.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>If you are reinstalling Bzip2, you will now first have to do
-<userinput>rm -f /usr/bin/bz*</userinput>, otherwise the following
+<para>If you are reinstalling Bzip2, you need to do
+<userinput>rm -f /usr/bin/bz*</userinput> first, otherwise the following
 <command>make install</command> will fail.</para>
 
 <para>Install the programs:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>And install the shared <command>bzip2</command> binary into the
+<para>Now install the shared <command>bzip2</command> binary into the
 <filename class="directory">/bin</filename> directory, then make some
 necessary symbolic links, and clean up:</para>
 
@@ -54,8 +61,58 @@ ln -s bzip2 /bin/bzcat</userinput></screen>
 
 </sect2>
 
-&aa-bzip2-shortdesc;
-&aa-bzip2-desc;
 
-</sect1>
+<sect2 id="contents-bzip2"><title>Contents of Bzip2</title>
+
+<para><emphasis>Installed programs</emphasis>: bunzip2 (link to bzip2), bzcat
+(link to bzip2), bzcmp, bzdiff, bzegrep, bzfgrep, bzgrep, bzip2, bzip2recover,
+bzless and bzmore</para>
+
+<para><emphasis>Installed libraries</emphasis>: libbz2.a, libbz2.so (link to
+libbz2.so.1.0), libbz2.so.1.0 (link to libbz2.so.&bzip2-version;) and
+libbz2.so.&bzip2-version;</para>
+
+</sect2>
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-system-bzip2 bunzip2"><primary sortas="b-bunzip2">bunzip2</primary></indexterm>
+<para id="bunzip2"><command>bunzip2</command> decompresses bzipped files.</para>
+
+<indexterm zone="ch-system-bzip2 bzcat"><primary sortas="b-bzcat">bzcat</primary></indexterm>
+<para id="bzcat"><command>bzcat</command> decompresses to standard output.</para>
+
+<indexterm zone="ch-system-bzip2 bzcmp"><primary sortas="b-bzcmp">bzcmp</primary></indexterm>
+<para id="bzcmp"><command>bzcmp</command> runs cmp on bzipped files.</para>
+
+<indexterm zone="ch-system-bzip2 bzdiff"><primary sortas="b-bzdiff">bzdiff</primary></indexterm>
+<para id="bzdiff"><command>bzdiff</command> runs diff on bzipped files.</para>
 
+<indexterm zone="ch-system-bzip2 bzgrep"><primary sortas="b-bzgrep">bzgrep</primary></indexterm>
+<para id="bzgrep"><command>bzgrep</command> and friends run grep on bzipped files.</para>
+
+<indexterm zone="ch-system-bzip2 bzip2"><primary sortas="b-bzip2">bzip2</primary></indexterm>
+<para id="bzip2"><command>bzip2</command> compresses files using the Burrows-Wheeler
+block sorting text compression algorithm with Huffman coding. The compression
+rate is generally considerably better than that achieved by more conventional
+compressors using LZ77/LZ78, like <command>gzip</command>.</para>
+
+<indexterm zone="ch-system-bzip2 bzip2recover"><primary sortas="b-bzip2recover">bzip2recover</primary></indexterm>
+<para id="bzip2recover"><command>bzip2recover</command> tries to recover data from damaged
+bzip2 files.</para>
+
+<indexterm zone="ch-system-bzip2 bzless"><primary sortas="b-bzless">bzless</primary></indexterm>
+<para id="bzless"><command>bzless</command> runs less on bzipped files.</para>
+
+<indexterm zone="ch-system-bzip2 bzmore"><primary sortas="b-bzmore">bzmore</primary></indexterm>
+<para id="bzmore"><command>bzmore</command> runs more on bzipped files.</para>
+
+<indexterm zone="ch-system-bzip2 libbz2"><primary sortas="c-libbz2*">libbz2*</primary></indexterm>
+<para id="libbz2"><command>libbz2*</command> is the library implementing lossless,
+block-sorting data compression, using the Burrows-Wheeler algorithm.</para>
+
+</sect2>
+
+
+
+</sect1>