* Merged newxml into HEAD

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

1 files changed, 47 insertions, 14 deletions

diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index a8404ec27..4202899d1 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -1,24 +1,31 @@
+<?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-bison" xreflabel="Bison">
-<title>Installing Bison-&bison-version;</title>
-<?dbhtml filename="bison.html" dir="chapter06"?>
+<title>Bison-&bison-version;</title>
+<?dbhtml filename="bison.html"?>
+
+<indexterm zone="ch-system-bison"><primary sortas="a-Bison">Bison</primary></indexterm>
 
 <para>The Bison package contains a parser generator.</para>
 
-<screen>&buildtime; &bison-time;
-&diskspace; &bison-compsize;</screen>
+<screen>&buildtime; 0.6 SBU
+&diskspace; 10.6 MB</screen>
+
+<para>Bison installation depends on: Bash, Binutils, Coreutils, Diffutils,
+GCC, Gettext, Glibc, Grep, M4, Make, Sed.</para>
 
-&aa-bison-down;
-&aa-bison-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Bison</title>
 
 <para>First fix a minor compilation problem that Bison has with some packages,
-the patch is backported from CVS:</para>
+the patch is back-ported from CVS:</para>
 
-<screen><userinput>patch -Np1 -i ../&bison-patch;</userinput></screen>
+<screen><userinput>patch -Np1 -i ../bison-&bison-version;-attribute.patch</userinput></screen>
 
 <para>Now prepare Bison for compilation:</para>
 
@@ -28,17 +35,43 @@ the patch is backported from CVS:</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>And install the package:</para>
+<para>Now install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
 </sect2>
 
-&aa-bison-shortdesc;
-&aa-bison-desc;
 
-</sect1>
+<sect2 id="contents-bison"><title>Contents of Bison</title>
+
+<para><emphasis>Installed programs</emphasis>: bison and yacc</para>
+
+<para><emphasis>Installed library</emphasis>: liby.a</para>
+
+</sect2>
+
+
+<sect2><title>Short descriptions</title>
 
+<indexterm zone="ch-system-bison bison"><primary sortas="b-bison">bison</primary></indexterm>
+<para id="bison"><command>bison</command> generates, from a series of rules, a program
+for analyzing the structure of text files. Bison is a replacement for yacc
+(Yet Another Compiler Compiler).</para>
+
+<indexterm zone="ch-system-bison yacc"><primary sortas="b-yacc">yacc</primary></indexterm>
+<para id="yacc"><command>yacc</command> is a wrapper for bison, meant for programs
+that still call yacc instead of bison. It calls bison with the -y option.</para>
+
+<indexterm zone="ch-system-bison liby.a"><primary sortas="c-liby.a">liby.a</primary></indexterm>
+<para id="liby.a"><command>liby.a</command> is the Yacc library containing
+implementations of Yacc-compatible yyerror and main functions. This library
+is normally not very useful, but POSIX requires it.</para>
+
+</sect2>
+
+
+
+</sect1>