Index: general.ent
===================================================================
--- general.ent	(revision 4a29e2bbcd05b5c8fa817a58d67fb3fff148c4ee)
+++ general.ent	(revision cd34755042560d2a25bb358e8494c720ec92305e)
@@ -526,5 +526,5 @@
 <!-- Chapter 22 -->
 <!ENTITY db-version                   "5.3.21">
-<!ENTITY mysql-version                "5.5.28">
+<!ENTITY mysql-version                "5.5.29">
 <!ENTITY postgresql-version           "9.2.1">
 <!ENTITY sqlite-version               "3.7.15.2">
Index: general/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision 4a29e2bbcd05b5c8fa817a58d67fb3fff148c4ee)
+++ general/genutils/gtk-doc.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
@@ -116,14 +116,4 @@
   </sect2>
 
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i '...' gtkdoc-fixxref.in</command>: This command fixes
-    an issue where invocations of the <application>Vim</application> editor
-    does not behave as expected. See upstream bug at
-    <ulink url="https://bugzilla.gnome.org/show_bug.cgi?id=627223"/>.</para>
-
-  </sect2>
-
   <sect2 role="content">
     <title>Contents</title>
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision 4a29e2bbcd05b5c8fa817a58d67fb3fff148c4ee)
+++ general/graphlib/libpng.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
@@ -100,5 +100,8 @@
     </para>
 
-<screen><userinput>gzip -cd ../libpng-&libpng-version;-apng.patch.gz | patch -p1</userinput></screen>
+<screen><userinput>gzip -cd ../libpng-&libpng-version;-apng.patch.gz | patch -p1 &amp;&amp;
+START=$(awk '/@/' scripts/symbols.def | sort -k2.3n | tail -1 | cut -d "@" -f2) &amp;&amp;
+awk -v v="$START" '/^PNG(_.+)?_EXPORTA?\(/ {gsub(/PNG(_.+)?_EXPORTA?\(/, ""); gsub(/,/, ""); \
+if($1 > v) print $3 " @"$1}' png.h | sort -k2.3n &gt;&gt; scripts/symbols.def</userinput></screen>
 
     <para>
@@ -125,4 +128,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>awk -v ...</command>: This command fixes the testsuite
+      when APNG patch is applied.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4a29e2bbcd05b5c8fa817a58d67fb3fff148c4ee)
+++ introduction/welcome/changelog.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
@@ -49,4 +49,7 @@
       <itemizedlist>
         <listitem>
+          <para>[krejzi] - MySQL 5.5.29.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated Audacious/Audacious-Plugins to 3.3.3</para>
         </listitem>
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision 4a29e2bbcd05b5c8fa817a58d67fb3fff148c4ee)
+++ networking/netlibs/libtirpc.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
@@ -102,6 +102,6 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libtirpc"/></para>
-
+      <ulink url="&blfs-wiki;/libtirpc"/>
+    </para>
   </sect2>
 
@@ -110,9 +110,10 @@
 
     <para>
-      Glibc-2.14 and later do not install NIS and RPC related headers by
-      default. If needed, install them here:
-    </para>
-
-<screen><userinput>if [ ! -r /usr/include/rpc/rpc.h ]; then
+      Glibc 2.14 and later does not install NIS and RPC related headers by
+      default. If needed, install them by running the following command
+      as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>if [ ! -r /usr/include/rpc/rpc.h ]; then
    tar -xvf ../rpcnis-headers.tar.bz2 -C /usr/include
 fi</userinput></screen>
@@ -124,5 +125,6 @@
 
 <screen><userinput>patch -Np1 -i ../libtirpc-&libtirpc-version;-remove-nis-2.patch &amp;&amp;
-autoreconf &amp;&amp;
+sed "s@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g" -i configure.ac &amp;&amp;
+autoreconf -fi &amp;&amp;
 ./configure --prefix=/usr CFLAGS="-fPIC" &amp;&amp;
 make</userinput></screen>
