* Merged newxml into HEAD

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

1 files changed, 75 insertions, 13 deletions

diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 81e054b4d..6294e6906 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -1,17 +1,24 @@
+<?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-gzip" xreflabel="Gzip">
-<title>Installing Gzip-&gzip-version;</title>
-<?dbhtml filename="gzip.html" dir="chapter06"?>
+<title>Gzip-&gzip-version;</title>
+<?dbhtml filename="gzip.html"?>
+
+<indexterm zone="ch-system-gzip"><primary sortas="a-Gzip">Gzip</primary></indexterm>
 
 <para>The Gzip package contains programs for compressing and decompressing
 files.</para>
 
-<screen>&buildtime; &gzip-time;
-&diskspace; &gzip-compsize;</screen>
+<screen>&buildtime; 0.1 SBU
+&diskspace; 2.6 MB</screen>
+
+<para>Gzip installation depends on: Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Sed.</para>
 
-&aa-gzip-down;
-&aa-gzip-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Gzip</title>
@@ -22,7 +29,7 @@ files.</para>
 
 <para>The <command>gzexe</command> script has the location of the
 <command>gzip</command> binary hard-wired into it. Because we later change
-the location of the binary, the following command assures that the new
+the location of the binary, the following command ensures that the new
 location gets placed into the script:</para>
 
 <screen><userinput>cp gzexe.in{,.backup}
@@ -36,8 +43,7 @@ sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in</userinput></screen>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>And move the programs to the <filename
-class="directory">/bin</filename> directory:</para>
+<para>Move the programs to the <filename class="directory">/bin</filename> directory:</para>
 
 <screen><userinput>mv /usr/bin/gzip /bin
 rm /usr/bin/{gunzip,zcat}
@@ -47,8 +53,64 @@ ln -s gunzip /bin/uncompress</userinput></screen>
 
 </sect2>
 
-&aa-gzip-shortdesc;
-&aa-gzip-desc;
 
-</sect1>
+<sect2 id="contents-gzip"><title>Contents of Gzip</title>
+
+<para><emphasis>Installed programs</emphasis>: gunzip (link to gzip), gzexe,
+gzip, uncompress (link to gunzip), zcat (link to gzip), zcmp, zdiff,
+zegrep, zfgrep, zforce, zgrep, zless, zmore and znew</para>
+
+</sect2>
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-system-gzip gunzip"><primary sortas="b-gunzip">gunzip</primary></indexterm>
+<para id="gunzip"><command>gunzip</command> decompresses gzipped files.</para>
+
+<indexterm zone="ch-system-gzip gzexe"><primary sortas="b-gzexe">gzexe</primary></indexterm>
+<para id="gzexe"><command>gzexe</command> is used to create self-uncompressing
+executable files.</para>
+
+<indexterm zone="ch-system-gzip gzip"><primary sortas="b-gzip">gzip</primary></indexterm>
+<para id="gzip"><command>gzip</command> compresses the given files, using
+Lempel-Ziv (LZ77) coding.</para>
+
+<indexterm zone="ch-system-gzip zcat"><primary sortas="b-zcat">zcat</primary></indexterm>
+<para id="zcat"><command>zcat</command> uncompresses the given gzipped files to
+standard output.</para>
+
+<indexterm zone="ch-system-gzip zcmp"><primary sortas="b-zcmp">zcmp</primary></indexterm>
+<para id="zcmp"><command>zcmp</command> runs cmp on gzipped files.</para>
+
+<indexterm zone="ch-system-gzip zdiff"><primary sortas="b-zdiff">zdiff</primary></indexterm>
+<para id="zdiff"><command>zdiff</command> runs diff on gzipped files.</para>
 
+<indexterm zone="ch-system-gzip zegrep"><primary sortas="b-zegrep">zegrep</primary></indexterm>
+<para id="zegrep"><command>zegrep</command> runs egrep on gzipped files.</para>
+
+<indexterm zone="ch-system-gzip zfgrep"><primary sortas="b-zfgrep">zfgrep</primary></indexterm>
+<para id="zfgrep"><command>zfgrep</command> runs fgrep on gzipped files.</para>
+
+<indexterm zone="ch-system-gzip zforce"><primary sortas="b-zforce">zforce</primary></indexterm>
+<para id="zforce"><command>zforce</command> forces a .gz extension on all given files
+that are gzipped files, so that gzip will not compress them again. This can be
+useful when file names were truncated during a file transfer.</para>
+
+<indexterm zone="ch-system-gzip zgrep"><primary sortas="b-zgrep">zgrep</primary></indexterm>
+<para id="zgrep"><command>zgrep</command> runs grep on gzipped files.</para>
+
+<indexterm zone="ch-system-gzip zless"><primary sortas="b-zless">zless</primary></indexterm>
+<para id="zless"><command>zless</command> runs less on gzipped files.</para>
+
+<indexterm zone="ch-system-gzip zmore"><primary sortas="b-zmore">zmore</primary></indexterm>
+<para id="zmore"><command>zmore</command> runs more on gzipped files.</para>
+
+<indexterm zone="ch-system-gzip znew"><primary sortas="b-znew">znew</primary></indexterm>
+<para id="znew"><command>znew</command> re-compresses files from compress format
+to gzip format -- .Z to .gz.</para>
+
+</sect2>
+
+
+
+</sect1>