diff options
Diffstat (limited to 'chapter06/diffutils.xml')
-rw-r--r-- | chapter06/diffutils.xml | 55 |
1 files changed, 52 insertions, 3 deletions
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index dfe1e4d2d..3649469f2 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -3,13 +3,15 @@ <!ENTITY % general-entities SYSTEM "../general.ent"> %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"?> <indexterm zone="ch-system-diffutils"><primary sortas="a-Diffutils">Diffutils</primary></indexterm> <sect2 role="package"><title/> +<para>The Diffutils package contains programs that show the differences +between files or directories.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -17,6 +19,11 @@ <seglistitem><seg>0.1 SBU</seg><seg>7.5 MB</seg></seglistitem> </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> <sect2 role="installation"> @@ -30,7 +37,9 @@ <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> @@ -39,8 +48,48 @@ <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> + |