Index: content/databases/mysql.xml
===================================================================
--- content/databases/mysql.xml	(revision ff769b8c6178dd8b799a5e122a2e6a5d69a22a2c)
+++ content/databases/mysql.xml	(revision 20f5e71af0266f0c72fdbbfb00ccfa10d54a5a62)
@@ -7,8 +7,8 @@
   <!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           "2886edbe5cc826727fbb79a79d41145c">
-  <!ENTITY mysql-size          "22 MB">
-  <!ENTITY mysql-buildsize     "117 MB">
-  <!ENTITY mysql-time          "4.65 SBU">
+  <!ENTITY mysql-md5           "6a4a6a5b3d0a42a9a271b2b8867bde82">
+  <!ENTITY mysql-size          "22.5 MB">
+  <!ENTITY mysql-buildsize     "207 MB">
+  <!ENTITY mysql-time          "3.83 SBU">
 ]>
 
@@ -20,4 +20,6 @@
 <?dbhtml filename="mysql.html"?>
 <title>MySQL-&mysql-version;</title>
+<indexterm zone="mysql">
+<primary sortas="a-MySQL">MySQL</primary></indexterm>
 
 <sect2>
@@ -47,6 +49,5 @@
 </title>
 <sect4><title>Optional</title>
-<para>
-<xref linkend="openssl"/>,
+<para><xref linkend="openssl"/>,
 <xref linkend="tcpwrappers"/>,
 <ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink> 
@@ -55,6 +56,6 @@
 installed), 
 <xref linkend="doxygen"/> and
-<xref linkend="tex"/>
-</para></sect4>
+<xref linkend="tex"/></para>
+</sect4>
 </sect3>
 
@@ -69,5 +70,5 @@
 
 <screen><userinput><command>groupadd mysql &amp;&amp;
-useradd -c mysql -d /dev/null -g mysql -s /bin/false mysql</command></userinput></screen>
+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 
@@ -80,8 +81,15 @@
     --with-unix-socket-path=/var/run/mysql/mysql.sock \
     --without-debug --without-bench --without-readline &amp;&amp;
-make testdir=/usr/lib/mysql/mysql-test &amp;&amp;
-make testdir=/usr/lib/mysql/mysql-test install &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 -sf mysql/libmysqlclient{,_r}.so* .</command></userinput></screen>
+ln -v -sf mysql/libmysqlclient{,_r}.so* .</command></userinput></screen>
 
 </sect2>
@@ -108,7 +116,7 @@
 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>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>:
@@ -144,8 +152,12 @@
 <title>Configuring <application>My<acronym>SQL</acronym></application></title>
 
-<sect3>
+<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>
@@ -156,36 +168,41 @@
 <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:</para>
-
-<screen><userinput><command>cp /usr/share/mysql/my-medium.cnf /etc/my.cnf</command></userinput></screen>
+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.</para>
-
-<screen><userinput><command>mysql_install_db --user=mysql</command></userinput></screen>
+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:</para>
-
-<screen><userinput><command>install -o mysql -d /var/run/mysql &amp;&amp;
+<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 to set one. Replace 
+so use the following command as the root user to set one. Replace 
 <replaceable>[new-password]</replaceable> with your own.</para>
 
-<screen><userinput><command>mysqladmin -u root password <replaceable>[new-password]</replaceable></command></userinput></screen>
+<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:</para>
-
-<screen><userinput><command>mysqladmin -p shutdown</command></userinput></screen>
-
-<para>Install the <filename>/etc/rc.d/init.d/mysql</filename>
+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.</para>
-
-<screen><userinput><command>make install-mysql</command></userinput></screen>
+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>
@@ -196,77 +213,38 @@
 <title>Contents</title>
 
-<para>The <application>My<acronym>SQL</acronym></application> package contains 
-<command>client_test</command>,
-<command>comp_err</command>, <command>
-isamchk</command>, <command>
-isamlog</command>, <command>
-make_win_binary_distribution</command>, <command>
-make_win_src_distribution</command>, <command>
-msql2mysql</command>, <command>
-my_print_defaults</command>, <command>
-myisam_ftdump</command>, <command>
-myisamchk</command>, <command>
-myisamlog</command>, <command>
-myisampack</command>, <command>
-mysql</command>, <command>
-mysql_config</command>, <command>
-mysql_convert_table_format</command>, <command>
-mysql_create_system_tables</command>, <command>
-mysql_explain_log</command>, <command>
-mysql_find_rows</command>, <command>
-mysql_fix_extensions</command>, <command>
-mysql_fix_privilege_tables</command>, <command>
-mysql_install_db</command>, <command>
-mysql_secure_installation</command>, <command>
-mysql_setpermission</command>, <command>
-mysql_tableinfo</command>, <command>
-mysql_tzinfo_to_sql</command>, <command>
-mysql_waitpid</command>, <command>
-mysql_zap</command>, <command>
-mysqlacess</command>,<command>
-mysqladmin</command>, <command>
-mysqlbinlog</command>, <command>
-mysqlbug</command>, <command>
-mysqlcheck</command>, <command>
-mysqld</command>, <command>
-mysqld_multi</command>, <command>
-mysqld_safe</command>, <command>
-mysqldump</command>, <command>
-mysqldumpslow</command>, <command>
-mysqlhotcopy</command>, <command>
-mysqlimport</command>, <command>
-mysqlmanager</command>, <command>
-mysqlmanager-pwgen</command>, <command>
-mysqlmanagerc</command>, <command>
-mysqlshow</command>, <command>
-mysqltest</command>, <command>
-pack_isam</command>, <command>
-perror</command>, <command>
-replace</command>, <command>
-resolve_stack_dump</command>, <command>
-resolveip</command>, <filename class="libraryfile">
-libdbug</filename>, <filename class="libraryfile">
-libheap</filename>, <filename class="libraryfile">
-libmerge</filename>, <filename class="libraryfile">
-libmyisam</filename>, <filename class="libraryfile">
-libmyisammrg</filename>, <filename class="libraryfile">
-libmysqlclient</filename>, <filename class="libraryfile">
-libmysqlclient_r</filename>, <filename class="libraryfile">
-libmystrings</filename>, <filename class="libraryfile">
-libmysys</filename>, <filename class="libraryfile">
-libnisam</filename> and <filename class="libraryfile">
-libvio</filename>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<para>A package listing would be several pages long. Consult the 
-<application>My<acronym>SQL</acronym></application> documentation for full 
-details instead.</para>
+<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>
