diff options
Diffstat (limited to 'chapter06/diffutils.xml')
| -rw-r--r-- | chapter06/diffutils.xml | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index 01a7d031c..f65781a6c 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -44,32 +44,48 @@ Gettext, Glibc, Grep, Make, Sed</seg></seglistitem> </sect2> -<sect2 id="contents-diffutils"><title>Contents of Diffutils</title> - -<para><emphasis>Installed programs</emphasis>: cmp, diff, diff3 and sdiff</para> - -</sect2> +<sect2 id="contents-diffutils" role="content"><title>Contents of Diffutils</title> +<segmentedlist> +<segtitle>Installed programs</segtitle> +<seglistitem><seg>cmp, diff, diff3 and sdiff</seg></seglistitem> +</segmentedlist> -<sect2><title>Short descriptions</title> +<variablelist><title>Short descriptions</title> +<varlistentry> +<term id="cmp"><command>cmp</command></term> +<listitem> <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> +<para>compares two files and reports whether or in which bytes they differ.</para> +</listitem> +</varlistentry> +<varlistentry> +<term id="diff"><command>diff</command></term> +<listitem> <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> +<para>compares two files or directories and reports which lines in the files differ.</para> +</listitem> +</varlistentry> +<varlistentry> +<term id="diff3"><command>diff3</command></term> +<listitem> <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> +<para>compares three files line by line.</para> +</listitem> +</varlistentry> +<varlistentry> +<term id="sdiff"><command>sdiff</command></term> +<listitem> <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> +<para>merges two files and interactively outputs the results.</para> +</listitem> +</varlistentry> +</variablelist> </sect2> - - </sect1> |