Changeset 81fd230 for chapter06/diffutils.xml

Timestamp:

02/19/2005 10:16:42 PM (19 years ago)

Author:

Gerard Beekmans <gerard@…>

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.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, 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:

3d31fc4

Parents:

2f9131f

Message:

Trunk is now identical to Testing

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

File:

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

chapter06/diffutils.xml

@@ -4 +4 @@
   %general-entities;
 ]>
-<sect1 id="ch-system-diffutils" xreflabel="Diffutils" role="wrap">
+<sect1 id="ch-system-diffutils" role="wrap">
 <title>Diffutils-&diffutils-version;</title>
 <?dbhtml filename="diffutils.html"?>
@@ -11 +11 @@
 
 <sect2 role="package"><title/>
+<para>The Diffutils package contains programs that show the differences
+between files or directories.</para>
 
 <segmentedlist>
@@ -18 +20 @@
 </segmentedlist>
 
+<segmentedlist>
+<segtitle>Diffutils installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, GCC,
+Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
+</segmentedlist>
 </sect2>
 
@@ -31 +38 @@
 <screen><userinput>make</userinput></screen>
 
-<para>Install it:</para>
+<para>This package does not come with a test suite.</para>
+
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
@@ -40 +49 @@
 <sect2 id="contents-diffutils" role="content"><title>Contents of Diffutils</title>
 
-<para>See testing</para>
+<segmentedlist>
+<segtitle>Installed programs</segtitle>
+<seglistitem><seg>cmp, diff, diff3, and sdiff</seg></seglistitem>
+</segmentedlist>
+
+<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="cmp">
+<term><command>cmp</command></term>
+<listitem>
+<para>Compares two files and reports whether or in which bytes they differ</para>
+<indexterm zone="ch-system-diffutils cmp"><primary sortas="b-cmp">cmp</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="diff">
+<term><command>diff</command></term>
+<listitem>
+<para>Compares two files or directories and reports which lines in the files differ</para>
+<indexterm zone="ch-system-diffutils diff"><primary sortas="b-diff">diff</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="diff3">
+<term><command>diff3</command></term>
+<listitem>
+<para>Compares three files line by line</para>
+<indexterm zone="ch-system-diffutils diff3"><primary sortas="b-diff3">diff3</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="sdiff">
+<term><command>sdiff</command></term>
+<listitem>
+<para>Merges two files and interactively outputs the results</para>
+<indexterm zone="ch-system-diffutils sdiff"><primary sortas="b-sdiff">sdiff</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
 </sect1>
+