Changeset 673b0d8 for chapter06/diffutils.xml

Timestamp:

05/03/2004 10:59:46 AM (20 years ago)

Author:

Matthew Burgess <matthew@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.0, 6.1, 6.1.1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, v5_1, v5_1_1, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

0c43171, 2ec64b3, a4a675f

Parents:

287ea55

Message:

• Merged newxml into HEAD

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

File:

• chapter06/diffutils.xml (modified) (3 diffs)

chapter06/diffutils.xml

@@ +1 @@
+<?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-diffutils" xreflabel="Diffutils">
-<title>Installing Diffutils-&diffutils-version;</title>
-<?dbhtml filename="diffutils.html" dir="chapter06"?>
+<title>Diffutils-&diffutils-version;</title>
+<?dbhtml filename="diffutils.html"?>
+
+<indexterm zone="ch-system-diffutils"><primary sortas="a-Diffutils">Diffutils</primary></indexterm>
 
 <para>The Diffutils package contains programs that show the differences
 between files or directories.</para>
 
-<screen>&buildtime; &diffutils-time;
-&diskspace; &diffutils-compsize;</screen>
+<screen>&buildtime; 0.1 SBU
+&diskspace; 7.5 MB</screen>
 
-&aa-diffutils-down;
-&aa-diffutils-dep;
+<para>Diffutils installation depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
+Gettext, Glibc, Grep, Make, Sed.</para>
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 
 <sect2>
@@ -25 +32 @@
 <screen><userinput>make</userinput></screen>
 
-<para>And install it:</para>
+<para>Install it:</para>
 
 <screen><userinput>make install</userinput></screen>
@@ -31 +38 @@
 </sect2>
 
-&aa-diffutils-shortdesc;
-&aa-diffutils-desc;
+
+<sect2 id="contents-diffutils"><title>Contents of Diffutils</title>
+
+<para><emphasis>Installed programs</emphasis>: cmp, diff, diff3 and sdiff</para>
+
+</sect2>
+
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-system-diffutils cmp"><primary sortas="b-cmp">cmp</primary></indexterm>
+<para id="cmp"><command>cmp</command> compares two files and reports whether or
+in which bytes they differ.</para>
+
+<indexterm zone="ch-system-diffutils diff"><primary sortas="b-diff">diff</primary></indexterm>
+<para id="diff"><command>diff</command> compares two files or directories and reports
+which lines in the files differ.</para>
+
+<indexterm zone="ch-system-diffutils diff3"><primary sortas="b-diff3">diff3</primary></indexterm>
+<para id="diff3"><command>diff3</command> compares three files line by line.</para>
+
+<indexterm zone="ch-system-diffutils sdiff"><primary sortas="b-sdiff">sdiff</primary></indexterm>
+<para id="sdiff"><command>sdiff</command> merges two files and interactively outputs
+the results.</para>
+
+</sect2>
+
+
 
 </sect1>
-