@@ -144,4 +146,10 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed "s@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g"
+      -i configure.ac</command>: This sed fixes some issues with
+      <application>Automake</application> 1.13 and later.
+    </para>
 
     <para>
@@ -176,5 +184,5 @@
 
       <varlistentry id="libtirpc-lib">
-        <term><filename class='libraryfile'>libtirpc.{so,a}</filename></term>
+        <term><filename class="libraryfile">libtirpc.{so,a}</filename></term>
         <listitem>
           <para>
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision 4a29e2bbcd05b5c8fa817a58d67fb3fff148c4ee)
+++ postlfs/security/mitkrb.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
@@ -178,16 +178,8 @@
 chmod -v 755 /bin/ksu   &amp;&amp;
 
-install -m644 -v ../doc/*.info /usr/share/info &amp;&amp;
-
-for INFOFILE in admin install user; do
-    install-info --info-dir=/usr/share/info \
-                 /usr/share/info/krb5-$INFOFILE.info
-    rm ../doc/krb5-$INFOFILE.info
-done &amp;&amp;
-
 install -v -dm755 /usr/share/doc/krb5-&mitkrb-version; &amp;&amp;
 cp -vfr ../doc/*  /usr/share/doc/krb5-&mitkrb-version; &amp;&amp;
 
-unset LIBRARY INFOFILE</userinput></screen>
+unset LIBRARY</userinput></screen>
 
     <para>
Index: server/databases/mysql.xml
===================================================================
--- server/databases/mysql.xml	(revision 4a29e2bbcd05b5c8fa817a58d67fb3fff148c4ee)
+++ server/databases/mysql.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
@@ -7,7 +7,7 @@
   <!ENTITY mysql-download-http "http://cdn.mysql.com/Downloads/MySQL-5.5/mysql-&mysql-version;.tar.gz">
   <!ENTITY mysql-download-ftp  " ">
-  <!ENTITY mysql-md5sum        "da8ddb3d00e6e159153d2444360f52a8">
+  <!ENTITY mysql-md5sum        "e6b9f9cb82e990bd8f0474df7462904e">
   <!ENTITY mysql-size          "24 MB">
-  <!ENTITY mysql-buildsize     "932 MB (additional 170 MB to run the test suite)">
+  <!ENTITY mysql-buildsize     "760 MB (additional 170 MB to run the test suite)">
   <!ENTITY mysql-time          "4.0 SBU (Test suite is an additional 45 minutes, only partially CPU dependent)">
 ]>
@@ -30,7 +30,9 @@
     <title>Introduction to MySQL</title>
 
-    <para><application>MySQL</application> is a widely used and fast SQL
-    database server. It is a client/server implementation that consists of a
-    server daemon and many different client programs and libraries.</para>
+    <para>
+      <application>MySQL</application> is a widely used and fast SQL database
+      server. It is a client/server implementation that consists of a
+      server daemon and many different client programs and libraries.
+    </para>
 
     &lfs72_checked;
@@ -39,20 +41,32 @@
     <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-md5sum;</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>
+        <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-md5sum;
+        </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>
@@ -61,13 +75,12 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Optional patch (required if building for Amarok): <ulink
-        url="&patch-root;/mysql-&mysql-version;-embedded_library_shared-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Optional patch (required if building only the client): <ulink
-        url="&patch-root;/mysql-&mysql-version;-fix_client_only-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Optional Documentation (see tip below):
+        <para>
+          Optional patch (recommended if building for Amarok):
+          <ulink url="&patch-root;/mysql-&mysql-version;-embedded_library_shared-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Optional Documentation (see tip below):
           <ulink url="http://dev.mysql.com/doc/"/>
         </para>
@@ -78,8 +91,12 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="optional"><xref linkend="cmake"/></para>
+    <para role="required">
+      <xref linkend="cmake"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="optional"><xref linkend="openssl"/></para>
+    <para role="recommended">
+      <xref linkend="openssl"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -89,55 +106,66 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/mysql"/></para>
-
+      <ulink url="&blfs-wiki;/mysql"/>
+    </para>
   </sect2>
   
   <sect2 role="installation">
     <title>Installation of MySQL</title>
-
-    <sect3>
-    <title>Building</title>
    
-    <para>For security reasons, running the server as an unprivileged user
-    and group is strongly encouraged. Issue the following (as
-    <systemitem class="username">root</systemitem>) to create the user and
-    group:</para>
+    <para>
+      For security reasons, running the server as an unprivileged user
+      and group is strongly encouraged. Issue the following (as
+      <systemitem class="username">root</systemitem>) to create the
+      user and group:
+    </para>
 
 <screen role="root"><userinput>groupadd -g 40 mysql &amp;&amp;
-useradd -c "MySQL Server" -d /dev/null -g mysql -s /bin/false -u 40 mysql</userinput></screen>
-
-    <para>If the MySQL server is not needed, it is possible to build only the
-    client libraries of MySQL. To do this you need to apply the optional patch,
-    use the cmake option <parameter>-DWITHOUT_SERVER=ON</parameter> and the
-    client-only installation instructions below.</para>
-
-    <para>MySQL contains an embedded server library which can be enabled with
-    the cmake option <parameter>-DWITH_EMBEDDED_SERVER=ON</parameter>. By default
-    this server is built as a statically linked library,
-    <filename>libmysqld.a</filename>, but by applying the optional patch, a
-    shared version of this library can be built. The shared library is needed
-    by certain applications, such as <application>Amarok</application>.</para>
-    
-    <para>There are numerous options available to
-    <userinput>cmake</userinput>. Check the output of the `<userinput>cmake .
-    -LH</userinput>` for additional customization options. See the <ulink
-    url="http://dev.mysql.com/doc/refman/5.5/en/source-configuration-options.html">MySQL
-    Documentation</ulink> for a full listing of all options.</para>
-    
-    <para>If you want the shared version of the embedded server library, apply
-    the patch:</para>
+useradd -c "MySQL Server" -d /srv/mysql -g mysql -s /bin/false -u 40 mysql</userinput></screen>
+
+    <para>
+      If the MySQL server is not needed, it is possible to build only the
+      client libraries of MySQL. To do this you need to add
+      <parameter>-DWITHOUT_SERVER=ON</parameter> to the <command>cmake</command>
+      command below.
+    </para>
+
+    <para>
+      MySQL contains an embedded server library which can be enabled with
+      the cmake option <parameter>-DWITH_EMBEDDED_SERVER=ON</parameter>. By
+      default this server is built as a statically linked library,
+      <filename>libmysqld.a</filename>, but by applying the optional patch, a
+      shared version of this library can be built. The library is needed
+      by certain applications, such as <application>Amarok</application> and
+      we recommend use of the shared libraries.
+    </para>
+    
+    <para>
+      There are numerous options available to
+      <userinput>cmake</userinput>. Check the output of the `<userinput>cmake .
+      -LH</userinput>` for additional customization options. See the <ulink
+      url="http://dev.mysql.com/doc/refman/5.5/en/source-configuration-options.html">MySQL
+      Documentation</ulink> for a full listing of all options.
+    </para>
+    
+    <para>
+      If you want to build shared version of the embedded server library, apply
+      the following patch:
+    </para>
     
 <screen><userinput>patch -Np1 -i ../mysql-&mysql-version;-embedded_library_shared-1.patch</userinput></screen>
-
-     <para>If building the client-only, apply the patch:</para>
-
-<screen><userinput>patch -Np1 -i ../mysql-&mysql-version;-fix_client_only-1.patch</userinput></screen>
-    
-    <para>Configure and build <application>MySQL</application> by
-    running the following commands:</para>
-    
-<screen><userinput>mkdir build &amp;&amp;
+    
+    <para>
+      Install <application>MySQL</application> by running the
+      following commands:
+    </para>
+    
+<screen><userinput>sed -i "/ADD_SUBDIRECTORY(sql\/share)/d" CMakeLists.txt &amp;&amp;
+sed -i "s/ADD_SUBDIRECTORY(libmysql)/&amp;\\nADD_SUBDIRECTORY(sql\/share)/" CMakeLists.txt &amp;&amp;
+sed -i "s@data/test@\${INSTALL_MYSQLSHAREDIR}@g" sql/CMakeLists.txt &amp;&amp;
+sed -i "s@data/mysql@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &amp;&amp;
+mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=/usr                   \
+cmake -DCMAKE_BUILD_TYPE=Release                    \
+      -DCMAKE_INSTALL_PREFIX=/usr                   \
       -DINSTALL_DOCDIR=share/doc/mysql              \
       -DINSTALL_DOCREADMEDIR=share/doc/mysql        \
@@ -155,5 +183,5 @@
       -DMYSQL_DATADIR=/srv/mysql                    \
       -DMYSQL_UNIX_ADDR=/var/run/mysql/mysql.sock   \
-      -DSYSCONFDIR=/etc                             \
+      -DSYSCONFDIR=/etc/mysql                       \
       -DWITH_PARTITION_STORAGE_ENGINE=OFF           \
       -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF          \
@@ -163,59 +191,33 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make test-force 2>&amp;1 | tee
-    test.log</command>.  This forces the test to run to completion and logs all
-    the test output.  There will be many tests that are not run due to
-    configuration options and developer considerations.  Note that if you use
-    TCP Wrappers and have a restrictive <filename>/etc/hosts.deny</filename>
-    file, you will need to add an appropriate entry to the
-    <filename>/etc/hosts.allow</filename> file for the
-    <command>mysqld</command> daemon. Otherwise many of the tests will
-    fail.  Also, two tests will fail if ipv6 is not available in the kernel
-    either as a module or built in.</para>
-
-    <note><para>The SSL tests may fail due to expired certificates.</para></note>
-    </sect3>
-    
-    <sect3>
-      <title>Installation (server and client)</title>
-    
-      <para>To install the server and client, issue the following command (as
-      the <systemitem class="username">root</systemitem> user):</para>
-
-<screen role="root"><userinput>SEGMENTS="Client Server IniFiles ManPages SharedLibraries"
-SEGMENTS="$SEGMENTS Development Documentation Info Readme"
-
-for segment in $SEGMENTS; do
-   cmake -DCMAKE_INSTALL_COMPONENT=$segment -P cmake_install.cmake
-done
-
-unset SEGMENTS</userinput></screen>
-
-      <note><para>If you built the embedded server library add
-      <userinput>Embedded</userinput> to the <userinput>SEGMENTS</userinput>
-      variable above.</para></note>
-
-      <tip><para>The only documentation shipped in the source tarball are
-      <filename>mysql.info</filename> and man pages. You can download various
-      formats of the <application>MySQL</application> Reference Manual
-      from <ulink url="http://dev.mysql.com/doc/"/>.</para></tip>
-
-    </sect3>
-
-    <sect3>
-      <title>Installation (client only)</title>
-      <para>If you would like to install the client software only, issue the
-      following (as <systemitem class="username">root</systemitem>):</para>
-
-<screen role="root"><userinput>SEGMENTS="Client ManPages SharedLibraries"
-SEGMENTS="$SEGMENTS Development Documentation Info Readme"
-
-for segment in $SEGMENTS; do
-   cmake -DCMAKE_INSTALL_COMPONENT=$segment -P cmake_install.cmake
-done
-
-unset SEGMENTS</userinput></screen>
-
-    </sect3>
+    <para>
+      To test the results, issue: <command>make test-force 2>&amp;1 | tee
+      test.log</command>. This forces the test to run to completion and logs all
+      the test output. There will be many tests that are not run due to
+      configuration options and developer considerations. Otherwise many of the
+      tests will fail. Also, two tests will fail if ipv6 is not available in
+      the kernel either as a module or built in.
+    </para>
+
+    <note>
+      <para>
+        The SSL tests may fail due to expired certificates.
+      </para>
+    </note>
+    
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <tip>
+      <para>
+        The only documentation shipped in the source tarball are
+        <filename>mysql.info</filename> and man pages. You can download
+        various formats of the <application>MySQL</application>
+        Reference Manual from <ulink url="http://dev.mysql.com/doc/"/>.
+      </para>
+    </tip>
 
   </sect2>
@@ -224,26 +226,33 @@
     <title>Command Explanations</title>
 
-    <para><parameter>-DWITH_&lt;engine&gt;_STORAGE_ENGINE=ON</parameter>: The default
-    instructions only build the innobase (InnoDB) storage engine. If other
-    storage engines are desired use this switch to enable them. Valid choices
-    are ARCHIVE, BLACKHOLE, EXAMPLE, FEDERATED, INNOBASE, NDBCLUSTER,
-    PARTITION and PERFSCHEMA.</para>
-
-    <para><parameter>-DWITHOUT_SERVER=ON</parameter>: Use this switch if you don't
-    want the server and would like to build the client only.</para>
-
-    <para><parameter>-DWITH_EMBEDDED_SERVER=ON</parameter>: Use this switch to build
-    the embedded server library.</para>
-    
-    <para><parameter>-DWITH_SSL=system</parameter>: Use this switch to build
-    against a system version of SSL.</para>
-
-    <para><command>cmake -DCMAKE_INSTALL_COMPONENT=$segment ...</command>: This
-    command installs the appropriate portion of the package. Different
-    segments may be added or deleted as desired.  Valid segments are listed
-    with `<command>make list_install_components</command>`.
-    Note that the 'DataFiles' install segment does not honor the
-    -DMYSQL_DATADIR or -DINSTALL_MYSQLDATADIR statements and installs datafiles
-    in <filename class="directory">/usr/data</filename>.</para>
+    <para>
+      <command>sed -i ...</command>: First two seds fix client-only builds. Last
+      two seds set correct installation directories for some components.
+    </para>
+
+    <para>
+      <parameter>-DWITH_&lt;engine&gt;_STORAGE_ENGINE=ON</parameter>: The default
+      instructions only build the innobase (InnoDB) storage engine. If other
+      storage engines are desired use this switch to enable them. Valid choices
+      are ARCHIVE, BLACKHOLE, EXAMPLE, FEDERATED, INNOBASE, NDBCLUSTER,
+      PARTITION and PERFSCHEMA.
+    </para>
+
+    <para>
+      <parameter>-DWITHOUT_SERVER=ON</parameter>: Use this switch if you don't
+      want the server and would like to build the client only.
+    </para>
+
+    <para>
+      <parameter>-DWITH_EMBEDDED_SERVER=ON</parameter>: Use this switch to build
+      the embedded server library.
+    </para>
+    
+    <para>
+      <parameter>-DWITH_SSL=system</parameter>: This switch is used to tell the
+      build system to use system version of the
+      <application>OpenSSL</application>. Remove it if you didn't install
+      <application>OpenSSL</application>.
+    </para>
 
   </sect2>
@@ -255,6 +264,8 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/my.cnf</filename> and
-      <filename>~/.my.cnf</filename></para>
+      <para>
+        <filename>/etc/mysql/my.cnf</filename> and
+        <filename>~/.my.cnf</filename>
+      </para>
 
       <indexterm zone="mysql mysql-config">
@@ -263,5 +274,5 @@
 
       <indexterm zone="mysql mysql-config">
-        <primary sortas="e-etc-my.cnf">/etc/my.cnf</primary>
+        <primary sortas="e-etc-mysql-my.cnf">/etc/mysql/my.cnf</primary>
       </indexterm>
 
@@ -271,39 +282,50 @@
       <title>Configuration Information</title>
 
-      <para>There are several default configuration files available in
-      <filename class="directory">/usr/share/mysql</filename> which you can
-      use. When creating the file, ensure binary logs are disabled unless you
-      are doing database replication.  Create <filename>/etc/my.cnf</filename>
-      using the following commands as the <systemitem
-      class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -m644 /usr/share/mysql/support/my-medium.cnf /etc/my.cnf
-sed -i 's/^log-bin/#log-bin/' /etc/my.cnf</userinput></screen>
-
-      <para>You can now install a database and change the ownership to the
-      unprivileged user and group (perform as the <systemitem
-      class="username">root</systemitem> user):</para>
+      <para>
+        There are several default configuration files available in
+        <filename class="directory">/usr/share/mysql</filename> which you can
+        use. When creating the file, ensure binary logs are disabled unless you
+        are doing database replication. Create <filename>/etc/mysql/my.cnf</filename>
+        using the following commands as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>install -v -Dm644 /usr/share/mysql/support/my-medium.cnf /etc/mysql/my.cnf &amp;&amp;
+sed -i 's/^log-bin/#log-bin/' /etc/mysql/my.cnf &amp;&amp;
+sed -i 's/^binlog/#binlog/' /etc/mysql/my.cnf</userinput></screen>
+
+      <para>
+        You can now install a database and change the ownership to the
+        unprivileged user and group (perform as the <systemitem
+        class="username">root</systemitem> user):
+      </para>
 
 <screen role="root"><userinput>mysql_install_db --basedir=/usr --datadir=/srv/mysql --user=mysql &amp;&amp;
-chgrp -v mysql /srv/mysql{,/test,/mysql}</userinput></screen>
-
-      <para>Further configuration requires that the
-      <application>MySQL</application> server is running. Start
-      the server using the following commands as the <systemitem
-      class="username">root</systemitem> user:</para>
+chown -R mysql:mysql /srv/mysql</userinput></screen>
+
+      <para>
+        Further configuration requires that the
+        <application>MySQL</application> server is running. Start
+        the server using the following commands as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>install -v -m755 -o mysql -g mysql -d /var/run/mysql &amp;&amp;
 mysqld_safe --user=mysql 2&gt;&amp;1 &gt;/dev/null &amp;</userinput></screen>
 
-      <para>A default installation does not set up a password for the
-      administrator, so use the following command as the <systemitem
-      class="username">root</systemitem> user to set one. Replace
-      <replaceable>&lt;new-password&gt;</replaceable> with your own.</para>
+      <para>
+        A default installation does not set up a password for the
+        administrator, so use the following command as the <systemitem
+        class="username">root</systemitem> user to set one. Replace
+        <replaceable>&lt;new-password&gt;</replaceable> with your own.
+      </para>
 
 <screen role="root"><userinput>mysqladmin -u root password <replaceable>&lt;new-password&gt;</replaceable></userinput></screen>
 
-      <para>Configuration of the server is now finished. Shut the server
-      down using the following command as the <systemitem
-      class="username">root</systemitem> user:</para>
+      <para>
+        Configuration of the server is now finished. Shut the server
+        down using the following command as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>mysqladmin -p shutdown</userinput></screen>
@@ -314,8 +336,10 @@
       <title>Boot Script</title>
 
-      <para>Install the <filename>/etc/rc.d/init.d/mysql</filename> init script
-      included in the <xref linkend="bootscripts"/> package as
-      the <systemitem class="username">root</systemitem> user to start the
-      <application>MySQL</application> server during system boot-up.</para>
+      <para>
+        Install the <filename>/etc/rc.d/init.d/mysql</filename> init script
+        included in the <xref linkend="bootscripts"/> package as
+        the <systemitem class="username">root</systemitem> user to start the
+        <application>MySQL</application> server during system boot-up.
+      </para>
 
       <indexterm zone="mysql mysql-init">
@@ -338,18 +362,28 @@
 
       <seglistitem>
-        <seg>innochecksum, msql2mysql, my_print_defaults, myisam_ftdump,
-        myisamchk, myisamlog, myisampack, mysql, mysql_client_test,
-        mysql_config, mysql_convert_table_format, mysql_find_rows,
-        mysql_fix_extensions, mysql_install_db, mysql_plugin,
-        mysql_secure_installation, mysql_setpermission, mysql_tzinfo_to_sql,
-        mysql_upgrade, mysql_waitpid, mysql_zap, mysqlaccess, mysqladmin,
-        mysqlbinlog, mysqlbug, mysqlcheck, mysqld, mysqld_multi, mysqld_safe,
-        mysqldump, mysqldumpslow, mysqlhotcopy, mysqlimport, mysqlshow,
-        mysqlslap, mysqltest, perror, replace, resolve_stack_dump and
-        resolveip</seg>
-        <seg>libmysqlclient.{so,a}, libmysqlclient_r.{so,a}, libmysqlservices.a
-        and several in /usr/lib/mysql</seg>
-        <seg>/srv/mysql, /usr/include/mysql, /usr/lib/mysql, /usr/share/mysql and
-        /var/run/mysql</seg>
+        <seg>
+          innochecksum, msql2mysql, myisamchk, myisam_ftdump, myisamlog,
+          myisampack, my_print_defaults, mysql, mysqlaccess, mysqlaccess.conf,
+          mysqladmin, mysqlbinlog, mysqlbug, mysqlcheck, mysql_client_test,
+          mysql_client_test_embedded, mysql_config, mysql_convert_table_format,
+          mysqld, mysqld_multi, mysqld_safe, mysqldump, mysqldumpslow,
+          mysql_embedded, mysql_find_rows, mysql_fix_extensions, mysqlhotcopy,
+          mysqlimport, mysql_install_db, mysql_plugin, mysql_secure_installation,
+          mysql_setpermission, mysqlshow, mysqlslap, mysqltest,
+          mysqltest_embedded, mysql_tzinfo_to_sql, mysql_upgrade, mysql_waitpid,
+          mysql_zap, perror, replace, resolveip and resolve_stack_dump
+        </seg>
+        <seg>
+          libmysqlclient.{so,a}, libmysqlclient_r.{so,a}, libmysqld.{so,a},
+          libmysqlservices.a and several in /usr/lib/mysql
+        </seg>
+        <seg>
+          /etc/mysql,
+          /srv/mysql,
+          /usr/include/mysql,
+          /usr/lib/mysql,
+          /usr/share/doc/mysql and
+          /usr/share/mysql
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -357,12 +391,16 @@
     <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 
-    <para>Descriptions of all the programs and libraries would be several
-    pages long. Instead, consult the <filename>mysql.info</filename>
-    documentation or the on-line reference manual at <ulink
-    url="http://dev.mysql.com/doc/refman/5.5/en/index.html"/>.</para>
-
-    <para>The <application>Perl</application> DBI modules must be installed
-    for some of the <application>MySQL</application> support programs to
-    function properly.</para>
+    <para>
+      Descriptions of all the programs and libraries would be several
+      pages long. Instead, consult the <filename>mysql.info</filename>
+      documentation or the on-line reference manual at <ulink
+      url="http://dev.mysql.com/doc/refman/5.5/en/index.html"/>.
+    </para>
+
+    <para>
+      The <application>Perl</application> DBI modules must be installed
+      for some of the <application>MySQL</application> support programs to
+      function properly.
+    </para>
 
   </sect2>
Index: x/wm/sawfish.xml
===================================================================
--- x/wm/sawfish.xml	(revision 4a29e2bbcd05b5c8fa817a58d67fb3fff148c4ee)
+++ x/wm/sawfish.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
@@ -64,4 +64,5 @@
     <para role="required">
        <xref linkend="rep-gtk"/> and
+       <xref linkend="which"/>
     </para>
 
