Ignore:
Timestamp:
02/03/2006 08:54:03 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
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.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:
6a82dd9
Parents:
45b032f
Message:

Indenting chapter 6, part 4

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • chapter06/diffutils.xml

    r45b032f r54e422c1  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    2 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
     2<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     3  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
    34  <!ENTITY % general-entities SYSTEM "../general.ent">
    45  %general-entities;
    56]>
     7
    68<sect1 id="ch-system-diffutils" role="wrap">
    7 <title>Diffutils-&diffutils-version;</title>
    8 <?dbhtml filename="diffutils.html"?>
     9  <?dbhtml filename="diffutils.html"?>
    910
    10 <indexterm zone="ch-system-diffutils"><primary sortas="a-Diffutils">Diffutils</primary></indexterm>
     11  <title>Diffutils-&diffutils-version;</title>
    1112
    12 <sect2 role="package"><title/>
    13 <para>The Diffutils package contains programs that show the differences
    14 between files or directories.</para>
     13  <indexterm zone="ch-system-diffutils">
     14    <primary sortas="a-Diffutils">Diffutils</primary>
     15  </indexterm>
    1516
    16 <segmentedlist>
    17 <segtitle>&buildtime;</segtitle>
    18 <segtitle>&diskspace;</segtitle>
    19 <seglistitem><seg>0.1 SBU</seg><seg>5.6 MB</seg></seglistitem>
    20 </segmentedlist>
     17  <sect2 role="package">
     18    <title/>
    2119
    22 <segmentedlist>
    23 <segtitle>&dependencies;</segtitle>
    24 <seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, GCC,
    25 Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
    26 </segmentedlist>
    27 </sect2>
     20    <para>The Diffutils package contains programs that show the differences
     21    between files or directories.</para>
    2822
    29 <sect2 role="installation">
    30 <title>Installation of Diffutils</title>
     23    <segmentedlist>
     24      <segtitle>&buildtime;</segtitle>
     25      <segtitle>&diskspace;</segtitle>
    3126
    32 <para>POSIX requires the <command>diff</command> command to treat whitespace
    33 characters according to the current locale. The following patch fixes the
    34 non-compliance issue:</para>
     27      <seglistitem>
     28        <seg>0.1 SBU</seg>
     29        <seg>5.6 MB</seg>
     30      </seglistitem>
     31    </segmentedlist>
     32
     33    <segmentedlist>
     34      <segtitle>&dependencies;</segtitle>
     35
     36      <seglistitem>
     37        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc,
     38        Grep, Make, and Sed</seg>
     39      </seglistitem>
     40    </segmentedlist>
     41
     42  </sect2>
     43
     44  <sect2 role="installation">
     45    <title>Installation of Diffutils</title>
     46
     47    <para>POSIX requires the <command>diff</command> command to treat whitespace
     48    characters according to the current locale. The following patch fixes the
     49    non-compliance issue:</para>
    3550
    3651<screen><userinput>patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen>
    3752
    38 <para>Prepare Diffutils for compilation:</para>
     53    <para>Prepare Diffutils for compilation:</para>
    3954
    4055<screen><userinput>./configure --prefix=/usr</userinput></screen>
    4156
    42 <para>Compile the package:</para>
     57    <para>Compile the package:</para>
    4358
    4459<screen><userinput>make</userinput></screen>
    4560
    46 <para>This package does not come with a test suite.</para>
     61    <para>This package does not come with a test suite.</para>
    4762
    48 <para>Install the package:</para>
     63    <para>Install the package:</para>
    4964
    5065<screen><userinput>make install</userinput></screen>
    5166
    52 </sect2>
     67  </sect2>
    5368
    5469
    55 <sect2 id="contents-diffutils" role="content"><title>Contents of Diffutils</title>
     70  <sect2 id="contents-diffutils" role="content">
     71    <title>Contents of Diffutils</title>
    5672
    57 <segmentedlist>
    58 <segtitle>Installed programs</segtitle>
    59 <seglistitem><seg>cmp, diff, diff3, and sdiff</seg></seglistitem>
    60 </segmentedlist>
     73    <segmentedlist>
     74      <segtitle>Installed programs</segtitle>
    6175
    62 <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
    63 <?dbfo list-presentation="list"?>
    64 <?dbhtml list-presentation="table"?>
     76      <seglistitem>
     77        <seg>cmp, diff, diff3, and sdiff</seg>
     78      </seglistitem>
     79    </segmentedlist>
    6580
    66 <varlistentry id="cmp">
    67 <term><command>cmp</command></term>
    68 <listitem>
    69 <para>Compares two files and reports whether or in which bytes they differ</para>
    70 <indexterm zone="ch-system-diffutils cmp"><primary sortas="b-cmp">cmp</primary></indexterm>
    71 </listitem>
    72 </varlistentry>
     81    <variablelist>
     82      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
     83      <?dbfo list-presentation="list"?>
     84      <?dbhtml list-presentation="table"?>
    7385
    74 <varlistentry id="diff">
    75 <term><command>diff</command></term>
    76 <listitem>
    77 <para>Compares two files or directories and reports which lines in the files differ</para>
    78 <indexterm zone="ch-system-diffutils diff"><primary sortas="b-diff">diff</primary></indexterm>
    79 </listitem>
    80 </varlistentry>
     86      <varlistentry id="cmp">
     87        <term><command>cmp</command></term>
     88        <listitem>
     89          <para>Compares two files and reports whether or in which bytes they
     90          differ</para>
     91          <indexterm zone="ch-system-diffutils cmp">
     92            <primary sortas="b-cmp">cmp</primary>
     93          </indexterm>
     94        </listitem>
     95      </varlistentry>
    8196
    82 <varlistentry id="diff3">
    83 <term><command>diff3</command></term>
    84 <listitem>
    85 <para>Compares three files line by line</para>
    86 <indexterm zone="ch-system-diffutils diff3"><primary sortas="b-diff3">diff3</primary></indexterm>
    87 </listitem>
    88 </varlistentry>
     97      <varlistentry id="diff">
     98        <term><command>diff</command></term>
     99        <listitem>
     100          <para>Compares two files or directories and reports which lines in
     101          the files differ</para>
     102          <indexterm zone="ch-system-diffutils diff">
     103            <primary sortas="b-diff">diff</primary>
     104          </indexterm>
     105        </listitem>
     106      </varlistentry>
    89107
    90 <varlistentry id="sdiff">
    91 <term><command>sdiff</command></term>
    92 <listitem>
    93 <para>Merges two files and interactively outputs the results</para>
    94 <indexterm zone="ch-system-diffutils sdiff"><primary sortas="b-sdiff">sdiff</primary></indexterm>
    95 </listitem>
    96 </varlistentry>
    97 </variablelist>
     108      <varlistentry id="diff3">
     109        <term><command>diff3</command></term>
     110        <listitem>
     111            <para>Compares three files line by line</para>
     112            <indexterm zone="ch-system-diffutils diff3">
     113              <primary sortas="b-diff3">diff3</primary>
     114            </indexterm>
     115        </listitem>
     116      </varlistentry>
    98117
    99 </sect2>
     118      <varlistentry id="sdiff">
     119        <term><command>sdiff</command></term>
     120        <listitem>
     121          <para>Merges two files and interactively outputs the results</para>
     122          <indexterm zone="ch-system-diffutils sdiff">
     123            <primary sortas="b-sdiff">sdiff</primary>
     124          </indexterm>
     125        </listitem>
     126      </varlistentry>
     127
     128    </variablelist>
     129
     130  </sect2>
    100131
    101132</sect1>
    102 
Note: See TracChangeset for help on using the changeset viewer.