From 673b0d84ba9591e07c0bdf0ee49d92eba10f502c Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 3 May 2004 10:59:46 +0000
Subject: * Merged newxml into HEAD

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3435 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/m4.xml | 47 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 11 deletions(-)

(limited to 'chapter06/m4.xml')

diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index d990a91e5..1ca0a6861 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -1,16 +1,23 @@
+<?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-m4" xreflabel="M4">
-<title>Installing M4-&m4-version;</title>
-<?dbhtml filename="m4.html" dir="chapter06"?>
+<title>M4-&m4-version;</title>
+<?dbhtml filename="m4.html"?>
+
+<indexterm zone="ch-system-m4"><primary sortas="a-M4">M4</primary></indexterm>
 
 <para>The M4 package contains a macro processor.</para>
 
-<screen>&buildtime; &m4-time;
-&diskspace; &m4-compsize;</screen>
+<screen>&buildtime; 0.1 SBU
+&diskspace; 3.0 MB</screen>
+
+<para>M4 installation depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
+Gettext, Glibc, Grep, Make, Perl, Sed.</para>
 
-&aa-m4-down;
-&aa-m4-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of M4</title>
@@ -23,7 +30,7 @@
 
 <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>
@@ -32,8 +39,26 @@
 
 </sect2>
 
-&aa-m4-shortdesc;
-&aa-m4-desc;
 
-</sect1>
+<sect2 id="contents-m4"><title>Contents of M4</title>
+
+<para><emphasis>Installed program</emphasis>: m4</para>
+
+</sect2>
+
+<sect2><title>Short description</title>
 
+<indexterm zone="ch-system-m4 m4"><primary sortas="b-m4">m4</primary></indexterm>
+<para id="m4"><command>m4</command> copies the given files
+while expanding the macros that they contain. These macros are either built-in
+or user-defined and can take any number of arguments. Besides just doing macro
+expansion, m4 has built-in functions for including named files, running Unix
+commands, doing integer arithmetic, manipulating text in various ways,
+recursion, and so on. The m4 program can be used either as a front-end to a
+compiler or as a macro processor in its own right.</para>
+
+</sect2>
+
+
+
+</sect1>
-- 
cgit v1.2.3-54-g00ecf