* Merged newxml into HEAD

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

1 files changed, 64 insertions, 15 deletions

diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index db2485a73..a6f2aa3d5 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -1,18 +1,26 @@
+<?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-findutils" xreflabel="Findutils">
-<title>Installing Findutils-&findutils-version;</title>
-<?dbhtml filename="findutils.html" dir="chapter06"?>
+<title>Findutils-&findutils-version;</title>
+<?dbhtml filename="findutils.html"?>
 
-<para>The Findutils package contains programs to find files. The finding is
-done either by doing a live recursive search through a directory tree, or by
-consulting a previously set up database.</para>
+<indexterm zone="ch-system-findutils"><primary sortas="a-Findutils">Findutils</primary></indexterm>
 
-<screen>&buildtime; &findutils-time;
-&diskspace; &findutils-compsize;</screen>
+<para>The Findutils package contains programs to find files. Processes
+are provided to recursively search through a directory tree and to
+create, maintain and search a database (often faster than the recursive
+find, but unreliable if the database has not been recently updated).</para>
+
+<screen>&buildtime; 0.2 SBU
+&diskspace; 7.5 MB</screen>
+
+<para>Findutils installation depends on: Bash, Binutils, Coreutils,
+Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed.</para>
 
-&aa-findutils-down;
-&aa-findutils-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Findutils</title>
@@ -29,17 +37,58 @@ database to be in /var/lib/misc, which is FHS-compliant.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To have the results tested, issue:
+<para>To test the results, issue:
 <userinput>make check</userinput>.</para>
 
-<para>And install the package:</para>
+<para>Now install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
 </sect2>
 
-&aa-findutils-shortdesc;
-&aa-findutils-desc;
 
-</sect1>
+<sect2 id="contents-findutils"><title>Contents of Findutils</title>
+
+<para><emphasis>Installed programs</emphasis>: bigram, code, find, frcode,
+locate, updatedb and xargs</para>
+
+</sect2>
+
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-system-findutils bigram"><primary sortas="b-bigram">bigram</primary></indexterm>
+<para id="bigram"><command>bigram</command> was formerly used to produce locate
+databases.</para>
+
+<indexterm zone="ch-system-findutils code"><primary sortas="b-code">code</primary></indexterm>
+<para id="code"><command>code</command> was formerly used to produce locate
+databases. It is the ancestor of frcode.</para>
 
+<indexterm zone="ch-system-findutils find"><primary sortas="b-find">find</primary></indexterm>
+<para id="find"><command>find</command> searches given directory trees for files
+matching the specified criteria.</para>
+
+<indexterm zone="ch-system-findutils frcode"><primary sortas="b-frcode">frcode</primary></indexterm>
+<para id="frcode"><command>frcode</command> is called by updatedb to compress the
+list of file names. It uses front-compression, reducing the database size by a
+factor of 4 to 5.</para>
+
+<indexterm zone="ch-system-findutils locate"><primary sortas="b-locate">locate</primary></indexterm>
+<para id="locate"><command>locate</command> searches through a database of file names,
+and reports the names that contain a given string or match a given pattern.</para>
+
+<indexterm zone="ch-system-findutils updatedb"><primary sortas="b-updatedb">updatedb</primary></indexterm>
+<para id="updatedb"><command>updatedb</command> updates the locate database. It scans
+the entire file system (including other file systems that are currently mounted,
+unless told not to) and puts every file name it finds in the database.</para>
+
+<indexterm zone="ch-system-findutils xargs"><primary sortas="b-xargs">xargs</primary></indexterm>
+<para id="xargs"><command>xargs</command> can be used to apply a given command to
+a list of files.</para>
+
+</sect2>
+
+
+
+</sect1>