diff options
author | Manuel Canales Esparcia <manuel@linuxfromscratch.org> | 2006-02-03 20:54:03 +0000 |
---|---|---|
committer | Manuel Canales Esparcia <manuel@linuxfromscratch.org> | 2006-02-03 20:54:03 +0000 |
commit | 54e422c1d96d41a9fbc8938962b9cb0f1e087e94 (patch) | |
tree | 1e31d05727290ef4bc3d73b09521ad0a37da4a7c /chapter06/diffutils.xml | |
parent | 45b032ff258bb7d94d40da0eaae1e1960fff9d42 (diff) |
Indenting chapter 6, part 4
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7340 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06/diffutils.xml')
-rw-r--r-- | chapter06/diffutils.xml | 182 |
1 files changed, 106 insertions, 76 deletions
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index 5234bd6c7..167709fa3 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -1,102 +1,132 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ <!ENTITY % general-entities SYSTEM "../general.ent"> %general-entities; ]> + <sect1 id="ch-system-diffutils" role="wrap"> -<title>Diffutils-&diffutils-version;</title> -<?dbhtml filename="diffutils.html"?> + <?dbhtml filename="diffutils.html"?> + + <title>Diffutils-&diffutils-version;</title> + + <indexterm zone="ch-system-diffutils"> + <primary sortas="a-Diffutils">Diffutils</primary> + </indexterm> + + <sect2 role="package"> + <title/> -<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> -<sect2 role="package"><title/> -<para>The Diffutils package contains programs that show the differences -between files or directories.</para> + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> -<segmentedlist> -<segtitle>&buildtime;</segtitle> -<segtitle>&diskspace;</segtitle> -<seglistitem><seg>0.1 SBU</seg><seg>5.6 MB</seg></seglistitem> -</segmentedlist> + <seglistitem> + <seg>0.1 SBU</seg> + <seg>5.6 MB</seg> + </seglistitem> + </segmentedlist> -<segmentedlist> -<segtitle>&dependencies;</segtitle> -<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, GCC, -Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem> -</segmentedlist> -</sect2> + <segmentedlist> + <segtitle>&dependencies;</segtitle> -<sect2 role="installation"> -<title>Installation of Diffutils</title> + <seglistitem> + <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, + Grep, Make, and Sed</seg> + </seglistitem> + </segmentedlist> -<para>POSIX requires the <command>diff</command> command to treat whitespace -characters according to the current locale. The following patch fixes the -non-compliance issue:</para> + </sect2> + + <sect2 role="installation"> + <title>Installation of Diffutils</title> + + <para>POSIX requires the <command>diff</command> command to treat whitespace + characters according to the current locale. The following patch fixes the + non-compliance issue:</para> <screen><userinput>patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen> -<para>Prepare Diffutils for compilation:</para> + <para>Prepare Diffutils for compilation:</para> <screen><userinput>./configure --prefix=/usr</userinput></screen> -<para>Compile the package:</para> + <para>Compile the package:</para> <screen><userinput>make</userinput></screen> -<para>This package does not come with a test suite.</para> + <para>This package does not come with a test suite.</para> -<para>Install the package:</para> + <para>Install the package:</para> <screen><userinput>make install</userinput></screen> -</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> - -<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead> -<?dbfo list-presentation="list"?> -<?dbhtml list-presentation="table"?> - -<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> + </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> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <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> - |