* Merged newxml into HEAD

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

1 files changed, 36 insertions, 12 deletions

diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index 8ff7e4c69..081d36278 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -1,21 +1,28 @@
+<?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-patch" xreflabel="Patch">
-<title>Installing Patch-&patch-version;</title>
-<?dbhtml filename="patch.html" dir="chapter06"?>
+<title>Patch-&patch-version;</title>
+<?dbhtml filename="patch.html"?>
+
+<indexterm zone="ch-system-patch"><primary sortas="a-Patch">Patch</primary></indexterm>
 
 <para>The Patch package contains a program for modifying files.</para>
 
-<screen>&buildtime; &patch-time;
-&diskspace; &patch-compsize;</screen>
+<screen>&buildtime; 0.1 SBU
+&diskspace; 1.9 MB</screen>
+
+<para>Patch installation depends on: Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Sed.</para>
 
-&aa-patch-down;
-&aa-patch-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Patch</title>
 
-<para>Prepare Patch for compilation (setting the preprocessor flags to
+<para>Prepare Patch for compilation (the preprocessor flag
 <emphasis>-D_GNU_SOURCE</emphasis> is only needed on PowerPCs, on other
 machines you can leave it out):</para>
 
@@ -25,14 +32,31 @@ machines you can leave it out):</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>And install it:</para>
+<para>Now install it:</para>
 
 <screen><userinput>make install</userinput></screen>
 
 </sect2>
 
-&aa-patch-shortdesc;
-&aa-patch-desc;
 
-</sect1>
+<sect2 id="contents-patch"><title>Contents of Patch</title>
+
+<para><emphasis>Installed program</emphasis>: patch</para>
+
+</sect2>
+
 
+<sect2><title>Short description</title>
+
+<indexterm zone="ch-system-patch patch"><primary sortas="b-patch">patch</primary></indexterm>
+<para id="patch"><command>patch</command> modifies files according to a patch file.
+A patch file normally is a difference listing created with the diff program.
+By applying these differences to the original files, patch creates the patched
+versions. Using patches instead of entirely new tarballs to keep your sources
+up-to-date can save you a lot of download time.</para>
+
+</sect2>
+
+
+
+</sect1>