* Merged newxml into HEAD

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

1 files changed, 54 insertions, 13 deletions

diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index f9e8cff54..a2a672d84 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.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-texinfo" xreflabel="Texinfo">
-<title>Installing Texinfo-&texinfo-version;</title>
-<?dbhtml filename="texinfo.html" dir="chapter06"?>
+<title>Texinfo-&texinfo-version;</title>
+<?dbhtml filename="texinfo.html"?>
+
+<indexterm zone="ch-system-texinfo"><primary sortas="a-Texinfo">Texinfo</primary></indexterm>
 
 <para>The Texinfo package contains programs for reading, writing, and
 converting Info documents.</para>
 
-<screen>&buildtime; &texinfo-time;
-&diskspace; &texinfo-compsize;</screen>
+<screen>&buildtime; 0.2 SBU
+&diskspace; 17 MB</screen>
+
+<para>Texinfo installation depends on: Bash, Binutils, Coreutils,
+Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed.</para>
 
-&aa-texinfo-down;
-&aa-texinfo-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Texinfo</title>
@@ -24,14 +31,14 @@ converting Info documents.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To have the results tested, issue:
+<para>To test the results, issue:
 <userinput>make check</userinput>.</para>
 
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>And optionally install the components belonging in a TeX installation:</para>
+<para>Optionally install the components belonging in a TeX installation:</para>
 
 <screen><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
 
@@ -54,13 +61,47 @@ will accomplish the task:</para>
 <screen><userinput>cd /usr/share/info
 rm dir
 for f in *
-do install-info $f dir 2>/dev/null
+do install-info $f dir 2&gt;/dev/null
 done</userinput></screen>
 
 </sect2>
 
-&aa-texinfo-shortdesc;
-&aa-texinfo-desc;
 
-</sect1>
+<sect2 id="contents-texinfo"><title>Contents of Texinfo</title>
+
+<para><emphasis>Installed programs</emphasis>: info, infokey, install-info,
+makeinfo, texi2dvi and texindex</para>
+
+</sect2>
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-system-texinfo info"><primary sortas="b-info">info</primary></indexterm>
+<para id="info"><command>info</command> is used to read Info documents. Info
+documents are a bit like man pages, but often go much deeper than just
+explaining all the flags. Compare for example man tar and info tar.</para>
+
+<indexterm zone="ch-system-texinfo infokey"><primary sortas="b-infokey">infokey</primary></indexterm>
+<para id="infokey"><command>infokey</command> compiles a source file containing Info
+customizations into a binary format.</para>
 
+<indexterm zone="ch-system-texinfo install-info"><primary sortas="b-install-info">install-info</primary></indexterm>
+<para id="install-info"><command>install-info</command> is used to install Info files. It
+updates entries in the Info index file.</para>
+
+<indexterm zone="ch-system-texinfo makeinfo"><primary sortas="b-makeinfo">makeinfo</primary></indexterm>
+<para id="makeinfo"><command>makeinfo</command> translates the given Texinfo source
+documents into various other formats: Info files, plain text, or HTML.</para>
+
+<indexterm zone="ch-system-texinfo texi2dvi"><primary sortas="b-texi2dvi">texi2dvi</primary></indexterm>
+<para id="texi2dvi"><command>texi2dvi</command> is used to format the given Texinfo
+document into a device-independent file that can be printed.</para>
+
+<indexterm zone="ch-system-texinfo texindex"><primary sortas="b-texindex">texindex</primary></indexterm>
+<para id="texindex"><command>texindex</command> is used to sort Texinfo index files.</para>
+
+</sect2>
+
+
+
+</sect1>