diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2004-05-03 10:59:46 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2004-05-03 10:59:46 +0000 |
| commit | 673b0d84ba9591e07c0bdf0ee49d92eba10f502c (patch) | |
| tree | 129e27a1450727b440da4378e0117a468eb9c25e /chapter06/diffutils.xml | |
| parent | 287ea55da70ceb1f0990554b7db921d525fef816 (diff) | |
* Merged newxml into HEAD
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3435 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06/diffutils.xml')
| -rw-r--r-- | chapter06/diffutils.xml | 54 |
1 files changed, 43 insertions, 11 deletions
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index 203244033..845b83818 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -1,17 +1,24 @@ +<?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> + +<para>Diffutils installation depends on: Bash, Binutils, Coreutils, Diffutils, GCC, +Gettext, Glibc, Grep, Make, Sed.</para> -&aa-diffutils-down; -&aa-diffutils-dep; -<sect2><title> </title><para> </para></sect2> <sect2> <title>Installation of Diffutils</title> @@ -24,14 +31,39 @@ between files or directories.</para> <screen><userinput>make</userinput></screen> -<para>And install it:</para> +<para>Install it:</para> <screen><userinput>make install</userinput></screen> </sect2> -&aa-diffutils-shortdesc; -&aa-diffutils-desc; -</sect1> +<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> |