* Merged newxml into HEAD

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

1 files changed, 57 insertions, 15 deletions

diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 43bb389fb..9d944d340 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -1,16 +1,23 @@
+<?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-inetutils" xreflabel="Inetutils">
-<title>Installing Inetutils-&inetutils-version;</title>
-<?dbhtml filename="inetutils.html" dir="chapter06"?>
+<title>Inetutils-&inetutils-version;</title>
+<?dbhtml filename="inetutils.html"?>
+
+<indexterm zone="ch-system-inetutils"><primary sortas="a-Inetutils">Inetutils</primary></indexterm>
 
 <para>The Inetutils package contains programs for basic networking.</para>
 
-<screen>&buildtime; &inetutils-time;
-&diskspace; &inetutils-compsize;</screen>
+<screen>&buildtime; 0.2 SBU
+&diskspace; 11 MB</screen>
+
+<para>Inetutils installation depends on: Bash, Binutils, Coreutils,
+Diffutils, GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
 
-&aa-inetutils-down;
-&aa-inetutils-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Inetutils</title>
@@ -19,14 +26,14 @@
 However, the Inetutils build system will insist on installing all the man
 pages anyway. The following patch will correct this situation:</para>
 
-<screen><userinput>patch -Np1 -i ../&inetutils-no-server-man-pages-patch;</userinput></screen>
+<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-no_server_man_pages-1.patch</userinput></screen>
 
 <para>Now prepare Inetutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
-&nbsp;&nbsp;&nbsp;&nbsp;--sysconfdir=/etc --localstatedir=/var \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-logger --disable-syslogd \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-whois --disable-servers</userinput></screen>
+    --sysconfdir=/etc --localstatedir=/var \
+    --disable-logger --disable-syslogd \
+    --disable-whois --disable-servers</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
@@ -61,15 +68,50 @@ replacements are available for many of these servers.</para></listitem>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>And move the <command>ping</command> program to its FHS-compliant
+<para>Move the <command>ping</command> program to its FHS-compliant
 place:</para>
 
 <screen><userinput>mv /usr/bin/ping /bin</userinput></screen>
 
 </sect2>
 
-&aa-inetutils-shortdesc;
-&aa-inetutils-desc;
 
-</sect1>
+<sect2 id="contents-inetutils"><title>Contents of Inetutils</title>
+
+<para><emphasis>Installed programs</emphasis>: ftp, ping, rcp, rlogin, rsh,
+talk, telnet and tftp</para>
+
+</sect2>
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-system-inetutils ftp"><primary sortas="b-ftp">ftp</primary></indexterm>
+<para id="ftp"><command>ftp</command> is the ARPANET file transfer program.</para>
+
+<indexterm zone="ch-system-inetutils ping"><primary sortas="b-ping">ping</primary></indexterm>
+<para id="ping"><command>ping</command> sends echo-request packets and reports how
+long the replies take.</para>
+
+<indexterm zone="ch-system-inetutils rcp"><primary sortas="b-rcp">rcp</primary></indexterm>
+<para id="rcp"><command>rcp</command> does remote file copy.</para>
 
+<indexterm zone="ch-system-inetutils rlogin"><primary sortas="b-rlogin">rlogin</primary></indexterm>
+<para id="rlogin"><command>rlogin</command> does remote login.</para>
+
+<indexterm zone="ch-system-inetutils rsh"><primary sortas="b-rsh">rsh</primary></indexterm>
+<para id="rsh"><command>rsh</command> runs a remote shell.</para>
+
+<indexterm zone="ch-system-inetutils talk"><primary sortas="b-talk">talk</primary></indexterm>
+<para id="talk"><command>talk</command> is used to chat up another user.</para>
+
+<indexterm zone="ch-system-inetutils telnet"><primary sortas="b-telnet">telnet</primary></indexterm>
+<para id="telnet"><command>telnet</command> is an interface to the TELNET protocol.</para>
+
+<indexterm zone="ch-system-inetutils tftp"><primary sortas="b-tftp">tftp</primary></indexterm>
+<para id="tftp"><command>tftp</command> is a trivial file transfer program.</para>
+
+</sect2>
+
+
+
+</sect1>