Index: ntent/databases/databases.xml
===================================================================
--- content/databases/databases.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="content-databases">
-<?dbhtml filename="databases.html"?>
-<title>Databases</title>
-
-<para>This chapter includes databases that range from single-user
-read/write to industrial database servers with transaction support.
-Generally, you will be sent here to satisfy dependencies to other
-applications although building a <acronym>SQL</acronym> server on a base
-<acronym>LFS</acronym> system is entirely possible.</para>
-
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="db.xml"/>   
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mysql.xml"/>   
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="postgresql.xml"/>   
-
-</chapter>
Index: ntent/databases/db.xml
===================================================================
--- content/databases/db.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,232 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY db-download-http " ">
-  <!ENTITY db-download-ftp  "ftp://sleepycat1.inetu.net/releases/db-&db-version;.tar.gz">
-  <!ENTITY db-md5sum        "fcc481d52c3b80e20a328f8c0cb042bd">
-  <!ENTITY db-size          "5.7 MB">
-  <!ENTITY db-buildsize     "68 MB (additional 140 MB to run parallel standard testsuite)">
-  <!ENTITY db-time          "1.23 SBU (additional 74.5 SBU to run parallel standard testsuite)">
-]>
-
-<sect1 id="db" xreflabel="Berkeley DB-&db-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="db.html"?>
-<title>Berkeley DB-&db-version;</title>
-<indexterm zone="db">
-<primary sortas="a-Berkeley-DB">Berkeley DB</primary></indexterm>
-
-<sect2>
-<title>Introduction to <application>Berkeley DB</application></title>
-
-<para>The <application>Berkeley DB</application> package contains programs and
-utilities used by many other applications for database related
-functions.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&db-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&db-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &db-md5sum;</para></listitem>
-<listitem><para>Download size: &db-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&db-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&db-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>Berkeley DB</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="tcl"/> and <xref linkend="j2sdk"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Berkeley DB</application></title>
-
-<para>Install <application>Berkeley DB</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>cd build_unix &amp;&amp;
-../dist/configure --prefix=/usr \
-    --enable-compat185 \
-    --enable-cxx &amp;&amp;
-make LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread"</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make docdir=/usr/share/doc/db-&db-version; install &amp;&amp;
-chown root:root /usr/bin/db_* \
-/usr/lib/libdb* /usr/include/db* &amp;&amp;
-chown -R root:root /usr/share/doc/db-&db-version;</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><command>cd build_unix &amp;&amp; 
-../dist/configure --prefix=/usr...</command>: 
-This replaces the normal <command>./configure</command> command, as
-<application>Berkeley DB</application> comes with various 
-build directories for different platforms.</para>
-
-<para><parameter>--enable-compat185</parameter>: This switch enables
-building DB 1.85 compatibility <acronym>API</acronym>.</para>
-
-<para><parameter>--enable-cxx</parameter>: This switch enables building
-C++ <acronym>API</acronym> libraries.</para>
-
-<para><command>make LIBSO_LIBS="-lpthread"
-LIBXSO_LIBS="-lpthread"</command>:  <command>configure</command> does not 
-correctly handle <acronym>NPTL</acronym>. These variables force it to 
-properly link against <acronym>NPTL</acronym>.</para> 
-
-<para><command>make docdir=/usr/share/doc/db-&db-version; 
-install</command>: This installs the documentation in
-the correct place.</para>
-
-<para><option>--enable-tcl --with-tcl=/usr/lib</option>:
-Enables <application>Tcl</application> support in DB and creates the
-<filename class="libraryfile">libdb_tcl</filename> libraries.</para>
-
-<para><option>--enable-java</option>: Enables <application>Java</application>
-support in DB and creates the 
-<filename class='libraryfile'>libdb_java</filename> libraries.</para>
-
-<para><option>--enable-rpc</option>: Enables building the 
-<application>Berkeley DB</application> <acronym>RPC</acronym> server.</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directory</segtitle>
-
-<seglistitem>
-<seg>berkeley_db_svc, db_archive, db_checkpoint, db_deadlock, db_dump, 
-db_load, db_printlog, db_recover, db_stat, db_upgrade and db_verify</seg>
-<seg>libdb.[so,a], libdb_cxx.[so,a], libdb_java.[so,a] and 
-libdb_tcl.[so,a]</seg>
-<seg>/usr/share/doc/db-&db-version;</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="berkeley_db_svc">
-<term><command>berkeley_db_svc</command></term>
-<listitem><para>is the <application>Berkeley DB</application> 
-<acronym>RPC</acronym> server.</para>
-<indexterm zone="db berkeley_db_svc">
-<primary sortas="b-berkeley_db_svc">berkeley_db_svc</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="db_archive">
-<term><command>db_archive</command></term>
-<listitem><para>prints the pathnames of log files that are no longer in 
-use.</para>
-<indexterm zone="db db_archive">
-<primary sortas="b-db_archive">db_archive</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="db_checkpoint">
-<term><command>db_checkpoint</command></term>
-<listitem><para>is a daemon process used to monitor and checkpoint database 
-logs.</para>
-<indexterm zone="db db_checkpoint">
-<primary sortas="b-db_checkpoint">db_checkpoint</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="db_deadlock">
-<term><command>db_deadlock</command></term>
-<listitem><para>is used to abort lock requests when deadlocks are 
-detected.</para>
-<indexterm zone="db db_deadlock">
-<primary sortas="b-db_deadlock">db_deadlock</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="db_dump">
-<term><command>db_dump</command></term>
-<listitem><para>converts database files to a flat file format readable by 
-<command>db_load</command>.</para>
-<indexterm zone="db db_dump">
-<primary sortas="b-db_dump">db_dump</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="db_load">
-<term><command>db_load</command></term>
-<listitem><para>is used to create database files from flat files created with 
-<command>db_dump</command>.</para>
-<indexterm zone="db db_load">
-<primary sortas="b-db_load">db_load</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="db_printlog">
-<term><command>db_printlog</command></term>
-<listitem><para>converts database log files to human readable text.</para>
-<indexterm zone="db db_printlog">
-<primary sortas="b-db_printlog">db_printlog</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="db_recover">
-<term><command>db_recover</command></term>
-<listitem><para>is used to restore a database to a consistent state after a 
-failure.</para>
-<indexterm zone="db db_recover">
-<primary sortas="b-db_recover">db_recover</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="db_stat">
-<term><command>db_stat</command></term>
-<listitem><para>displays database environment statistics.</para>
-<indexterm zone="db db_stat">
-<primary sortas="b-db_stat">db_stat</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="db_upgrade">
-<term><command>db_upgrade</command></term>
-<listitem><para>is used to upgrade database files to a newer version of 
-<application>Berkeley DB</application>.</para>
-<indexterm zone="db db_upgrade">
-<primary sortas="b-db_upgrade">db_upgrade</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="db_verify">
-<term><command>db_verify</command></term>
-<listitem><para>is used to run consistency checks on database files.</para>
-<indexterm zone="db db_verify">
-<primary sortas="b-db_verify">db_verify</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
Index: ntent/databases/mysql.xml
===================================================================
--- content/databases/mysql.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,252 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY mysql-download-http "http://mysql.he.net/Downloads/MySQL-4.1/mysql-&mysql-version;.tar.gz">
-  <!ENTITY mysql-download-ftp  "ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-4.1/mysql-&mysql-version;.tar.gz">
-  <!ENTITY mysql-md5           "6a4a6a5b3d0a42a9a271b2b8867bde82">
-  <!ENTITY mysql-size          "22.5 MB">
-  <!ENTITY mysql-buildsize     "207 MB">
-  <!ENTITY mysql-time          "3.83 SBU">
-]>
-
-<sect1 id="mysql" xreflabel="MySQL-&mysql-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="mysql.html"?>
-<title>MySQL-&mysql-version;</title>
-<indexterm zone="mysql">
-<primary sortas="a-MySQL">MySQL</primary></indexterm>
-
-<sect2>
-<title>Introduction to <application>My<acronym>SQL</acronym></application>
-</title>
-
-<para><application>My<acronym>SQL</acronym></application> is a widely used and 
-fast <acronym>SQL</acronym> database server. It is a client/server 
-implementation that consists of a server daemon and many different 
-client programs and libraries.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&mysql-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&mysql-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &mysql-md5;</para></listitem>
-<listitem><para>Download size: &mysql-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&mysql-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&mysql-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>My<acronym>SQL</acronym></application> dependencies
-</title>
-<sect4><title>Optional</title>
-<para><xref linkend="openssl"/>,
-<xref linkend="tcpwrappers"/>,
-<ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink> 
-(as an alternative to readline), 
-<xref linkend="ORBit"/> (detected only if <xref linkend="which"/> is 
-installed), 
-<xref linkend="doxygen"/> and
-<xref linkend="tex"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>My<acronym>SQL</acronym></application>
-</title>
-
-<para>For security reasons, running the server as an unprivileged user 
-and group is strongly encouraged:</para>
-
-<screen><userinput><command>groupadd mysql &amp;&amp;
-useradd -c "MySQL Server" -d /dev/null -g mysql -s /bin/false mysql</command></userinput></screen>
-
-<para>Build and install <application>My<acronym>SQL</acronym></application> by 
-running the following commands:</para>
-
-<screen><userinput><command>CPPFLAGS="-D_GNU_SOURCE" ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/sbin --localstatedir=/srv/mysql \
-    --enable-thread-safe-client --enable-assembler \
-    --enable-local-infile --with-named-thread-libs=-lpthread \
-    --with-unix-socket-path=/var/run/mysql/mysql.sock \
-    --without-debug --without-bench --without-readline &amp;&amp;
-make testdir=/usr/lib/mysql/mysql-test</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make testdir=/usr/lib/mysql/mysql-test install &amp;&amp;
-install -v -d -m755 /usr/share/mysql/Docs/Images &amp;&amp;
-install -v -m644 Docs/manual{,_toc}.html \
-                 Docs/manual.txt /usr/share/mysql/Docs &amp;&amp;
-install -v -m644 Docs/Images/*.{jpg,gif} /usr/share/mysql/Docs/Images &amp;&amp;
-cd /usr/lib &amp;&amp;
-ln -v -sf mysql/libmysqlclient{,_r}.so* .</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>--libexecdir=/usr/sbin</parameter>: This switch installs the 
-<command>mysqld</command> daemon in an appropriate location.</para>
-
-<para><parameter>--localstatedir=/srv/mysql</parameter>: This switch forces
-<application>My<acronym>SQL</acronym></application> to use 
-<filename class='directory'>/srv/mysql</filename> for database files and other 
-variable data.</para>
-
-<para><parameter>--enable-thread-safe-client</parameter>: This switch compiles a 
-thread-safe <application>My<acronym>SQL</acronym></application> client library.
-</para>
-
-<para><parameter>--enable-assembler</parameter>: This switch allows using 
-assembler versions of some string functions.</para>
-
-<para><parameter>--enable-local-infile</parameter>: This switch enables the
-LOAD DATA INFILE <acronym>SQL</acronym> statement.</para>
-
-<para><parameter>CPPFLAGS="-D_GNU_SOURCE" 
---with-named-thread-libs=-lpthread</parameter>: This environment variable and 
-configure switch enable building on <acronym>NPTL</acronym> systems.</para>
-
-<para><parameter>--with-unix-socket-path=/var/run/mysql</parameter>:
-This switch puts the unix-domain socket into <filename
-class="directory">/var/run/mysql</filename> directory instead of default
-<filename class="directory">/tmp</filename>.</para>
-
-<para><parameter>--without-bench</parameter>: This switch skips building the 
-benchmark suite.</para>
-
-<para><parameter>--without-readline</parameter>: This switch forces the build 
-to use the system copy of <application>readline</application> instead of the 
-bundled copy.</para>
-
-<para><command>make testdir=...</command>: This installs the test suite in 
-<filename class='directory'>/usr/lib/mysql/mysql-test</filename>. 
-<acronym>BLFS</acronym> is currently seeking a method to omit the installation 
-of the test suite altogether.</para>
-
-<para><command>ln -sf mysql/libmysqlclient{,_r}.so* .</command>: This command
-makes the <application>My<acronym>SQL</acronym></application> shared libraries 
-available to other packages at run-time.</para>
-
-<para><option>--with-libwrap</option>: This switch adds tcpwrappers
-support to <application>My<acronym>SQL</acronym></application>.</para>
-
-<para><option>--with-openssl</option>: This switch adds OpenSSL support
-to <application>My<acronym>SQL</acronym></application>.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>My<acronym>SQL</acronym></application></title>
-
-<sect3 id="mysql-config">
-<title>Config files</title>
-
-<para><filename>/etc/my.cnf</filename>, <filename>~/.my.cnf</filename></para>
-<indexterm zone="mysql mysql-config">
-<primary sortas="e-AA.my.cnf">~/.my.cnf</primary></indexterm>
-<indexterm zone="mysql mysql-config">
-<primary sortas="e-etc-my.cnf">/etc/my.cnf</primary></indexterm>
-
-</sect3>
-
-<sect3>
-<title>Configuration Information</title>
-
-<para>There are several default configuration files available in
-<filename class="directory">/usr/share/mysql</filename> which you can
-use. Create <filename>/etc/my.cnf</filename> using the following
-command as the root user:</para>
-
-<screen><userinput role='root'><command>install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf</command></userinput></screen>
-
-<para>You can now install a database and change the ownership to the
-unprivileged user and group (perform as the root user):</para>
-
-<screen><userinput role='root'><command>mysql_install_db --user=mysql &amp;&amp;
-chgrp -v mysql /srv/mysql{,/test,/mysql}</command></userinput></screen>
-
-<para>Further configuration requires that the 
-<application>My<acronym>SQL</acronym></application> server be running. Start 
-the server using the following commands as the root user:</para>
-
-<screen><userinput role='root'><command>install -v -m750 -o mysql -g mysql -d /var/run/mysql &amp;&amp;
-mysqld_safe --user=mysql 2&gt;&amp;1 &gt;/dev/null &amp;</command></userinput></screen>
-
-<para>A default installation does not setup a password for the administrator, 
-so use the following command as the root user to set one. Replace 
-<replaceable>[new-password]</replaceable> with your own.</para>
-
-<screen><userinput role='root'><command>mysqladmin -u root password <replaceable>[new-password]</replaceable></command></userinput></screen>
-
-<para>Configuration of the server is now finished. Shut the server down
-using the following command as the root user:</para>
-
-<screen><userinput role='root'><command>mysqladmin -p shutdown</command></userinput></screen>
-
-<para id="mysql-init">Install the <filename>/etc/rc.d/init.d/mysql</filename> 
-init script included in the <xref linkend="intro-important-bootscripts"/> 
-package as the root user to start the <application>MySQL</application> server 
-during system boot-up.</para>
-<indexterm zone="mysql mysql-init">
-<primary sortas="f-mysql">mysql</primary></indexterm>
-
-<screen><userinput role='root'><command>make install-mysql</command></userinput></screen>
-
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>comp_err, isamchk, isamlog, make_win_binary_distribution, 
-make_win_src_distribution, msql2mysql, my_print_defaults, myisam_ftdump, 
-myisamchk, myisamlog, myisampack, mysql, mysql_client_test, mysql_config, 
-mysql_convert_table_format, mysql_create_system_tables, mysql_explain_log, 
-mysql_find_rows, mysql_fix_extensions, mysql_fix_privilege_tables, 
-mysql_install_db, mysql_secure_installation, mysql_setpermission, 
-mysql_tableinfo, mysql_tzinfo_to_sql, mysql_waitpid, mysql_zap, mysqlaccess, 
-mysqladmin, mysqlbinlog, mysqlbug, mysqlcheck, mysqld, mysqld_multi, 
-mysqld_safe, mysqldump, mysqldumpslow, mysqlhotcopy, mysqlimport, 
-mysqlmanager, mysqlmanager-pwgen, mysqlmanagerc, mysqlshow, mysqltest, 
-pack_isam, perror, replace, resolve_stack_dump and resolveip</seg>
-<seg>libdbug.a, libheap.a, libmerge.a, libmyisam.a, libmyisammrg.a, 
-libmysqlclient.[so,a], libmysqlclient_r.[so,a], libmystrings.a, libmysys.a, 
-libnisam.a and libvio.a</seg>
-<seg>/srv/mysql, /usr/include/mysql, /usr/lib/mysql, /usr/share/mysql and 
-/var/run/mysql</seg>
-</seglistitem>
-</segmentedlist>
-
-<sect3><title>Short description</title>
-<para>Descriptions of all the programs and libraries would be several pages 
-long. Instead, consult the <application>My<acronym>SQL</acronym></application> 
-documentation for full details.</para>
-
-<para>Certain <application>My<acronym>SQL</acronym></application> support 
-programs may require the <application>Perl</application> DBI modules to be 
-installed to function properly.</para>
-</sect3>
-
-</sect2>
-
-</sect1>
Index: ntent/databases/postgresql.xml
===================================================================
--- content/databases/postgresql.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,468 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY postgresql-download-http "http://gd.tuwien.ac.at/db/postgresql/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
-  <!ENTITY postgresql-download-ftp  "ftp://ftp.fr.postgresql.org/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
-  <!ENTITY postgresql-md5sum        "075ac81c865b0af865459260bf1ca890">
-  <!ENTITY postgresql-size          "11.0 MB">
-  <!ENTITY postgresql-buildsize     "259 MB">
-  <!ENTITY postgresql-time          "1.34 SBU">
-]>
-
-<sect1 id="postgresql" xreflabel="PostgreSQL-&postgresql-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="postgresql.html"?>
-<title>Postgre<acronym>SQL</acronym>-&postgresql-version;</title>
-<indexterm zone="postgresql">
-<primary sortas="a-PostgreSQL">PostgreSQL</primary></indexterm>
-
-<sect2>
-<title>Introduction to 
-<application>Postgre<acronym>SQL</acronym></application></title>
-
-<para><application>Postgre<acronym>SQL</acronym></application> is an advanced 
-object-relational database management system (<acronym>ORDBMS</acronym>), 
-derived from the Berkeley Postgres database management system.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&postgresql-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&postgresql-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &postgresql-md5sum;</para></listitem>
-<listitem><para>Download size: &postgresql-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&postgresql-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&postgresql-time;</para></listitem></itemizedlist>
-</sect3>
-
-<!-- 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required patch: <ulink 
-url="&patch-root;/postgresql-&postgresql-version;-dsssl_fix-1.patch"/></para>
-</listitem></itemizedlist>
-</sect3>
- -->
-
-<sect3><title><application>Postgre<acronym>SQL</acronym></application> 
-dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="python"/>, 
-<xref linkend="tcl"/>,
-<xref linkend="openssl"/>,
-<xref linkend="Linux_PAM"/>,
-<xref linkend="sgml-dtd"/>, 
-<xref linkend="docbook-dsssl"/>,
-<xref linkend="openjade"/>,
-<xref linkend="perl-modules"/>: SGMLSpm-&SGMLSpm-version;, 
-<ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, and 
-<ulink url="http://rendezvous.sourceforge.net/">Rendezvous</ulink></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of 
-<application>Postgre<acronym>SQL</acronym></application></title>
-
-<para>In order for <command>configure</command> to properly discover 
-<application>Docbook <acronym>SGML</acronym> 
-<acronym>DTD</acronym></application>, you may need to remove 
-<application>OpenSP</application> catalog definitions from the system 
-<acronym>SGML</acronym> catalogs. Use the following command before building 
-the package to accomplish this:</para>
-
-<screen><userinput><command>sed -i.orig \
-    -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
-    /etc/sgml/catalog \
-    /etc/sgml/sgml-docbook.cat</command></userinput></screen>
-
-<para>Install <application>Postgre<acronym>SQL</acronym></application> with the 
-following commands: </para>
-
-<screen><userinput><command>sed -i \
-    -e "s|dsssl-stylesheets|&amp; \\\\\n        sgml/docbook/&amp;-&docbook-dsssl-version;|" \
-    configure &amp;&amp;
-./configure --prefix=/usr --enable-thread-safety &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install &amp;&amp;
-chown -R root:root /usr/share/doc/postgresql/html</command></userinput></screen>
-
-<!-- 
-<para>The standard installation provides only the header files needed
-for client application development. Server-side applications require
-the entire <application>Postgre<acronym>SQL</acronym></application>
-include tree which can be installed using the following command:</para>
-
-<screen><userinput><command>make install-all-headers</command></userinput></screen>
- -->
-
-<note><para>If you are upgrading an existing system and are going to
-install the new files over the old ones, then you should
-back up your data, shut down the old server and follow the
-instructions in <ulink
-url="http://www.postgresql.org/docs/8.0/static/install-upgrading.html">the
-official <application>Postgre<acronym>SQL</acronym></application>
-documentation</ulink>.</para></note>
-
-<para>Initialize a database cluster with the following commands issued by the 
-root user:</para>
-
-<screen><userinput role='root'><command>install -v -m755 -d /srv/pgsql/data &amp;&amp;
-useradd -c "PostgreSQL Server" -g users -d /srv/pgsql/data postgres &amp;&amp;
-chown -v postgres /srv/pgsql/data &amp;&amp;
-su - postgres -c '/usr/bin/initdb -D /srv/pgsql/data'</command></userinput></screen>
-
-<para>As the root user, start the database server with the following 
-command:</para>
-
-<screen><userinput role='root'><command>su - postgres -c '/usr/bin/postmaster -D /srv/pgsql/data > \
-    /srv/pgsql/data/logfile 2&gt;&amp;1 &amp;'</command></userinput></screen>
-
-<para>Still as user root, create a database and verify the 
-installation:</para>
-
-<screen><userinput role='root'><command>su - postgres -c '/usr/bin/createdb test' &amp;&amp;
-echo "create table t1 ( name varchar(20), state_province varchar(20) );" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "insert into t1 values ('Billy', 'NewYork');" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "insert into t1 values ('Evanidus', 'Quebec');" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "insert into t1 values ('Jesse', 'Ontario');" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "select * from t1;" | (su - postgres -c '/usr/bin/psql test')</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><command>sed -i -e "s|dsssl-stylesheets|..."</command>: This command 
-puts an extra line in the <command>configure</command> script so that the
-<acronym>BLFS</acronym> installed version of the <acronym>DSSSL</acronym>
-stylesheets can be discovered.</para>
-
-<para><parameter>--enable-thread-safety</parameter>: This switch makes the 
-client libraries thread-safe by allowing concurrent threads in 
-<filename class='libraryfile'>libpq</filename> and <acronym>ECPG</acronym> 
-programs to safely control their private connection handles.</para>
-
-<para><command>chown -R root:root /usr/share/doc/postgresql/html</command>: 
-This command corrects the improper ownership of some documentation 
-files.</para>
-
-<para><command>useradd ...</command>: Add an unprivileged user to run the 
-database server.</para>
-
-<para><command>createdb test; create table t1; insert into t1 values...; 
-select * from t1</command>: Create a database, add a table to it, insert some 
-rows into the table and select them to verify that the installation is working
-properly.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring 
-<application>Postgre<acronym>SQL</acronym></application></title>
-
-<sect3 id="postgresql-config"><title>Config files</title>
-
-<para><filename>$PGDATA/pg_ident.con</filename>, 
-<filename>$PGDATA/pg_hba.conf</filename> and 
-<filename>$PGDATA/postgresql.conf</filename></para>
-<indexterm zone="postgresql postgresql-config">
-<primary sortas="e-A.PGDATA-pg_ident.con">$PGDATA/pg_indent.con</primary>
-</indexterm>
-<indexterm zone="postgresql postgresql-config">
-<primary sortas="e-A.PGDATA-pg_hba.conf">$PGDATA/pg_hba_conf</primary>
-</indexterm>
-<indexterm zone="postgresql postgresql-config">
-<primary sortas="e-A.PGDATA-postgresql.conf">$PGDATA/postgresql.conf</primary>
-</indexterm>
-
-<para>The <envar>PGDATA</envar> environment variable is used to distinguish 
-database clusters from one another by setting it to the value of the directory
-which contains the cluster desired. The three configuration files
-exist in every <filename class="directory">PGDATA/</filename> directory. 
-Details on the format of the files and the options that can be set in 
-each can be found in <ulink
-url="file:///usr/share/doc/postgresql/html/index.html"/>.</para>
-
-<para id="postgresql-init">Install the 
-<filename>/etc/rc.d/init.d/postgresql</filename> init script included in the 
-<xref linkend="intro-important-bootscripts"/> package.</para>
-<indexterm zone="postgresql postgresql-init">
-<primary sortas="f-postgresql">postgresql</primary></indexterm>
-
-<screen><userinput><command>make install-postgresql</command></userinput></screen>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>clusterdb, createdb, createlang, createuser, dropdb, droplang, dropuser, 
-ecpg, initdb, ipcclean, pg_config, pg_controldata, pg_ctl, pg_dump, 
-pg_dumpall, pg_resetxlog, pg_restore, pltcl_delmod, pltcl_listmod, 
-pltcl_loadmod, postgres, postmaster, psql, vacuumdb</seg>
-<seg>libecpg.[so,a], libecpg_compat.[so,a], libpgport.a, libpgtypes.[so,a], 
-libpq.[so,a] and various charset modules.</seg>
-<seg>/srv/pgsql, /usr/include/libpq, /usr/include/postgresql, 
-/usr/lib/postgresql, /usr/share/doc/postgresql and /usr/share/postgresql</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="clusterdb">
-<term><command>clusterdb</command></term>
-<listitem><para>is a utility for reclustering tables in a 
-<application>Postgre<acronym>SQL</acronym></application> database.</para>
-<indexterm zone="postgresql clusterdb">
-<primary sortas="b-clusterdb">clusterdb</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="createdb">
-<term><command>createdb</command></term>
-<listitem><para> creates a new 
-<application>Postgre<acronym>SQL</acronym></application> database.</para>
-<indexterm zone="postgresql createdb">
-<primary sortas="b-createdb">createdb</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="createlang">
-<term><command>createlang</command></term>
-<listitem><para>defines a new 
-<application>Postgre<acronym>SQL</acronym></application> procedural 
-language.</para>
-<indexterm zone="postgresql createlang">
-<primary sortas="b-createlang">createlang</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="createuser">
-<term><command>createuser</command></term>
-<listitem><para>defines a new 
-<application>Postgre<acronym>SQL</acronym></application> user account.</para>
-<indexterm zone="postgresql createuser">
-<primary sortas="b-createuser">createuser</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="dropdb">
-<term><command>dropdb</command></term>
-<listitem><para>removes a 
-<application>Postgre<acronym>SQL</acronym></application> database.</para>
-<indexterm zone="postgresql dropdb">
-<primary sortas="b-dropdb">dropdb</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="droplang">
-<term><command>droplang</command></term>
-<listitem><para>removes a 
-<application>Postgre<acronym>SQL</acronym></application> procedural 
-language.</para>
-<indexterm zone="postgresql droplang">
-<primary sortas="b-droplang">droplang</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="dropuser">
-<term><command>dropuser</command></term>
-<listitem><para>removes a 
-<application>Postgre<acronym>SQL</acronym></application> user account.</para>
-<indexterm zone="postgresql dropuser">
-<primary sortas="b-dropuser">dropuser</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="ecpg">
-<term><command>ecpg</command></term>
-<listitem><para>is the embedded <acronym>SQL</acronym> preprocessor.</para>
-<indexterm zone="postgresql ecpg">
-<primary sortas="b-ecpg">ecpg</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="initdb">
-<term><command>initdb</command></term>
-<listitem><para>creates a new database cluster.</para>
-<indexterm zone="postgresql initdb">
-<primary sortas="b-initdb">initdb</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="ipcclean">
-<term><command>ipcclean</command></term>
-<listitem><para>removes shared memory and semaphores left over by an aborted 
-database server.</para>
-<indexterm zone="postgresql ipcclean">
-<primary sortas="b-ipcclean">ipcclean</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pg_config">
-<term><command>pg_config</command></term>
-<listitem><para>retrieves 
-<application>Postgre<acronym>SQL</acronym></application> version 
-information.</para>
-<indexterm zone="postgresql pg_config">
-<primary sortas="b-pg_config">pg_config</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pg_controldata">
-<term><command>pg_controldata</command></term>
-<listitem><para>returns information initialized during 
-<command>initdb</command>, such as the catalog version and server 
-locale.</para>
-<indexterm zone="postgresql pg_controldata">
-<primary sortas="b-pg_controldata">pg_controldata</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pg_ctl">
-<term><command>pg_ctl</command></term>
-<listitem><para>controls stopping and starting the database server.</para>
-<indexterm zone="postgresql pg_ctl">
-<primary sortas="b-pg_ctl">pg_ctl</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pg_dump">
-<term><command>pg_dump</command></term>
-<listitem><para>dumps database data and metadata into scripts which are used 
-to recreate the database.</para>
-<indexterm zone="postgresql pg_dump">
-<primary sortas="b-pg_dump">pg_dump</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pg_dumpall">
-<term><command>pg_dumpall</command></term>
-<listitem><para>recursively calls <command>pg_dump</command> for each 
-database in a cluster.</para>
-<indexterm zone="postgresql pg_dumpall">
-<primary sortas="b-pg_dumpall">pg_dumpall</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pg_resetxlog">
-<term><command>pg_resetxlog</command></term>
-<listitem><para>clears the write-ahead log and optionally resets some 
-fields in the <filename>pg_control</filename> file.</para>
-<indexterm zone="postgresql pg_resetxlog">
-<primary sortas="b-pg_resetxlog">pg_resetxlog</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pg_restore">
-<term><command>pg_restore</command></term>
-<listitem><para>creates databases from dump files created by 
-<command>pg_dump</command>.</para>
-<indexterm zone="postgresql pg_restore">
-<primary sortas="b-pg_restore">pg_restore</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pltcl_delmod">
-<term><command>pltcl_delmod</command></term>
-<listitem><para>is a support script used to delete a module from a 
-<acronym>PL</acronym>/<application>Tcl</application> table. The command 
-requires the <application><ulink 
-url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink></application> 
-package to be installed also.</para>
-<indexterm zone="postgresql pltcl_delmod">
-<primary sortas="b-pltcl_delmod">pltcl_delmod</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pltcl_listmod">
-<term><command>pltcl_listmod</command></term>
-<listitem><para>is a support script used to list the modules in a 
-<acronym>PL</acronym>/<application>Tcl</application> table. The command 
-requires the <application><ulink 
-url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink></application> 
-package to be installed also.</para>
-<indexterm zone="postgresql pltcl_listmod">
-<primary sortas="b-pltcl_listmod">pltcl_listmod</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pltcl_loadmod">
-<term><command>pltcl_loadmod</command></term>
-<listitem><para>is a support script used to load a module into a 
-<acronym>PL</acronym>/<application>Tcl</application> table. The command 
-requires the <application><ulink 
-url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink></application> 
-package to be installed also.</para>
-<indexterm zone="postgresql pltcl_loadmod">
-<primary sortas="b-pltcl_loadmod">pltcl_loadmod</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="postgres">
-<term><command>postgres</command></term>
-<listitem><para>is a single user database server, generally used for 
-debugging.</para>
-<indexterm zone="postgresql postgres">
-<primary sortas="b-postgres">postgres</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="postmaster">
-<term><command>postmaster</command></term>
-<listitem><para>is a multi-user database daemon.</para>
-<indexterm zone="postgresql postmaster">
-<primary sortas="b-postmaster">postmaster</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="psql">
-<term><command>psql</command></term>
-<listitem><para>is a console based database shell.</para>
-<indexterm zone="postgresql psql">
-<primary sortas="b-psql">psql</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="vacuumdb">
-<term><command>vacuumdb</command></term>
-<listitem><para>compacts databases and generates statistics for the query 
-analyzer.</para>
-<indexterm zone="postgresql vacuumdb">
-<primary sortas="b-vacuumdb">vacuumdb</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
Index: ntent/web/apache.xml
===================================================================
--- content/web/apache.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,299 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY apache-download-http "http://www.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
-  <!ENTITY apache-download-ftp  "ftp://ftp.tux.org/pub/net/apache/dist/httpd/httpd-&apache-version;.tar.bz2">
-  <!ENTITY apache-md5sum        "94f3a793fb1665365724943206cce23f">
-  <!ENTITY apache-size          "5.0 MB">
-  <!ENTITY apache-buildsize     "91.6 MB">
-  <!ENTITY apache-time          "1.69 SBU">
-]>
-
-<sect1 id="apache" xreflabel="Apache-&apache-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="apache.html"?>
-<title>Apache-&apache-version;</title>
-<indexterm zone="apache">
-<primary sortas="a-Apache">Apache</primary></indexterm>
-
-<sect2>
-<title>Introduction to <application>Apache</application></title>
-
-<para>The <application>Apache</application> package contains an
-open-source <acronym>HTTP</acronym> server. It is useful for creating local 
-intranet web sites or running huge web serving operations.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&apache-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&apache-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &apache-md5sum;</para></listitem>
-<listitem><para>Download size: &apache-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&apache-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &apache-time;</para></listitem>
-</itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink 
-url="&patch-root;/httpd-&apache-version;-config-1.patch"/></para></listitem>
-</itemizedlist></sect3>
-
-<sect3><title><application>Apache</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="db"/> or <xref linkend="gdbm"/>, 
-<xref linkend="openssl"/>, 
-<xref linkend="openldap"/>, 
-<xref linkend="expat"/> and 
-<xref linkend="doxygen"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Apache</application></title>
-
-<para>For security reasons, running the server as an unprivileged user and 
-group is strongly encouraged. Create the following group and user using the 
-following commands (as root):</para>
-
-<screen><userinput><command>groupadd apache &amp;&amp;
-useradd -c "Apache Server" -d /dev/null -g apache -s /bin/false apache</command></userinput></screen>
-
-<para>The following patch will define the layout of destination directories
-and, among them, the build directory at
-<filename class="directory">/usr/lib/apache/build</filename>. This 
-will allow the modules added to <application>Apache</application> to
-be configured without errors. Apply the patch:</para>
-
-<screen><userinput><command>patch -Np1 -i ../httpd-&apache-version;-config-1.patch</command></userinput></screen>
-
-<para>Build and install <application>Apache</application> by running the 
-following commands:</para>
-
-<screen><userinput><command>./configure --enable-layout=FHS --enable-mods-shared=all &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install &amp;&amp;
-chown root:root /usr/sbin/{apxs,apachectl,dbmmanage,envvars-std,envvars} \
-    /usr/include/apache/* /usr/lib/apache/httpd.exp \
-    /usr/share/man/man1/{dbmmanage,htdigest,htpasswd}.1 \
-    /usr/share/man/man8/{ab,apachectl,apxs,httpd}.8 \
-    /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 &amp;&amp;
-chown -R apache:apache /srv/www</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><option>--with-expat=/usr</option>: Uses system installed
-<application>expat</application>. <emphasis>If you have installed 
-<application>expat</application> and do not use this switch, the
-<application>Apache</application> installation may overwrite some files from 
-the <application>expat</application> installation.</emphasis></para>
-
-<para><parameter>--enable-mods-shared=all</parameter>: The modules should be 
-compiled and used as Dynamic Shared Objects
-(<acronym>DSO</acronym>s) so they can be included and excluded from the
-server using the run-time configuration directives.</para>
-
-<para><option>--enable-ssl</option>: Use this switch
-to create the <filename class="libraryfile">mod_ssl</filename>
-module and enable <acronym>SSL</acronym> support.</para>
-
-<para><command>chown root:root ...</command>: This command changes 
-the ownership of some installed files, the result of building the package as a 
-user other than root.</para>
-
-<para><command>chown -R apache:apache /srv/www</command>: By default, the 
-installation process installs files (documentation, error messages, default 
-icons, etc.) with the ownership of the user that extracted the files from the 
-tar file.  If you want to change the ownership to another user, you should do 
-so at this point.  The only requirement is that the document directories need 
-to be accessible by the <command>httpd</command> process with (r-x) permissions 
-and files need to be readable (r--) by the apache user.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>Apache</application></title>
-
-<sect3 id="apache-config">
-<title>Config files</title>
-
-<para><filename>/etc/apache/*</filename></para>
-<indexterm zone="apache apache-config">
-<primary sortas="e-etc-apache">/etc/apache/*</primary></indexterm>
-<indexterm zone="apache apache-config">
-<primary sortas="e-etc-apache-httpd.conf">/etc/apache/httpd.conf</primary>
-</indexterm>
-</sect3>
-
-<sect3>
-<title>Configuration Information</title>
-
-<para>The main configuration file is named <filename>httpd.conf</filename>. 
-Modify it to run the server as a dedicated user:</para>
-
-<screen><userinput><command>sed -i -e "s%User nobody%User apache%" \
-       -e "s%^Group #-1%Group apache%" \
-    /etc/apache/httpd.conf</command></userinput></screen>
-
-<para>See <ulink url="http://httpd.apache.org/docs-2.0/configuring.html"/> for 
-detailed instructions on customizing your <application>Apache</application> 
-<acronym>HTTP</acronym> server.</para>
-
-<para>There's a problem with the ISAPI <acronym>DSO</acronym> module
-caused from compiling with 
-<application><acronym>GCC</acronym></application>-&gcc-version;. Comment out 
-the module from the configuration file with the following command:</para>
-
-<screen><userinput><command>sed -i -e "s/^LoadModule isapi_module/# &amp;/" \
-    /etc/apache/httpd.conf</command></userinput></screen>
-
-<para id="apache-init">If you want the <application>Apache</application> 
-server to start automatically when the system is booted, install the 
-<filename>/etc/rc.d/init.d/apache</filename> init script included in the 
-<xref linkend="intro-important-bootscripts"/> package.</para>
-<indexterm zone="apache apache-init"> 
-<primary sortas="f-apache">apache</primary></indexterm>
-
-<screen><userinput><command>make install-apache</command></userinput></screen>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-<seglistitem>
-<seg>ab, apachectl, apr-config, apu-config, apxs, checkgid, dbmmanage, htdbm, 
-htdigest, htpasswd, httpd, instdso.sh, logresolve and rotatelogs</seg>
-<seg>libapr-0.[so,a], libaprutil-0.[so,a] and /usr/lib/apache/*.so</seg>
-<seg>/etc/apache, /srv/www, /usr/include/apache, /usr/lib/apache and 
-/var/log/apache</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="ab">
-<term><command>ab</command></term>
-<listitem><para>is a tool for benchmarking your 
-<application>Apache</application> <acronym>HTTP</acronym> server.</para>
-<indexterm zone="apache ab">
-<primary sortas="b-ab">ab</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="apachectl">
-<term><command>apachectl</command></term>
-<listitem><para>is a front end to the <application>Apache</application> 
-<acronym>HTTP</acronym> server which is designed to help the administrator 
-control the functioning of the <application>Apache</application> httpd 
-daemon.</para>
-<indexterm zone="apache apachectl">
-<primary sortas="b-apachectl">apachectl</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="apxs">
-<term><command>apxs</command></term>
-<listitem><para>is a tool for building and installing extension modules for 
-the <application>Apache</application> <acronym>HTTP</acronym> server.</para>
-<indexterm zone="apache apxs">
-<primary sortas="b-apxs">apxs</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="dbmanage">
-<term><command>dbmanage</command></term>
-<listitem><para>is used to create and update the <filename>DBM</filename> 
-format files used to store usernames and passwords for basic authentication 
-of <acronym>HTTP</acronym> users.</para>
-<indexterm zone="apache dbmanage">
-<primary sortas="b-dbmanage">dbmanage</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="htdigest">
-<term><command>htdigest</command></term>
-<listitem><para>is used to create and update the flat-files used to store 
-usernames, realms and passwords for digest authentication of 
-<acronym>HTTP</acronym> users.</para>
-<indexterm zone="apache htdigest">
-<primary sortas="b-htdigest">htdigest</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="htpasswd">
-<term><command>htpasswd</command></term>
-<listitem><para>is used to create and update the flat-files used to store 
-usernames and passwords for basic authentication of <acronym>HTTP</acronym> 
-users.</para>
-<indexterm zone="apache htpasswd">
-<primary sortas="b-htpasswd">htpasswd</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="httpd">
-<term><command>httpd</command></term>
-<listitem><para>is the <application>Apache</application> 
-<acronym>HTTP</acronym> server program.</para>
-<indexterm zone="apache httpd">
-<primary sortas="b-httpd">httpd</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="instdso.sh">
-<term><command>instdso.sh</command></term>
-<listitem><para>is a script which installs <application>Apache</application> 
-<acronym>DSO</acronym> modules.</para>
-<indexterm zone="apache instdso.sh">
-<primary sortas="b-instdso.sh">instdso.sh</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="logresolve">
-<term><command>logresolve</command></term>
-<listitem><para>is a post-processing program to resolve 
-<acronym>IP</acronym>-addresses in <application>Apache</application>'s 
-access log files.</para>
-<indexterm zone="apache logresolve">
-<primary sortas="b-logresolve">logresolve</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="rotatelogs">
-<term><command>rotatelogs</command></term>
-<listitem><para>is a simple program for use in conjunction with 
-<application>Apache</application>'s piped log file feature.</para>
-<indexterm zone="apache rotatelogs">
-<primary sortas="b-rotatelogs">rotatelogs</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
Index: ntent/web/php.xml
===================================================================
--- content/web/php.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,243 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY php-download-http "http://us2.php.net/distributions/php-&php-version;.tar.bz2">
-  <!ENTITY php-download-ftp  "ftp://ftp.isu.edu.tw/pub/Unix/Web/PHP/distributions/php-&php-version;.tar.bz2">
-  <!ENTITY php-md5sum        "fb1aac107870f897d26563a9cc5053c0">
-  <!ENTITY php-size          "4.7 MB">
-  <!ENTITY php-buildsize     "126 MB">
-  <!ENTITY php-time          "1.82 SBU">
-]>
-
-<sect1 id="php" xreflabel="PHP-&php-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="php.html"?>
-<title><acronym>PHP</acronym>-&php-version;</title>
-<indexterm zone="php">
-<primary sortas="a-PHP">PHP</primary></indexterm>
-
-<sect2>
-<title>Introduction to <application><acronym>PHP</acronym></application></title>
-
-<para><application><acronym>PHP</acronym></application> is the 
-<acronym>PHP</acronym> Hypertext Preprocessor. Primarily used in dynamic web 
-sites, it allows for programming code to be directly embedded into the
-<acronym>HTML</acronym> markup.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&php-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&php-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &php-md5sum;</para></listitem>
-<listitem><para>Download size: &php-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&php-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&php-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing="compact">
-<listitem><para>Required patch for Berkeley DB: <ulink 
-url="&patch-root;/php-&php-version;-db43-1.patch"/></para>
-</listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application><acronym>PHP</acronym></application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="apache"/></para>
-</sect4>
-
-<sect4><title>Optional</title>
-<para><xref linkend="libxml2"/>,
-<xref linkend="libxslt"/>,
-<xref linkend="openssl"/>,
-<ulink url="http://www.fastio.com/">ClibPDF</ulink>,
-<xref linkend="libjpeg"/>,
-<xref linkend="libtiff"/>,
-<xref linkend="curl"/>,
-<ulink url="http://qdbm.sourceforge.net/">QDBM</ulink>,
-<ulink url="http://cr.yp.to/cdb.html">cdb</ulink>,
-<xref linkend="gdbm"/>, 
-<xref linkend="db"/>,
-<xref linkend="fam"/>,
-<ulink url="http://www.boutell.com/gd/">GD</ulink>,
-<xref linkend="libpng"/>,
-X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
-<xref linkend="freetype2"/>,
-<ulink 
-url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.0.2.tar.gz">
-t1lib</ulink>,
-<xref linkend="gmp"/>
-<xref linkend="mysql"/>,
-<xref linkend="pcre"/>,
-<xref linkend="postgresql"/>,
-<xref linkend="aspell"/>,
-<xref linkend="pkgconfig"/>,
-<xref linkend="html-tidy"/>,
-<xref linkend="openldap"/>,
-<xref linkend="cyrus-sasl"/>,
-<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
-<ulink url="http://mcrypt.hellug.gr/">libmcrypt</ulink>,
-<ulink url="http://mhash.sourceforge.net/">mhash</ulink>,
-<ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
-<ulink url="http://www.sqlite.org/">SQLite</ulink>,
-<ulink url="http://dmalloc.com/">Dmalloc</ulink>,
-<ulink url="http://www.mnogosearch.org/">mnoGoSearch</ulink>,
-<ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink>,
-<ulink url="http://www.empress.com/">Empress</ulink>,
-<ulink url="http://www.birdstep.com/">Birdstep</ulink>,
-<ulink url="http://www.dbmaker.com/">DBMaker</ulink>,
-<ulink url="http://www.softwareag.com/">Adabas</ulink>,
-<ulink url="http://www.frontbase.com/">FrontBase</ulink>,
-<ulink url="http://caudium.net/">Caudium</ulink>,
-<ulink url="http://www.openwddx.org/">WDDX</ulink>,
-<ulink url="http://partners.adobe.com/asn/acrobat/forms.jsp">
-FDF Toolkit</ulink>,
-<ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,
-<ulink url="http://www.mainstreetsoftworks.com/">Monetra</ulink>,
-<xref linkend="expat"/> and
-<ulink url="../server/mail.html">MTA</ulink></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application><acronym>PHP</acronym></application></title>
-
-<note><para>You can use <application><acronym>PHP</acronym></application>
-for server-side scripting, command line scripting or client-side
-<acronym>GUI</acronym> applications. The book provides instructions for
-setting up <application><acronym>PHP</acronym></application> for
-server-side scripting as it is the most common form.</para></note>
-
-<para>If you have Berkeley DB installed and wish to utilize it, apply
-the following patch:</para>
-
-<screen><userinput><command>patch -Np1 -i ../php-&php-version;-db43-1.patch</command></userinput></screen>
-
-<para>Install <application><acronym>PHP</acronym></application> by
-running the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --with-apxs2 \
-            --with-config-file-path=/etc \
-            --with-zlib \
-            --enable-bcmath \
-            --with-bz2 \
-            --enable-calendar \
-            --enable-dba \
-            --enable-exif \
-            --enable-ftp \
-            --with-gettext \
-            --with-iconv \
-            --enable-mbstring \
-            --with-ncurses \
-            --with-readline \
-            --disable-libxml &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install &amp;&amp;
-cp php.ini-recommended /etc/php.ini</command></userinput></screen>
-
-<para>Remove the <parameter>--disable-libxml</parameter> switch if you
-have <xref linkend="libxml2"/> installed otherwise
-<command>pear</command> will not be built.</para>
-
-<note><para><acronym>PHP</acronym> has many more configure options that
-will enable support for certain things. You can use
-<command>./configure --help</command> to see a full list of the
-available options. Also, use of the
-<ulink url="http://www.php.net/"><acronym>PHP</acronym> web site</ulink>
-is highly recommended, as their online docs are very good.</para></note>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application><acronym>PHP</acronym></application></title>
-
-<sect3 id="php-config"><title>Config files</title>
-<para><filename>/etc/php.ini</filename>,
-<filename>/etc/pear.conf</filename></para>
-<indexterm zone="php php-config">
-<primary sortas="e-etc-php.ini">/etc/php.ini</primary></indexterm>
-<indexterm zone="php php-config">
-<primary sortas="e-etc-pear.conf">/etc/pear.conf</primary></indexterm>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para>To enable <acronym>PHP</acronym> support in the
-<application>Apache</application> web server,
-a new LoadModule (which should be handled automatically by the
-<command>make install</command> command) and AddType directives must be added 
-to the <filename>httpd.conf</filename> file:</para>
-
-<screen><userinput>LoadModule php5_module lib/apache/libphp5.so
-AddType application/x-httpd-php .php</userinput></screen>
-
-<para>Also, it can be useful to add an entry for 
-<filename>index.php</filename> to the DirectoryIndex directive of the 
-<filename>httpd.conf</filename> file.</para>
-
-<para>You'll need to restart the <application>Apache</application> web server 
-after making any modifications to the <filename>httpd.conf</filename> 
-file.</para>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Library</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>pear, php, php-config, phpextdist and phpize</seg>
-<seg>libphp5.so</seg>
-<seg>/usr/include/php and /usr/lib/php</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="php-prog">
-<term><command>php</command></term>
-<listitem><para>is a command line interface that enables you to parse and 
-execute <acronym>PHP</acronym> code.</para>
-<indexterm zone="php php-prog">
-<primary sortas="b-php">php</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pear">
-<term><command>pear</command></term>
-<listitem><para>is the <acronym>PHP</acronym> Extension and Application 
-Repository (<acronym>PEAR</acronym>) package manager.</para>
-<indexterm zone="php pear">
-<primary sortas="b-pear">pear</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
Index: ntent/web/proftpd.xml
===================================================================
--- content/web/proftpd.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,288 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY proftpd-download-http "http://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.bz2">
-  <!ENTITY proftpd-download-ftp  "ftp://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.bz2">
-  <!ENTITY proftpd-md5sum        "5feb4a7348e12faefc25e34fd92efdd6">
-  <!ENTITY proftpd-size          "901 KB">
-  <!ENTITY proftpd-buildsize     "7.3 MB">
-  <!ENTITY proftpd-time          "0.27 SBU">
-]>
-
-<sect1 id="proftpd" xreflabel="ProFTPD-&proftpd-version;">
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
-
-<?dbhtml filename="proftpd.html"?>
-<title><application>Pro<acronym>FTP</acronym>D</application>-&proftpd-version;</title>
-
-<indexterm zone="proftpd">
-  <primary sortas="a-proftpd">Proftpd</primary>
-</indexterm>
-
-<sect2>
-<title>Introduction to <application>Pro<acronym>FTP</acronym>D</application></title>
-
-<para>The <application>Pro<acronym>FTP</acronym>D</application> package 
-contains a secure and highly configurable <acronym>FTP</acronym> daemon. This 
-is useful for serving large file archives over a network.</para>
-
-<sect3>
-<title>Package information</title>
-<itemizedlist spacing='compact'>
-  <listitem><para>Download (HTTP): <ulink url="&proftpd-download-http;"/></para></listitem>
-  <listitem><para>Download (FTP): <ulink url="&proftpd-download-ftp;"/></para></listitem>
-  <listitem><para>Download MD5 sum: &proftpd-md5sum;</para></listitem>
-  <listitem><para>Download size: &proftpd-size;</para></listitem>
-  <listitem><para>Estimated disk space required: &proftpd-buildsize;</para></listitem>
-  <listitem><para>Estimated build time: &proftpd-time;</para></listitem>
-</itemizedlist>
-</sect3>
-
-<sect3>
-<title><application>Pro<acronym>FTP</acronym>D</application> dependencies</title>
-
-<sect4>
-<title>Optional</title>
-
-<para><xref linkend="Linux_PAM"/></para>
-
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Pro<acronym>FTP</acronym>D</application></title>
-
-<para>For security reasons, you should install
-<application>Pro<acronym>FTP</acronym>D</application> using an unprivileged user
-and group.  As the root user:</para>
-
-<screen><userinput><command>groupadd proftpd &amp;&amp;
-useradd -c proftpd -d /home/ftp -g proftpd \
-        -s /usr/lib/proftpd/proftpdshell proftpd &amp;&amp;
-install -d -m775 -o proftpd -g proftpd /usr/lib/proftpd &amp;&amp;
-ln -s /bin/false /usr/lib/proftpd/proftpdshell &amp;&amp;
-echo /usr/lib/proftpd/proftpdshell &gt;&gt; /etc/shells</command></userinput></screen>
-
-<para>Install <application>Pro<acronym>FTP</acronym>D</application> as a regular user by running 
-the following commands:</para>
-
-<screen><userinput><command>install_user=proftpd install_group=proftpd \
-    ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var/run &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, again as the root user:</para>
- 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><command>install -d -m775 -o proftpd -g proftpd /usr/lib/proftpd</command>: 
-Create the home directory for <application>Pro<acronym>FTP</acronym>D</application>.</para>
-
-<para><command>ln -s /bin/false /usr/lib/proftpd/proftpdshell</command>:
-Set the default shell as a link to a invalid shell.</para> 
-
-<para><command>echo /usr/lib/proftpd/proftpdshell &gt;&gt; /etc/shells</command>:
-Fake a valid shell for compatability purposes.</para>
-
-<note><para>The above three commands can be ommitted if the following directive is 
-placed in the configuration file:
-
-<screen>RequireValidShell off</screen>
-
-By default, proftpd will require that users logging in have valid shells. 
-The RequireValidShell directive turns off this requirement.  This is only
-recommended if you are setting up your <acronym>FTP</acronym> server exclusively 
-for anonymous downloads.
-</para></note>
-
-<para><parameter>install_user=proftpd install_group=proftpd</parameter>:
-Specify the user and group identity for 
-<application>Pro<acronym>FTP</acronym>D</application>.</para>
-
-<para><parameter>--sysconfdir=/etc</parameter>:
-This prevents the configuration files from going to
-<filename class="directory">/usr/etc</filename>.</para>
-
-<para><parameter>--localstatedir=/var/run</parameter>:
-This uses <filename class="directory">/var/run</filename> instead of
-<filename class="directory">/usr/var</filename> for lock files.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>Pro<acronym>FTP</acronym>D</application></title>
-
-<sect3 id='proftpd-init'>
-<title>proftpd init.d script</title>
-
-<indexterm zone="proftpd proftpd-init">
-  <primary sortas="f-proftpd">proftpd</primary>
-</indexterm>
-
-
-<para>Install the <filename>/etc/rc.d/init.d/proftpd</filename> init script 
-included in the <xref linkend="intro-important-bootscripts"/> package.</para>
-
-<screen><userinput><command>make install-proftpd</command></userinput></screen>
-
-</sect3>
-
-<sect3 id='proftpd-config'>
-<title>Config files</title>
-
-<indexterm zone="proftpd proftpd-config">
-   <primary sortas="e-etc-proftpd">/etc/proftpd.conf</primary>
-</indexterm>
-
-<para><filename>/etc/proftpd.conf</filename></para>
-</sect3>
-
-<sect3><title>Configuration information</title>
-<para>This is a simple, download-only sample configuration. See the 
-<application>Pro<acronym>FTP</acronym>D</application> documentation in 
-<filename class="directory">/usr/share/doc/proftpd</filename> and consult the 
-website at <ulink url="http://www.proftpd.org/"/> for example 
-configurations.</para>
-
-<screen><userinput><command>cat &gt; /etc/proftpd.conf &lt;&lt; "EOF"</command>
-# This is a basic ProFTPD configuration file
-# It establishes a single server and a single anonymous login.
-
-ServerName                      "ProFTPD Default Installation"
-ServerType                      standalone
-DefaultServer                   on
-
-# Port 21 is the standard FTP port.
-Port                            21
-# Umask 022 is a good standard umask to prevent new dirs and files
-# from being group and world writable.
-Umask                           022
-
-# To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
-# at once, simply increase this value.  Note that this ONLY works
-# in standalone mode, in inetd mode you should use an inetd server
-# that allows you to limit maximum number of processes per service
-# (such as xinetd)
-MaxInstances                    30
-
-# Set the user and group that the server normally runs at.
-User                            proftpd
-Group                           proftpd
-
-# Normally, files should be overwritable.
-&lt;Directory /*&gt;
-  AllowOverwrite                on
-&lt;/Directory&gt;
-
-# A basic anonymous configuration, no upload directories.
-&lt;Anonymous ~proftpd&gt;
-  User                          proftpd
-  Group                         proftpd
-  # Clients should be able to login with "anonymous" as well as "proftpd"
-  UserAlias                     anonymous proftpd
-
-  # Limit the maximum number of anonymous logins
-  MaxClients                    10
-
-  # 'welcome.msg' should be displayed at login, and '.message' displayed
-  # in each newly chdired directory.
-  DisplayLogin                  welcome.msg
-  DisplayFirstChdir             .message
-
-  # Limit WRITE everywhere in the anonymous chroot
-  &lt;Limit WRITE&gt;
-    DenyAll
-  &lt;/Limit&gt;
-&lt;/Anonymous&gt;
-<command>EOF</command></userinput></screen></sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-  <segtitle>Installed Programs</segtitle>
-  <segtitle>Installed Libraries</segtitle>
-  <segtitle>Installed Directory</segtitle>
- 
-  <seglistitem>
-    <seg>ftpcount, ftpdctl, ftptop, ftpwho, ftpshut, proftpd</seg>
-    <seg>None</seg>
-    <seg>/var/run/proftpd</seg>
-  </seglistitem>
-</segmentedlist>
- 
-<variablelist>
-  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-  <?dbfo list-presentation="list"?>
-
-<varlistentry id="proftpd-prog">
-  <term><command>proftpd</command></term>
-  <listitem>
-    <para>is the <acronym>FTP</acronym> daemon.</para>
-    <indexterm zone="proftpd proftpd-prog">
-      <primary sortas="b-proftpd">proftpd</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="ftpcount">
-  <term><command>ftpcount</command></term>
-  <listitem>
-    <para>shows the current number of connections.</para>
-    <indexterm zone="proftpd ftpcount">
-      <primary sortas="b-ftpcount">ftpcount</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="ftpshut">
-  <term><command>ftpshut</command></term>
-  <listitem>
-    <para>shuts down all <application>proftpd</application> servers at a given time.</para>
-    <indexterm zone="proftpd ftpshut">
-      <primary sortas="b-ftpshut">ftpshut</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="ftptop">
-  <term><command>ftptop</command></term>
-  <listitem>
-    <para>displays running status on connections.</para>
-    <indexterm zone="proftpd ftptop">
-      <primary sortas="b-ftptop">ftptop</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="ftpwho">
-  <term><command>ftpwho</command></term>
-  <listitem>
-    <para>shows current process information for each session.</para>
-    <indexterm zone="proftpd ftpwho">
-      <primary sortas="b-ftpwho">ftpwho</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-</variablelist>
-</sect2>
-
-</sect1>
-
Index: ntent/web/vsftpd.xml
===================================================================
--- content/web/vsftpd.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY vsftpd-download-http " ">
-  <!ENTITY vsftpd-download-ftp  "ftp://vsftpd.beasts.org/users/cevans/vsftpd-&vsftpd-version;.tar.gz">
-  <!ENTITY vsftpd-md5sum        "63838791ec8b1375ed154fb2603e52e9">
-  <!ENTITY vsftpd-size          "148 KB">
-  <!ENTITY vsftpd-buildsize     "492 KB">
-  <!ENTITY vsftpd-time          "0.01 SBU">
-]>
-
-<sect1 id="vsftpd" xreflabel="vsFTPD-&vsftpd-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="vsftpd.html"?>
-<title><application>vs<acronym>FTP</acronym>D</application>-&vsftpd-version;
-</title>
-
-<sect2>
-<title>Introduction to 
-<application>vs<acronym>FTP</acronym>D</application></title>
-
-<para>The <application>vs<acronym>FTP</acronym>D</application> package 
-contains a very secure and very small <acronym>FTP</acronym> daemon. This is 
-useful for serving files over a network.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&vsftpd-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&vsftpd-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &vsftpd-md5sum;</para></listitem>
-<listitem><para>Download size: &vsftpd-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&vsftpd-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&vsftpd-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>vsFTPD</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="Linux_PAM"/>,
-<xref linkend="openssl"/>, and
-<xref linkend="tcpwrappers"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>vsFTPD</application></title>
-
-<para>For security reasons, running 
-<application>vs<acronym>FTP</acronym>D</application> as an unprivileged user 
-and group is encouraged. Also, a user to map anonymous users to should be
-created.</para>
-
-<screen><userinput><command>install -d -m 0755 /var/ftp/empty &amp;&amp;
-install -d -m 0755 /home/ftp &amp;&amp;
-groupadd vsftpd &amp;&amp;
-useradd -d /dev/null -c "vsFTPD User" -g vsftpd -s /bin/false vsftpd &amp;&amp;
-groupadd ftp &amp;&amp;
-useradd -c anonymous_user -d /home/ftp -g ftp -s /bin/false ftp</command>
-</userinput></screen>
-
-<para>Install <application>vs<acronym>FTP</acronym>D</application> by running 
-the following commands:</para>
-
-<screen><userinput><command>make &amp;&amp;
-install -m 755 vsftpd /usr/sbin/vsftpd &amp;&amp;
-install -m 644 vsftpd.8 /usr/share/man/man8 &amp;&amp;
-install -m 644 vsftpd.conf.5 /usr/share/man/man5 &amp;&amp;
-install -m 644 vsftpd.conf /etc</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>install -d [...]</parameter>: This creates the directory that
-anonymous users will use (<filename class='directory'>/home/ftp</filename>) 
-and the directory the daemon will chroot into 
-(<filename class='directory'>/var/ftp/empty</filename>).</para>
-
-<note><para><filename class="directory">/home/ftp</filename> should not be
-owned by the user vsftpd, or the user ftp.</para></note>
-
-<para><parameter>echo "#define VSF_BUILD_TCPWRAPPERS" >>builddefs.h</parameter>:
-Use this prior to <command>make</command> to add support for 
-<application>tcpwrappers</application>.</para>
-
-<para><parameter>echo "#define VSF_BUILD_SSL" >>builddefs.h</parameter>:
-Use this prior to <command>make</command> to add support for 
-<acronym>SSL</acronym>.</para>
-
-<para><parameter>install -m [...]</parameter>:
-The <filename>Makefile</filename> hardwires 
-<filename class='directory'>/usr/local</filename> (if it exists). These 
-commands install the files in 
-<filename class='directory'>/usr</filename>.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>vs<acronym>FTP</acronym>D</application></title>
-
-<sect3><title>vsftpd init.d script</title>
-<para>Install the <filename>/etc/rc.d/init.d/vsftpd</filename>
-init script included in the 
-<xref linkend="intro-important-bootscripts"/> package.</para>
-
-<screen><userinput><command>make install-vsftpd</command></userinput></screen>
-
-</sect3>
-
-<sect3><title>Config files</title>
-<para><filename>/etc/vsftpd.conf</filename></para>
-</sect3>
-
-<sect3><title>Configuration information</title>
-<para><application>vs<acronym>FTP</acronym>D</application> comes with a basic 
-anonymous-only configuration file that was copied to 
-<filename class='directory'>/etc</filename> above. This file should be modified 
-because it is now recommended to run <command>vsftpd</command> in standalone 
-mode as opposed to <command>inetd</command>/<command>xinetd</command> mode. 
-Also, you should specify the privilege separation user created above. Finally, 
-you should specify the <command>chroot</command> directory. 
-<command>man vsftpd.conf</command> will give you all the details.</para>
-
-<screen><userinput><command>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"</command>
-background=YES
-listen=YES
-nopriv_user=vsftpd
-secure_chroot_dir=/var/ftp/empty
-<command>EOF</command></userinput></screen>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The <application>vs<acronym>FTP</acronym>D</application> package contains 
-<command>vsftpd</command>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>vsftpd</title>
-<para><command>vsftpd</command> is the <acronym>FTP</acronym> 
-daemon.</para></sect3>
-
-</sect2>
-
-</sect1>
-
Index: index.xml
===================================================================
--- index.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ index.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -17,5 +17,4 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/basicnet.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="server/server.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="content/content.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x/x.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kde/kde.xml"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ introduction/welcome/changelog.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -22,4 +22,8 @@
 
 <itemizedlist>
+
+<listitem><para>April 12th, 2005 [bdubbs]: Major reorganization of 
+server sections.  Consolidated 'Server Networking' and 'Content
+Serving'.</para></listitem>
 
 <listitem><para>April 11th, 2005 [dj]: Added 'Additional X Windows 
Index: introduction/welcome/which.xml
===================================================================
--- introduction/welcome/which.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ introduction/welcome/which.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -59,7 +59,7 @@
 <para>Once you have dealt with these basics, you may wish to configure
 more advanced network services.  These are dealt with in the <xref 
-linkend="server"/> and <xref linkend="content"/> parts of the book.  
+linkend="server"/> and <xref linkend="server"/> parts of the book.  
 Those wanting to build servers should find enough information to give 
-them a good starting point here.  Note that <xref linkend="content"/> also
+them a good starting point here.  Note that <xref linkend="server"/> also
 contains information on various database packages.</para>
 
Index: server/databases/databases.xml
===================================================================
--- server/databases/databases.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/databases/databases.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter 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;
+]>
+
+<chapter id="server-databases">
+<?dbhtml filename="databases.html"?>
+<title>Databases</title>
+
+<para>This chapter includes databases that range from single-user
+read/write to industrial database servers with transaction support.
+Generally, you will be sent here to satisfy dependencies to other
+applications although building a <acronym>SQL</acronym> server on a base
+<acronym>LFS</acronym> system is entirely possible.</para>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="db.xml"/>   
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mysql.xml"/>   
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="postgresql.xml"/>   
+
+</chapter>
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/databases/db.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,232 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY db-download-http " ">
+  <!ENTITY db-download-ftp  "ftp://sleepycat1.inetu.net/releases/db-&db-version;.tar.gz">
+  <!ENTITY db-md5sum        "fcc481d52c3b80e20a328f8c0cb042bd">
+  <!ENTITY db-size          "5.7 MB">
+  <!ENTITY db-buildsize     "68 MB (additional 140 MB to run parallel standard testsuite)">
+  <!ENTITY db-time          "1.23 SBU (additional 74.5 SBU to run parallel standard testsuite)">
+]>
+
+<sect1 id="db" xreflabel="Berkeley DB-&db-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="db.html"?>
+<title>Berkeley DB-&db-version;</title>
+<indexterm zone="db">
+<primary sortas="a-Berkeley-DB">Berkeley DB</primary></indexterm>
+
+<sect2>
+<title>Introduction to <application>Berkeley DB</application></title>
+
+<para>The <application>Berkeley DB</application> package contains programs and
+utilities used by many other applications for database related
+functions.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&db-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&db-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &db-md5sum;</para></listitem>
+<listitem><para>Download size: &db-size;</para></listitem>
+<listitem><para>Estimated disk space required:
+&db-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&db-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Berkeley DB</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="tcl"/> and <xref linkend="j2sdk"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Berkeley DB</application></title>
+
+<para>Install <application>Berkeley DB</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>cd build_unix &amp;&amp;
+../dist/configure --prefix=/usr \
+    --enable-compat185 \
+    --enable-cxx &amp;&amp;
+make LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread"</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make docdir=/usr/share/doc/db-&db-version; install &amp;&amp;
+chown root:root /usr/bin/db_* \
+/usr/lib/libdb* /usr/include/db* &amp;&amp;
+chown -R root:root /usr/share/doc/db-&db-version;</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>cd build_unix &amp;&amp; 
+../dist/configure --prefix=/usr...</command>: 
+This replaces the normal <command>./configure</command> command, as
+<application>Berkeley DB</application> comes with various 
+build directories for different platforms.</para>
+
+<para><parameter>--enable-compat185</parameter>: This switch enables
+building DB 1.85 compatibility <acronym>API</acronym>.</para>
+
+<para><parameter>--enable-cxx</parameter>: This switch enables building
+C++ <acronym>API</acronym> libraries.</para>
+
+<para><command>make LIBSO_LIBS="-lpthread"
+LIBXSO_LIBS="-lpthread"</command>:  <command>configure</command> does not 
+correctly handle <acronym>NPTL</acronym>. These variables force it to 
+properly link against <acronym>NPTL</acronym>.</para> 
+
+<para><command>make docdir=/usr/share/doc/db-&db-version; 
+install</command>: This installs the documentation in
+the correct place.</para>
+
+<para><option>--enable-tcl --with-tcl=/usr/lib</option>:
+Enables <application>Tcl</application> support in DB and creates the
+<filename class="libraryfile">libdb_tcl</filename> libraries.</para>
+
+<para><option>--enable-java</option>: Enables <application>Java</application>
+support in DB and creates the 
+<filename class='libraryfile'>libdb_java</filename> libraries.</para>
+
+<para><option>--enable-rpc</option>: Enables building the 
+<application>Berkeley DB</application> <acronym>RPC</acronym> server.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directory</segtitle>
+
+<seglistitem>
+<seg>berkeley_db_svc, db_archive, db_checkpoint, db_deadlock, db_dump, 
+db_load, db_printlog, db_recover, db_stat, db_upgrade and db_verify</seg>
+<seg>libdb.[so,a], libdb_cxx.[so,a], libdb_java.[so,a] and 
+libdb_tcl.[so,a]</seg>
+<seg>/usr/share/doc/db-&db-version;</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="berkeley_db_svc">
+<term><command>berkeley_db_svc</command></term>
+<listitem><para>is the <application>Berkeley DB</application> 
+<acronym>RPC</acronym> server.</para>
+<indexterm zone="db berkeley_db_svc">
+<primary sortas="b-berkeley_db_svc">berkeley_db_svc</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="db_archive">
+<term><command>db_archive</command></term>
+<listitem><para>prints the pathnames of log files that are no longer in 
+use.</para>
+<indexterm zone="db db_archive">
+<primary sortas="b-db_archive">db_archive</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="db_checkpoint">
+<term><command>db_checkpoint</command></term>
+<listitem><para>is a daemon process used to monitor and checkpoint database 
+logs.</para>
+<indexterm zone="db db_checkpoint">
+<primary sortas="b-db_checkpoint">db_checkpoint</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="db_deadlock">
+<term><command>db_deadlock</command></term>
+<listitem><para>is used to abort lock requests when deadlocks are 
+detected.</para>
+<indexterm zone="db db_deadlock">
+<primary sortas="b-db_deadlock">db_deadlock</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="db_dump">
+<term><command>db_dump</command></term>
+<listitem><para>converts database files to a flat file format readable by 
+<command>db_load</command>.</para>
+<indexterm zone="db db_dump">
+<primary sortas="b-db_dump">db_dump</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="db_load">
+<term><command>db_load</command></term>
+<listitem><para>is used to create database files from flat files created with 
+<command>db_dump</command>.</para>
+<indexterm zone="db db_load">
+<primary sortas="b-db_load">db_load</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="db_printlog">
+<term><command>db_printlog</command></term>
+<listitem><para>converts database log files to human readable text.</para>
+<indexterm zone="db db_printlog">
+<primary sortas="b-db_printlog">db_printlog</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="db_recover">
+<term><command>db_recover</command></term>
+<listitem><para>is used to restore a database to a consistent state after a 
+failure.</para>
+<indexterm zone="db db_recover">
+<primary sortas="b-db_recover">db_recover</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="db_stat">
+<term><command>db_stat</command></term>
+<listitem><para>displays database environment statistics.</para>
+<indexterm zone="db db_stat">
+<primary sortas="b-db_stat">db_stat</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="db_upgrade">
+<term><command>db_upgrade</command></term>
+<listitem><para>is used to upgrade database files to a newer version of 
+<application>Berkeley DB</application>.</para>
+<indexterm zone="db db_upgrade">
+<primary sortas="b-db_upgrade">db_upgrade</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="db_verify">
+<term><command>db_verify</command></term>
+<listitem><para>is used to run consistency checks on database files.</para>
+<indexterm zone="db db_verify">
+<primary sortas="b-db_verify">db_verify</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
Index: server/databases/mysql.xml
===================================================================
--- server/databases/mysql.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/databases/mysql.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,252 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY mysql-download-http "http://mysql.he.net/Downloads/MySQL-4.1/mysql-&mysql-version;.tar.gz">
+  <!ENTITY mysql-download-ftp  "ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-4.1/mysql-&mysql-version;.tar.gz">
+  <!ENTITY mysql-md5           "6a4a6a5b3d0a42a9a271b2b8867bde82">
+  <!ENTITY mysql-size          "22.5 MB">
+  <!ENTITY mysql-buildsize     "207 MB">
+  <!ENTITY mysql-time          "3.83 SBU">
+]>
+
+<sect1 id="mysql" xreflabel="MySQL-&mysql-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="mysql.html"?>
+<title>MySQL-&mysql-version;</title>
+<indexterm zone="mysql">
+<primary sortas="a-MySQL">MySQL</primary></indexterm>
+
+<sect2>
+<title>Introduction to <application>My<acronym>SQL</acronym></application>
+</title>
+
+<para><application>My<acronym>SQL</acronym></application> is a widely used and 
+fast <acronym>SQL</acronym> database server. It is a client/server 
+implementation that consists of a server daemon and many different 
+client programs and libraries.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&mysql-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&mysql-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &mysql-md5;</para></listitem>
+<listitem><para>Download size: &mysql-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&mysql-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&mysql-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>My<acronym>SQL</acronym></application> dependencies
+</title>
+<sect4><title>Optional</title>
+<para><xref linkend="openssl"/>,
+<xref linkend="tcpwrappers"/>,
+<ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink> 
+(as an alternative to readline), 
+<xref linkend="ORBit"/> (detected only if <xref linkend="which"/> is 
+installed), 
+<xref linkend="doxygen"/> and
+<xref linkend="tex"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>My<acronym>SQL</acronym></application>
+</title>
+
+<para>For security reasons, running the server as an unprivileged user 
+and group is strongly encouraged:</para>
+
+<screen><userinput><command>groupadd mysql &amp;&amp;
+useradd -c "MySQL Server" -d /dev/null -g mysql -s /bin/false mysql</command></userinput></screen>
+
+<para>Build and install <application>My<acronym>SQL</acronym></application> by 
+running the following commands:</para>
+
+<screen><userinput><command>CPPFLAGS="-D_GNU_SOURCE" ./configure --prefix=/usr --sysconfdir=/etc \
+    --libexecdir=/usr/sbin --localstatedir=/srv/mysql \
+    --enable-thread-safe-client --enable-assembler \
+    --enable-local-infile --with-named-thread-libs=-lpthread \
+    --with-unix-socket-path=/var/run/mysql/mysql.sock \
+    --without-debug --without-bench --without-readline &amp;&amp;
+make testdir=/usr/lib/mysql/mysql-test</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make testdir=/usr/lib/mysql/mysql-test install &amp;&amp;
+install -v -d -m755 /usr/share/mysql/Docs/Images &amp;&amp;
+install -v -m644 Docs/manual{,_toc}.html \
+                 Docs/manual.txt /usr/share/mysql/Docs &amp;&amp;
+install -v -m644 Docs/Images/*.{jpg,gif} /usr/share/mysql/Docs/Images &amp;&amp;
+cd /usr/lib &amp;&amp;
+ln -v -sf mysql/libmysqlclient{,_r}.so* .</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--libexecdir=/usr/sbin</parameter>: This switch installs the 
+<command>mysqld</command> daemon in an appropriate location.</para>
+
+<para><parameter>--localstatedir=/srv/mysql</parameter>: This switch forces
+<application>My<acronym>SQL</acronym></application> to use 
+<filename class='directory'>/srv/mysql</filename> for database files and other 
+variable data.</para>
+
+<para><parameter>--enable-thread-safe-client</parameter>: This switch compiles a 
+thread-safe <application>My<acronym>SQL</acronym></application> client library.
+</para>
+
+<para><parameter>--enable-assembler</parameter>: This switch allows using 
+assembler versions of some string functions.</para>
+
+<para><parameter>--enable-local-infile</parameter>: This switch enables the
+LOAD DATA INFILE <acronym>SQL</acronym> statement.</para>
+
+<para><parameter>CPPFLAGS="-D_GNU_SOURCE" 
+--with-named-thread-libs=-lpthread</parameter>: This environment variable and 
+configure switch enable building on <acronym>NPTL</acronym> systems.</para>
+
+<para><parameter>--with-unix-socket-path=/var/run/mysql</parameter>:
+This switch puts the unix-domain socket into <filename
+class="directory">/var/run/mysql</filename> directory instead of default
+<filename class="directory">/tmp</filename>.</para>
+
+<para><parameter>--without-bench</parameter>: This switch skips building the 
+benchmark suite.</para>
+
+<para><parameter>--without-readline</parameter>: This switch forces the build 
+to use the system copy of <application>readline</application> instead of the 
+bundled copy.</para>
+
+<para><command>make testdir=...</command>: This installs the test suite in 
+<filename class='directory'>/usr/lib/mysql/mysql-test</filename>. 
+<acronym>BLFS</acronym> is currently seeking a method to omit the installation 
+of the test suite altogether.</para>
+
+<para><command>ln -sf mysql/libmysqlclient{,_r}.so* .</command>: This command
+makes the <application>My<acronym>SQL</acronym></application> shared libraries 
+available to other packages at run-time.</para>
+
+<para><option>--with-libwrap</option>: This switch adds tcpwrappers
+support to <application>My<acronym>SQL</acronym></application>.</para>
+
+<para><option>--with-openssl</option>: This switch adds OpenSSL support
+to <application>My<acronym>SQL</acronym></application>.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>My<acronym>SQL</acronym></application></title>
+
+<sect3 id="mysql-config">
+<title>Config files</title>
+
+<para><filename>/etc/my.cnf</filename>, <filename>~/.my.cnf</filename></para>
+<indexterm zone="mysql mysql-config">
+<primary sortas="e-AA.my.cnf">~/.my.cnf</primary></indexterm>
+<indexterm zone="mysql mysql-config">
+<primary sortas="e-etc-my.cnf">/etc/my.cnf</primary></indexterm>
+
+</sect3>
+
+<sect3>
+<title>Configuration Information</title>
+
+<para>There are several default configuration files available in
+<filename class="directory">/usr/share/mysql</filename> which you can
+use. Create <filename>/etc/my.cnf</filename> using the following
+command as the root user:</para>
+
+<screen><userinput role='root'><command>install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf</command></userinput></screen>
+
+<para>You can now install a database and change the ownership to the
+unprivileged user and group (perform as the root user):</para>
+
+<screen><userinput role='root'><command>mysql_install_db --user=mysql &amp;&amp;
+chgrp -v mysql /srv/mysql{,/test,/mysql}</command></userinput></screen>
+
+<para>Further configuration requires that the 
+<application>My<acronym>SQL</acronym></application> server be running. Start 
+the server using the following commands as the root user:</para>
+
+<screen><userinput role='root'><command>install -v -m750 -o mysql -g mysql -d /var/run/mysql &amp;&amp;
+mysqld_safe --user=mysql 2&gt;&amp;1 &gt;/dev/null &amp;</command></userinput></screen>
+
+<para>A default installation does not setup a password for the administrator, 
+so use the following command as the root user to set one. Replace 
+<replaceable>[new-password]</replaceable> with your own.</para>
+
+<screen><userinput role='root'><command>mysqladmin -u root password <replaceable>[new-password]</replaceable></command></userinput></screen>
+
+<para>Configuration of the server is now finished. Shut the server down
+using the following command as the root user:</para>
+
+<screen><userinput role='root'><command>mysqladmin -p shutdown</command></userinput></screen>
+
+<para id="mysql-init">Install the <filename>/etc/rc.d/init.d/mysql</filename> 
+init script included in the <xref linkend="intro-important-bootscripts"/> 
+package as the root user to start the <application>MySQL</application> server 
+during system boot-up.</para>
+<indexterm zone="mysql mysql-init">
+<primary sortas="f-mysql">mysql</primary></indexterm>
+
+<screen><userinput role='root'><command>make install-mysql</command></userinput></screen>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>comp_err, isamchk, isamlog, make_win_binary_distribution, 
+make_win_src_distribution, msql2mysql, my_print_defaults, myisam_ftdump, 
+myisamchk, myisamlog, myisampack, mysql, mysql_client_test, mysql_config, 
+mysql_convert_table_format, mysql_create_system_tables, mysql_explain_log, 
+mysql_find_rows, mysql_fix_extensions, mysql_fix_privilege_tables, 
+mysql_install_db, mysql_secure_installation, mysql_setpermission, 
+mysql_tableinfo, mysql_tzinfo_to_sql, mysql_waitpid, mysql_zap, mysqlaccess, 
+mysqladmin, mysqlbinlog, mysqlbug, mysqlcheck, mysqld, mysqld_multi, 
+mysqld_safe, mysqldump, mysqldumpslow, mysqlhotcopy, mysqlimport, 
+mysqlmanager, mysqlmanager-pwgen, mysqlmanagerc, mysqlshow, mysqltest, 
+pack_isam, perror, replace, resolve_stack_dump and resolveip</seg>
+<seg>libdbug.a, libheap.a, libmerge.a, libmyisam.a, libmyisammrg.a, 
+libmysqlclient.[so,a], libmysqlclient_r.[so,a], libmystrings.a, libmysys.a, 
+libnisam.a and libvio.a</seg>
+<seg>/srv/mysql, /usr/include/mysql, /usr/lib/mysql, /usr/share/mysql and 
+/var/run/mysql</seg>
+</seglistitem>
+</segmentedlist>
+
+<sect3><title>Short description</title>
+<para>Descriptions of all the programs and libraries would be several pages 
+long. Instead, consult the <application>My<acronym>SQL</acronym></application> 
+documentation for full details.</para>
+
+<para>Certain <application>My<acronym>SQL</acronym></application> support 
+programs may require the <application>Perl</application> DBI modules to be 
+installed to function properly.</para>
+</sect3>
+
+</sect2>
+
+</sect1>
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/databases/postgresql.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,468 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY postgresql-download-http "http://gd.tuwien.ac.at/db/postgresql/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
+  <!ENTITY postgresql-download-ftp  "ftp://ftp.fr.postgresql.org/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
+  <!ENTITY postgresql-md5sum        "075ac81c865b0af865459260bf1ca890">
+  <!ENTITY postgresql-size          "11.0 MB">
+  <!ENTITY postgresql-buildsize     "259 MB">
+  <!ENTITY postgresql-time          "1.34 SBU">
+]>
+
+<sect1 id="postgresql" xreflabel="PostgreSQL-&postgresql-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="postgresql.html"?>
+<title>Postgre<acronym>SQL</acronym>-&postgresql-version;</title>
+<indexterm zone="postgresql">
+<primary sortas="a-PostgreSQL">PostgreSQL</primary></indexterm>
+
+<sect2>
+<title>Introduction to 
+<application>Postgre<acronym>SQL</acronym></application></title>
+
+<para><application>Postgre<acronym>SQL</acronym></application> is an advanced 
+object-relational database management system (<acronym>ORDBMS</acronym>), 
+derived from the Berkeley Postgres database management system.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&postgresql-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&postgresql-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &postgresql-md5sum;</para></listitem>
+<listitem><para>Download size: &postgresql-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&postgresql-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&postgresql-time;</para></listitem></itemizedlist>
+</sect3>
+
+<!-- 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch: <ulink 
+url="&patch-root;/postgresql-&postgresql-version;-dsssl_fix-1.patch"/></para>
+</listitem></itemizedlist>
+</sect3>
+ -->
+
+<sect3><title><application>Postgre<acronym>SQL</acronym></application> 
+dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="python"/>, 
+<xref linkend="tcl"/>,
+<xref linkend="openssl"/>,
+<xref linkend="Linux_PAM"/>,
+<xref linkend="sgml-dtd"/>, 
+<xref linkend="docbook-dsssl"/>,
+<xref linkend="openjade"/>,
+<xref linkend="perl-modules"/>: SGMLSpm-&SGMLSpm-version;, 
+<ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
+<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, and 
+<ulink url="http://rendezvous.sourceforge.net/">Rendezvous</ulink></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of 
+<application>Postgre<acronym>SQL</acronym></application></title>
+
+<para>In order for <command>configure</command> to properly discover 
+<application>Docbook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application>, you may need to remove 
+<application>OpenSP</application> catalog definitions from the system 
+<acronym>SGML</acronym> catalogs. Use the following command before building 
+the package to accomplish this:</para>
+
+<screen><userinput><command>sed -i.orig \
+    -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
+    /etc/sgml/catalog \
+    /etc/sgml/sgml-docbook.cat</command></userinput></screen>
+
+<para>Install <application>Postgre<acronym>SQL</acronym></application> with the 
+following commands: </para>
+
+<screen><userinput><command>sed -i \
+    -e "s|dsssl-stylesheets|&amp; \\\\\n        sgml/docbook/&amp;-&docbook-dsssl-version;|" \
+    configure &amp;&amp;
+./configure --prefix=/usr --enable-thread-safety &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
+chown -R root:root /usr/share/doc/postgresql/html</command></userinput></screen>
+
+<!-- 
+<para>The standard installation provides only the header files needed
+for client application development. Server-side applications require
+the entire <application>Postgre<acronym>SQL</acronym></application>
+include tree which can be installed using the following command:</para>
+
+<screen><userinput><command>make install-all-headers</command></userinput></screen>
+ -->
+
+<note><para>If you are upgrading an existing system and are going to
+install the new files over the old ones, then you should
+back up your data, shut down the old server and follow the
+instructions in <ulink
+url="http://www.postgresql.org/docs/8.0/static/install-upgrading.html">the
+official <application>Postgre<acronym>SQL</acronym></application>
+documentation</ulink>.</para></note>
+
+<para>Initialize a database cluster with the following commands issued by the 
+root user:</para>
+
+<screen><userinput role='root'><command>install -v -m755 -d /srv/pgsql/data &amp;&amp;
+useradd -c "PostgreSQL Server" -g users -d /srv/pgsql/data postgres &amp;&amp;
+chown -v postgres /srv/pgsql/data &amp;&amp;
+su - postgres -c '/usr/bin/initdb -D /srv/pgsql/data'</command></userinput></screen>
+
+<para>As the root user, start the database server with the following 
+command:</para>
+
+<screen><userinput role='root'><command>su - postgres -c '/usr/bin/postmaster -D /srv/pgsql/data > \
+    /srv/pgsql/data/logfile 2&gt;&amp;1 &amp;'</command></userinput></screen>
+
+<para>Still as user root, create a database and verify the 
+installation:</para>
+
+<screen><userinput role='root'><command>su - postgres -c '/usr/bin/createdb test' &amp;&amp;
+echo "create table t1 ( name varchar(20), state_province varchar(20) );" \
+    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
+echo "insert into t1 values ('Billy', 'NewYork');" \
+    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
+echo "insert into t1 values ('Evanidus', 'Quebec');" \
+    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
+echo "insert into t1 values ('Jesse', 'Ontario');" \
+    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
+echo "select * from t1;" | (su - postgres -c '/usr/bin/psql test')</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>sed -i -e "s|dsssl-stylesheets|..."</command>: This command 
+puts an extra line in the <command>configure</command> script so that the
+<acronym>BLFS</acronym> installed version of the <acronym>DSSSL</acronym>
+stylesheets can be discovered.</para>
+
+<para><parameter>--enable-thread-safety</parameter>: This switch makes the 
+client libraries thread-safe by allowing concurrent threads in 
+<filename class='libraryfile'>libpq</filename> and <acronym>ECPG</acronym> 
+programs to safely control their private connection handles.</para>
+
+<para><command>chown -R root:root /usr/share/doc/postgresql/html</command>: 
+This command corrects the improper ownership of some documentation 
+files.</para>
+
+<para><command>useradd ...</command>: Add an unprivileged user to run the 
+database server.</para>
+
+<para><command>createdb test; create table t1; insert into t1 values...; 
+select * from t1</command>: Create a database, add a table to it, insert some 
+rows into the table and select them to verify that the installation is working
+properly.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring 
+<application>Postgre<acronym>SQL</acronym></application></title>
+
+<sect3 id="postgresql-config"><title>Config files</title>
+
+<para><filename>$PGDATA/pg_ident.con</filename>, 
+<filename>$PGDATA/pg_hba.conf</filename> and 
+<filename>$PGDATA/postgresql.conf</filename></para>
+<indexterm zone="postgresql postgresql-config">
+<primary sortas="e-A.PGDATA-pg_ident.con">$PGDATA/pg_indent.con</primary>
+</indexterm>
+<indexterm zone="postgresql postgresql-config">
+<primary sortas="e-A.PGDATA-pg_hba.conf">$PGDATA/pg_hba_conf</primary>
+</indexterm>
+<indexterm zone="postgresql postgresql-config">
+<primary sortas="e-A.PGDATA-postgresql.conf">$PGDATA/postgresql.conf</primary>
+</indexterm>
+
+<para>The <envar>PGDATA</envar> environment variable is used to distinguish 
+database clusters from one another by setting it to the value of the directory
+which contains the cluster desired. The three configuration files
+exist in every <filename class="directory">PGDATA/</filename> directory. 
+Details on the format of the files and the options that can be set in 
+each can be found in <ulink
+url="file:///usr/share/doc/postgresql/html/index.html"/>.</para>
+
+<para id="postgresql-init">Install the 
+<filename>/etc/rc.d/init.d/postgresql</filename> init script included in the 
+<xref linkend="intro-important-bootscripts"/> package.</para>
+<indexterm zone="postgresql postgresql-init">
+<primary sortas="f-postgresql">postgresql</primary></indexterm>
+
+<screen><userinput><command>make install-postgresql</command></userinput></screen>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>clusterdb, createdb, createlang, createuser, dropdb, droplang, dropuser, 
+ecpg, initdb, ipcclean, pg_config, pg_controldata, pg_ctl, pg_dump, 
+pg_dumpall, pg_resetxlog, pg_restore, pltcl_delmod, pltcl_listmod, 
+pltcl_loadmod, postgres, postmaster, psql, vacuumdb</seg>
+<seg>libecpg.[so,a], libecpg_compat.[so,a], libpgport.a, libpgtypes.[so,a], 
+libpq.[so,a] and various charset modules.</seg>
+<seg>/srv/pgsql, /usr/include/libpq, /usr/include/postgresql, 
+/usr/lib/postgresql, /usr/share/doc/postgresql and /usr/share/postgresql</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="clusterdb">
+<term><command>clusterdb</command></term>
+<listitem><para>is a utility for reclustering tables in a 
+<application>Postgre<acronym>SQL</acronym></application> database.</para>
+<indexterm zone="postgresql clusterdb">
+<primary sortas="b-clusterdb">clusterdb</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="createdb">
+<term><command>createdb</command></term>
+<listitem><para> creates a new 
+<application>Postgre<acronym>SQL</acronym></application> database.</para>
+<indexterm zone="postgresql createdb">
+<primary sortas="b-createdb">createdb</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="createlang">
+<term><command>createlang</command></term>
+<listitem><para>defines a new 
+<application>Postgre<acronym>SQL</acronym></application> procedural 
+language.</para>
+<indexterm zone="postgresql createlang">
+<primary sortas="b-createlang">createlang</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="createuser">
+<term><command>createuser</command></term>
+<listitem><para>defines a new 
+<application>Postgre<acronym>SQL</acronym></application> user account.</para>
+<indexterm zone="postgresql createuser">
+<primary sortas="b-createuser">createuser</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="dropdb">
+<term><command>dropdb</command></term>
+<listitem><para>removes a 
+<application>Postgre<acronym>SQL</acronym></application> database.</para>
+<indexterm zone="postgresql dropdb">
+<primary sortas="b-dropdb">dropdb</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="droplang">
+<term><command>droplang</command></term>
+<listitem><para>removes a 
+<application>Postgre<acronym>SQL</acronym></application> procedural 
+language.</para>
+<indexterm zone="postgresql droplang">
+<primary sortas="b-droplang">droplang</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="dropuser">
+<term><command>dropuser</command></term>
+<listitem><para>removes a 
+<application>Postgre<acronym>SQL</acronym></application> user account.</para>
+<indexterm zone="postgresql dropuser">
+<primary sortas="b-dropuser">dropuser</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ecpg">
+<term><command>ecpg</command></term>
+<listitem><para>is the embedded <acronym>SQL</acronym> preprocessor.</para>
+<indexterm zone="postgresql ecpg">
+<primary sortas="b-ecpg">ecpg</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="initdb">
+<term><command>initdb</command></term>
+<listitem><para>creates a new database cluster.</para>
+<indexterm zone="postgresql initdb">
+<primary sortas="b-initdb">initdb</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ipcclean">
+<term><command>ipcclean</command></term>
+<listitem><para>removes shared memory and semaphores left over by an aborted 
+database server.</para>
+<indexterm zone="postgresql ipcclean">
+<primary sortas="b-ipcclean">ipcclean</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pg_config">
+<term><command>pg_config</command></term>
+<listitem><para>retrieves 
+<application>Postgre<acronym>SQL</acronym></application> version 
+information.</para>
+<indexterm zone="postgresql pg_config">
+<primary sortas="b-pg_config">pg_config</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pg_controldata">
+<term><command>pg_controldata</command></term>
+<listitem><para>returns information initialized during 
+<command>initdb</command>, such as the catalog version and server 
+locale.</para>
+<indexterm zone="postgresql pg_controldata">
+<primary sortas="b-pg_controldata">pg_controldata</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pg_ctl">
+<term><command>pg_ctl</command></term>
+<listitem><para>controls stopping and starting the database server.</para>
+<indexterm zone="postgresql pg_ctl">
+<primary sortas="b-pg_ctl">pg_ctl</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pg_dump">
+<term><command>pg_dump</command></term>
+<listitem><para>dumps database data and metadata into scripts which are used 
+to recreate the database.</para>
+<indexterm zone="postgresql pg_dump">
+<primary sortas="b-pg_dump">pg_dump</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pg_dumpall">
+<term><command>pg_dumpall</command></term>
+<listitem><para>recursively calls <command>pg_dump</command> for each 
+database in a cluster.</para>
+<indexterm zone="postgresql pg_dumpall">
+<primary sortas="b-pg_dumpall">pg_dumpall</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pg_resetxlog">
+<term><command>pg_resetxlog</command></term>
+<listitem><para>clears the write-ahead log and optionally resets some 
+fields in the <filename>pg_control</filename> file.</para>
+<indexterm zone="postgresql pg_resetxlog">
+<primary sortas="b-pg_resetxlog">pg_resetxlog</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pg_restore">
+<term><command>pg_restore</command></term>
+<listitem><para>creates databases from dump files created by 
+<command>pg_dump</command>.</para>
+<indexterm zone="postgresql pg_restore">
+<primary sortas="b-pg_restore">pg_restore</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pltcl_delmod">
+<term><command>pltcl_delmod</command></term>
+<listitem><para>is a support script used to delete a module from a 
+<acronym>PL</acronym>/<application>Tcl</application> table. The command 
+requires the <application><ulink 
+url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink></application> 
+package to be installed also.</para>
+<indexterm zone="postgresql pltcl_delmod">
+<primary sortas="b-pltcl_delmod">pltcl_delmod</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pltcl_listmod">
+<term><command>pltcl_listmod</command></term>
+<listitem><para>is a support script used to list the modules in a 
+<acronym>PL</acronym>/<application>Tcl</application> table. The command 
+requires the <application><ulink 
+url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink></application> 
+package to be installed also.</para>
+<indexterm zone="postgresql pltcl_listmod">
+<primary sortas="b-pltcl_listmod">pltcl_listmod</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pltcl_loadmod">
+<term><command>pltcl_loadmod</command></term>
+<listitem><para>is a support script used to load a module into a 
+<acronym>PL</acronym>/<application>Tcl</application> table. The command 
+requires the <application><ulink 
+url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink></application> 
+package to be installed also.</para>
+<indexterm zone="postgresql pltcl_loadmod">
+<primary sortas="b-pltcl_loadmod">pltcl_loadmod</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="postgres">
+<term><command>postgres</command></term>
+<listitem><para>is a single user database server, generally used for 
+debugging.</para>
+<indexterm zone="postgresql postgres">
+<primary sortas="b-postgres">postgres</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="postmaster">
+<term><command>postmaster</command></term>
+<listitem><para>is a multi-user database daemon.</para>
+<indexterm zone="postgresql postmaster">
+<primary sortas="b-postmaster">postmaster</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="psql">
+<term><command>psql</command></term>
+<listitem><para>is a console based database shell.</para>
+<indexterm zone="postgresql psql">
+<primary sortas="b-psql">psql</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="vacuumdb">
+<term><command>vacuumdb</command></term>
+<listitem><para>compacts databases and generates statistics for the query 
+analyzer.</para>
+<indexterm zone="postgresql vacuumdb">
+<primary sortas="b-vacuumdb">vacuumdb</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ server/mail/mail.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -18,9 +18,9 @@
 server (Courier-<acronym>IMAP</acronym>).</para>
 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="courier.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="exim.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="postfix.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="qpopper.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sendmail.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="exim.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="qpopper.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="courier.xml"/>
 
 </chapter>
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/major/apache.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,299 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY apache-download-http "http://www.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
+  <!ENTITY apache-download-ftp  "ftp://ftp.tux.org/pub/net/apache/dist/httpd/httpd-&apache-version;.tar.bz2">
+  <!ENTITY apache-md5sum        "94f3a793fb1665365724943206cce23f">
+  <!ENTITY apache-size          "5.0 MB">
+  <!ENTITY apache-buildsize     "91.6 MB">
+  <!ENTITY apache-time          "1.69 SBU">
+]>
+
+<sect1 id="apache" xreflabel="Apache-&apache-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="apache.html"?>
+<title>Apache-&apache-version;</title>
+<indexterm zone="apache">
+<primary sortas="a-Apache">Apache</primary></indexterm>
+
+<sect2>
+<title>Introduction to <application>Apache</application></title>
+
+<para>The <application>Apache</application> package contains an
+open-source <acronym>HTTP</acronym> server. It is useful for creating local 
+intranet web sites or running huge web serving operations.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&apache-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&apache-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &apache-md5sum;</para></listitem>
+<listitem><para>Download size: &apache-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&apache-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &apache-time;</para></listitem>
+</itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch: <ulink 
+url="&patch-root;/httpd-&apache-version;-config-1.patch"/></para></listitem>
+</itemizedlist></sect3>
+
+<sect3><title><application>Apache</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="db"/> or <xref linkend="gdbm"/>, 
+<xref linkend="openssl"/>, 
+<xref linkend="openldap"/>, 
+<xref linkend="expat"/> and 
+<xref linkend="doxygen"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Apache</application></title>
+
+<para>For security reasons, running the server as an unprivileged user and 
+group is strongly encouraged. Create the following group and user using the 
+following commands (as root):</para>
+
+<screen><userinput><command>groupadd apache &amp;&amp;
+useradd -c "Apache Server" -d /dev/null -g apache -s /bin/false apache</command></userinput></screen>
+
+<para>The following patch will define the layout of destination directories
+and, among them, the build directory at
+<filename class="directory">/usr/lib/apache/build</filename>. This 
+will allow the modules added to <application>Apache</application> to
+be configured without errors. Apply the patch:</para>
+
+<screen><userinput><command>patch -Np1 -i ../httpd-&apache-version;-config-1.patch</command></userinput></screen>
+
+<para>Build and install <application>Apache</application> by running the 
+following commands:</para>
+
+<screen><userinput><command>./configure --enable-layout=FHS --enable-mods-shared=all &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
+chown root:root /usr/sbin/{apxs,apachectl,dbmmanage,envvars-std,envvars} \
+    /usr/include/apache/* /usr/lib/apache/httpd.exp \
+    /usr/share/man/man1/{dbmmanage,htdigest,htpasswd}.1 \
+    /usr/share/man/man8/{ab,apachectl,apxs,httpd}.8 \
+    /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 &amp;&amp;
+chown -R apache:apache /srv/www</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><option>--with-expat=/usr</option>: Uses system installed
+<application>expat</application>. <emphasis>If you have installed 
+<application>expat</application> and do not use this switch, the
+<application>Apache</application> installation may overwrite some files from 
+the <application>expat</application> installation.</emphasis></para>
+
+<para><parameter>--enable-mods-shared=all</parameter>: The modules should be 
+compiled and used as Dynamic Shared Objects
+(<acronym>DSO</acronym>s) so they can be included and excluded from the
+server using the run-time configuration directives.</para>
+
+<para><option>--enable-ssl</option>: Use this switch
+to create the <filename class="libraryfile">mod_ssl</filename>
+module and enable <acronym>SSL</acronym> support.</para>
+
+<para><command>chown root:root ...</command>: This command changes 
+the ownership of some installed files, the result of building the package as a 
+user other than root.</para>
+
+<para><command>chown -R apache:apache /srv/www</command>: By default, the 
+installation process installs files (documentation, error messages, default 
+icons, etc.) with the ownership of the user that extracted the files from the 
+tar file.  If you want to change the ownership to another user, you should do 
+so at this point.  The only requirement is that the document directories need 
+to be accessible by the <command>httpd</command> process with (r-x) permissions 
+and files need to be readable (r--) by the apache user.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Apache</application></title>
+
+<sect3 id="apache-config">
+<title>Config files</title>
+
+<para><filename>/etc/apache/*</filename></para>
+<indexterm zone="apache apache-config">
+<primary sortas="e-etc-apache">/etc/apache/*</primary></indexterm>
+<indexterm zone="apache apache-config">
+<primary sortas="e-etc-apache-httpd.conf">/etc/apache/httpd.conf</primary>
+</indexterm>
+</sect3>
+
+<sect3>
+<title>Configuration Information</title>
+
+<para>The main configuration file is named <filename>httpd.conf</filename>. 
+Modify it to run the server as a dedicated user:</para>
+
+<screen><userinput><command>sed -i -e "s%User nobody%User apache%" \
+       -e "s%^Group #-1%Group apache%" \
+    /etc/apache/httpd.conf</command></userinput></screen>
+
+<para>See <ulink url="http://httpd.apache.org/docs-2.0/configuring.html"/> for 
+detailed instructions on customizing your <application>Apache</application> 
+<acronym>HTTP</acronym> server.</para>
+
+<para>There's a problem with the ISAPI <acronym>DSO</acronym> module
+caused from compiling with 
+<application><acronym>GCC</acronym></application>-&gcc-version;. Comment out 
+the module from the configuration file with the following command:</para>
+
+<screen><userinput><command>sed -i -e "s/^LoadModule isapi_module/# &amp;/" \
+    /etc/apache/httpd.conf</command></userinput></screen>
+
+<para id="apache-init">If you want the <application>Apache</application> 
+server to start automatically when the system is booted, install the 
+<filename>/etc/rc.d/init.d/apache</filename> init script included in the 
+<xref linkend="intro-important-bootscripts"/> package.</para>
+<indexterm zone="apache apache-init"> 
+<primary sortas="f-apache">apache</primary></indexterm>
+
+<screen><userinput><command>make install-apache</command></userinput></screen>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>ab, apachectl, apr-config, apu-config, apxs, checkgid, dbmmanage, htdbm, 
+htdigest, htpasswd, httpd, instdso.sh, logresolve and rotatelogs</seg>
+<seg>libapr-0.[so,a], libaprutil-0.[so,a] and /usr/lib/apache/*.so</seg>
+<seg>/etc/apache, /srv/www, /usr/include/apache, /usr/lib/apache and 
+/var/log/apache</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="ab">
+<term><command>ab</command></term>
+<listitem><para>is a tool for benchmarking your 
+<application>Apache</application> <acronym>HTTP</acronym> server.</para>
+<indexterm zone="apache ab">
+<primary sortas="b-ab">ab</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="apachectl">
+<term><command>apachectl</command></term>
+<listitem><para>is a front end to the <application>Apache</application> 
+<acronym>HTTP</acronym> server which is designed to help the administrator 
+control the functioning of the <application>Apache</application> httpd 
+daemon.</para>
+<indexterm zone="apache apachectl">
+<primary sortas="b-apachectl">apachectl</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="apxs">
+<term><command>apxs</command></term>
+<listitem><para>is a tool for building and installing extension modules for 
+the <application>Apache</application> <acronym>HTTP</acronym> server.</para>
+<indexterm zone="apache apxs">
+<primary sortas="b-apxs">apxs</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="dbmanage">
+<term><command>dbmanage</command></term>
+<listitem><para>is used to create and update the <filename>DBM</filename> 
+format files used to store usernames and passwords for basic authentication 
+of <acronym>HTTP</acronym> users.</para>
+<indexterm zone="apache dbmanage">
+<primary sortas="b-dbmanage">dbmanage</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="htdigest">
+<term><command>htdigest</command></term>
+<listitem><para>is used to create and update the flat-files used to store 
+usernames, realms and passwords for digest authentication of 
+<acronym>HTTP</acronym> users.</para>
+<indexterm zone="apache htdigest">
+<primary sortas="b-htdigest">htdigest</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="htpasswd">
+<term><command>htpasswd</command></term>
+<listitem><para>is used to create and update the flat-files used to store 
+usernames and passwords for basic authentication of <acronym>HTTP</acronym> 
+users.</para>
+<indexterm zone="apache htpasswd">
+<primary sortas="b-htpasswd">htpasswd</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="httpd">
+<term><command>httpd</command></term>
+<listitem><para>is the <application>Apache</application> 
+<acronym>HTTP</acronym> server program.</para>
+<indexterm zone="apache httpd">
+<primary sortas="b-httpd">httpd</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="instdso.sh">
+<term><command>instdso.sh</command></term>
+<listitem><para>is a script which installs <application>Apache</application> 
+<acronym>DSO</acronym> modules.</para>
+<indexterm zone="apache instdso.sh">
+<primary sortas="b-instdso.sh">instdso.sh</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="logresolve">
+<term><command>logresolve</command></term>
+<listitem><para>is a post-processing program to resolve 
+<acronym>IP</acronym>-addresses in <application>Apache</application>'s 
+access log files.</para>
+<indexterm zone="apache logresolve">
+<primary sortas="b-logresolve">logresolve</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="rotatelogs">
+<term><command>rotatelogs</command></term>
+<listitem><para>is a simple program for use in conjunction with 
+<application>Apache</application>'s piped log file feature.</para>
+<indexterm zone="apache rotatelogs">
+<primary sortas="b-rotatelogs">rotatelogs</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/major/bind.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,538 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY bind-download-http "http://gd.tuwien.ac.at/infosys/servers/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
+<!ENTITY bind-download-ftp "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
+<!ENTITY bind-md5sum "fdb42fff7e345372ac52a4493b77b694">
+<!ENTITY bind-size "4.6 MB">
+<!ENTITY bind-buildsize "87 MB">
+<!ENTITY bind-time "1.87 SBU (additional 4.14 SBU to run the complete test suite)">
+]>
+
+<sect1 id="bind" xreflabel="BIND-&bind-version;p1">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="bind.html"?>
+<title><acronym>BIND</acronym>-&bind-version;p1</title>
+<indexterm zone="bind">
+<primary sortas="a-BIND">BIND</primary>
+</indexterm>
+
+<sect2>
+<title>Introduction to 
+<application><acronym>BIND</acronym></application></title>
+
+<para>The <application><acronym>BIND</acronym></application> package
+provides a <acronym>DNS</acronym> server and client utilities. If you
+are only interested in the utilities, refer to the 
+<xref linkend="bind-utils"/>.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&bind-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&bind-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: 
+&bind-md5sum;</para></listitem>
+<listitem><para>Download size: 
+&bind-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&bind-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&bind-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para><ulink 
+url="ftp://ftp.isc.org/isc/bind9/9.3.0/&bind-version;-patch1"/></para>
+</listitem>
+</itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>BIND</acronym></application> 
+dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="openssl"/></para>
+</sect4>
+
+<sect4><title>Optional (to run the full test suite)</title>
+<para><xref linkend="net-tools"/> (for <command>ifconfig</command>) and 
+<xref linkend="perl-modules"/>: Net-DNS</para>
+</sect4>
+
+<sect4><title>Optional (to [re]build documentation)</title>
+<para><xref linkend="openjade"/>, 
+<xref linkend="jadetex"/>, 
+<xref linkend="docbook-dsssl"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of 
+<application><acronym>BIND</acronym></application></title>
+
+<para>Install <application><acronym>BIND</acronym></application> by
+running the following commands:</para>
+
+<screen><userinput><command>patch -Np1 -i ../&bind-version;-patch1 &amp;&amp;
+sed -i -e "s/dsssl-stylesheets/&amp;-1.78/g" configure &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc \
+    --enable-threads --with-libtool &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
+chmod 755 \
+    /usr/lib/{lib{bind9,isc{,cc,cfg},lwres}.so.?.?.?,libdns.so.20.0.0} &amp;&amp;
+mv /usr/share/man/man8/named.conf.5 /usr/share/man/man5 &amp;&amp;
+cd doc &amp;&amp;
+install -d -m755 /usr/share/doc/bind-9.3.0/{arm,draft,misc,rfc} &amp;&amp;
+install -m644 arm/*.html \
+    /usr/share/doc/bind-9.3.0/arm &amp;&amp;
+install -m644 draft/*.txt \
+    /usr/share/doc/bind-9.3.0/draft &amp;&amp;
+install -m644 rfc/* \
+    /usr/share/doc/bind-9.3.0/rfc &amp;&amp;
+install -m644 \
+    misc/{dnssec,ipv6,migrat*,options,rfc-compliance,roadmap,sdb} \
+    /usr/share/doc/bind-9.3.0/misc</command></userinput></screen>
+
+<para>In order to run the complete test suite before installing the 
+package, you need to set up some dummy interfaces (requires 
+<command>ifconfig</command>). Issue the following commands to run the 
+complete suite of tests (you will have to be the root user to issue the
+<command>ifconfig</command> commands):</para>
+
+<screen><userinput role='root'><command>bin/tests/system/ifconfig.sh up &amp;&amp;
+make check &gt;check.log 2&gt;&amp;1 &amp;&amp;
+bin/tests/system/ifconfig.sh down</command></userinput></screen>
+
+<para>If desired, issue the following command to ensure all 145 tests ran 
+successfully:</para>
+
+<screen><userinput><command>grep "R:PASS" check.log | wc -l</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>patch -Np1 -i ../&bind-version;-patch1</command>: There's a 
+vulnerability in the <acronym>DNS</acronym><acronym>SEC</acronym> code. See 
+<ulink url="http://www.kb.cert.org/vuls/id/938617"/>. The patch fixes the
+bug.</para>
+
+<para><command>sed -i -e ... configure</command>: This command forces 
+<command>configure</command> to look for the <acronym>DSSSL</acronym> 
+stylesheets in the standard <acronym>BLFS</acronym> location.</para>
+
+<para><parameter>--sysconfdir=/etc</parameter>: This parameter forces 
+<application><acronym>BIND</acronym></application> to look for configuration 
+files in <filename class='directory'>/etc</filename> instead of 
+<filename class='directory'>/usr/etc</filename>.</para>
+
+<para><parameter>--enable-threads</parameter>: This parameter enables 
+multi-threading capability.</para>
+
+<para><parameter>--with-libtool</parameter>: This parameter forces the 
+building of dynamic libraries and links the installed binaries to these 
+libraries.</para>
+
+<para><command>cd doc; install ...</command>: These commands install the 
+additional package documentation. Optionally, omit any or all of these 
+commands.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring
+<application><acronym>BIND</acronym></application></title>
+
+<sect3 id="bind-config"><title>Config files</title>
+<para><filename>named.conf</filename>, 
+<filename>root.hints</filename>, 
+<filename>127.0.0</filename>, 
+<filename>rndc.conf</filename> and 
+<filename>resolv.conf</filename></para>
+<indexterm zone="bind bind-config">
+<primary sortas="e-etc-named.conf">/etc/named.conf</primary></indexterm>
+<indexterm zone="bind bind-config">
+<primary sortas="e-etc-rndc.conf">/etc/rndc.conf</primary></indexterm>
+<indexterm zone="bind bind-config">
+<primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary></indexterm>
+<indexterm zone="bind bind-config">
+<primary sortas="e-etc-namedb-root.hints">/etc/namedb/root.hints</primary>
+</indexterm>
+<indexterm zone="bind bind-config">
+<primary sortas="e-etc-namedb-pz-127.0.0.0">/etc/namedb/pz/127.0.0.0</primary>
+</indexterm>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para><application><acronym>BIND</acronym></application> will be configured 
+to run in a <command>chroot</command> jail as an unprivileged user (named). 
+This configuration is more secure in that a <acronym>DNS</acronym> compromise 
+can only affect a few files in the named user's <envar>HOME</envar> 
+directory.</para> 
+
+<para>Create the unprivileged user and group named:</para>
+
+<screen><userinput role='root'><command>groupadd named &amp;&amp;
+useradd -m -c "BIND Owner" -g named -s /bin/false named</command></userinput></screen>
+
+<para>Set up some files, directories and devices needed by 
+<application><acronym>BIND</acronym></application>:</para>
+
+<screen><userinput role='root'><command>cd /home/named &amp;&amp;
+mkdir -p dev etc/namedb/slave var/run &amp;&amp;
+mknod /home/named/dev/null c 1 3 &amp;&amp;
+mknod /home/named/dev/random c 1 8 &amp;&amp;
+chmod 666 /home/named/dev/{null,random} &amp;&amp;
+mkdir /home/named/etc/namedb/pz &amp;&amp;
+cp /etc/localtime /home/named/etc</command></userinput></screen>
+
+<para>Then, generate a key for use in the <filename>named.conf</filename> 
+and <filename>rdnc.conf</filename> files using the 
+<command>rndc-confgen</command> command:</para>
+
+<screen><userinput role='root'><command>rndc-confgen -b 512 | grep -m 1 "secret" | cut -d '"' -f 2</command></userinput></screen>
+
+<para>Create the <filename>named.conf</filename> file from which named 
+will read the location of zone files, root name servers and secure 
+<acronym>DNS</acronym> keys:</para>
+
+<screen><userinput role='root'><command>cat &gt; /home/named/etc/named.conf &lt;&lt; "EOF"</command>
+ options {
+     directory "/etc/namedb";
+    pid-file "/var/run/named.pid";
+    statistics-file "/var/run/named.stats";
+       
+ };
+ controls {
+     inet 127.0.0.1 allow { localhost; } keys { rndc_key; };
+ };
+ key "rndc_key" {
+     algorithm hmac-md5;
+     secret "<replaceable>[Insert secret from rndc-confgen's output here]</replaceable>";
+ };
+ zone "." {
+     type hint;
+     file "root.hints";
+ };
+ zone "0.0.127.in-addr.arpa" {
+     type master;
+     file "pz/127.0.0";
+ };
+
+// Bind 9 now logs by default through syslog (except debug).
+// These are the default logging rules.
+
+logging {
+     category default { default_syslog; default_debug; };
+     category unmatched { null; };
+
+  channel default_syslog {
+      syslog daemon;                      // send to syslog's daemon
+                                          // facility
+      severity info;                      // only send priority info
+                                          // and higher
+  };
+
+  channel default_debug {
+      file "named.run";                   // write to named.run in
+                                          // the working directory
+                                          // Note: stderr is used instead
+                                          // of "named.run"
+                                          // if the server is started
+                                          // with the '-f' option.
+      severity dynamic;                   // log at the server's
+                                          // current debug level
+  };
+
+  channel default_stderr {
+      stderr;                             // writes to stderr
+      severity info;                      // only send priority info
+                                          // and higher
+  };
+
+  channel null {
+     null;                                // toss anything sent to
+                                          // this channel
+  };
+};
+
+
+
+<command>EOF</command></userinput></screen>
+
+<para>Create the <filename>rndc.conf</filename> file with the following 
+commands:</para>
+
+<screen><userinput role='root'><command>cat &gt; /etc/rndc.conf &lt;&lt; "EOF"</command>
+key rndc_key {
+algorithm "hmac-md5";
+    secret
+    "<replaceable>[Insert secret from rndc-confgen's output here]</replaceable>";
+    };
+options {
+    default-server localhost;
+    default-key    rndc_key;
+};
+<command>EOF</command></userinput></screen>
+
+<para>The <filename>rndc.conf</filename> file contains information for 
+controlling named operations with the <command>rndc</command> 
+utility.</para>
+
+<para>Create a zone file with the following contents:</para>
+
+<screen><userinput role='root'><command>cat &gt; /home/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF"</command>
+$TTL 3D
+@      IN      SOA     ns.local.domain. hostmaster.local.domain. (
+                        1       ; Serial
+                        8H      ; Refresh
+                        2H      ; Retry
+                        4W      ; Expire
+                        1D)     ; Minimum TTL
+                NS      ns.local.domain.
+1               PTR     localhost.
+<command>EOF</command></userinput></screen>
+
+<para>Create the <filename>root.hints</filename> file with the following
+commands:</para>
+
+<note><para>Caution must be used to ensure there are no leading spaces in this 
+file.</para></note>
+
+<screen><userinput><command>cat &gt; /home/named/etc/namedb/root.hints &lt;&lt; "EOF"</command>
+.                       6D  IN      NS      A.ROOT-SERVERS.NET.
+.                       6D  IN      NS      B.ROOT-SERVERS.NET.
+.                       6D  IN      NS      C.ROOT-SERVERS.NET.
+.                       6D  IN      NS      D.ROOT-SERVERS.NET.
+.                       6D  IN      NS      E.ROOT-SERVERS.NET.
+.                       6D  IN      NS      F.ROOT-SERVERS.NET.
+.                       6D  IN      NS      G.ROOT-SERVERS.NET.
+.                       6D  IN      NS      H.ROOT-SERVERS.NET.
+.                       6D  IN      NS      I.ROOT-SERVERS.NET.
+.                       6D  IN      NS      J.ROOT-SERVERS.NET.
+.                       6D  IN      NS      K.ROOT-SERVERS.NET.
+.                       6D  IN      NS      L.ROOT-SERVERS.NET.
+.                       6D  IN      NS      M.ROOT-SERVERS.NET.
+A.ROOT-SERVERS.NET.     6D  IN      A       198.41.0.4
+B.ROOT-SERVERS.NET.     6D  IN      A       192.228.79.201
+C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
+D.ROOT-SERVERS.NET.     6D  IN      A       128.8.10.90
+E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
+F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
+G.ROOT-SERVERS.NET.     6D  IN      A       192.112.36.4
+H.ROOT-SERVERS.NET.     6D  IN      A       128.63.2.53
+I.ROOT-SERVERS.NET.     6D  IN      A       192.36.148.17
+J.ROOT-SERVERS.NET.     6D  IN      A       192.58.128.30
+K.ROOT-SERVERS.NET.     6D  IN      A       193.0.14.129
+L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
+M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
+<command>EOF</command></userinput></screen>
+
+<para>The <filename>root.hints</filename> file is a list of root name servers. 
+This file must be updated periodically with the <command>dig</command> 
+utility.  A current copy of root.hints can be obtained from 
+<ulink url="ftp://rs.internic.net/domain/named.root" />. Consult the 
+<ulink url="http://www.bind9.net/Bv9ARM.html"><application>
+<acronym>BIND</acronym></application> 9 Administrator Reference Manual</ulink> 
+for details.</para>
+
+<para>Create or modify <filename>resolv.conf</filename> to use the new 
+name server with the following commands:</para>
+
+<note><para>Replace <replaceable>[yourdomain.com]</replaceable> with your own 
+valid domain name.</para></note>
+
+<screen><userinput role='root'><command>cp /etc/resolv.conf /etc/resolv.conf.bak &amp;&amp;
+cat &gt; /etc/resolv.conf &lt;&lt; "EOF"</command>
+search <replaceable>[yourdomain.com]</replaceable>
+nameserver 127.0.0.1
+<command>EOF</command></userinput></screen>
+
+<para>Set permissions on the <command>chroot</command> jail with the 
+following command:</para>
+
+<screen><userinput role='root'><command>chown -R named.named /home/named</command></userinput></screen>
+
+<para id="bind-init">To start the <acronym>DNS</acronym> server at boot, install the 
+<filename>/etc/rc.d/init.d/bind</filename> init script included in the 
+<xref linkend="intro-important-bootscripts"/> package.</para>
+<indexterm zone="bind bind-init">
+<primary sortas="f-bind">bind</primary></indexterm>
+
+<screen><userinput role='root'><command>make install-bind</command></userinput></screen>
+
+<para>Now start <application><acronym>BIND</acronym></application> with
+the new boot script:</para>
+
+<screen><userinput role='root'><command>/etc/rc.d/init.d/bind start</command></userinput></screen>
+
+</sect3>
+
+<sect3><title>Testing <application><acronym>BIND</acronym></application></title>
+
+<para>Test out the new
+<application><acronym>BIND</acronym></application> 9 installation. First
+query the local host address with <command>dig</command>:</para>
+
+<screen><userinput><command>dig -x 127.0.0.1</command></userinput></screen>
+
+<para>Now try an external name lookup, taking note of the speed
+difference in repeated lookups due to the caching. Run the 
+<command>dig</command> command twice on the same address:</para>
+
+<screen><userinput><command>dig www.linuxfromscratch.org &amp;&amp;
+dig www.linuxfromscratch.org</command></userinput></screen>
+
+<para>You can see almost instantaneous results with the named caching lookups. 
+Consult the <application><acronym>BIND</acronym></application> Administrator 
+Reference Manual located at 
+<filename>doc/arm/Bv9ARM.html</filename> in the package source tree, for 
+further configuration options.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>dig, dnssec-keygen, dnssec-signzone, host, isc-config.sh, lwresd, 
+named, named-checkconf, named-checkzone, nslookup, nsupdate, rndc and 
+rndc-confgen</seg>
+<seg>libbind9.[so,a], libdns.[so,a], libisc.[so,a], libisccc.[so,a], 
+libisccfg.[so,a] and liblwres.[so,a]</seg>
+<seg>/home/named, /usr/include/bind9, /usr/include/dns, /usr/include/dst, 
+/usr/include/isc, /usr/include/isccc, /usr/include/isccfg, /usr/include/lwres 
+and /usr/share/doc/bind-&bind-version;</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="dig">
+<term><command>dig</command></term>
+<listitem><para>interrogates <acronym>DNS</acronym> servers.</para>
+<indexterm zone="bind dig">
+<primary sortas="b-dig">dig</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="dnssec-keygen">
+<term><command>dnssec-keygen</command></term>
+<listitem><para>is a key generator for secure <acronym>DNS</acronym>.</para>
+<indexterm zone="bind dnssec-keygen">
+<primary sortas="b-dnssec-keygen">dnssec-keygen</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="dnssec-signzone">
+<term><command>dnssec-signzone</command></term>
+<listitem><para>generates signed versions of zone files.</para>
+<indexterm zone="bind dnssec-signzone">
+<primary sortas="b-dnssec-signzone">dnssec-signzone</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="host">
+<term><command>host</command></term>
+<listitem><para>is a utility for <acronym>DNS</acronym> lookups.</para>
+<indexterm zone="bind host">
+<primary sortas="b-host">host</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="lwresd">
+<term><command>lwresd</command></term>
+<listitem><para>is a caching-only name server for local process use.</para>
+<indexterm zone="bind lwresd">
+<primary sortas="b-lwresd">lwresd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="named">
+<term><command>named</command></term>
+<listitem><para>is the name server daemon.</para>
+<indexterm zone="bind named">
+<primary sortas="b-named">named</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="named-checkconf">
+<term><command>named-checkconf</command></term>
+<listitem><para>checks the syntax of <filename>named.conf</filename> 
+files.</para>
+<indexterm zone="bind named-checkconf">
+<primary sortas="b-named-checkconf">named-checkconf</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="named-checkzone">
+<term><command>named-checkzone</command></term>
+<listitem><para>checks zone file validity.</para>
+<indexterm zone="bind named-checkzone">
+<primary sortas="b-named-checkzone">named-checkzone</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="nslookup">
+<term><command>nslookup</command></term>
+<listitem><para>is a program used to query Internet domain nameservers.</para>
+<indexterm zone="bind nslookup">
+<primary sortas="b-nslookup">nslookup</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="nsupdate">
+<term><command>nsupdate</command></term>
+<listitem><para>is used to submit <acronym>DNS</acronym> update 
+requests.</para>
+<indexterm zone="bind nsupdate">
+<primary sortas="b-nsupdate">nsupdate</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="rndc">
+<term><command>rndc</command></term>
+<listitem><para>controls the operation of 
+<application><acronym>BIND</acronym></application>.</para>
+<indexterm zone="bind rndc">
+<primary sortas="b-rndc">rndc</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="rndc-confgen">
+<term><command>rndc-confgen</command></term>
+<listitem><para>generates <filename>rndc.conf</filename> files.</para>
+<indexterm zone="bind rndc-confgen">
+<primary sortas="b-rndc-confgen">rndc-confgen</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
+
Index: server/major/major.xml
===================================================================
--- server/major/major.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/major/major.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter 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;
+]>
+
+<chapter id="server-major">
+<?dbhtml filename="majorservers.html"?>
+<title>Major Servers</title>
+
+<para>Major servers are the programs that provide content or services to users or other
+programs. 
+</para>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="apache.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bind.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openssh.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="proftpd.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="samba3.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vsftpd.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xinetd.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="php.xml"/>
+
+</chapter>
Index: server/major/openssh.xml
===================================================================
--- server/major/openssh.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/major/openssh.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,309 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY openssh-download-http "http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
+<!ENTITY openssh-download-ftp "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
+<!ENTITY openssh-md5sum "7b36f28fc16e1b7f4ba3c1dca191ac92">
+<!ENTITY openssh-size "889 KB">
+<!ENTITY openssh-buildsize "14.5 MB">
+<!ENTITY openssh-time "0.42 SBU">
+]>
+
+<sect1 id="openssh" xreflabel="OpenSSH-&openssh-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="openssh.html"?>
+<title>Open<acronym>SSH</acronym>-&openssh-version;</title>
+<indexterm zone="openssh">
+<primary sortas="a-OpenSSH">OpenSSH</primary></indexterm>
+
+<sect2>
+<title>Introduction to 
+<application>Open<acronym>SSH</acronym></application></title>
+
+<para>The <application>Open<acronym>SSH</acronym></application> package 
+contains <command>ssh</command> clients and the <command>sshd</command> daemon. 
+This is useful for encrypting authentication and subsequent traffic over a 
+network.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&openssh-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&openssh-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &openssh-md5sum;</para></listitem>
+<listitem><para>Download size: &openssh-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&openssh-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&openssh-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Open<acronym>SSH</acronym></application> 
+dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="openssl"/></para>
+</sect4>
+
+<sect4><title>Optional</title>
+<para><xref linkend="Linux_PAM"/>, 
+<xref linkend="tcpwrappers"/>, 
+X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
+<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, 
+<xref linkend="j2sdk"/>, 
+<xref linkend="net-tools"/>, 
+<ulink url="http://www.opensc.org/">OpenSC</ulink> and 
+<ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of 
+<application>Open<acronym>SSH</acronym></application></title>
+
+<para><application>Open<acronym>SSH</acronym></application> runs as two 
+processes when connecting to other computers. The first process is a 
+privileged process and controls the issuance of privileges as necessary. 
+The second process communicates with the network. Additional installation 
+steps are necessary to set up the proper environment, which are performed 
+by the following commands:</para>
+
+<screen><userinput><command>install -v -d -m700 /var/lib/sshd &amp;&amp;
+chown root:sys /var/lib/sshd &amp;&amp;
+groupadd sshd &amp;&amp;
+useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd -s /bin/false sshd</command></userinput></screen>
+
+<para><application>OpenSSH</application> is very sensitive to changes in the
+linked <application>OpenSSL</application> libraries. If you recompile
+<application>OpenSSL</application>, <application>OpenSSH</application> may
+fail to startup. An alternative is to link against the static 
+<application>OpenSSL</application> library. To link against the static 
+library, execute the following command:</para>
+
+<screen><userinput><command>sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure</command></userinput></screen>
+
+<para>Install <application>Open<acronym>SSH</acronym></application> by running 
+the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc/ssh \
+    --libexecdir=/usr/sbin --with-md5-passwords \
+    --with-privsep-path=/var/lib/sshd</command></userinput></screen>
+
+<para>If you use <application>Heimdal</application> as your Kerberos5 
+implementation and you linked the <application>Heimdal</application> libraries 
+into the build using the <option>--with-kerberos5</option> parameter, you'll 
+need to modify the <filename>Makefile</filename> or the build will fail. Use 
+the following command:</para>
+
+<screen><userinput><command>sed -i -e "s/lkrb5 -ldes/lkrb5/" Makefile</command></userinput></screen>
+
+<para>Continue the build:</para>
+
+<screen><userinput><command>make</command></userinput></screen>
+
+<para>If you linked <application>tcp_wrappers</application> into the build 
+using the <option>--with-tcp-wrappers</option> parameter, ensure you add 
+127.0.0.1 to the sshd line in <filename>/etc/hosts.allow</filename> if you 
+have a restrictive <filename>/etc/hosts.deny</filename> file, or the testsuite 
+will fail. To run the testsuite, issue: <command>make -k 
+tests</command>.</para>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--sysconfdir=/etc/ssh</parameter>: This prevents the 
+configuration files from being installed in 
+<filename class="directory">/usr/etc</filename>.</para>
+
+<para><parameter>--with-md5-passwords</parameter>: This is required
+if you made the changes recommended by the shadowpasswd_plus
+<acronym>LFS</acronym> hint on
+your <acronym>SSH</acronym> server when you installed the Shadow Password 
+Suite or if you access a <acronym>SSH</acronym> server that authenticates by 
+user passwords encrypted with md5. </para>
+
+<para><parameter>--libexecdir=/usr/sbin</parameter>: This parameter 
+changes the installation path of some programs to 
+<filename class="directory">/usr/sbin</filename> instead of 
+<filename class="directory">/usr/libexec</filename>.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Open<acronym>SSH</acronym></application></title>
+
+<sect3 id="openssh-config"><title>Config files</title>
+
+<para><filename>~/.ssh/*, /etc/ssh/ssh_config</filename> and 
+<filename>/etc/ssh/sshd_config</filename></para>
+<indexterm zone="openssh openssh-config">
+<primary sortas="e-AA.ssh">~/.ssh/*</primary></indexterm>
+<indexterm zone="openssh openssh-config">
+<primary sortas="e-etc-ssh-ssh_config">/etc/ssh/ssh_config</primary>
+</indexterm>
+<indexterm zone="openssh openssh-config">
+<primary sortas="e-etc-ssh-sshd_config">/etc/ssh/sshd_config</primary>
+</indexterm>
+
+<para>There are no required changes to any of these files. However,  
+you may wish to view the <filename class='directory'>/etc/ssh/</filename> 
+files and make any changes appropriate for the security of your system. One 
+recomended change is that you disable root login via <command>ssh</command>. 
+Execute the following command to disable root login via 
+<command>ssh</command>:</para>
+
+<screen><userinput><command>echo "PermitRootLogin no" >> /etc/ssh/sshd_config</command></userinput></screen>
+
+<para>Additional configuration information can be found in the man pages for
+<command>sshd</command>, <command>ssh</command> and 
+<command>ssh-agent</command>.</para>
+</sect3>
+
+<sect3 id="openssh-init"><title>sshd init.d script</title>
+
+<para>To start the <acronym>SSH</acronym> server at system boot, install the 
+<filename>/etc/rc.d/init.d/sshd</filename> init script included in the 
+<xref linkend="intro-important-bootscripts"/> package.</para>
+<indexterm zone="openssh openssh-init">
+<primary sortas="f-sshd">sshd</primary></indexterm>
+
+<screen><userinput><command>make install-sshd</command></userinput></screen>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>scp, sftp, sftp-server, slogin, ssh, sshd, ssh-add, ssh-agent, 
+ssh-keygen, ssh-keyscan and ssh-keysign</seg>
+<seg>None</seg>
+<seg>/etc/ssh and /var/lib/sshd</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="scp">
+<term><command>scp</command></term>
+<listitem><para>is a file copy program that acts like <command>rcp</command> 
+except it uses an encrypted protocol.</para>
+<indexterm zone="openssh scp">
+<primary sortas="b-scp">scp</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="sftp">
+<term><command>sftp</command></term>
+<listitem><para>is an <acronym>FTP</acronym>-like program that works over 
+<acronym>SSH</acronym>1 and <acronym>SSH</acronym>2 protocols.</para>
+<indexterm zone="openssh sftp">
+<primary sortas="b-sftp">sftp</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="sftp-server">
+<term><command>sftp-server</command></term>
+<listitem><para>is an <acronym>SFTP</acronym> server subsystem.</para>
+<indexterm zone="openssh sftp-server">
+<primary sortas="b-sftp-server">sftp-server</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="slogin">
+<term><command>slogin</command></term>
+<listitem><para>is a symlink to <command>ssh</command>.</para>
+<indexterm zone="openssh slogin">
+<primary sortas="g-slogin">slogin</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ssh">
+<term><command>ssh</command></term>
+<listitem><para>is an <command>rlogin</command>/<command>rsh</command>-like 
+client program except it uses an encrypted protocol.</para>
+<indexterm zone="openssh ssh">
+<primary sortas="b-ssh">ssh</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="sshd">
+<term><command>sshd</command></term>
+<listitem><para>is a daemon that listens for <command>ssh</command> login 
+requests.</para>
+<indexterm zone="openssh sshd">
+<primary sortas="b-sshd">sshd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ssh-add">
+<term><command>ssh-add</command></term>
+<listitem><para>is a tool which adds keys to the 
+<command>ssh-agent</command>.</para>
+<indexterm zone="openssh ssh-add">
+<primary sortas="b-ssh-add">ssh-add</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ssh-agent">
+<term><command>ssh-agent</command></term>
+<listitem><para>is an authentication agent that can store private keys.</para>
+<indexterm zone="openssh ssh-agent">
+<primary sortas="b-ssh-agent">ssh-agent</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ssh-keygen">
+<term><command>ssh-keygen</command></term>
+<listitem><para>is a key generation tool.</para>
+<indexterm zone="openssh ssh-keygen">
+<primary sortas="b-ssh-keygen">ssh-keygen</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ssh-keyscan">
+<term><command>ssh-keyscan</command></term>
+<listitem><para>is a utility for gathering public host keys from a number of 
+hosts.</para>
+<indexterm zone="openssh ssh-keyscan">
+<primary sortas="b-ssh-keyscan">ssh-keyscan</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ssh-keysign">
+<term><command>ssh-keysign</command></term>
+<listitem><para>is used by <command>ssh</command> to access the local host 
+keys and generate the digital signature required during hostbased 
+authentication with <acronym>SSH</acronym> protocol version 2.</para>
+<indexterm zone="openssh ssh-keysign">
+<primary sortas="b-ssh-keysign">ssh-keysign</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
+
Index: server/major/php.xml
===================================================================
--- server/major/php.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/major/php.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,243 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY php-download-http "http://us2.php.net/distributions/php-&php-version;.tar.bz2">
+  <!ENTITY php-download-ftp  "ftp://ftp.isu.edu.tw/pub/Unix/Web/PHP/distributions/php-&php-version;.tar.bz2">
+  <!ENTITY php-md5sum        "fb1aac107870f897d26563a9cc5053c0">
+  <!ENTITY php-size          "4.7 MB">
+  <!ENTITY php-buildsize     "126 MB">
+  <!ENTITY php-time          "1.82 SBU">
+]>
+
+<sect1 id="php" xreflabel="PHP-&php-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="php.html"?>
+<title><acronym>PHP</acronym>-&php-version;</title>
+<indexterm zone="php">
+<primary sortas="a-PHP">PHP</primary></indexterm>
+
+<sect2>
+<title>Introduction to <application><acronym>PHP</acronym></application></title>
+
+<para><application><acronym>PHP</acronym></application> is the 
+<acronym>PHP</acronym> Hypertext Preprocessor. Primarily used in dynamic web 
+sites, it allows for programming code to be directly embedded into the
+<acronym>HTML</acronym> markup.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&php-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&php-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &php-md5sum;</para></listitem>
+<listitem><para>Download size: &php-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&php-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&php-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing="compact">
+<listitem><para>Required patch for Berkeley DB: <ulink 
+url="&patch-root;/php-&php-version;-db43-1.patch"/></para>
+</listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>PHP</acronym></application> 
+dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="apache"/></para>
+</sect4>
+
+<sect4><title>Optional</title>
+<para><xref linkend="libxml2"/>,
+<xref linkend="libxslt"/>,
+<xref linkend="openssl"/>,
+<ulink url="http://www.fastio.com/">ClibPDF</ulink>,
+<xref linkend="libjpeg"/>,
+<xref linkend="libtiff"/>,
+<xref linkend="curl"/>,
+<ulink url="http://qdbm.sourceforge.net/">QDBM</ulink>,
+<ulink url="http://cr.yp.to/cdb.html">cdb</ulink>,
+<xref linkend="gdbm"/>, 
+<xref linkend="db"/>,
+<xref linkend="fam"/>,
+<ulink url="http://www.boutell.com/gd/">GD</ulink>,
+<xref linkend="libpng"/>,
+X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
+<xref linkend="freetype2"/>,
+<ulink 
+url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.0.2.tar.gz">
+t1lib</ulink>,
+<xref linkend="gmp"/>
+<xref linkend="mysql"/>,
+<xref linkend="pcre"/>,
+<xref linkend="postgresql"/>,
+<xref linkend="aspell"/>,
+<xref linkend="pkgconfig"/>,
+<xref linkend="html-tidy"/>,
+<xref linkend="openldap"/>,
+<xref linkend="cyrus-sasl"/>,
+<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
+<ulink url="http://mcrypt.hellug.gr/">libmcrypt</ulink>,
+<ulink url="http://mhash.sourceforge.net/">mhash</ulink>,
+<ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
+<ulink url="http://www.sqlite.org/">SQLite</ulink>,
+<ulink url="http://dmalloc.com/">Dmalloc</ulink>,
+<ulink url="http://www.mnogosearch.org/">mnoGoSearch</ulink>,
+<ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink>,
+<ulink url="http://www.empress.com/">Empress</ulink>,
+<ulink url="http://www.birdstep.com/">Birdstep</ulink>,
+<ulink url="http://www.dbmaker.com/">DBMaker</ulink>,
+<ulink url="http://www.softwareag.com/">Adabas</ulink>,
+<ulink url="http://www.frontbase.com/">FrontBase</ulink>,
+<ulink url="http://caudium.net/">Caudium</ulink>,
+<ulink url="http://www.openwddx.org/">WDDX</ulink>,
+<ulink url="http://partners.adobe.com/asn/acrobat/forms.jsp">
+FDF Toolkit</ulink>,
+<ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,
+<ulink url="http://www.mainstreetsoftworks.com/">Monetra</ulink>,
+<xref linkend="expat"/> and
+<ulink url="../server/mail.html">MTA</ulink></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>PHP</acronym></application></title>
+
+<note><para>You can use <application><acronym>PHP</acronym></application>
+for server-side scripting, command line scripting or client-side
+<acronym>GUI</acronym> applications. The book provides instructions for
+setting up <application><acronym>PHP</acronym></application> for
+server-side scripting as it is the most common form.</para></note>
+
+<para>If you have Berkeley DB installed and wish to utilize it, apply
+the following patch:</para>
+
+<screen><userinput><command>patch -Np1 -i ../php-&php-version;-db43-1.patch</command></userinput></screen>
+
+<para>Install <application><acronym>PHP</acronym></application> by
+running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --with-apxs2 \
+            --with-config-file-path=/etc \
+            --with-zlib \
+            --enable-bcmath \
+            --with-bz2 \
+            --enable-calendar \
+            --enable-dba \
+            --enable-exif \
+            --enable-ftp \
+            --with-gettext \
+            --with-iconv \
+            --enable-mbstring \
+            --with-ncurses \
+            --with-readline \
+            --disable-libxml &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
+cp php.ini-recommended /etc/php.ini</command></userinput></screen>
+
+<para>Remove the <parameter>--disable-libxml</parameter> switch if you
+have <xref linkend="libxml2"/> installed otherwise
+<command>pear</command> will not be built.</para>
+
+<note><para><acronym>PHP</acronym> has many more configure options that
+will enable support for certain things. You can use
+<command>./configure --help</command> to see a full list of the
+available options. Also, use of the
+<ulink url="http://www.php.net/"><acronym>PHP</acronym> web site</ulink>
+is highly recommended, as their online docs are very good.</para></note>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application><acronym>PHP</acronym></application></title>
+
+<sect3 id="php-config"><title>Config files</title>
+<para><filename>/etc/php.ini</filename>,
+<filename>/etc/pear.conf</filename></para>
+<indexterm zone="php php-config">
+<primary sortas="e-etc-php.ini">/etc/php.ini</primary></indexterm>
+<indexterm zone="php php-config">
+<primary sortas="e-etc-pear.conf">/etc/pear.conf</primary></indexterm>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>To enable <acronym>PHP</acronym> support in the
+<application>Apache</application> web server,
+a new LoadModule (which should be handled automatically by the
+<command>make install</command> command) and AddType directives must be added 
+to the <filename>httpd.conf</filename> file:</para>
+
+<screen><userinput>LoadModule php5_module lib/apache/libphp5.so
+AddType application/x-httpd-php .php</userinput></screen>
+
+<para>Also, it can be useful to add an entry for 
+<filename>index.php</filename> to the DirectoryIndex directive of the 
+<filename>httpd.conf</filename> file.</para>
+
+<para>You'll need to restart the <application>Apache</application> web server 
+after making any modifications to the <filename>httpd.conf</filename> 
+file.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>pear, php, php-config, phpextdist and phpize</seg>
+<seg>libphp5.so</seg>
+<seg>/usr/include/php and /usr/lib/php</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="php-prog">
+<term><command>php</command></term>
+<listitem><para>is a command line interface that enables you to parse and 
+execute <acronym>PHP</acronym> code.</para>
+<indexterm zone="php php-prog">
+<primary sortas="b-php">php</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pear">
+<term><command>pear</command></term>
+<listitem><para>is the <acronym>PHP</acronym> Extension and Application 
+Repository (<acronym>PEAR</acronym>) package manager.</para>
+<indexterm zone="php pear">
+<primary sortas="b-pear">pear</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
Index: server/major/proftpd.xml
===================================================================
--- server/major/proftpd.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/major/proftpd.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,288 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY proftpd-download-http "http://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.bz2">
+  <!ENTITY proftpd-download-ftp  "ftp://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.bz2">
+  <!ENTITY proftpd-md5sum        "5feb4a7348e12faefc25e34fd92efdd6">
+  <!ENTITY proftpd-size          "901 KB">
+  <!ENTITY proftpd-buildsize     "7.3 MB">
+  <!ENTITY proftpd-time          "0.27 SBU">
+]>
+
+<sect1 id="proftpd" xreflabel="ProFTPD-&proftpd-version;">
+<sect1info>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
+</sect1info>
+
+<?dbhtml filename="proftpd.html"?>
+<title><application>Pro<acronym>FTP</acronym>D</application>-&proftpd-version;</title>
+
+<indexterm zone="proftpd">
+  <primary sortas="a-proftpd">Proftpd</primary>
+</indexterm>
+
+<sect2>
+<title>Introduction to <application>Pro<acronym>FTP</acronym>D</application></title>
+
+<para>The <application>Pro<acronym>FTP</acronym>D</application> package 
+contains a secure and highly configurable <acronym>FTP</acronym> daemon. This 
+is useful for serving large file archives over a network.</para>
+
+<sect3>
+<title>Package information</title>
+<itemizedlist spacing='compact'>
+  <listitem><para>Download (HTTP): <ulink url="&proftpd-download-http;"/></para></listitem>
+  <listitem><para>Download (FTP): <ulink url="&proftpd-download-ftp;"/></para></listitem>
+  <listitem><para>Download MD5 sum: &proftpd-md5sum;</para></listitem>
+  <listitem><para>Download size: &proftpd-size;</para></listitem>
+  <listitem><para>Estimated disk space required: &proftpd-buildsize;</para></listitem>
+  <listitem><para>Estimated build time: &proftpd-time;</para></listitem>
+</itemizedlist>
+</sect3>
+
+<sect3>
+<title><application>Pro<acronym>FTP</acronym>D</application> dependencies</title>
+
+<sect4>
+<title>Optional</title>
+
+<para><xref linkend="Linux_PAM"/></para>
+
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Pro<acronym>FTP</acronym>D</application></title>
+
+<para>For security reasons, you should install
+<application>Pro<acronym>FTP</acronym>D</application> using an unprivileged user
+and group.  As the root user:</para>
+
+<screen><userinput><command>groupadd proftpd &amp;&amp;
+useradd -c proftpd -d /home/ftp -g proftpd \
+        -s /usr/lib/proftpd/proftpdshell proftpd &amp;&amp;
+install -d -m775 -o proftpd -g proftpd /usr/lib/proftpd &amp;&amp;
+ln -s /bin/false /usr/lib/proftpd/proftpdshell &amp;&amp;
+echo /usr/lib/proftpd/proftpdshell &gt;&gt; /etc/shells</command></userinput></screen>
+
+<para>Install <application>Pro<acronym>FTP</acronym>D</application> as a regular user by running 
+the following commands:</para>
+
+<screen><userinput><command>install_user=proftpd install_group=proftpd \
+    ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var/run &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, again as the root user:</para>
+ 
+<screen><userinput role='root'><command>make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>install -d -m775 -o proftpd -g proftpd /usr/lib/proftpd</command>: 
+Create the home directory for <application>Pro<acronym>FTP</acronym>D</application>.</para>
+
+<para><command>ln -s /bin/false /usr/lib/proftpd/proftpdshell</command>:
+Set the default shell as a link to a invalid shell.</para> 
+
+<para><command>echo /usr/lib/proftpd/proftpdshell &gt;&gt; /etc/shells</command>:
+Fake a valid shell for compatability purposes.</para>
+
+<note><para>The above three commands can be ommitted if the following directive is 
+placed in the configuration file:
+
+<screen>RequireValidShell off</screen>
+
+By default, proftpd will require that users logging in have valid shells. 
+The RequireValidShell directive turns off this requirement.  This is only
+recommended if you are setting up your <acronym>FTP</acronym> server exclusively 
+for anonymous downloads.
+</para></note>
+
+<para><parameter>install_user=proftpd install_group=proftpd</parameter>:
+Specify the user and group identity for 
+<application>Pro<acronym>FTP</acronym>D</application>.</para>
+
+<para><parameter>--sysconfdir=/etc</parameter>:
+This prevents the configuration files from going to
+<filename class="directory">/usr/etc</filename>.</para>
+
+<para><parameter>--localstatedir=/var/run</parameter>:
+This uses <filename class="directory">/var/run</filename> instead of
+<filename class="directory">/usr/var</filename> for lock files.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Pro<acronym>FTP</acronym>D</application></title>
+
+<sect3 id='proftpd-init'>
+<title>proftpd init.d script</title>
+
+<indexterm zone="proftpd proftpd-init">
+  <primary sortas="f-proftpd">proftpd</primary>
+</indexterm>
+
+
+<para>Install the <filename>/etc/rc.d/init.d/proftpd</filename> init script 
+included in the <xref linkend="intro-important-bootscripts"/> package.</para>
+
+<screen><userinput><command>make install-proftpd</command></userinput></screen>
+
+</sect3>
+
+<sect3 id='proftpd-config'>
+<title>Config files</title>
+
+<indexterm zone="proftpd proftpd-config">
+   <primary sortas="e-etc-proftpd">/etc/proftpd.conf</primary>
+</indexterm>
+
+<para><filename>/etc/proftpd.conf</filename></para>
+</sect3>
+
+<sect3><title>Configuration information</title>
+<para>This is a simple, download-only sample configuration. See the 
+<application>Pro<acronym>FTP</acronym>D</application> documentation in 
+<filename class="directory">/usr/share/doc/proftpd</filename> and consult the 
+website at <ulink url="http://www.proftpd.org/"/> for example 
+configurations.</para>
+
+<screen><userinput><command>cat &gt; /etc/proftpd.conf &lt;&lt; "EOF"</command>
+# This is a basic ProFTPD configuration file
+# It establishes a single server and a single anonymous login.
+
+ServerName                      "ProFTPD Default Installation"
+ServerType                      standalone
+DefaultServer                   on
+
+# Port 21 is the standard FTP port.
+Port                            21
+# Umask 022 is a good standard umask to prevent new dirs and files
+# from being group and world writable.
+Umask                           022
+
+# To prevent DoS attacks, set the maximum number of child processes
+# to 30.  If you need to allow more than 30 concurrent connections
+# at once, simply increase this value.  Note that this ONLY works
+# in standalone mode, in inetd mode you should use an inetd server
+# that allows you to limit maximum number of processes per service
+# (such as xinetd)
+MaxInstances                    30
+
+# Set the user and group that the server normally runs at.
+User                            proftpd
+Group                           proftpd
+
+# Normally, files should be overwritable.
+&lt;Directory /*&gt;
+  AllowOverwrite                on
+&lt;/Directory&gt;
+
+# A basic anonymous configuration, no upload directories.
+&lt;Anonymous ~proftpd&gt;
+  User                          proftpd
+  Group                         proftpd
+  # Clients should be able to login with "anonymous" as well as "proftpd"
+  UserAlias                     anonymous proftpd
+
+  # Limit the maximum number of anonymous logins
+  MaxClients                    10
+
+  # 'welcome.msg' should be displayed at login, and '.message' displayed
+  # in each newly chdired directory.
+  DisplayLogin                  welcome.msg
+  DisplayFirstChdir             .message
+
+  # Limit WRITE everywhere in the anonymous chroot
+  &lt;Limit WRITE&gt;
+    DenyAll
+  &lt;/Limit&gt;
+&lt;/Anonymous&gt;
+<command>EOF</command></userinput></screen></sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+  <segtitle>Installed Libraries</segtitle>
+  <segtitle>Installed Directory</segtitle>
+ 
+  <seglistitem>
+    <seg>ftpcount, ftpdctl, ftptop, ftpwho, ftpshut, proftpd</seg>
+    <seg>None</seg>
+    <seg>/var/run/proftpd</seg>
+  </seglistitem>
+</segmentedlist>
+ 
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
+
+<varlistentry id="proftpd-prog">
+  <term><command>proftpd</command></term>
+  <listitem>
+    <para>is the <acronym>FTP</acronym> daemon.</para>
+    <indexterm zone="proftpd proftpd-prog">
+      <primary sortas="b-proftpd">proftpd</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ftpcount">
+  <term><command>ftpcount</command></term>
+  <listitem>
+    <para>shows the current number of connections.</para>
+    <indexterm zone="proftpd ftpcount">
+      <primary sortas="b-ftpcount">ftpcount</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ftpshut">
+  <term><command>ftpshut</command></term>
+  <listitem>
+    <para>shuts down all <application>proftpd</application> servers at a given time.</para>
+    <indexterm zone="proftpd ftpshut">
+      <primary sortas="b-ftpshut">ftpshut</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ftptop">
+  <term><command>ftptop</command></term>
+  <listitem>
+    <para>displays running status on connections.</para>
+    <indexterm zone="proftpd ftptop">
+      <primary sortas="b-ftptop">ftptop</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ftpwho">
+  <term><command>ftpwho</command></term>
+  <listitem>
+    <para>shows current process information for each session.</para>
+    <indexterm zone="proftpd ftpwho">
+      <primary sortas="b-ftpwho">ftpwho</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+</variablelist>
+</sect2>
+
+</sect1>
+
Index: server/major/samba3.xml
===================================================================
--- server/major/samba3.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/major/samba3.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,669 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY samba3-download-http "http://us1.samba.org/samba/ftp/samba-&samba3-version;.tar.gz">
+<!ENTITY samba3-download-ftp "ftp://ftp.samba.org/pub/samba/samba-&samba3-version;.tar.gz">
+<!ENTITY samba3-md5sum "217e489646a474b4fb69d5802c14bc6e">
+<!ENTITY samba3-size "15.3 MB">
+<!ENTITY samba3-buildsize "143 MB">
+<!ENTITY samba3-time "2.12 SBU">
+]>
+
+<sect1 id="samba3" xreflabel="Samba-&samba3-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="samba3.html"?>
+<title>Samba-&samba3-version;</title>
+<indexterm zone="samba3">
+<primary sortas="a-Samba">Samba</primary></indexterm>
+
+<sect2>
+<title>Introduction to <application>Samba</application></title>
+
+<para>The <application>Samba</application> package provides file and print 
+services to <acronym>SMB</acronym>/<acronym>CIFS</acronym> clients and
+Windows networking to Linux clients. <application>Samba</application> can also 
+be configured as a Windows NT 4.0 Domain Controller replacement 
+(with caveats working with NT <acronym>PDC</acronym>'s and 
+<acronym>BDC</acronym>'s), a file/print server acting as a member of a 
+Windows NT 4.0 or Active Directory domain and a NetBIOS (rfc1001/1002) 
+nameserver (which amongst other things provides 
+<acronym>LAN</acronym> browsing support).</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&samba3-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&samba3-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: 
+&samba3-md5sum;</para></listitem>
+<listitem><para>Download size: 
+&samba3-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&samba3-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&samba3-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3>
+<title><application>Samba</application> dependencies</title>
+<sect4>
+<title>Optional</title>
+<para><xref linkend="popt"/>, 
+<xref linkend="Linux_PAM"/>,
+<xref linkend="openldap"/>,
+<xref linkend="cups"/>,
+<xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
+<xref linkend="libxml2"/>,
+<xref linkend="mysql"/> or <xref linkend="postgresql"/>,
+<xref linkend="python"/>, 
+<xref linkend="xinetd"/>, 
+<ulink url="http://valgrind.kde.org/">Valgrind</ulink> and 
+<xref linkend="stunnel"/> (used to encrypt access to SWAT)</para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Samba</application></title>
+
+<para>Install <application>Samba</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>cd source &amp;&amp;
+install -d /var/cache/samba &amp;&amp;
+./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --with-piddir=/var/run \
+    --with-fhs \
+    --with-smbmount &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
+mv /usr/lib/samba/libsmbclient.so /usr/lib &amp;&amp;
+ln -sf ../libsmbclient.so /usr/lib/samba &amp;&amp;
+chmod 644 /usr/include/libsmbclient.h \
+          /usr/lib/samba/libsmbclient.a &amp;&amp;
+install -m755 nsswitch/libnss_win{s,bind}.so /lib &amp;&amp;
+ln -sf libnss_winbind.so /lib/libnss_winbind.so.2 &amp;&amp;
+ln -sf libnss_wins.so /lib/libnss_wins.so.2 &amp;&amp;
+cp ../examples/smb.conf.default /etc/samba &amp;&amp;
+install -m644 ../docs/*.pdf /usr/share/samba &amp;&amp;
+if [ -f nsswitch/pam_winbind.so ]; then 
+    install -m755 nsswitch/pam_winbind.so /lib/security
+fi</command></userinput></screen>
+
+<note><para>You may want to run <command>configure</command> with the
+<parameter>--help</parameter> parameter.  There may be other parameters 
+needed to take advantage of the optional dependencies.</para></note>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>install -d /var/cache/samba</command>: This directory is 
+needed for proper operation of the <command>smbd</command> and 
+<command>nmbd</command> daemons.</para>
+
+<para><parameter>--sysconfdir=/etc</parameter>: Sets the configuration
+file directory to avoid the default of 
+<filename class="directory">/usr/etc</filename>.</para>
+
+<para><parameter>--localstatedir=/var</parameter>: Sets the variable
+data directory to avoid the default of 
+<filename class="directory">/usr/var</filename>.</para>
+
+<para><option>--with-fhs</option>: Assigns all other file paths in a manner 
+compliant with the Filesystem Hierarchy Standard 
+(<acronym>FHS</acronym>).</para>
+
+<para><option>--with-smbmount</option>: Orders the creation of an extra 
+binary for use by the <command>mount</command> command so that mounting remote 
+<acronym>SMB</acronym> (Windows) shares becomes no more complex than mounting 
+remote <acronym>NFS</acronym> shares.</para>
+
+<para><option>--with-pam</option>: Use this parameter to link 
+<application>Linux-<acronym>PAM</acronym></application> into the build. This 
+also builds the <filename class='libraryfile'>pam_winbind.so</filename> 
+<application><acronym>PAM</acronym></application> module. You can find 
+instructions on how to configure and use the module by running 
+<command>man winbindd</command>.</para>
+
+<para><command>mv /usr/lib/samba/libsmbclient.so ...; ln -sf 
+../libsmbclient.so ...</command>: The 
+<filename class='libraryfile'>libsmbclient.so</filename> library is needed 
+by other packages. This command moves it to a location where other packages 
+can find it.</para>
+
+<para><command>install -m755 nsswitch/libnss_win{s,bind}.so /lib</command>:
+The nss libraries are not installed by default.  If you intend to use
+winbindd for domain auth, and/or <acronym>WINS</acronym> name resolution, 
+you need these libraries.</para> 
+
+<para><command>ln -sf libnss_winbind.so /lib/libnss_winbind.so.2</command> 
+and <command>ln -sf libnss_wins.so /lib/libnss_wins.so.2</command>:
+These symlinks are required by glibc to use the nss libraries.</para>
+
+<para><command>cp ../examples/smb.conf.default /etc/samba</command>:
+This copies a default <filename>smb.conf </filename>into
+<filename>/etc/samba</filename>.  This sample configuration will not 
+work unless edited for your site, and renamed 
+<filename>smb.conf</filename>.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Samba</application></title>
+
+<sect3 id="samba3-config"><title>Config files</title>
+<para>/etc/samba/smb.conf</para>
+<indexterm zone="samba3 samba3-config">
+<primary sortas="e-etc-samba-smb.conf">/etc/samba/smb.conf</primary>
+</indexterm>
+</sect3>
+
+<sect3><title>Configuration overview and available documentation</title>
+
+<para>Due to the complexity and the many various uses for 
+<application>Samba</application>, complete configuration is well beyond the 
+scope of the <acronym>BLFS</acronym> book. Advanced configurations including 
+setting up Primary and Backup Domain Controllers are advanced topics and 
+cannot be adequately covered in <acronym>BLFS</acronym> (it should be noted, 
+however, that a <application>Samba</application> <acronym>BDC</acronym> cannot 
+be used as a fallback for a 
+<application>Windows</application> <acronym>PDC</acronym>, and conversely, a 
+<application>Windows</application> <acronym>BDC</acronym> cannot be used as a 
+fallback for a <application>Samba</application> <acronym>PDC</acronym>). Many 
+complete books have been written on these topics alone.</para>
+
+<para>There is quite a bit of documentation available which covers many of 
+these advanced configurations. Point your web browser to the links below to 
+view some of the documentation included with the 
+<application>Samba</application> package:</para>
+
+<itemizedlist spacing='compact'>
+<listitem><para>Using Samba, 2nd Edition; a popular book published by O'Reilly 
+<ulink url="file:///usr/share/samba/swat/using_samba/toc.html"/></para>
+</listitem>
+
+<listitem><para>The Official Samba HOWTO and Reference Guide <ulink 
+url="file:///usr/share/samba/swat/help/Samba-HOWTO-Collection/index.html"/>
+</para>
+</listitem>
+
+<listitem><para>Samba-3 by Example 
+<ulink url="file:///usr/share/samba/swat/help/Samba-Guide/index.html"/></para>
+</listitem>
+
+<listitem><para>The Samba-3 man Pages
+<ulink url="file:///usr/share/samba/swat/help/samba.7.html"/></para>
+</listitem>
+</itemizedlist>
+</sect3>
+
+<sect3 id="samba3-swat-config"><title>Configuring SWAT</title>
+
+<para>The built in <acronym>SWAT</acronym> 
+(<application>Samba</application> Web Administration Tool) utility can be used 
+for basic configuration of the <application>Samba</application> installation,  
+but because it may be inconvenient, undesireable or perhaps even impossible 
+to gain access to the console, BLFS recommends setting up access to 
+<acronym>SWAT</acronym> using <application>Stunnel</application>.</para>
+<indexterm zone="samba3 samba3-swat-config">
+<primary sortas="g-SWAT">SWAT</primary></indexterm>
+
+<para>First you must add entries to <filename>/etc/services</filename> and 
+modify the <command>inetd</command>/<command>xinetd</command> 
+configuration.</para> 
+
+<indexterm zone="samba3 samba3-swat-config">
+  <primary sortas="e-etc-services">/etc/services</primary>
+</indexterm>
+
+<indexterm zone="samba3 samba3-swat-config">
+  <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
+</indexterm>
+
+<indexterm zone="samba3 samba3-swat-config">
+  <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
+</indexterm>
+
+<para>Add swat and swat_tunnel entries to 
+<filename>/etc/services</filename> with the following commands issued as the 
+root user:</para>
+
+<screen><userinput role='root'><command>echo "swat            901/tcp" &gt;&gt; /etc/services &amp;&amp;
+echo "swat_tunnel     902/tcp" &gt;&gt; /etc/services</command></userinput></screen>
+
+<para>If <command>inetd</command> is used, the following command will add the 
+swat_tunnel entry to <filename>/etc/inetd.conf</filename> (as user root):</para>
+
+<screen><userinput role='root'><command>echo "swat_tunnel stream tcp nowait.400 root /usr/sbin/swat swat" \
+    &gt;&gt; /etc/inetd.conf</command></userinput></screen>
+<para>Issue a <command>killall -HUP inetd</command> to reread the
+changed <filename>inetd.conf</filename> file.</para>
+
+<para>If you use <command>xinetd</command>, the following command will create the 
+<application>Samba</application> file as <filename>/etc/xinetd.d/swat_tunnel</filename>: 
+(you may need to modify or remove the 
+<quote>only_from</quote> line to include the desired host[s]):</para>
+
+<screen><userinput role='root'><command>cat &gt;&gt; /etc/xinetd.d/swat_tunnel &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd.d/swat_tunnel
+
+service swat_tunnel
+{
+    port            = 902
+    socket_type     = stream
+    wait            = no
+    only_from       = 127.0.0.1
+    user            = root
+    server          = /usr/sbin/swat
+    log_on_failure  += USERID
+}
+
+# End /etc/xinetd.d/swat_tunnel
+<command>EOF</command></userinput></screen>
+
+<indexterm zone="samba3 samba3-swat-config">
+  <primary sortas="e-etc-xinetd.d-swat-tunnel">/etc/xinetd.d/swat_tunnel</primary>
+</indexterm>
+
+<para>Issue a <command>killall -HUP xinetd</command> to reread the
+changed <filename>xinetd.conf</filename> file.</para>
+
+<para>Next, you must add an entry for the swat service to the 
+<filename>/etc/stunnel/stunnel.conf</filename> file (as user root):</para>
+
+<indexterm zone="samba3 samba3-swat-config">
+  <primary sortas="e-etc-stunnel-stunnel.conf">/etc/stunnel/stunnel.conf</primary>
+</indexterm>
+
+<screen><userinput role='root'><command>cat &gt;&gt; /etc/stunnel/stunnel.conf &lt;&lt; "EOF"</command>
+[swat]
+accept  = 901
+connect = 902
+
+<command>EOF</command></userinput></screen>
+
+<para>Restart the <command>stunnel</command> daemon using the following 
+command as the root user:</para>
+
+<screen><userinput role='root'><command>/etc/rc.d/init.d/stunnel restart</command></userinput></screen>
+
+<para><acronym>SWAT</acronym> can be launched by pointing your web browser to 
+<userinput>https://<replaceable>[CA_DN_field]</replaceable>:901</userinput>. 
+Substitute the hostname listed in the <acronym>DN</acronym> field of the 
+<acronym>CA</acronym> certificate used with 
+<application>Stunnel</application> for 
+<replaceable>[CA_DN_field]</replaceable>.</para>
+
+<note><para>If you linked 
+<application>Linux-<acronym>PAM</acronym></application> into the 
+<application>Samba</application> build, you'll need to create an 
+<filename>/etc/pam.d/samba</filename> file.</para></note>
+
+<indexterm zone="samba3 samba3-swat-config">
+  <primary sortas="e-etc-pam.d-samba">/etc/pam.d/samba</primary>
+</indexterm>
+
+</sect3>
+
+<sect3><title>Printing to <acronym>SMB</acronym> clients</title>
+
+<para>If you use <application><acronym>CUPS</acronym></application> for print 
+services, and you wish to print to a printer attached to an 
+<acronym>SMB</acronym> client, you need to create an <acronym>SMB</acronym> 
+backend device. To create the device, issue the following command as the 
+root user:</para>
+
+<screen><userinput><command>ln -sf /usr/bin/smbspool /usr/lib/cups/backend/smb</command></userinput></screen>
+</sect3>
+
+<sect3 id="samba3-init"><title>Installing bootscripts</title>
+
+<para>For your convenience, boot scripts have been provided for
+<application>Samba</application>.  There are two included in the
+<xref linkend="intro-important-bootscripts"/> package.  The first,
+<filename>samba</filename>, will start the <command>smbd</command> and
+<command>nmbd</command> daemons needed to provide
+<acronym>SMB</acronym>/<acronym>CIFS</acronym> services.  The second
+script, <filename>winbind</filename>, starts the <command>winbindd</command> 
+daemon, used for providing Windows domain services to Linux clients.</para>
+
+<indexterm zone="samba3 samba3-init">
+  <primary sortas="f-samba">samba</primary>
+</indexterm>
+
+<indexterm zone="samba3 samba3-init">
+  <primary sortas="f-winbind">winbind</primary>
+</indexterm>
+
+<para>Install the <filename>samba</filename> script with the following 
+command issued as the root user:</para>
+
+<screen><userinput role='root'><command>make install-samba</command></userinput></screen>
+
+<para>If you also need the <filename>winbind</filename> script:</para>
+
+<screen><userinput role='root'><command>make install-winbind</command></userinput></screen>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>findsmb, mount.smbfs, net, nmbd, nmblookup, ntlm_auth, pdbedit, profiles, 
+rpcclient, smbcacls, smbclient, smbcontrol, smbcquotas, smbd, smbmnt, 
+smbmount, smbpasswd, smbspool, smbstatus, smbtar, smbtree, smbumount, swat, 
+tdbbackup, tdbdump, tdbtool, testparm, testprns, wbinfo and winbindd</seg>
+<seg>libnss_winbind.so, libnss_wins.so, libsmbclient.[so,a], the 
+pam_winbind.so <acronym>PAM</acronym> library and assorted character set, 
+filesystem and support modules.</seg>
+<seg>/etc/samba, /usr/lib/samba, /usr/share/samba, /var/cache/samba and 
+/var/lib/samba</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="findsmb">
+<term><command>findsmb</command></term>
+<listitem><para>lists information about machines that respond to 
+<acronym>SMB</acronym> name queries on a subnet.</para>
+<indexterm zone="samba3 findsmb">
+<primary sortas="b-findsmb">findsmb</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="mount.smbfs">
+<term><command>mount.smbfs</command></term>
+<listitem><para>is a symlink to <command>mountsmb</command> which provides 
+<command>/bin/mount</command> with a way to mount remote Windows (or
+<application>Samba</application>) fileshares.</para>
+<indexterm zone="samba3 mount.smbfs">
+<primary sortas="b-mount.smbfs">mount.smbfs</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="net">
+<term><command>net</command></term>
+<listitem><para>is a tool for administration of 
+<application>Samba</application> and remote <acronym>CIFS</acronym> servers,
+similar to the <command>net</command> utility for 
+<acronym>DOS</acronym>/Windows.</para>
+<indexterm zone="samba3 net">
+<primary sortas="b-net">net</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="nmbd">
+<term><command>nmbd</command></term>
+<listitem><para>is the <application>Samba</application>
+Net<acronym>BIOS</acronym> name server.</para>
+<indexterm zone="samba3 nmbd">
+<primary sortas="b-nmbd">nmbd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="nmblookup">
+<term><command>nmblookup</command></term>
+<listitem><para>is used to query Net<acronym>BIOS</acronym> names and map 
+them to <acronym>IP</acronym> addresses.</para>
+<indexterm zone="samba3 nmblookup">
+<primary sortas="b-nmblookup">nmblookup</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ntlm_auth">
+<term><command>ntlm_auth</command></term>
+<listitem><para>is a tool to allow external access to Winbind's 
+<acronym>NTLM</acronym> authentication function.</para>
+<indexterm zone="samba3 ntlm_auth">
+<primary sortas="b-ntlm_auth">ntlm_auth</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pdbedit">
+<term><command>pdbedit</command></term>
+<listitem><para>is a tool used to manage the <acronym>SAM</acronym> 
+database.</para>
+<indexterm zone="samba3 pdbedit">
+<primary sortas="b-pdbedit">pdbedit</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="profiles">
+<term><command>profiles</command></term>
+<listitem><para>is a utility that reports and changes <acronym>SID</acronym>s 
+in Windows registry files. It currently only supports Windows NT.</para>
+<indexterm zone="samba3 profiles">
+<primary sortas="b-profiles">profiles</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="rpcclient">
+<term><command>rpcclient</command></term>
+<listitem><para>is used to execute MS-<acronym>RPC</acronym> client side 
+functions.</para>
+<indexterm zone="samba3 rpcclient">
+<primary sortas="b-rpcclient">rpcclient</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbcacls">
+<term><command>smbcacls</command></term>
+<listitem><para>is used to manipulate Windows NT access control lists.</para>
+<indexterm zone="samba3 smbcacls">
+<primary sortas="b-smbcacls">smbcacls</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbclient">
+<term><command>smbclient</command></term>
+<listitem><para>is a <acronym>SMB</acronym>/<acronym>CIFS</acronym> access 
+utility, similar to <acronym>FTP</acronym>.</para>
+<indexterm zone="samba3 smbclient">
+<primary sortas="b-smbclient">smbclient</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbcontrol">
+<term><command>smbcontrol</command></term>
+<listitem><para>is used to control running <command>smbd</command>, 
+<command>nmbd</command> and <command>winbindd</command> daemons.</para>
+<indexterm zone="samba3 smbcontrol">
+<primary sortas="b-smbcontrol">smbcontrol</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbcquotas">
+<term><command>smbcquotas</command></term>
+<listitem><para>is used to manipulate Windows NT quotas on 
+<acronym>SMB</acronym> file shares.</para>
+<indexterm zone="samba3 smbcquotas">
+<primary sortas="b-smbcquotas">smbcquotas</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbd">
+<term><command>smbd</command></term>
+<listitem><para>is the main <application>Samba</application> daemon which 
+provides <acronym>SMB</acronym>/<acronym>CIFS</acronym> services to 
+clients.</para>
+<indexterm zone="samba3 smbd">
+<primary sortas="b-smbd">smbd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbmnt">
+<term><command>smbmnt</command></term>
+<listitem><para>is a helper application used by the 
+<command>smbmount</command> program to do the actual mounting of
+<acronym>SMB</acronym> shares. It can be installed setuid root if you want
+normal users to be able to mount their <acronym>SMB</acronym> shares.</para>
+<indexterm zone="samba3 smbmnt">
+<primary sortas="b-smbmnt">smbmnt</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbmount">
+<term><command>smbmount</command></term>
+<listitem><para>is usually invoked as <command>mount.smbfs</command> by the 
+<command>mount</command> command when using the 
+<parameter>-t smbfs</parameter> option, mounts a Linux <acronym>SMB</acronym> 
+filesystem.</para>
+<indexterm zone="samba3 smbmount">
+<primary sortas="b-smbmount">smbmount</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbpasswd">
+<term><command>smbpasswd</command></term>
+<listitem><para>changes a user's <application>Samba</application> 
+password.</para>
+<indexterm zone="samba3 smbpasswd">
+<primary sortas="b-smbpasswd">smbpasswd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbspool">
+<term><command>smbspool</command></term>
+<listitem><para>sends a print job to an <acronym>SMB</acronym> printer.</para>
+<indexterm zone="samba3 smbspool">
+<primary sortas="b-smbspool">smbspool</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbstatus">
+<term><command>smbstatus</command></term>
+<listitem><para>reports current <application>Samba</application> 
+connections.</para>
+<indexterm zone="samba3 smbstatus">
+<primary sortas="b-smbstatus">smbstatus</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbtar">
+<term><command>smbtar</command></term>
+<listitem><para>is a shell script used for backing up 
+<acronym>SMB</acronym>/<acronym>CIFS</acronym> shares directly to Linux tape 
+drives or a file.</para>
+<indexterm zone="samba3 smbtar">
+<primary sortas="b-smbtar">smbtar</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbtree">
+<term><command>smbtree</command></term>
+<listitem><para>is a text-based <acronym>SMB</acronym> network browser.</para>
+<indexterm zone="samba3 smbtree">
+<primary sortas="b-smbtree">smbtree</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="smbumount">
+<term><command>smbumount</command></term>
+<listitem><para>is used by normal users to unmount <acronym>SMB</acronym> 
+filesystems, provided that it is setuid root.</para>
+<indexterm zone="samba3 smbumount">
+<primary sortas="b-smbumount">smbumount</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="swat">
+<term><command>swat</command></term>
+<listitem><para>is the <application>Samba</application> Web Administration 
+Tool.</para>
+<indexterm zone="samba3 swat">
+<primary sortas="b-swat">swat</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="tdbbackup">
+<term><command>tdbbackup</command></term>
+<listitem><para>is a tool for backing up or validating the integrity of 
+<application>Samba</application> <filename>.tdb</filename> files.</para>
+<indexterm zone="samba3 tdbbackup">
+<primary sortas="b-tdbbackup">tdbbackup</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="tdbdump">
+<term><command>tdbdump</command></term>
+<listitem><para> is a tool used to print the contents of a 
+<application>Samba</application> <filename>.tdb</filename> file.</para>
+<indexterm zone="samba3 tdbdump">
+<primary sortas="b-tdbdump">tdbdump</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="tdbtool">
+<term><command>tdbtool</command></term>
+<listitem><para>is a tool which allows simple database manipulation from the 
+command line.</para>
+<indexterm zone="samba3 tdbtool">
+<primary sortas="b-tdbtool">tdbtool</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="testparm">
+<term><command>testparm</command></term>
+<listitem><para>checks an <filename>smb.conf</filename> file for proper 
+syntax.</para>
+<indexterm zone="samba3 testparm">
+<primary sortas="b-testparm">testparm</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="testprns">
+<term><command>testprns</command></term>
+<listitem><para>tests printer names.</para>
+<indexterm zone="samba3 testprns">
+<primary sortas="b-testprns">testprns</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="wbinfo">
+<term><command>wbinfo</command></term>
+<listitem><para>queries a running <command>winbindd</command> daemon.</para>
+<indexterm zone="samba3 wbinfo">
+<primary sortas="b-wbinfo">wbinfo</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="winbindd">
+<term><command>winbindd</command></term>
+<listitem><para>resolves names from Windows NT servers.</para>
+<indexterm zone="samba3 winbindd">
+<primary sortas="b-winbindd">winbindd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+</variablelist>
+
+</sect2>
+
+</sect1>
+
Index: server/major/vsftpd.xml
===================================================================
--- server/major/vsftpd.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/major/vsftpd.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,163 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY vsftpd-download-http " ">
+  <!ENTITY vsftpd-download-ftp  "ftp://vsftpd.beasts.org/users/cevans/vsftpd-&vsftpd-version;.tar.gz">
+  <!ENTITY vsftpd-md5sum        "63838791ec8b1375ed154fb2603e52e9">
+  <!ENTITY vsftpd-size          "148 KB">
+  <!ENTITY vsftpd-buildsize     "492 KB">
+  <!ENTITY vsftpd-time          "0.01 SBU">
+]>
+
+<sect1 id="vsftpd" xreflabel="vsFTPD-&vsftpd-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="vsftpd.html"?>
+<title><application>vs<acronym>FTP</acronym>D</application>-&vsftpd-version;
+</title>
+
+<sect2>
+<title>Introduction to 
+<application>vs<acronym>FTP</acronym>D</application></title>
+
+<para>The <application>vs<acronym>FTP</acronym>D</application> package 
+contains a very secure and very small <acronym>FTP</acronym> daemon. This is 
+useful for serving files over a network.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&vsftpd-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&vsftpd-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &vsftpd-md5sum;</para></listitem>
+<listitem><para>Download size: &vsftpd-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&vsftpd-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&vsftpd-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>vsFTPD</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="Linux_PAM"/>,
+<xref linkend="openssl"/>, and
+<xref linkend="tcpwrappers"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>vsFTPD</application></title>
+
+<para>For security reasons, running 
+<application>vs<acronym>FTP</acronym>D</application> as an unprivileged user 
+and group is encouraged. Also, a user to map anonymous users to should be
+created.</para>
+
+<screen><userinput><command>install -d -m 0755 /var/ftp/empty &amp;&amp;
+install -d -m 0755 /home/ftp &amp;&amp;
+groupadd vsftpd &amp;&amp;
+useradd -d /dev/null -c "vsFTPD User" -g vsftpd -s /bin/false vsftpd &amp;&amp;
+groupadd ftp &amp;&amp;
+useradd -c anonymous_user -d /home/ftp -g ftp -s /bin/false ftp</command>
+</userinput></screen>
+
+<para>Install <application>vs<acronym>FTP</acronym>D</application> by running 
+the following commands:</para>
+
+<screen><userinput><command>make &amp;&amp;
+install -m 755 vsftpd /usr/sbin/vsftpd &amp;&amp;
+install -m 644 vsftpd.8 /usr/share/man/man8 &amp;&amp;
+install -m 644 vsftpd.conf.5 /usr/share/man/man5 &amp;&amp;
+install -m 644 vsftpd.conf /etc</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>install -d [...]</parameter>: This creates the directory that
+anonymous users will use (<filename class='directory'>/home/ftp</filename>) 
+and the directory the daemon will chroot into 
+(<filename class='directory'>/var/ftp/empty</filename>).</para>
+
+<note><para><filename class="directory">/home/ftp</filename> should not be
+owned by the user vsftpd, or the user ftp.</para></note>
+
+<para><parameter>echo "#define VSF_BUILD_TCPWRAPPERS" >>builddefs.h</parameter>:
+Use this prior to <command>make</command> to add support for 
+<application>tcpwrappers</application>.</para>
+
+<para><parameter>echo "#define VSF_BUILD_SSL" >>builddefs.h</parameter>:
+Use this prior to <command>make</command> to add support for 
+<acronym>SSL</acronym>.</para>
+
+<para><parameter>install -m [...]</parameter>:
+The <filename>Makefile</filename> hardwires 
+<filename class='directory'>/usr/local</filename> (if it exists). These 
+commands install the files in 
+<filename class='directory'>/usr</filename>.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>vs<acronym>FTP</acronym>D</application></title>
+
+<sect3><title>vsftpd init.d script</title>
+<para>Install the <filename>/etc/rc.d/init.d/vsftpd</filename>
+init script included in the 
+<xref linkend="intro-important-bootscripts"/> package.</para>
+
+<screen><userinput><command>make install-vsftpd</command></userinput></screen>
+
+</sect3>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/vsftpd.conf</filename></para>
+</sect3>
+
+<sect3><title>Configuration information</title>
+<para><application>vs<acronym>FTP</acronym>D</application> comes with a basic 
+anonymous-only configuration file that was copied to 
+<filename class='directory'>/etc</filename> above. This file should be modified 
+because it is now recommended to run <command>vsftpd</command> in standalone 
+mode as opposed to <command>inetd</command>/<command>xinetd</command> mode. 
+Also, you should specify the privilege separation user created above. Finally, 
+you should specify the <command>chroot</command> directory. 
+<command>man vsftpd.conf</command> will give you all the details.</para>
+
+<screen><userinput><command>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"</command>
+background=YES
+listen=YES
+nopriv_user=vsftpd
+secure_chroot_dir=/var/ftp/empty
+<command>EOF</command></userinput></screen>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>vs<acronym>FTP</acronym>D</application> package contains 
+<command>vsftpd</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>vsftpd</title>
+<para><command>vsftpd</command> is the <acronym>FTP</acronym> 
+daemon.</para></sect3>
+
+</sect2>
+
+</sect1>
+
Index: server/major/xinetd.xml
===================================================================
--- server/major/xinetd.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/major/xinetd.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -0,0 +1,717 @@
+<?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" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY xinetd-download-http "http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz">
+<!ENTITY xinetd-download-ftp " ">
+<!ENTITY xinetd-md5sum "4295b5fe12350f09b5892b363348ac8b">
+<!ENTITY xinetd-size "291 KB">
+<!ENTITY xinetd-buildsize "4.12 MB">
+<!ENTITY xinetd-time "0.11 SBU">
+]>
+
+<sect1 id="xinetd" xreflabel="xinetd-&xinetd-version;">
+<sect1info>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
+</sect1info>
+
+<?dbhtml filename="xinetd.html"?>
+<title>xinetd-&xinetd-version;</title>
+
+<indexterm zone="xinetd">
+  <primary sortas="a-Xinetd">Xinetd</primary>
+</indexterm>
+
+<sect2>
+<title>Introduction to <application>xinetd</application></title>
+
+<para><application>xinetd</application> is the eXtended InterNET services 
+Daemon, a secure replacement for <command>inetd</command>.</para>
+
+<sect3>
+<title>Package information</title>
+<itemizedlist spacing='compact'>
+  <listitem><para>Download (HTTP): <ulink url="&xinetd-download-http;"/></para></listitem>
+  <listitem><para>Download (FTP): <ulink url="&xinetd-download-ftp;"/></para></listitem>
+  <listitem><para>Download MD5 sum: &xinetd-md5sum;</para></listitem>
+  <listitem><para>Download size: &xinetd-size;</para></listitem>
+  <listitem><para>Estimated disk space required: &xinetd-buildsize;</para></listitem>
+  <listitem><para>Estimated build time: &xinetd-time;</para></listitem>
+</itemizedlist>
+</sect3>
+
+<sect3>
+<title><application>xinetd</application> dependencies</title>
+
+<sect4>
+<title>Optional</title>
+  <para><xref linkend="tcpwrappers"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>xinetd</application></title>
+
+<para>Install <application>xinetd</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>xinetd</application></title>
+
+<sect3 id="xinetd-config">
+<title>Config files</title>
+
+<para><filename>/etc/xinetd.conf</filename></para>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
+</indexterm>
+</sect3>
+
+<sect3>
+<title>Configuration Information</title>
+
+<para>Ensure the path to all daemons is 
+<filename class="directory">/usr/sbin</filename>, rather than the default path 
+of <filename class="directory">/usr/etc</filename>, and install the 
+<application>xinetd</application> configuration files by running the following
+commands as the root user:</para>
+
+<screen><userinput role='root'><command>cat &gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd
+# Configuration file for xinetd
+#
+
+defaults
+{
+      instances       = 60
+      log_type        = SYSLOG daemon
+      log_on_success  = HOST PID USERID
+      log_on_failure  = HOST USERID
+      cps             = 25 30
+}
+
+# All service files are stored in the /etc/xinetd.d directory
+#
+includedir /etc/xinetd.d
+# End /etc/xinetd
+<command>EOF</command></userinput></screen>
+
+<para>All of the following files have the statement, "disable = yes". To activate 
+any of the services, this statement will need to be changed to "disable = no".</para>
+
+<note><para>The following files are listed to demonstrate classic
+<application>xinetd</application> applications.  In many cases, these
+applications are not needed.  In some cases, the applications are 
+considered security risks.  For example, telnet, rlogin, rexec, and rsh
+transmit unencrypted usernames and passwords over the network and can be easily
+replaced with a more secure alternative: ssh.</para></note>
+
+<screen><userinput role='root'><command>install -d -m755 /etc/xinetd.d &amp;&amp;</command>
+<command>cat &gt; /etc/xinetd.d/login &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/login
+
+service login
+{
+   disable        = yes
+   socket_type    = stream
+   protocol       = tcp
+   wait           = no
+   user           = root
+   server         = /usr/sbin/in.rlogind
+   log_type       = SYSLOG local4 info
+}
+
+# End /etc/xinetd.d/login
+<command>EOF
+cat &gt; /etc/xinetd.d/shell &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/shell
+
+service shell
+{
+   disable        = yes
+   socket_type    = stream
+   wait           = no
+   user           = root
+   instances      = UNLIMITED
+   flags          = IDONLY
+   log_on_success += USERID
+   server         = /usr/sbin/in.rshd
+}
+
+# End /etc/xinetd.d/shell
+<command>EOF
+cat &gt; /etc/xinetd.d/exec &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/exec
+
+service exec
+{
+   disable        = yes
+   socket_type    = stream
+   wait           = no
+   user           = root
+   server         = /usr/sbin/in.rexecd
+}
+
+# End /etc/xinetd.d/exec
+<command>EOF
+cat &gt; /etc/xinetd.d/comsat &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/comsat
+
+service comsat
+{
+   disable        = yes
+   socket_type    = dgram
+   wait           = yes
+   user           = nobody
+   group          = tty
+   server         = /usr/sbin/in.comsat
+}
+
+# End /etc/xinetd.d/comsat
+<command>EOF
+cat &gt; /etc/xinetd.d/talk &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/talk
+
+service talk
+{
+   disable        = yes
+   socket_type    = dgram
+   wait           = yes
+   user           = root
+   server         = /usr/sbin/in.talkd
+}
+
+# End /etc/xinetd.d/talk
+<command>EOF
+cat &gt; /etc/xinetd.d/ntalk &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/ntalk
+
+service ntalk
+{
+   disable        = yes
+   socket_type    = dgram
+   wait           = yes
+   user           = root
+   server         = /usr/sbin/in.ntalkd
+}
+
+# End /etc/xinetd.d/ntalk
+<command>EOF
+cat &gt; /etc/xinetd.d/telnet &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/telnet
+
+service telnet
+{
+   disable        = yes
+   socket_type    = stream	
+   wait           = no
+   user           = root
+   server         = /usr/sbin/in.telnetd
+   bind           = 127.0.0.1
+   log_on_failure += USERID
+}
+
+service telnet
+{
+   disable        = yes
+   socket_type    = stream	
+   wait           = no
+   user           = root
+#  server         = /usr/sbin/in.telnetd
+   bind           = 192.231.139.175
+   redirect       = 128.138.202.20 23
+   log_on_failure += USERID
+}
+
+# End /etc/xinetd.d/telnet
+<command>EOF
+cat &gt; /etc/xinetd.d/ftp &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/ftp
+
+service ftp
+{
+   disable        = yes
+   socket_type    = stream
+   wait           = no
+   user           = root
+   server         = /usr/sbin/in.ftpd
+   server_args    = -l
+   instances      = 4
+   log_on_success += DURATION USERID
+   log_on_failure += USERID
+   access_times   = 2:00-8:59 12:00-23:59
+   nice           = 10
+}
+
+# End /etc/xinetd.d/ftp
+<command>EOF
+cat &gt; /etc/xinetd.d/tftp &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/tftp
+
+service tftp
+{
+   disable        = yes
+   socket_type    = dgram
+   wait           = yes
+   user           = root
+   server         = /usr/sbin/in.tftpd
+   server_args    = -s /tftpboot
+}
+
+# End /etc/xinetd.d/tftp
+<command>EOF
+cat &gt; /etc/xinetd.d/finger &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/finger
+
+service finger
+{
+   disable        = yes
+   socket_type    = stream
+   wait           = no
+   user           = nobody
+   server         = /usr/sbin/in.fingerd
+}
+
+# End /etc/xinetd.d/finger
+<command>EOF
+cat &gt; /etc/xinetd.d/systat &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/systat
+
+service systat
+{
+   disable           = yes
+   socket_type       = stream
+   wait              = no
+   user              = nobody
+   server            = /usr/bin/ps
+   server_args       = -auwwx
+   only_from         = 128.138.209.0
+   log_on_success    = HOST
+}
+
+# End /etc/xinetd.d/systat
+<command>EOF
+cat &gt; /etc/xinetd.d/netstat &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/netstat
+
+service netstat
+{
+   disable           = yes
+   socket_type       = stream
+   wait              = no
+   user              = nobody
+   server            = /usr/ucb/netstat
+   server_args       = -f inet
+   only_from         = 128.138.209.0
+   log_on_success    = HOST
+}
+
+# End /etc/xinetd.d/netstat
+<command>EOF
+cat &gt; /etc/xinetd.d/echo &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/echo
+
+service echo
+{
+   disable     = yes
+   type        = INTERNAL
+   id          = echo-stream
+   socket_type = stream
+   protocol    = tcp
+   user        = root
+   wait        = no
+}
+
+service echo
+{
+   disable     = yes
+   type        = INTERNAL
+   id          = echo-dgram
+   socket_type = dgram
+   protocol    = udp
+   user        = root
+   wait        = yes
+}
+
+# End /etc/xinetd.d/echo
+<command>EOF
+cat &gt; /etc/xinetd.d/chargen &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/chargen
+
+service chargen
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = chargen-stream
+   socket_type    = stream
+   protocol       = tcp
+   user           = root
+   wait           = no
+}
+
+service chargen
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = chargen-dgram
+   socket_type    = dgram
+   protocol       = udp
+   user           = root
+   wait           = yes
+}
+
+# End /etc/xinetd.d/chargen
+<command>EOF
+cat &gt; /etc/xinetd.d/daytime &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/daytime
+
+service daytime
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = daytime-stream
+   socket_type    = stream
+   protocol       = tcp
+   user           = root
+   wait           = no
+}
+
+service daytime
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = daytime-dgram
+   socket_type    = dgram
+   protocol       = udp
+   user           = root
+   wait           = yes
+}
+
+# End /etc/xinetd.d/daytime
+<command>EOF
+cat &gt; /etc/xinetd.d/time &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/time
+
+service time
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = time-stream
+   socket_type    = stream
+   protocol       = tcp
+   user           = root
+   wait           = no
+}
+
+
+service time
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = time-dgram
+   socket_type    = dgram
+   protocol       = udp
+   user           = root
+   wait           = yes
+}
+
+# End /etc/xinetd.d/time
+<command>EOF
+cat &gt; /etc/xinetd.d/rstatd &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/rstatd
+
+ervice rstatd
+{
+   disable     = yes
+   type        = RPC
+   flags       = INTERCEPT
+   rpc_version = 2-4
+   socket_type = dgram
+   protocol    = udp
+   server      = /usr/sbin/rpc.rstatd
+   wait        = yes
+   user        = root
+}
+
+# End /etc/xinetd.d/rstatd
+<command>EOF
+cat &gt; /etc/xinetd.d/rquotad &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/rquotad
+
+service rquotad
+{
+   disable     = yes
+   type        = RPC
+   rpc_version = 1
+   socket_type = dgram
+   protocol    = udp
+   wait        = yes
+   user        = root
+   server      = /usr/sbin/rpc.rstatd
+}
+
+# End /etc/xinetd.d/rquotad
+<command>EOF
+cat &gt; /etc/xinetd.d/rusersd &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/rusersd
+
+service rusersd
+{
+   disable     = yes
+   type        = RPC
+   rpc_version = 1-2
+   socket_type = dgram
+   protocol    = udp
+   wait        = yes
+   user        = root
+   server      = /usr/sbin/rpc.rusersd
+}
+
+# End /etc/xinetd.d/rusersd
+<command>EOF
+cat &gt; /etc/xinetd.d/sprayd &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/sprayd
+
+service sprayd
+{
+   disable      = yes
+   type         = RPC
+   rpc_version  = 1
+   socket_type  = dgram
+   protocol     = udp
+   wait         = yes
+   user         = root
+   server       = /usr/sbin/rpc.sprayd
+}
+
+# End /etc/xinetd.d/sprayd
+<command>EOF
+cat &gt; /etc/xinetd.d/walld &lt;&lt; "EOF" &amp;&amp;</command>
+# Begin /etc/xinetd.d/walld
+
+service walld
+{
+   disable      = yes
+   type         = RPC
+   rpc_version  = 1
+   socket_type  = dgram
+   protocol     = udp
+   wait         = yes
+   user         = nobody
+   group        = tty
+   server       = /usr/sbin/rpc.rwalld
+}
+
+# End /etc/xinetd.d/walld
+<command>EOF
+cat &gt; /etc/xinetd.d/irc &lt;&lt; "EOF"</command>
+# Begin /etc/xinetd.d/irc
+
+service irc
+{
+   disable      = yes
+   socket_type  = stream
+   wait         = no
+   user         = root
+   flags        = SENSOR
+   type         = INTERNAL
+   bind         = 192.168.1.30
+   deny_time    = 60
+}
+
+# End /etc/xinetd.d/irc
+<command>EOF</command></userinput></screen>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-login">/etc/xinetd.d/login</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-shell">/etc/xinetd.d/shell</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-exec">/etc/xinetd.d/exec</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-comsat">/etc/xinetd.d/comsat</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-talk">/etc/xinetd.d/talk</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-ntalk">/etc/xinetd.d/ntalk</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-telnet">/etc/xinetd.d/telnet</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-ftp">/etc/xinetd.d/ftp</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-tftp">/etc/xinetd.d/tftp</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-systat">/etc/xinetd.d/systat</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-finger">/etc/xinetd.d/finger</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-netstat">/etc/xinetd.d/netstat</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-echo">/etc/xinetd.d/echo</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-chargen">/etc/xinetd.d/chargen</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-daytime">/etc/xinetd.d/daytime</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-time">/etc/xinetd.d/time</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-rstatd">/etc/xinetd.d/rstatd</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-rquotad">/etc/xinetd.d/rquotad</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-ruserd">/etc/xinetd.d/ruserd</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-sprayd">/etc/xinetd.d/sprayd</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-walld">/etc/xinetd.d/walld</primary>
+</indexterm>
+
+<indexterm zone="xinetd xinetd-config">
+  <primary sortas="e-etc-xinetd.d-irc">/etc/xinetd.d/irc</primary>
+</indexterm>
+
+
+
+<para>The format of the <filename>/etc/xinetd.conf</filename> is
+documented in the <filename>xinetd.conf.5</filename> man page. Further 
+information can be found at <ulink url="http://www.xinetd.org"/>.</para>
+
+<para id="xinetd-init">As the root user, install the 
+<filename>/etc/rc.d/init.d/xinetd</filename> init script included in the 
+<xref linkend="intro-important-bootscripts"/> package.</para>
+
+<indexterm zone="xinetd xinetd-init">
+  <primary sortas="f-xinetd">xinetd</primary>
+</indexterm>
+
+<screen><userinput role='root'><command>make install-xinetd</command></userinput></screen>
+
+<para>As the root user, use the new boot script to start 
+<command>xinetd</command>:</para>
+
+<screen><userinput role='root'><command>/etc/rc.d/init.d/xinetd start</command></userinput></screen>
+
+<para>Checking the <filename>/var/log/daemon.log</filename> file
+should prove quite entertaining. This file may contain entries
+similar to the following:</para>
+
+<screen>Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rlogind is not 
+executable [line=29]
+Aug 22 21:40:21 dps10 xinetd[2696]: Error parsing attribute server -
+DISABLING SERVICE [line=29]
+Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rshd is not
+executable [line=42]</screen>
+
+<para>These errors are because most of the servers <command>xinetd</command> 
+is trying to control are not installed yet.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>itox, xconv.pl and xinetd</seg>
+<seg>None</seg>
+<seg>/etc/xinetd.d/</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="itox">
+<term><command>itox</command></term>
+<listitem><para>is a utility used for converting 
+<filename>inetd.conf</filename> files to 
+<filename>xinetd.conf</filename> format.</para>
+<indexterm zone="xinetd itox">
+<primary sortas="b-itox">itox</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="xconv.pl">
+<term><command>xconv.pl</command></term>
+<listitem><para>is a <application>Perl</application> script used for 
+converting <filename>inetd.conf</filename> files to
+<filename>xinetd.conf</filename> format, similar to
+<command>itox</command>.</para>
+<indexterm zone="xinetd xconv.pl">
+<primary sortas="b-xconv.pl">xconv.pl</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="xinetd-prog">
+<term><command>xinetd</command></term>
+<listitem><para>is the Internet services daemon.</para>
+<indexterm zone="xinetd xinetd-prog">
+<primary sortas="b-xinetd">xinetd</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
Index: rver/other/bind.xml
===================================================================
--- server/other/bind.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,538 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-<!ENTITY bind-download-http "http://gd.tuwien.ac.at/infosys/servers/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
-<!ENTITY bind-download-ftp "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
-<!ENTITY bind-md5sum "fdb42fff7e345372ac52a4493b77b694">
-<!ENTITY bind-size "4.6 MB">
-<!ENTITY bind-buildsize "87 MB">
-<!ENTITY bind-time "1.87 SBU (additional 4.14 SBU to run the complete test suite)">
-]>
-
-<sect1 id="bind" xreflabel="BIND-&bind-version;p1">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="bind.html"?>
-<title><acronym>BIND</acronym>-&bind-version;p1</title>
-<indexterm zone="bind">
-<primary sortas="a-BIND">BIND</primary>
-</indexterm>
-
-<sect2>
-<title>Introduction to 
-<application><acronym>BIND</acronym></application></title>
-
-<para>The <application><acronym>BIND</acronym></application> package
-provides a <acronym>DNS</acronym> server and client utilities. If you
-are only interested in the utilities, refer to the 
-<xref linkend="bind-utils"/>.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&bind-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&bind-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: 
-&bind-md5sum;</para></listitem>
-<listitem><para>Download size: 
-&bind-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&bind-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&bind-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para><ulink 
-url="ftp://ftp.isc.org/isc/bind9/9.3.0/&bind-version;-patch1"/></para>
-</listitem>
-</itemizedlist>
-</sect3>
-
-<sect3><title><application><acronym>BIND</acronym></application> 
-dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="openssl"/></para>
-</sect4>
-
-<sect4><title>Optional (to run the full test suite)</title>
-<para><xref linkend="net-tools"/> (for <command>ifconfig</command>) and 
-<xref linkend="perl-modules"/>: Net-DNS</para>
-</sect4>
-
-<sect4><title>Optional (to [re]build documentation)</title>
-<para><xref linkend="openjade"/>, 
-<xref linkend="jadetex"/>, 
-<xref linkend="docbook-dsssl"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of 
-<application><acronym>BIND</acronym></application></title>
-
-<para>Install <application><acronym>BIND</acronym></application> by
-running the following commands:</para>
-
-<screen><userinput><command>patch -Np1 -i ../&bind-version;-patch1 &amp;&amp;
-sed -i -e "s/dsssl-stylesheets/&amp;-1.78/g" configure &amp;&amp;
-./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-threads --with-libtool &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install &amp;&amp;
-chmod 755 \
-    /usr/lib/{lib{bind9,isc{,cc,cfg},lwres}.so.?.?.?,libdns.so.20.0.0} &amp;&amp;
-mv /usr/share/man/man8/named.conf.5 /usr/share/man/man5 &amp;&amp;
-cd doc &amp;&amp;
-install -d -m755 /usr/share/doc/bind-9.3.0/{arm,draft,misc,rfc} &amp;&amp;
-install -m644 arm/*.html \
-    /usr/share/doc/bind-9.3.0/arm &amp;&amp;
-install -m644 draft/*.txt \
-    /usr/share/doc/bind-9.3.0/draft &amp;&amp;
-install -m644 rfc/* \
-    /usr/share/doc/bind-9.3.0/rfc &amp;&amp;
-install -m644 \
-    misc/{dnssec,ipv6,migrat*,options,rfc-compliance,roadmap,sdb} \
-    /usr/share/doc/bind-9.3.0/misc</command></userinput></screen>
-
-<para>In order to run the complete test suite before installing the 
-package, you need to set up some dummy interfaces (requires 
-<command>ifconfig</command>). Issue the following commands to run the 
-complete suite of tests (you will have to be the root user to issue the
-<command>ifconfig</command> commands):</para>
-
-<screen><userinput role='root'><command>bin/tests/system/ifconfig.sh up &amp;&amp;
-make check &gt;check.log 2&gt;&amp;1 &amp;&amp;
-bin/tests/system/ifconfig.sh down</command></userinput></screen>
-
-<para>If desired, issue the following command to ensure all 145 tests ran 
-successfully:</para>
-
-<screen><userinput><command>grep "R:PASS" check.log | wc -l</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><command>patch -Np1 -i ../&bind-version;-patch1</command>: There's a 
-vulnerability in the <acronym>DNS</acronym><acronym>SEC</acronym> code. See 
-<ulink url="http://www.kb.cert.org/vuls/id/938617"/>. The patch fixes the
-bug.</para>
-
-<para><command>sed -i -e ... configure</command>: This command forces 
-<command>configure</command> to look for the <acronym>DSSSL</acronym> 
-stylesheets in the standard <acronym>BLFS</acronym> location.</para>
-
-<para><parameter>--sysconfdir=/etc</parameter>: This parameter forces 
-<application><acronym>BIND</acronym></application> to look for configuration 
-files in <filename class='directory'>/etc</filename> instead of 
-<filename class='directory'>/usr/etc</filename>.</para>
-
-<para><parameter>--enable-threads</parameter>: This parameter enables 
-multi-threading capability.</para>
-
-<para><parameter>--with-libtool</parameter>: This parameter forces the 
-building of dynamic libraries and links the installed binaries to these 
-libraries.</para>
-
-<para><command>cd doc; install ...</command>: These commands install the 
-additional package documentation. Optionally, omit any or all of these 
-commands.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring
-<application><acronym>BIND</acronym></application></title>
-
-<sect3 id="bind-config"><title>Config files</title>
-<para><filename>named.conf</filename>, 
-<filename>root.hints</filename>, 
-<filename>127.0.0</filename>, 
-<filename>rndc.conf</filename> and 
-<filename>resolv.conf</filename></para>
-<indexterm zone="bind bind-config">
-<primary sortas="e-etc-named.conf">/etc/named.conf</primary></indexterm>
-<indexterm zone="bind bind-config">
-<primary sortas="e-etc-rndc.conf">/etc/rndc.conf</primary></indexterm>
-<indexterm zone="bind bind-config">
-<primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary></indexterm>
-<indexterm zone="bind bind-config">
-<primary sortas="e-etc-namedb-root.hints">/etc/namedb/root.hints</primary>
-</indexterm>
-<indexterm zone="bind bind-config">
-<primary sortas="e-etc-namedb-pz-127.0.0.0">/etc/namedb/pz/127.0.0.0</primary>
-</indexterm>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para><application><acronym>BIND</acronym></application> will be configured 
-to run in a <command>chroot</command> jail as an unprivileged user (named). 
-This configuration is more secure in that a <acronym>DNS</acronym> compromise 
-can only affect a few files in the named user's <envar>HOME</envar> 
-directory.</para> 
-
-<para>Create the unprivileged user and group named:</para>
-
-<screen><userinput role='root'><command>groupadd named &amp;&amp;
-useradd -m -c "BIND Owner" -g named -s /bin/false named</command></userinput></screen>
-
-<para>Set up some files, directories and devices needed by 
-<application><acronym>BIND</acronym></application>:</para>
-
-<screen><userinput role='root'><command>cd /home/named &amp;&amp;
-mkdir -p dev etc/namedb/slave var/run &amp;&amp;
-mknod /home/named/dev/null c 1 3 &amp;&amp;
-mknod /home/named/dev/random c 1 8 &amp;&amp;
-chmod 666 /home/named/dev/{null,random} &amp;&amp;
-mkdir /home/named/etc/namedb/pz &amp;&amp;
-cp /etc/localtime /home/named/etc</command></userinput></screen>
-
-<para>Then, generate a key for use in the <filename>named.conf</filename> 
-and <filename>rdnc.conf</filename> files using the 
-<command>rndc-confgen</command> command:</para>
-
-<screen><userinput role='root'><command>rndc-confgen -b 512 | grep -m 1 "secret" | cut -d '"' -f 2</command></userinput></screen>
-
-<para>Create the <filename>named.conf</filename> file from which named 
-will read the location of zone files, root name servers and secure 
-<acronym>DNS</acronym> keys:</para>
-
-<screen><userinput role='root'><command>cat &gt; /home/named/etc/named.conf &lt;&lt; "EOF"</command>
- options {
-     directory "/etc/namedb";
-    pid-file "/var/run/named.pid";
-    statistics-file "/var/run/named.stats";
-       
- };
- controls {
-     inet 127.0.0.1 allow { localhost; } keys { rndc_key; };
- };
- key "rndc_key" {
-     algorithm hmac-md5;
-     secret "<replaceable>[Insert secret from rndc-confgen's output here]</replaceable>";
- };
- zone "." {
-     type hint;
-     file "root.hints";
- };
- zone "0.0.127.in-addr.arpa" {
-     type master;
-     file "pz/127.0.0";
- };
-
-// Bind 9 now logs by default through syslog (except debug).
-// These are the default logging rules.
-
-logging {
-     category default { default_syslog; default_debug; };
-     category unmatched { null; };
-
-  channel default_syslog {
-      syslog daemon;                      // send to syslog's daemon
-                                          // facility
-      severity info;                      // only send priority info
-                                          // and higher
-  };
-
-  channel default_debug {
-      file "named.run";                   // write to named.run in
-                                          // the working directory
-                                          // Note: stderr is used instead
-                                          // of "named.run"
-                                          // if the server is started
-                                          // with the '-f' option.
-      severity dynamic;                   // log at the server's
-                                          // current debug level
-  };
-
-  channel default_stderr {
-      stderr;                             // writes to stderr
-      severity info;                      // only send priority info
-                                          // and higher
-  };
-
-  channel null {
-     null;                                // toss anything sent to
-                                          // this channel
-  };
-};
-
-
-
-<command>EOF</command></userinput></screen>
-
-<para>Create the <filename>rndc.conf</filename> file with the following 
-commands:</para>
-
-<screen><userinput role='root'><command>cat &gt; /etc/rndc.conf &lt;&lt; "EOF"</command>
-key rndc_key {
-algorithm "hmac-md5";
-    secret
-    "<replaceable>[Insert secret from rndc-confgen's output here]</replaceable>";
-    };
-options {
-    default-server localhost;
-    default-key    rndc_key;
-};
-<command>EOF</command></userinput></screen>
-
-<para>The <filename>rndc.conf</filename> file contains information for 
-controlling named operations with the <command>rndc</command> 
-utility.</para>
-
-<para>Create a zone file with the following contents:</para>
-
-<screen><userinput role='root'><command>cat &gt; /home/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF"</command>
-$TTL 3D
-@      IN      SOA     ns.local.domain. hostmaster.local.domain. (
-                        1       ; Serial
-                        8H      ; Refresh
-                        2H      ; Retry
-                        4W      ; Expire
-                        1D)     ; Minimum TTL
-                NS      ns.local.domain.
-1               PTR     localhost.
-<command>EOF</command></userinput></screen>
-
-<para>Create the <filename>root.hints</filename> file with the following
-commands:</para>
-
-<note><para>Caution must be used to ensure there are no leading spaces in this 
-file.</para></note>
-
-<screen><userinput><command>cat &gt; /home/named/etc/namedb/root.hints &lt;&lt; "EOF"</command>
-.                       6D  IN      NS      A.ROOT-SERVERS.NET.
-.                       6D  IN      NS      B.ROOT-SERVERS.NET.
-.                       6D  IN      NS      C.ROOT-SERVERS.NET.
-.                       6D  IN      NS      D.ROOT-SERVERS.NET.
-.                       6D  IN      NS      E.ROOT-SERVERS.NET.
-.                       6D  IN      NS      F.ROOT-SERVERS.NET.
-.                       6D  IN      NS      G.ROOT-SERVERS.NET.
-.                       6D  IN      NS      H.ROOT-SERVERS.NET.
-.                       6D  IN      NS      I.ROOT-SERVERS.NET.
-.                       6D  IN      NS      J.ROOT-SERVERS.NET.
-.                       6D  IN      NS      K.ROOT-SERVERS.NET.
-.                       6D  IN      NS      L.ROOT-SERVERS.NET.
-.                       6D  IN      NS      M.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.     6D  IN      A       198.41.0.4
-B.ROOT-SERVERS.NET.     6D  IN      A       192.228.79.201
-C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
-D.ROOT-SERVERS.NET.     6D  IN      A       128.8.10.90
-E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
-F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
-G.ROOT-SERVERS.NET.     6D  IN      A       192.112.36.4
-H.ROOT-SERVERS.NET.     6D  IN      A       128.63.2.53
-I.ROOT-SERVERS.NET.     6D  IN      A       192.36.148.17
-J.ROOT-SERVERS.NET.     6D  IN      A       192.58.128.30
-K.ROOT-SERVERS.NET.     6D  IN      A       193.0.14.129
-L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
-M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
-<command>EOF</command></userinput></screen>
-
-<para>The <filename>root.hints</filename> file is a list of root name servers. 
-This file must be updated periodically with the <command>dig</command> 
-utility.  A current copy of root.hints can be obtained from 
-<ulink url="ftp://rs.internic.net/domain/named.root" />. Consult the 
-<ulink url="http://www.bind9.net/Bv9ARM.html"><application>
-<acronym>BIND</acronym></application> 9 Administrator Reference Manual</ulink> 
-for details.</para>
-
-<para>Create or modify <filename>resolv.conf</filename> to use the new 
-name server with the following commands:</para>
-
-<note><para>Replace <replaceable>[yourdomain.com]</replaceable> with your own 
-valid domain name.</para></note>
-
-<screen><userinput role='root'><command>cp /etc/resolv.conf /etc/resolv.conf.bak &amp;&amp;
-cat &gt; /etc/resolv.conf &lt;&lt; "EOF"</command>
-search <replaceable>[yourdomain.com]</replaceable>
-nameserver 127.0.0.1
-<command>EOF</command></userinput></screen>
-
-<para>Set permissions on the <command>chroot</command> jail with the 
-following command:</para>
-
-<screen><userinput role='root'><command>chown -R named.named /home/named</command></userinput></screen>
-
-<para id="bind-init">To start the <acronym>DNS</acronym> server at boot, install the 
-<filename>/etc/rc.d/init.d/bind</filename> init script included in the 
-<xref linkend="intro-important-bootscripts"/> package.</para>
-<indexterm zone="bind bind-init">
-<primary sortas="f-bind">bind</primary></indexterm>
-
-<screen><userinput role='root'><command>make install-bind</command></userinput></screen>
-
-<para>Now start <application><acronym>BIND</acronym></application> with
-the new boot script:</para>
-
-<screen><userinput role='root'><command>/etc/rc.d/init.d/bind start</command></userinput></screen>
-
-</sect3>
-
-<sect3><title>Testing <application><acronym>BIND</acronym></application></title>
-
-<para>Test out the new
-<application><acronym>BIND</acronym></application> 9 installation. First
-query the local host address with <command>dig</command>:</para>
-
-<screen><userinput><command>dig -x 127.0.0.1</command></userinput></screen>
-
-<para>Now try an external name lookup, taking note of the speed
-difference in repeated lookups due to the caching. Run the 
-<command>dig</command> command twice on the same address:</para>
-
-<screen><userinput><command>dig www.linuxfromscratch.org &amp;&amp;
-dig www.linuxfromscratch.org</command></userinput></screen>
-
-<para>You can see almost instantaneous results with the named caching lookups. 
-Consult the <application><acronym>BIND</acronym></application> Administrator 
-Reference Manual located at 
-<filename>doc/arm/Bv9ARM.html</filename> in the package source tree, for 
-further configuration options.</para>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>dig, dnssec-keygen, dnssec-signzone, host, isc-config.sh, lwresd, 
-named, named-checkconf, named-checkzone, nslookup, nsupdate, rndc and 
-rndc-confgen</seg>
-<seg>libbind9.[so,a], libdns.[so,a], libisc.[so,a], libisccc.[so,a], 
-libisccfg.[so,a] and liblwres.[so,a]</seg>
-<seg>/home/named, /usr/include/bind9, /usr/include/dns, /usr/include/dst, 
-/usr/include/isc, /usr/include/isccc, /usr/include/isccfg, /usr/include/lwres 
-and /usr/share/doc/bind-&bind-version;</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="dig">
-<term><command>dig</command></term>
-<listitem><para>interrogates <acronym>DNS</acronym> servers.</para>
-<indexterm zone="bind dig">
-<primary sortas="b-dig">dig</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="dnssec-keygen">
-<term><command>dnssec-keygen</command></term>
-<listitem><para>is a key generator for secure <acronym>DNS</acronym>.</para>
-<indexterm zone="bind dnssec-keygen">
-<primary sortas="b-dnssec-keygen">dnssec-keygen</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="dnssec-signzone">
-<term><command>dnssec-signzone</command></term>
-<listitem><para>generates signed versions of zone files.</para>
-<indexterm zone="bind dnssec-signzone">
-<primary sortas="b-dnssec-signzone">dnssec-signzone</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="host">
-<term><command>host</command></term>
-<listitem><para>is a utility for <acronym>DNS</acronym> lookups.</para>
-<indexterm zone="bind host">
-<primary sortas="b-host">host</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="lwresd">
-<term><command>lwresd</command></term>
-<listitem><para>is a caching-only name server for local process use.</para>
-<indexterm zone="bind lwresd">
-<primary sortas="b-lwresd">lwresd</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="named">
-<term><command>named</command></term>
-<listitem><para>is the name server daemon.</para>
-<indexterm zone="bind named">
-<primary sortas="b-named">named</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="named-checkconf">
-<term><command>named-checkconf</command></term>
-<listitem><para>checks the syntax of <filename>named.conf</filename> 
-files.</para>
-<indexterm zone="bind named-checkconf">
-<primary sortas="b-named-checkconf">named-checkconf</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="named-checkzone">
-<term><command>named-checkzone</command></term>
-<listitem><para>checks zone file validity.</para>
-<indexterm zone="bind named-checkzone">
-<primary sortas="b-named-checkzone">named-checkzone</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="nslookup">
-<term><command>nslookup</command></term>
-<listitem><para>is a program used to query Internet domain nameservers.</para>
-<indexterm zone="bind nslookup">
-<primary sortas="b-nslookup">nslookup</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="nsupdate">
-<term><command>nsupdate</command></term>
-<listitem><para>is used to submit <acronym>DNS</acronym> update 
-requests.</para>
-<indexterm zone="bind nsupdate">
-<primary sortas="b-nsupdate">nsupdate</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="rndc">
-<term><command>rndc</command></term>
-<listitem><para>controls the operation of 
-<application><acronym>BIND</acronym></application>.</para>
-<indexterm zone="bind rndc">
-<primary sortas="b-rndc">rndc</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="rndc-confgen">
-<term><command>rndc-confgen</command></term>
-<listitem><para>generates <filename>rndc.conf</filename> files.</para>
-<indexterm zone="bind rndc-confgen">
-<primary sortas="b-rndc-confgen">rndc-confgen</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
-
Index: rver/other/openssh.xml
===================================================================
--- server/other/openssh.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,309 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-<!ENTITY openssh-download-http "http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
-<!ENTITY openssh-download-ftp "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
-<!ENTITY openssh-md5sum "7b36f28fc16e1b7f4ba3c1dca191ac92">
-<!ENTITY openssh-size "889 KB">
-<!ENTITY openssh-buildsize "14.5 MB">
-<!ENTITY openssh-time "0.42 SBU">
-]>
-
-<sect1 id="openssh" xreflabel="OpenSSH-&openssh-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="openssh.html"?>
-<title>Open<acronym>SSH</acronym>-&openssh-version;</title>
-<indexterm zone="openssh">
-<primary sortas="a-OpenSSH">OpenSSH</primary></indexterm>
-
-<sect2>
-<title>Introduction to 
-<application>Open<acronym>SSH</acronym></application></title>
-
-<para>The <application>Open<acronym>SSH</acronym></application> package 
-contains <command>ssh</command> clients and the <command>sshd</command> daemon. 
-This is useful for encrypting authentication and subsequent traffic over a 
-network.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&openssh-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&openssh-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &openssh-md5sum;</para></listitem>
-<listitem><para>Download size: &openssh-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&openssh-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&openssh-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>Open<acronym>SSH</acronym></application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="openssl"/></para>
-</sect4>
-
-<sect4><title>Optional</title>
-<para><xref linkend="Linux_PAM"/>, 
-<xref linkend="tcpwrappers"/>, 
-X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
-<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, 
-<xref linkend="j2sdk"/>, 
-<xref linkend="net-tools"/>, 
-<ulink url="http://www.opensc.org/">OpenSC</ulink> and 
-<ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of 
-<application>Open<acronym>SSH</acronym></application></title>
-
-<para><application>Open<acronym>SSH</acronym></application> runs as two 
-processes when connecting to other computers. The first process is a 
-privileged process and controls the issuance of privileges as necessary. 
-The second process communicates with the network. Additional installation 
-steps are necessary to set up the proper environment, which are performed 
-by the following commands:</para>
-
-<screen><userinput><command>install -v -d -m700 /var/lib/sshd &amp;&amp;
-chown root:sys /var/lib/sshd &amp;&amp;
-groupadd sshd &amp;&amp;
-useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd -s /bin/false sshd</command></userinput></screen>
-
-<para><application>OpenSSH</application> is very sensitive to changes in the
-linked <application>OpenSSL</application> libraries. If you recompile
-<application>OpenSSL</application>, <application>OpenSSH</application> may
-fail to startup. An alternative is to link against the static 
-<application>OpenSSL</application> library. To link against the static 
-library, execute the following command:</para>
-
-<screen><userinput><command>sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure</command></userinput></screen>
-
-<para>Install <application>Open<acronym>SSH</acronym></application> by running 
-the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc/ssh \
-    --libexecdir=/usr/sbin --with-md5-passwords \
-    --with-privsep-path=/var/lib/sshd</command></userinput></screen>
-
-<para>If you use <application>Heimdal</application> as your Kerberos5 
-implementation and you linked the <application>Heimdal</application> libraries 
-into the build using the <option>--with-kerberos5</option> parameter, you'll 
-need to modify the <filename>Makefile</filename> or the build will fail. Use 
-the following command:</para>
-
-<screen><userinput><command>sed -i -e "s/lkrb5 -ldes/lkrb5/" Makefile</command></userinput></screen>
-
-<para>Continue the build:</para>
-
-<screen><userinput><command>make</command></userinput></screen>
-
-<para>If you linked <application>tcp_wrappers</application> into the build 
-using the <option>--with-tcp-wrappers</option> parameter, ensure you add 
-127.0.0.1 to the sshd line in <filename>/etc/hosts.allow</filename> if you 
-have a restrictive <filename>/etc/hosts.deny</filename> file, or the testsuite 
-will fail. To run the testsuite, issue: <command>make -k 
-tests</command>.</para>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>--sysconfdir=/etc/ssh</parameter>: This prevents the 
-configuration files from being installed in 
-<filename class="directory">/usr/etc</filename>.</para>
-
-<para><parameter>--with-md5-passwords</parameter>: This is required
-if you made the changes recommended by the shadowpasswd_plus
-<acronym>LFS</acronym> hint on
-your <acronym>SSH</acronym> server when you installed the Shadow Password 
-Suite or if you access a <acronym>SSH</acronym> server that authenticates by 
-user passwords encrypted with md5. </para>
-
-<para><parameter>--libexecdir=/usr/sbin</parameter>: This parameter 
-changes the installation path of some programs to 
-<filename class="directory">/usr/sbin</filename> instead of 
-<filename class="directory">/usr/libexec</filename>.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>Open<acronym>SSH</acronym></application></title>
-
-<sect3 id="openssh-config"><title>Config files</title>
-
-<para><filename>~/.ssh/*, /etc/ssh/ssh_config</filename> and 
-<filename>/etc/ssh/sshd_config</filename></para>
-<indexterm zone="openssh openssh-config">
-<primary sortas="e-AA.ssh">~/.ssh/*</primary></indexterm>
-<indexterm zone="openssh openssh-config">
-<primary sortas="e-etc-ssh-ssh_config">/etc/ssh/ssh_config</primary>
-</indexterm>
-<indexterm zone="openssh openssh-config">
-<primary sortas="e-etc-ssh-sshd_config">/etc/ssh/sshd_config</primary>
-</indexterm>
-
-<para>There are no required changes to any of these files. However,  
-you may wish to view the <filename class='directory'>/etc/ssh/</filename> 
-files and make any changes appropriate for the security of your system. One 
-recomended change is that you disable root login via <command>ssh</command>. 
-Execute the following command to disable root login via 
-<command>ssh</command>:</para>
-
-<screen><userinput><command>echo "PermitRootLogin no" >> /etc/ssh/sshd_config</command></userinput></screen>
-
-<para>Additional configuration information can be found in the man pages for
-<command>sshd</command>, <command>ssh</command> and 
-<command>ssh-agent</command>.</para>
-</sect3>
-
-<sect3 id="openssh-init"><title>sshd init.d script</title>
-
-<para>To start the <acronym>SSH</acronym> server at system boot, install the 
-<filename>/etc/rc.d/init.d/sshd</filename> init script included in the 
-<xref linkend="intro-important-bootscripts"/> package.</para>
-<indexterm zone="openssh openssh-init">
-<primary sortas="f-sshd">sshd</primary></indexterm>
-
-<screen><userinput><command>make install-sshd</command></userinput></screen>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>scp, sftp, sftp-server, slogin, ssh, sshd, ssh-add, ssh-agent, 
-ssh-keygen, ssh-keyscan and ssh-keysign</seg>
-<seg>None</seg>
-<seg>/etc/ssh and /var/lib/sshd</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="scp">
-<term><command>scp</command></term>
-<listitem><para>is a file copy program that acts like <command>rcp</command> 
-except it uses an encrypted protocol.</para>
-<indexterm zone="openssh scp">
-<primary sortas="b-scp">scp</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="sftp">
-<term><command>sftp</command></term>
-<listitem><para>is an <acronym>FTP</acronym>-like program that works over 
-<acronym>SSH</acronym>1 and <acronym>SSH</acronym>2 protocols.</para>
-<indexterm zone="openssh sftp">
-<primary sortas="b-sftp">sftp</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="sftp-server">
-<term><command>sftp-server</command></term>
-<listitem><para>is an <acronym>SFTP</acronym> server subsystem.</para>
-<indexterm zone="openssh sftp-server">
-<primary sortas="b-sftp-server">sftp-server</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="slogin">
-<term><command>slogin</command></term>
-<listitem><para>is a symlink to <command>ssh</command>.</para>
-<indexterm zone="openssh slogin">
-<primary sortas="g-slogin">slogin</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="ssh">
-<term><command>ssh</command></term>
-<listitem><para>is an <command>rlogin</command>/<command>rsh</command>-like 
-client program except it uses an encrypted protocol.</para>
-<indexterm zone="openssh ssh">
-<primary sortas="b-ssh">ssh</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="sshd">
-<term><command>sshd</command></term>
-<listitem><para>is a daemon that listens for <command>ssh</command> login 
-requests.</para>
-<indexterm zone="openssh sshd">
-<primary sortas="b-sshd">sshd</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="ssh-add">
-<term><command>ssh-add</command></term>
-<listitem><para>is a tool which adds keys to the 
-<command>ssh-agent</command>.</para>
-<indexterm zone="openssh ssh-add">
-<primary sortas="b-ssh-add">ssh-add</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="ssh-agent">
-<term><command>ssh-agent</command></term>
-<listitem><para>is an authentication agent that can store private keys.</para>
-<indexterm zone="openssh ssh-agent">
-<primary sortas="b-ssh-agent">ssh-agent</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="ssh-keygen">
-<term><command>ssh-keygen</command></term>
-<listitem><para>is a key generation tool.</para>
-<indexterm zone="openssh ssh-keygen">
-<primary sortas="b-ssh-keygen">ssh-keygen</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="ssh-keyscan">
-<term><command>ssh-keyscan</command></term>
-<listitem><para>is a utility for gathering public host keys from a number of 
-hosts.</para>
-<indexterm zone="openssh ssh-keyscan">
-<primary sortas="b-ssh-keyscan">ssh-keyscan</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="ssh-keysign">
-<term><command>ssh-keysign</command></term>
-<listitem><para>is used by <command>ssh</command> to access the local host 
-keys and generate the digital signature required during hostbased 
-authentication with <acronym>SSH</acronym> protocol version 2.</para>
-<indexterm zone="openssh ssh-keysign">
-<primary sortas="b-ssh-keysign">ssh-keysign</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
-
Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ server/other/other.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -17,14 +17,10 @@
 that you can analyze the risks.</para>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bind.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcp.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="leafnode.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openldap.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="rsync.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cvsserver.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="svnserver.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcp.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="leafnode.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openssh.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="rsync.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openldap.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="samba3.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xinetd.xml"/>
 
 </chapter>
Index: rver/other/samba3.xml
===================================================================
--- server/other/samba3.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,669 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-<!ENTITY samba3-download-http "http://us1.samba.org/samba/ftp/samba-&samba3-version;.tar.gz">
-<!ENTITY samba3-download-ftp "ftp://ftp.samba.org/pub/samba/samba-&samba3-version;.tar.gz">
-<!ENTITY samba3-md5sum "217e489646a474b4fb69d5802c14bc6e">
-<!ENTITY samba3-size "15.3 MB">
-<!ENTITY samba3-buildsize "143 MB">
-<!ENTITY samba3-time "2.12 SBU">
-]>
-
-<sect1 id="samba3" xreflabel="Samba-&samba3-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="samba3.html"?>
-<title>Samba-&samba3-version;</title>
-<indexterm zone="samba3">
-<primary sortas="a-Samba">Samba</primary></indexterm>
-
-<sect2>
-<title>Introduction to <application>Samba</application></title>
-
-<para>The <application>Samba</application> package provides file and print 
-services to <acronym>SMB</acronym>/<acronym>CIFS</acronym> clients and
-Windows networking to Linux clients. <application>Samba</application> can also 
-be configured as a Windows NT 4.0 Domain Controller replacement 
-(with caveats working with NT <acronym>PDC</acronym>'s and 
-<acronym>BDC</acronym>'s), a file/print server acting as a member of a 
-Windows NT 4.0 or Active Directory domain and a NetBIOS (rfc1001/1002) 
-nameserver (which amongst other things provides 
-<acronym>LAN</acronym> browsing support).</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&samba3-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&samba3-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: 
-&samba3-md5sum;</para></listitem>
-<listitem><para>Download size: 
-&samba3-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&samba3-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&samba3-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3>
-<title><application>Samba</application> dependencies</title>
-<sect4>
-<title>Optional</title>
-<para><xref linkend="popt"/>, 
-<xref linkend="Linux_PAM"/>,
-<xref linkend="openldap"/>,
-<xref linkend="cups"/>,
-<xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-<xref linkend="libxml2"/>,
-<xref linkend="mysql"/> or <xref linkend="postgresql"/>,
-<xref linkend="python"/>, 
-<xref linkend="xinetd"/>, 
-<ulink url="http://valgrind.kde.org/">Valgrind</ulink> and 
-<xref linkend="stunnel"/> (used to encrypt access to SWAT)</para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Samba</application></title>
-
-<para>Install <application>Samba</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>cd source &amp;&amp;
-install -d /var/cache/samba &amp;&amp;
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --with-piddir=/var/run \
-    --with-fhs \
-    --with-smbmount &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install &amp;&amp;
-mv /usr/lib/samba/libsmbclient.so /usr/lib &amp;&amp;
-ln -sf ../libsmbclient.so /usr/lib/samba &amp;&amp;
-chmod 644 /usr/include/libsmbclient.h \
-          /usr/lib/samba/libsmbclient.a &amp;&amp;
-install -m755 nsswitch/libnss_win{s,bind}.so /lib &amp;&amp;
-ln -sf libnss_winbind.so /lib/libnss_winbind.so.2 &amp;&amp;
-ln -sf libnss_wins.so /lib/libnss_wins.so.2 &amp;&amp;
-cp ../examples/smb.conf.default /etc/samba &amp;&amp;
-install -m644 ../docs/*.pdf /usr/share/samba &amp;&amp;
-if [ -f nsswitch/pam_winbind.so ]; then 
-    install -m755 nsswitch/pam_winbind.so /lib/security
-fi</command></userinput></screen>
-
-<note><para>You may want to run <command>configure</command> with the
-<parameter>--help</parameter> parameter.  There may be other parameters 
-needed to take advantage of the optional dependencies.</para></note>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><command>install -d /var/cache/samba</command>: This directory is 
-needed for proper operation of the <command>smbd</command> and 
-<command>nmbd</command> daemons.</para>
-
-<para><parameter>--sysconfdir=/etc</parameter>: Sets the configuration
-file directory to avoid the default of 
-<filename class="directory">/usr/etc</filename>.</para>
-
-<para><parameter>--localstatedir=/var</parameter>: Sets the variable
-data directory to avoid the default of 
-<filename class="directory">/usr/var</filename>.</para>
-
-<para><option>--with-fhs</option>: Assigns all other file paths in a manner 
-compliant with the Filesystem Hierarchy Standard 
-(<acronym>FHS</acronym>).</para>
-
-<para><option>--with-smbmount</option>: Orders the creation of an extra 
-binary for use by the <command>mount</command> command so that mounting remote 
-<acronym>SMB</acronym> (Windows) shares becomes no more complex than mounting 
-remote <acronym>NFS</acronym> shares.</para>
-
-<para><option>--with-pam</option>: Use this parameter to link 
-<application>Linux-<acronym>PAM</acronym></application> into the build. This 
-also builds the <filename class='libraryfile'>pam_winbind.so</filename> 
-<application><acronym>PAM</acronym></application> module. You can find 
-instructions on how to configure and use the module by running 
-<command>man winbindd</command>.</para>
-
-<para><command>mv /usr/lib/samba/libsmbclient.so ...; ln -sf 
-../libsmbclient.so ...</command>: The 
-<filename class='libraryfile'>libsmbclient.so</filename> library is needed 
-by other packages. This command moves it to a location where other packages 
-can find it.</para>
-
-<para><command>install -m755 nsswitch/libnss_win{s,bind}.so /lib</command>:
-The nss libraries are not installed by default.  If you intend to use
-winbindd for domain auth, and/or <acronym>WINS</acronym> name resolution, 
-you need these libraries.</para> 
-
-<para><command>ln -sf libnss_winbind.so /lib/libnss_winbind.so.2</command> 
-and <command>ln -sf libnss_wins.so /lib/libnss_wins.so.2</command>:
-These symlinks are required by glibc to use the nss libraries.</para>
-
-<para><command>cp ../examples/smb.conf.default /etc/samba</command>:
-This copies a default <filename>smb.conf </filename>into
-<filename>/etc/samba</filename>.  This sample configuration will not 
-work unless edited for your site, and renamed 
-<filename>smb.conf</filename>.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>Samba</application></title>
-
-<sect3 id="samba3-config"><title>Config files</title>
-<para>/etc/samba/smb.conf</para>
-<indexterm zone="samba3 samba3-config">
-<primary sortas="e-etc-samba-smb.conf">/etc/samba/smb.conf</primary>
-</indexterm>
-</sect3>
-
-<sect3><title>Configuration overview and available documentation</title>
-
-<para>Due to the complexity and the many various uses for 
-<application>Samba</application>, complete configuration is well beyond the 
-scope of the <acronym>BLFS</acronym> book. Advanced configurations including 
-setting up Primary and Backup Domain Controllers are advanced topics and 
-cannot be adequately covered in <acronym>BLFS</acronym> (it should be noted, 
-however, that a <application>Samba</application> <acronym>BDC</acronym> cannot 
-be used as a fallback for a 
-<application>Windows</application> <acronym>PDC</acronym>, and conversely, a 
-<application>Windows</application> <acronym>BDC</acronym> cannot be used as a 
-fallback for a <application>Samba</application> <acronym>PDC</acronym>). Many 
-complete books have been written on these topics alone.</para>
-
-<para>There is quite a bit of documentation available which covers many of 
-these advanced configurations. Point your web browser to the links below to 
-view some of the documentation included with the 
-<application>Samba</application> package:</para>
-
-<itemizedlist spacing='compact'>
-<listitem><para>Using Samba, 2nd Edition; a popular book published by O'Reilly 
-<ulink url="file:///usr/share/samba/swat/using_samba/toc.html"/></para>
-</listitem>
-
-<listitem><para>The Official Samba HOWTO and Reference Guide <ulink 
-url="file:///usr/share/samba/swat/help/Samba-HOWTO-Collection/index.html"/>
-</para>
-</listitem>
-
-<listitem><para>Samba-3 by Example 
-<ulink url="file:///usr/share/samba/swat/help/Samba-Guide/index.html"/></para>
-</listitem>
-
-<listitem><para>The Samba-3 man Pages
-<ulink url="file:///usr/share/samba/swat/help/samba.7.html"/></para>
-</listitem>
-</itemizedlist>
-</sect3>
-
-<sect3 id="samba3-swat-config"><title>Configuring SWAT</title>
-
-<para>The built in <acronym>SWAT</acronym> 
-(<application>Samba</application> Web Administration Tool) utility can be used 
-for basic configuration of the <application>Samba</application> installation,  
-but because it may be inconvenient, undesireable or perhaps even impossible 
-to gain access to the console, BLFS recommends setting up access to 
-<acronym>SWAT</acronym> using <application>Stunnel</application>.</para>
-<indexterm zone="samba3 samba3-swat-config">
-<primary sortas="g-SWAT">SWAT</primary></indexterm>
-
-<para>First you must add entries to <filename>/etc/services</filename> and 
-modify the <command>inetd</command>/<command>xinetd</command> 
-configuration.</para> 
-
-<indexterm zone="samba3 samba3-swat-config">
-  <primary sortas="e-etc-services">/etc/services</primary>
-</indexterm>
-
-<indexterm zone="samba3 samba3-swat-config">
-  <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
-</indexterm>
-
-<indexterm zone="samba3 samba3-swat-config">
-  <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
-</indexterm>
-
-<para>Add swat and swat_tunnel entries to 
-<filename>/etc/services</filename> with the following commands issued as the 
-root user:</para>
-
-<screen><userinput role='root'><command>echo "swat            901/tcp" &gt;&gt; /etc/services &amp;&amp;
-echo "swat_tunnel     902/tcp" &gt;&gt; /etc/services</command></userinput></screen>
-
-<para>If <command>inetd</command> is used, the following command will add the 
-swat_tunnel entry to <filename>/etc/inetd.conf</filename> (as user root):</para>
-
-<screen><userinput role='root'><command>echo "swat_tunnel stream tcp nowait.400 root /usr/sbin/swat swat" \
-    &gt;&gt; /etc/inetd.conf</command></userinput></screen>
-<para>Issue a <command>killall -HUP inetd</command> to reread the
-changed <filename>inetd.conf</filename> file.</para>
-
-<para>If you use <command>xinetd</command>, the following command will create the 
-<application>Samba</application> file as <filename>/etc/xinetd.d/swat_tunnel</filename>: 
-(you may need to modify or remove the 
-<quote>only_from</quote> line to include the desired host[s]):</para>
-
-<screen><userinput role='root'><command>cat &gt;&gt; /etc/xinetd.d/swat_tunnel &lt;&lt; "EOF"</command>
-# Begin /etc/xinetd.d/swat_tunnel
-
-service swat_tunnel
-{
-    port            = 902
-    socket_type     = stream
-    wait            = no
-    only_from       = 127.0.0.1
-    user            = root
-    server          = /usr/sbin/swat
-    log_on_failure  += USERID
-}
-
-# End /etc/xinetd.d/swat_tunnel
-<command>EOF</command></userinput></screen>
-
-<indexterm zone="samba3 samba3-swat-config">
-  <primary sortas="e-etc-xinetd.d-swat-tunnel">/etc/xinetd.d/swat_tunnel</primary>
-</indexterm>
-
-<para>Issue a <command>killall -HUP xinetd</command> to reread the
-changed <filename>xinetd.conf</filename> file.</para>
-
-<para>Next, you must add an entry for the swat service to the 
-<filename>/etc/stunnel/stunnel.conf</filename> file (as user root):</para>
-
-<indexterm zone="samba3 samba3-swat-config">
-  <primary sortas="e-etc-stunnel-stunnel.conf">/etc/stunnel/stunnel.conf</primary>
-</indexterm>
-
-<screen><userinput role='root'><command>cat &gt;&gt; /etc/stunnel/stunnel.conf &lt;&lt; "EOF"</command>
-[swat]
-accept  = 901
-connect = 902
-
-<command>EOF</command></userinput></screen>
-
-<para>Restart the <command>stunnel</command> daemon using the following 
-command as the root user:</para>
-
-<screen><userinput role='root'><command>/etc/rc.d/init.d/stunnel restart</command></userinput></screen>
-
-<para><acronym>SWAT</acronym> can be launched by pointing your web browser to 
-<userinput>https://<replaceable>[CA_DN_field]</replaceable>:901</userinput>. 
-Substitute the hostname listed in the <acronym>DN</acronym> field of the 
-<acronym>CA</acronym> certificate used with 
-<application>Stunnel</application> for 
-<replaceable>[CA_DN_field]</replaceable>.</para>
-
-<note><para>If you linked 
-<application>Linux-<acronym>PAM</acronym></application> into the 
-<application>Samba</application> build, you'll need to create an 
-<filename>/etc/pam.d/samba</filename> file.</para></note>
-
-<indexterm zone="samba3 samba3-swat-config">
-  <primary sortas="e-etc-pam.d-samba">/etc/pam.d/samba</primary>
-</indexterm>
-
-</sect3>
-
-<sect3><title>Printing to <acronym>SMB</acronym> clients</title>
-
-<para>If you use <application><acronym>CUPS</acronym></application> for print 
-services, and you wish to print to a printer attached to an 
-<acronym>SMB</acronym> client, you need to create an <acronym>SMB</acronym> 
-backend device. To create the device, issue the following command as the 
-root user:</para>
-
-<screen><userinput><command>ln -sf /usr/bin/smbspool /usr/lib/cups/backend/smb</command></userinput></screen>
-</sect3>
-
-<sect3 id="samba3-init"><title>Installing bootscripts</title>
-
-<para>For your convenience, boot scripts have been provided for
-<application>Samba</application>.  There are two included in the
-<xref linkend="intro-important-bootscripts"/> package.  The first,
-<filename>samba</filename>, will start the <command>smbd</command> and
-<command>nmbd</command> daemons needed to provide
-<acronym>SMB</acronym>/<acronym>CIFS</acronym> services.  The second
-script, <filename>winbind</filename>, starts the <command>winbindd</command> 
-daemon, used for providing Windows domain services to Linux clients.</para>
-
-<indexterm zone="samba3 samba3-init">
-  <primary sortas="f-samba">samba</primary>
-</indexterm>
-
-<indexterm zone="samba3 samba3-init">
-  <primary sortas="f-winbind">winbind</primary>
-</indexterm>
-
-<para>Install the <filename>samba</filename> script with the following 
-command issued as the root user:</para>
-
-<screen><userinput role='root'><command>make install-samba</command></userinput></screen>
-
-<para>If you also need the <filename>winbind</filename> script:</para>
-
-<screen><userinput role='root'><command>make install-winbind</command></userinput></screen>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>findsmb, mount.smbfs, net, nmbd, nmblookup, ntlm_auth, pdbedit, profiles, 
-rpcclient, smbcacls, smbclient, smbcontrol, smbcquotas, smbd, smbmnt, 
-smbmount, smbpasswd, smbspool, smbstatus, smbtar, smbtree, smbumount, swat, 
-tdbbackup, tdbdump, tdbtool, testparm, testprns, wbinfo and winbindd</seg>
-<seg>libnss_winbind.so, libnss_wins.so, libsmbclient.[so,a], the 
-pam_winbind.so <acronym>PAM</acronym> library and assorted character set, 
-filesystem and support modules.</seg>
-<seg>/etc/samba, /usr/lib/samba, /usr/share/samba, /var/cache/samba and 
-/var/lib/samba</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="findsmb">
-<term><command>findsmb</command></term>
-<listitem><para>lists information about machines that respond to 
-<acronym>SMB</acronym> name queries on a subnet.</para>
-<indexterm zone="samba3 findsmb">
-<primary sortas="b-findsmb">findsmb</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="mount.smbfs">
-<term><command>mount.smbfs</command></term>
-<listitem><para>is a symlink to <command>mountsmb</command> which provides 
-<command>/bin/mount</command> with a way to mount remote Windows (or
-<application>Samba</application>) fileshares.</para>
-<indexterm zone="samba3 mount.smbfs">
-<primary sortas="b-mount.smbfs">mount.smbfs</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="net">
-<term><command>net</command></term>
-<listitem><para>is a tool for administration of 
-<application>Samba</application> and remote <acronym>CIFS</acronym> servers,
-similar to the <command>net</command> utility for 
-<acronym>DOS</acronym>/Windows.</para>
-<indexterm zone="samba3 net">
-<primary sortas="b-net">net</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="nmbd">
-<term><command>nmbd</command></term>
-<listitem><para>is the <application>Samba</application>
-Net<acronym>BIOS</acronym> name server.</para>
-<indexterm zone="samba3 nmbd">
-<primary sortas="b-nmbd">nmbd</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="nmblookup">
-<term><command>nmblookup</command></term>
-<listitem><para>is used to query Net<acronym>BIOS</acronym> names and map 
-them to <acronym>IP</acronym> addresses.</para>
-<indexterm zone="samba3 nmblookup">
-<primary sortas="b-nmblookup">nmblookup</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="ntlm_auth">
-<term><command>ntlm_auth</command></term>
-<listitem><para>is a tool to allow external access to Winbind's 
-<acronym>NTLM</acronym> authentication function.</para>
-<indexterm zone="samba3 ntlm_auth">
-<primary sortas="b-ntlm_auth">ntlm_auth</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pdbedit">
-<term><command>pdbedit</command></term>
-<listitem><para>is a tool used to manage the <acronym>SAM</acronym> 
-database.</para>
-<indexterm zone="samba3 pdbedit">
-<primary sortas="b-pdbedit">pdbedit</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="profiles">
-<term><command>profiles</command></term>
-<listitem><para>is a utility that reports and changes <acronym>SID</acronym>s 
-in Windows registry files. It currently only supports Windows NT.</para>
-<indexterm zone="samba3 profiles">
-<primary sortas="b-profiles">profiles</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="rpcclient">
-<term><command>rpcclient</command></term>
-<listitem><para>is used to execute MS-<acronym>RPC</acronym> client side 
-functions.</para>
-<indexterm zone="samba3 rpcclient">
-<primary sortas="b-rpcclient">rpcclient</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbcacls">
-<term><command>smbcacls</command></term>
-<listitem><para>is used to manipulate Windows NT access control lists.</para>
-<indexterm zone="samba3 smbcacls">
-<primary sortas="b-smbcacls">smbcacls</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbclient">
-<term><command>smbclient</command></term>
-<listitem><para>is a <acronym>SMB</acronym>/<acronym>CIFS</acronym> access 
-utility, similar to <acronym>FTP</acronym>.</para>
-<indexterm zone="samba3 smbclient">
-<primary sortas="b-smbclient">smbclient</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbcontrol">
-<term><command>smbcontrol</command></term>
-<listitem><para>is used to control running <command>smbd</command>, 
-<command>nmbd</command> and <command>winbindd</command> daemons.</para>
-<indexterm zone="samba3 smbcontrol">
-<primary sortas="b-smbcontrol">smbcontrol</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbcquotas">
-<term><command>smbcquotas</command></term>
-<listitem><para>is used to manipulate Windows NT quotas on 
-<acronym>SMB</acronym> file shares.</para>
-<indexterm zone="samba3 smbcquotas">
-<primary sortas="b-smbcquotas">smbcquotas</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbd">
-<term><command>smbd</command></term>
-<listitem><para>is the main <application>Samba</application> daemon which 
-provides <acronym>SMB</acronym>/<acronym>CIFS</acronym> services to 
-clients.</para>
-<indexterm zone="samba3 smbd">
-<primary sortas="b-smbd">smbd</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbmnt">
-<term><command>smbmnt</command></term>
-<listitem><para>is a helper application used by the 
-<command>smbmount</command> program to do the actual mounting of
-<acronym>SMB</acronym> shares. It can be installed setuid root if you want
-normal users to be able to mount their <acronym>SMB</acronym> shares.</para>
-<indexterm zone="samba3 smbmnt">
-<primary sortas="b-smbmnt">smbmnt</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbmount">
-<term><command>smbmount</command></term>
-<listitem><para>is usually invoked as <command>mount.smbfs</command> by the 
-<command>mount</command> command when using the 
-<parameter>-t smbfs</parameter> option, mounts a Linux <acronym>SMB</acronym> 
-filesystem.</para>
-<indexterm zone="samba3 smbmount">
-<primary sortas="b-smbmount">smbmount</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbpasswd">
-<term><command>smbpasswd</command></term>
-<listitem><para>changes a user's <application>Samba</application> 
-password.</para>
-<indexterm zone="samba3 smbpasswd">
-<primary sortas="b-smbpasswd">smbpasswd</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbspool">
-<term><command>smbspool</command></term>
-<listitem><para>sends a print job to an <acronym>SMB</acronym> printer.</para>
-<indexterm zone="samba3 smbspool">
-<primary sortas="b-smbspool">smbspool</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbstatus">
-<term><command>smbstatus</command></term>
-<listitem><para>reports current <application>Samba</application> 
-connections.</para>
-<indexterm zone="samba3 smbstatus">
-<primary sortas="b-smbstatus">smbstatus</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbtar">
-<term><command>smbtar</command></term>
-<listitem><para>is a shell script used for backing up 
-<acronym>SMB</acronym>/<acronym>CIFS</acronym> shares directly to Linux tape 
-drives or a file.</para>
-<indexterm zone="samba3 smbtar">
-<primary sortas="b-smbtar">smbtar</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbtree">
-<term><command>smbtree</command></term>
-<listitem><para>is a text-based <acronym>SMB</acronym> network browser.</para>
-<indexterm zone="samba3 smbtree">
-<primary sortas="b-smbtree">smbtree</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="smbumount">
-<term><command>smbumount</command></term>
-<listitem><para>is used by normal users to unmount <acronym>SMB</acronym> 
-filesystems, provided that it is setuid root.</para>
-<indexterm zone="samba3 smbumount">
-<primary sortas="b-smbumount">smbumount</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="swat">
-<term><command>swat</command></term>
-<listitem><para>is the <application>Samba</application> Web Administration 
-Tool.</para>
-<indexterm zone="samba3 swat">
-<primary sortas="b-swat">swat</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="tdbbackup">
-<term><command>tdbbackup</command></term>
-<listitem><para>is a tool for backing up or validating the integrity of 
-<application>Samba</application> <filename>.tdb</filename> files.</para>
-<indexterm zone="samba3 tdbbackup">
-<primary sortas="b-tdbbackup">tdbbackup</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="tdbdump">
-<term><command>tdbdump</command></term>
-<listitem><para> is a tool used to print the contents of a 
-<application>Samba</application> <filename>.tdb</filename> file.</para>
-<indexterm zone="samba3 tdbdump">
-<primary sortas="b-tdbdump">tdbdump</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="tdbtool">
-<term><command>tdbtool</command></term>
-<listitem><para>is a tool which allows simple database manipulation from the 
-command line.</para>
-<indexterm zone="samba3 tdbtool">
-<primary sortas="b-tdbtool">tdbtool</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="testparm">
-<term><command>testparm</command></term>
-<listitem><para>checks an <filename>smb.conf</filename> file for proper 
-syntax.</para>
-<indexterm zone="samba3 testparm">
-<primary sortas="b-testparm">testparm</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="testprns">
-<term><command>testprns</command></term>
-<listitem><para>tests printer names.</para>
-<indexterm zone="samba3 testprns">
-<primary sortas="b-testprns">testprns</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="wbinfo">
-<term><command>wbinfo</command></term>
-<listitem><para>queries a running <command>winbindd</command> daemon.</para>
-<indexterm zone="samba3 wbinfo">
-<primary sortas="b-wbinfo">wbinfo</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="winbindd">
-<term><command>winbindd</command></term>
-<listitem><para>resolves names from Windows NT servers.</para>
-<indexterm zone="samba3 winbindd">
-<primary sortas="b-winbindd">winbindd</primary>
-</indexterm></listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-</sect1>
-
Index: rver/other/xinetd.xml
===================================================================
--- server/other/xinetd.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ 	(revision )
@@ -1,717 +1,0 @@
-<?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" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-<!ENTITY xinetd-download-http "http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz">
-<!ENTITY xinetd-download-ftp " ">
-<!ENTITY xinetd-md5sum "4295b5fe12350f09b5892b363348ac8b">
-<!ENTITY xinetd-size "291 KB">
-<!ENTITY xinetd-buildsize "4.12 MB">
-<!ENTITY xinetd-time "0.11 SBU">
-]>
-
-<sect1 id="xinetd" xreflabel="xinetd-&xinetd-version;">
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
-
-<?dbhtml filename="xinetd.html"?>
-<title>xinetd-&xinetd-version;</title>
-
-<indexterm zone="xinetd">
-  <primary sortas="a-Xinetd">Xinetd</primary>
-</indexterm>
-
-<sect2>
-<title>Introduction to <application>xinetd</application></title>
-
-<para><application>xinetd</application> is the eXtended InterNET services 
-Daemon, a secure replacement for <command>inetd</command>.</para>
-
-<sect3>
-<title>Package information</title>
-<itemizedlist spacing='compact'>
-  <listitem><para>Download (HTTP): <ulink url="&xinetd-download-http;"/></para></listitem>
-  <listitem><para>Download (FTP): <ulink url="&xinetd-download-ftp;"/></para></listitem>
-  <listitem><para>Download MD5 sum: &xinetd-md5sum;</para></listitem>
-  <listitem><para>Download size: &xinetd-size;</para></listitem>
-  <listitem><para>Estimated disk space required: &xinetd-buildsize;</para></listitem>
-  <listitem><para>Estimated build time: &xinetd-time;</para></listitem>
-</itemizedlist>
-</sect3>
-
-<sect3>
-<title><application>xinetd</application> dependencies</title>
-
-<sect4>
-<title>Optional</title>
-  <para><xref linkend="tcpwrappers"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>xinetd</application></title>
-
-<para>Install <application>xinetd</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>xinetd</application></title>
-
-<sect3 id="xinetd-config">
-<title>Config files</title>
-
-<para><filename>/etc/xinetd.conf</filename></para>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
-</indexterm>
-</sect3>
-
-<sect3>
-<title>Configuration Information</title>
-
-<para>Ensure the path to all daemons is 
-<filename class="directory">/usr/sbin</filename>, rather than the default path 
-of <filename class="directory">/usr/etc</filename>, and install the 
-<application>xinetd</application> configuration files by running the following
-commands as the root user:</para>
-
-<screen><userinput role='root'><command>cat &gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
-# Begin /etc/xinetd
-# Configuration file for xinetd
-#
-
-defaults
-{
-      instances       = 60
-      log_type        = SYSLOG daemon
-      log_on_success  = HOST PID USERID
-      log_on_failure  = HOST USERID
-      cps             = 25 30
-}
-
-# All service files are stored in the /etc/xinetd.d directory
-#
-includedir /etc/xinetd.d
-# End /etc/xinetd
-<command>EOF</command></userinput></screen>
-
-<para>All of the following files have the statement, "disable = yes". To activate 
-any of the services, this statement will need to be changed to "disable = no".</para>
-
-<note><para>The following files are listed to demonstrate classic
-<application>xinetd</application> applications.  In many cases, these
-applications are not needed.  In some cases, the applications are 
-considered security risks.  For example, telnet, rlogin, rexec, and rsh
-transmit unencrypted usernames and passwords over the network and can be easily
-replaced with a more secure alternative: ssh.</para></note>
-
-<screen><userinput role='root'><command>install -d -m755 /etc/xinetd.d &amp;&amp;</command>
-<command>cat &gt; /etc/xinetd.d/login &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/login
-
-service login
-{
-   disable        = yes
-   socket_type    = stream
-   protocol       = tcp
-   wait           = no
-   user           = root
-   server         = /usr/sbin/in.rlogind
-   log_type       = SYSLOG local4 info
-}
-
-# End /etc/xinetd.d/login
-<command>EOF
-cat &gt; /etc/xinetd.d/shell &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/shell
-
-service shell
-{
-   disable        = yes
-   socket_type    = stream
-   wait           = no
-   user           = root
-   instances      = UNLIMITED
-   flags          = IDONLY
-   log_on_success += USERID
-   server         = /usr/sbin/in.rshd
-}
-
-# End /etc/xinetd.d/shell
-<command>EOF
-cat &gt; /etc/xinetd.d/exec &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/exec
-
-service exec
-{
-   disable        = yes
-   socket_type    = stream
-   wait           = no
-   user           = root
-   server         = /usr/sbin/in.rexecd
-}
-
-# End /etc/xinetd.d/exec
-<command>EOF
-cat &gt; /etc/xinetd.d/comsat &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/comsat
-
-service comsat
-{
-   disable        = yes
-   socket_type    = dgram
-   wait           = yes
-   user           = nobody
-   group          = tty
-   server         = /usr/sbin/in.comsat
-}
-
-# End /etc/xinetd.d/comsat
-<command>EOF
-cat &gt; /etc/xinetd.d/talk &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/talk
-
-service talk
-{
-   disable        = yes
-   socket_type    = dgram
-   wait           = yes
-   user           = root
-   server         = /usr/sbin/in.talkd
-}
-
-# End /etc/xinetd.d/talk
-<command>EOF
-cat &gt; /etc/xinetd.d/ntalk &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/ntalk
-
-service ntalk
-{
-   disable        = yes
-   socket_type    = dgram
-   wait           = yes
-   user           = root
-   server         = /usr/sbin/in.ntalkd
-}
-
-# End /etc/xinetd.d/ntalk
-<command>EOF
-cat &gt; /etc/xinetd.d/telnet &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/telnet
-
-service telnet
-{
-   disable        = yes
-   socket_type    = stream	
-   wait           = no
-   user           = root
-   server         = /usr/sbin/in.telnetd
-   bind           = 127.0.0.1
-   log_on_failure += USERID
-}
-
-service telnet
-{
-   disable        = yes
-   socket_type    = stream	
-   wait           = no
-   user           = root
-#  server         = /usr/sbin/in.telnetd
-   bind           = 192.231.139.175
-   redirect       = 128.138.202.20 23
-   log_on_failure += USERID
-}
-
-# End /etc/xinetd.d/telnet
-<command>EOF
-cat &gt; /etc/xinetd.d/ftp &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/ftp
-
-service ftp
-{
-   disable        = yes
-   socket_type    = stream
-   wait           = no
-   user           = root
-   server         = /usr/sbin/in.ftpd
-   server_args    = -l
-   instances      = 4
-   log_on_success += DURATION USERID
-   log_on_failure += USERID
-   access_times   = 2:00-8:59 12:00-23:59
-   nice           = 10
-}
-
-# End /etc/xinetd.d/ftp
-<command>EOF
-cat &gt; /etc/xinetd.d/tftp &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/tftp
-
-service tftp
-{
-   disable        = yes
-   socket_type    = dgram
-   wait           = yes
-   user           = root
-   server         = /usr/sbin/in.tftpd
-   server_args    = -s /tftpboot
-}
-
-# End /etc/xinetd.d/tftp
-<command>EOF
-cat &gt; /etc/xinetd.d/finger &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/finger
-
-service finger
-{
-   disable        = yes
-   socket_type    = stream
-   wait           = no
-   user           = nobody
-   server         = /usr/sbin/in.fingerd
-}
-
-# End /etc/xinetd.d/finger
-<command>EOF
-cat &gt; /etc/xinetd.d/systat &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/systat
-
-service systat
-{
-   disable           = yes
-   socket_type       = stream
-   wait              = no
-   user              = nobody
-   server            = /usr/bin/ps
-   server_args       = -auwwx
-   only_from         = 128.138.209.0
-   log_on_success    = HOST
-}
-
-# End /etc/xinetd.d/systat
-<command>EOF
-cat &gt; /etc/xinetd.d/netstat &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/netstat
-
-service netstat
-{
-   disable           = yes
-   socket_type       = stream
-   wait              = no
-   user              = nobody
-   server            = /usr/ucb/netstat
-   server_args       = -f inet
-   only_from         = 128.138.209.0
-   log_on_success    = HOST
-}
-
-# End /etc/xinetd.d/netstat
-<command>EOF
-cat &gt; /etc/xinetd.d/echo &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/echo
-
-service echo
-{
-   disable     = yes
-   type        = INTERNAL
-   id          = echo-stream
-   socket_type = stream
-   protocol    = tcp
-   user        = root
-   wait        = no
-}
-
-service echo
-{
-   disable     = yes
-   type        = INTERNAL
-   id          = echo-dgram
-   socket_type = dgram
-   protocol    = udp
-   user        = root
-   wait        = yes
-}
-
-# End /etc/xinetd.d/echo
-<command>EOF
-cat &gt; /etc/xinetd.d/chargen &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/chargen
-
-service chargen
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = chargen-stream
-   socket_type    = stream
-   protocol       = tcp
-   user           = root
-   wait           = no
-}
-
-service chargen
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = chargen-dgram
-   socket_type    = dgram
-   protocol       = udp
-   user           = root
-   wait           = yes
-}
-
-# End /etc/xinetd.d/chargen
-<command>EOF
-cat &gt; /etc/xinetd.d/daytime &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/daytime
-
-service daytime
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = daytime-stream
-   socket_type    = stream
-   protocol       = tcp
-   user           = root
-   wait           = no
-}
-
-service daytime
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = daytime-dgram
-   socket_type    = dgram
-   protocol       = udp
-   user           = root
-   wait           = yes
-}
-
-# End /etc/xinetd.d/daytime
-<command>EOF
-cat &gt; /etc/xinetd.d/time &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/time
-
-service time
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = time-stream
-   socket_type    = stream
-   protocol       = tcp
-   user           = root
-   wait           = no
-}
-
-
-service time
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = time-dgram
-   socket_type    = dgram
-   protocol       = udp
-   user           = root
-   wait           = yes
-}
-
-# End /etc/xinetd.d/time
-<command>EOF
-cat &gt; /etc/xinetd.d/rstatd &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/rstatd
-
-ervice rstatd
-{
-   disable     = yes
-   type        = RPC
-   flags       = INTERCEPT
-   rpc_version = 2-4
-   socket_type = dgram
-   protocol    = udp
-   server      = /usr/sbin/rpc.rstatd
-   wait        = yes
-   user        = root
-}
-
-# End /etc/xinetd.d/rstatd
-<command>EOF
-cat &gt; /etc/xinetd.d/rquotad &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/rquotad
-
-service rquotad
-{
-   disable     = yes
-   type        = RPC
-   rpc_version = 1
-   socket_type = dgram
-   protocol    = udp
-   wait        = yes
-   user        = root
-   server      = /usr/sbin/rpc.rstatd
-}
-
-# End /etc/xinetd.d/rquotad
-<command>EOF
-cat &gt; /etc/xinetd.d/rusersd &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/rusersd
-
-service rusersd
-{
-   disable     = yes
-   type        = RPC
-   rpc_version = 1-2
-   socket_type = dgram
-   protocol    = udp
-   wait        = yes
-   user        = root
-   server      = /usr/sbin/rpc.rusersd
-}
-
-# End /etc/xinetd.d/rusersd
-<command>EOF
-cat &gt; /etc/xinetd.d/sprayd &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/sprayd
-
-service sprayd
-{
-   disable      = yes
-   type         = RPC
-   rpc_version  = 1
-   socket_type  = dgram
-   protocol     = udp
-   wait         = yes
-   user         = root
-   server       = /usr/sbin/rpc.sprayd
-}
-
-# End /etc/xinetd.d/sprayd
-<command>EOF
-cat &gt; /etc/xinetd.d/walld &lt;&lt; "EOF" &amp;&amp;</command>
-# Begin /etc/xinetd.d/walld
-
-service walld
-{
-   disable      = yes
-   type         = RPC
-   rpc_version  = 1
-   socket_type  = dgram
-   protocol     = udp
-   wait         = yes
-   user         = nobody
-   group        = tty
-   server       = /usr/sbin/rpc.rwalld
-}
-
-# End /etc/xinetd.d/walld
-<command>EOF
-cat &gt; /etc/xinetd.d/irc &lt;&lt; "EOF"</command>
-# Begin /etc/xinetd.d/irc
-
-service irc
-{
-   disable      = yes
-   socket_type  = stream
-   wait         = no
-   user         = root
-   flags        = SENSOR
-   type         = INTERNAL
-   bind         = 192.168.1.30
-   deny_time    = 60
-}
-
-# End /etc/xinetd.d/irc
-<command>EOF</command></userinput></screen>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-login">/etc/xinetd.d/login</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-shell">/etc/xinetd.d/shell</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-exec">/etc/xinetd.d/exec</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-comsat">/etc/xinetd.d/comsat</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-talk">/etc/xinetd.d/talk</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-ntalk">/etc/xinetd.d/ntalk</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-telnet">/etc/xinetd.d/telnet</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-ftp">/etc/xinetd.d/ftp</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-tftp">/etc/xinetd.d/tftp</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-systat">/etc/xinetd.d/systat</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-finger">/etc/xinetd.d/finger</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-netstat">/etc/xinetd.d/netstat</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-echo">/etc/xinetd.d/echo</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-chargen">/etc/xinetd.d/chargen</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-daytime">/etc/xinetd.d/daytime</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-time">/etc/xinetd.d/time</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-rstatd">/etc/xinetd.d/rstatd</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-rquotad">/etc/xinetd.d/rquotad</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-ruserd">/etc/xinetd.d/ruserd</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-sprayd">/etc/xinetd.d/sprayd</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-walld">/etc/xinetd.d/walld</primary>
-</indexterm>
-
-<indexterm zone="xinetd xinetd-config">
-  <primary sortas="e-etc-xinetd.d-irc">/etc/xinetd.d/irc</primary>
-</indexterm>
-
-
-
-<para>The format of the <filename>/etc/xinetd.conf</filename> is
-documented in the <filename>xinetd.conf.5</filename> man page. Further 
-information can be found at <ulink url="http://www.xinetd.org"/>.</para>
-
-<para id="xinetd-init">As the root user, install the 
-<filename>/etc/rc.d/init.d/xinetd</filename> init script included in the 
-<xref linkend="intro-important-bootscripts"/> package.</para>
-
-<indexterm zone="xinetd xinetd-init">
-  <primary sortas="f-xinetd">xinetd</primary>
-</indexterm>
-
-<screen><userinput role='root'><command>make install-xinetd</command></userinput></screen>
-
-<para>As the root user, use the new boot script to start 
-<command>xinetd</command>:</para>
-
-<screen><userinput role='root'><command>/etc/rc.d/init.d/xinetd start</command></userinput></screen>
-
-<para>Checking the <filename>/var/log/daemon.log</filename> file
-should prove quite entertaining. This file may contain entries
-similar to the following:</para>
-
-<screen>Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rlogind is not 
-executable [line=29]
-Aug 22 21:40:21 dps10 xinetd[2696]: Error parsing attribute server -
-DISABLING SERVICE [line=29]
-Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rshd is not
-executable [line=42]</screen>
-
-<para>These errors are because most of the servers <command>xinetd</command> 
-is trying to control are not installed yet.</para>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>itox, xconv.pl and xinetd</seg>
-<seg>None</seg>
-<seg>/etc/xinetd.d/</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="itox">
-<term><command>itox</command></term>
-<listitem><para>is a utility used for converting 
-<filename>inetd.conf</filename> files to 
-<filename>xinetd.conf</filename> format.</para>
-<indexterm zone="xinetd itox">
-<primary sortas="b-itox">itox</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="xconv.pl">
-<term><command>xconv.pl</command></term>
-<listitem><para>is a <application>Perl</application> script used for 
-converting <filename>inetd.conf</filename> files to
-<filename>xinetd.conf</filename> format, similar to
-<command>itox</command>.</para>
-<indexterm zone="xinetd xconv.pl">
-<primary sortas="b-xconv.pl">xconv.pl</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="xinetd-prog">
-<term><command>xinetd</command></term>
-<listitem><para>is the Internet services daemon.</para>
-<indexterm zone="xinetd xinetd-prog">
-<primary sortas="b-xinetd">xinetd</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
Index: server/server.xml
===================================================================
--- server/server.xml	(revision e5243605259981daa416a15a03141f9571623259)
+++ server/server.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
@@ -6,9 +6,11 @@
 ]>
 
-<part id="server" xreflabel="Server Networking">
+<part id="server" xreflabel="Servers">
 <?dbhtml filename="server.html" dir="server"?>
-<title>Server Networking</title>
+<title>Servers</title>
 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="major/major.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mail/mail.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="databases/databases.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/other.xml"/>
 
