List:Internals« Previous MessageNext Message »
From:jon Date:August 5 2005 3:19am
Subject:bk commit - mysqldoc@docsrva tree (jon:1.3174)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of jon. When jon does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3174 05/08/05 13:19:16 jon@stripped +2 -0
  RefMan-4.1 MySQL Administration 
  chapter edits - first part.
  
  Updated removed-sections file.

  refman-4.1/removed-sections.txt
    1.7 05/08/05 13:19:14 jon@stripped +10 -0
    Updating...

  refman-4.1/mysql-database-administration.xml
    1.28 05/08/05 13:19:14 jon@stripped +942 -2373
    First set of edits.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jon
# Host:	gigan.
# Root:	/home/jon/bk/mysqldoc

--- 1.6/refman-4.1/removed-sections.txt	2005-07-14 03:36:36 +10:00
+++ 1.7/refman-4.1/removed-sections.txt	2005-08-05 13:19:14 +10:00
@@ -145,3 +145,13 @@
 precision-math-rounding
 precision-math-examples
 
+# ----------------------------------------------------------------------
+
+# from mysql-database-administration.xml:
+
+instance-manager
+instance-manager-startup-process
+instance-manager-security
+instance-manager-command-line-options
+instance-manager-configuration-files
+instance-manager-commands

--- 1.27/refman-4.1/mysql-database-administration.xml	2005-08-04 15:56:19 +10:00
+++ 1.28/refman-4.1/mysql-database-administration.xml	2005-08-05 13:19:14 +10:00
@@ -49,8 +49,8 @@
 
       <para>
         All MySQL programs take many different options. However, every
-        MySQL program provides a <literal>--help</literal> option that
-        you can use to get a description of the program's options. For
+        MySQL program provides a <option>--help</option> option that you 
+        can use to get a description of the program's options. For 
         example, try <command>mysqld --help</command>.
       </para>
 
@@ -324,7 +324,7 @@
 
         <listitem>
           <para>
-            <literal>--with-server-suffix=-max</literal>
+            <option>--with-server-suffix=-max</option>
           </para>
 
           <para>
@@ -335,27 +335,29 @@
 
         <listitem>
           <para>
-            <literal>--with-innodb</literal>
+            <option>--with-innodb</option>
           </para>
 
           <para>
-            This option enables support for the InnoDB storage engine.
-            MySQL-Max servers always include InnoDB support, but this
-            option actually is needed only for MySQL 3.23. From MySQL 4
-            onwards, InnoDB is included by default in binary
-            distributions, so you do not need a MySQL-Max server merely
-            to obtain InnoDB support.
+            This option enables support for the 
+            <literal>InnoDB</literal> storage engine. MySQL-Max servers 
+            always include <literal>InnoDB</literal> support, but this
+            option actually is needed only for MySQL 3.23. From MySQL 
+            4.0 onwards, <literal>InnoDB</literal> is included by 
+            default in all binary distributions, so you do not need a 
+            MySQL-Max server merely to obtain 
+            <literal>InnoDB</literal> support.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--with-bdb</literal>
+            <option>--with-bdb</option>
           </para>
 
           <para>
-            This option enables support for the Berkeley DB (BDB)
-            storage engine.
+            This option enables support for the Berkeley DB 
+            (<literal>BDB</literal>) storage engine.
           </para>
         </listitem>
 
@@ -375,14 +377,14 @@
 
         <listitem>
           <para>
-            <literal>--with-ndbcluster</literal>
+            <option>--with-ndbcluster</option>
           </para>
 
           <para>
             This option enables support for the NDB Cluster storage
-            engine in MySQL 4.1.2 and newer. Note that as of MySQL
-            5.0.3, Cluster is supported on Linux, Solaris, and Mac OS X
-            only.
+            engine in MySQL 4.1.2 and newer. <emphasis>Currently, MySQL 
+            Cluster is supported on Linux, Solaris, and Mac OS X 
+            only</emphasis>.
           </para>
         </listitem>
 
@@ -397,22 +399,25 @@
       </para>
 
       <para>
-        MySQL-Max servers include the BerkeleyDB (BDB) storage engine
-        whenever possible, but not all platforms support BDB.
+        MySQL-Max servers include the BerkeleyDB 
+        (<literal>BDB</literal>) storage engine whenever possible, but 
+        not all platforms support <literal>BDB</literal>.
       </para>
 
       <para>
-        MySQL-Max servers for Solaris, Mac OS X, and Linux (on most
-        platforms) include support for the NDB Cluster storage engine.
-        Note that the server must be started with the
-        <literal>ndbcluster</literal> option in order to run the server
-        as part of a MySQL Cluster. (For details, see
+        MySQL-Max servers versions 4.1.2 and above for Solaris, Mac OS 
+        X, and Linux (on most platforms) include support for the 
+        <literal>NDB Cluster</literal> storage engine. Note that the 
+        server must be started with the <option>ndbcluster</option> 
+        option in order to run the server as part of a MySQL Cluster. 
+        (For details, see
         <xref linkend="mysql-cluster-configuration"/>.)
       </para>
 
       <para>
         The following table shows on which platforms allow MySQL-Max
-        binaries include support for BDB and/or NDB Cluster:
+        binaries include support for <literal>BDB</literal> and/or 
+        <literal>NDB Cluster</literal>:
       </para>
 
       <informaltable>
@@ -490,7 +495,7 @@
         </tgroup>
       </informaltable>
 
-<!--   Output for both SHOW commands following is from 5.0.2-alpha-nt-max -->
+<!--   Output for both SHOW commands following is from 4.1.13a-nt-max -->
 
       <para>
         To find out which storage engines your server supports, issue
@@ -518,8 +523,9 @@
 | EXAMPLE    | NO      | Example storage engine                                     |
 | ARCHIVE    | NO      | Archive storage engine                                     |
 | CSV        | NO      | CSV storage engine                                         |
+| BLACKHOLE  | NO      | Storage engine designed to act as null storage             |
 +------------+---------+------------------------------------------------------------+
-16 rows in set (0.02 sec)
+17 rows in set (0.02 sec)
 </programlisting>
 
       <para>
@@ -534,27 +540,28 @@
       </para>
 
 <programlisting>
-mysql&gt; SHOW VARIABLES LIKE 'have_%';
-+---------------------+-------+
-| Variable_name       | Value |
-+---------------------+-------+
-| have_archive        | NO    |
-| have_bdb            | YES   |
-| have_compress       | YES   |
-| have_crypt          | NO    |
-| have_csv            | NO    |
-| have_example_engine | NO    |
-| have_geometry       | YES   |
-| have_innodb         | YES   |
-| have_isam           | NO    |
-| have_ndbcluster     | NO    |
-| have_openssl        | NO    |
-| have_query_cache    | YES   |
-| have_raid           | NO    |
-| have_rtree_keys     | YES   |
-| have_symlink        | YES   |
-+---------------------+-------+
-15 rows in set (0.15 sec)
+mysql&gt; SHOW VARIABLES LIKE 'have%';
++-----------------------+-------+
+| Variable_name         | Value |
++-----------------------+-------+
+| have_archive          | NO    |
+| have_bdb              | YES   |
+| have_blackhole_engine | NO    |
+| have_compress         | YES   |
+| have_crypt            | NO    |
+| have_csv              | NO    |
+| have_example_engine   | NO    |
+| have_geometry         | YES   |
+| have_innodb           | YES   |
+| have_isam             | NO    |
+| have_ndbcluster       | NO    |
+| have_openssl          | NO    |
+| have_query_cache      | YES   |
+| have_raid             | NO    |
+| have_rtree_keys       | YES   |
+| have_symlink          | YES   |
++-----------------------+-------+
+16 rows in set (0.00 sec)
 </programlisting>
 
       <para>
@@ -623,8 +630,11 @@
         <literal>InnoDB</literal>, <literal>BDB</literal>, or
         <literal>ISAM</literal> storage engines if the server was
         compiled to support them, but was started with the
-        <literal>--skip-innodb</literal>, <literal>--skip-bdb</literal>,
-        or <literal>--skip-isam</literal> options at runtime.
+        <option>--skip-innodb</option>, <option>--skip-bdb</option>,
+        or <option>--skip-isam</option> options at runtime. This is 
+        also the case where the server supports <literal>NDB 
+        Cluster</literal>, but was not started with the 
+        <option>ndbcluster</option> option.
       </para>
 
       <para>
@@ -716,8 +726,8 @@
 
       <para>
         To override the default behavior and specify explicitly which
-        server you want to run, specify a <literal>--mysqld</literal> or
-        <literal>--mysqld-version</literal> option to
+        server you want to run, specify a <option>--mysqld</option> or
+        <option>--mysqld-version</option> option to
         <command>mysqld_safe</command>.
       </para>
 
@@ -732,7 +742,7 @@
         command line are passed to <command>mysqld</command>. If you
         want to use any options that are specific to
         <command>mysqld_safe</command> and that
-        <command>mysqld</command> doesn't support, do not specify them
+        <command>mysqld</command> does not support, do not specify them
         on the command line. Instead, list them in the
         <literal>[mysqld_safe]</literal> group of an option file. See
         <xref linkend="option-files"/>.
@@ -758,17 +768,7 @@
 
         <listitem>
           <para>
-            <literal>--help</literal>
-          </para>
-
-          <para>
-            Display a help message and exit. (New in 5.0.3)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--basedir=<replaceable>path</replaceable></literal>
+            <option>--basedir=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -778,7 +778,7 @@
 
         <listitem>
           <para>
-            <literal>--core-file-size=<replaceable>size</replaceable></literal>
+            <option>--core-file-size=<replaceable>size</replaceable></option>
           </para>
 
           <para>
@@ -790,7 +790,7 @@
 
         <listitem>
           <para>
-            <literal>--datadir=<replaceable>path</replaceable></literal>
+            <option>--datadir=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -800,7 +800,7 @@
 
         <listitem>
           <para>
-            <literal>--defaults-extra-file=<replaceable>path</replaceable></literal>
+            <option>--defaults-extra-file=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -811,7 +811,7 @@
 
         <listitem>
           <para>
-            <literal>--defaults-file=<replaceable>path</replaceable></literal>
+            <option>--defaults-file=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -822,18 +822,18 @@
 
         <listitem>
           <para>
-            <literal>--err-log=<replaceable>path</replaceable></literal>
+            <option>--err-log=<replaceable>path</replaceable></option>
           </para>
 
           <para>
-            The old form of the <literal>--log-error</literal> option,
+            The old form of the <option>--log-error</option> option,
             to be used before MySQL 4.0.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--ledir=<replaceable>path</replaceable></literal>
+            <option>--ledir=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -845,7 +845,7 @@
 
         <listitem>
           <para>
-            <literal>--log-error=<replaceable>path</replaceable></literal>
+            <option>--log-error=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -856,7 +856,7 @@
 
         <listitem>
           <para>
-            <literal>--mysqld=<replaceable>prog_name</replaceable></literal>
+            <option>--mysqld=<replaceable>prog_name</replaceable></option>
           </para>
 
           <para>
@@ -870,19 +870,19 @@
 
         <listitem>
           <para>
-            <literal>--mysqld-version=<replaceable>suffix</replaceable></literal>
+            <option>--mysqld-version=<replaceable>suffix</replaceable></option>
           </para>
 
           <para>
-            This option is similar to the <literal>--mysqld</literal>
+            This option is similar to the <option>--mysqld</option>
             option, but you specify only the suffix for the server
             program name. The basename is assumed to be
             <command>mysqld</command>. For example, if you use
-            <literal>--mysqld-version=max</literal>,
+            <option>--mysqld-version=max</option>,
             <command>mysqld_safe</command> starts the
             <command>mysqld-max</command> program in the
             <literal>ledir</literal> directory. If the argument to
-            <literal>--mysqld-version</literal> is empty,
+            <option>--mysqld-version</option> is empty,
             <command>mysqld_safe</command> uses
             <command>mysqld</command> in the <literal>ledir</literal>
             directory.
@@ -891,7 +891,7 @@
 
         <listitem>
           <para>
-            <literal>--nice=<replaceable>priority</replaceable></literal>
+            <option>--nice=<replaceable>priority</replaceable></option>
           </para>
 
           <para>
@@ -903,7 +903,7 @@
 
         <listitem>
           <para>
-            <literal>--no-defaults</literal>
+            <option>--no-defaults</option>
           </para>
 
           <para>
@@ -913,7 +913,7 @@
 
         <listitem>
           <para>
-            <literal>--open-files-limit=<replaceable>count</replaceable></literal>
+            <option>--open-files-limit=<replaceable>count</replaceable></option>
           </para>
 
           <para>
@@ -921,13 +921,13 @@
             to open. The option value is passed to <command>ulimit
             -n</command>. Note that you need to start
             <command>mysqld_safe</command> as <literal>root</literal>
-            for this to work properly!
+            for this to work properly.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--pid-file=<replaceable>path</replaceable></literal>
+            <option>--pid-file=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -937,7 +937,7 @@
 
         <listitem>
           <para>
-            <literal>--port=<replaceable>port_num</replaceable></literal>
+            <option>--port=<replaceable>port_num</replaceable></option>
           </para>
 
           <para>
@@ -948,7 +948,7 @@
 
         <listitem>
           <para>
-            <literal>--socket=<replaceable>path</replaceable></literal>
+            <option>--socket=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -958,7 +958,7 @@
 
         <listitem>
           <para>
-            <literal>--timezone=<replaceable>zone</replaceable></literal>
+            <option>--timezone=<replaceable>zone</replaceable></option>
           </para>
 
           <para>
@@ -1047,7 +1047,7 @@
       <para>
         If <command>mysqld_safe</command> fails, even when invoked from
         the MySQL installation directory, you can specify the
-        <literal>--ledir</literal> and <literal>--datadir</literal>
+        <option>--ledir</option> and <option>--datadir</option>
         options to indicate the directories in which the server and
         databases are located on your system.
       </para>
@@ -1203,7 +1203,7 @@
       <para>
         The program searches for groups named
         <literal>[mysqld#]</literal> in <filename>my.cnf</filename> (or
-        in the file named by the <literal>--config-file</literal>
+        in the file named by the <option>--config-file</option>
         option). <literal>#</literal> can be any positive integer. This
         number is referred to in the following discussion as the option
         group number, or <replaceable>GNR</replaceable>. Group numbers
@@ -1298,7 +1298,7 @@
 
         <listitem>
           <para>
-            <literal>--config-file=<replaceable>name</replaceable></literal>
+            <option>--config-file=<replaceable>name</replaceable></option>
           </para>
 
           <para>
@@ -1321,7 +1321,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--example</literal>
+            <option>--example</option>
           </para>
 
           <para>
@@ -1336,7 +1336,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--help</literal>
+            <option>--help</option>
           </para>
 
           <para>
@@ -1351,7 +1351,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--log=<replaceable>name</replaceable></literal>
+            <option>--log=<replaceable>name</replaceable></option>
           </para>
 
           <para>
@@ -1367,7 +1367,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--mysqladmin=<replaceable>prog_name</replaceable></literal>
+            <option>--mysqladmin=<replaceable>prog_name</replaceable></option>
           </para>
 
           <para>
@@ -1383,7 +1383,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--mysqld=<replaceable>prog_name</replaceable></literal>
+            <option>--mysqld=<replaceable>prog_name</replaceable></option>
           </para>
 
           <para>
@@ -1404,7 +1404,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--no-log</literal>
+            <option>--no-log</option>
           </para>
 
           <para>
@@ -1420,7 +1420,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--password=<replaceable>password</replaceable></literal>
+            <option>--password=<replaceable>password</replaceable></option>
           </para>
 
           <para>
@@ -1438,7 +1438,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--silent</literal>
+            <option>--silent</option>
           </para>
 
           <para>
@@ -1453,7 +1453,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--tcp-ip</literal>
+            <option>--tcp-ip</option>
           </para>
 
           <para>
@@ -1474,7 +1474,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--user=<replaceable>user_name</replaceable></literal>
+            <option>--user=<replaceable>user_name</replaceable></option>
           </para>
 
           <para>
@@ -1490,7 +1490,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--verbose</literal>
+            <option>--verbose</option>
           </para>
 
           <para>
@@ -1505,7 +1505,7 @@
               <secondary><command>mysqld_multi</command> option</secondary>
             </indexterm>
 
-            <literal>--version</literal>
+            <option>--version</option>
           </para>
 
           <para>
@@ -1554,10 +1554,10 @@
 
         <listitem>
           <para>
-            The <literal>--pid-file</literal> option is very important
+            The <option>--pid-file</option> option is very important
             if you are using <command>mysqld_safe</command> to start
             <command>mysqld</command> (for example,
-            <literal>--mysqld=mysqld_safe</literal>) Every
+            <option>--mysqld=mysqld_safe</option>) Every
             <command>mysqld</command> should have its own process ID
             file. The advantage of using <command>mysqld_safe</command>
             instead of <command>mysqld</command> is that
@@ -1599,11 +1599,11 @@
 
         <listitem>
           <para>
-            You might want to use the <literal>--user</literal> option
+            You might want to use the <option>--user</option> option
             for <command>mysqld</command>, but in order to do this you
             need to run the <command>mysqld_multi</command> script as
             the Unix <literal>root</literal> user. Having the option in
-            the option file doesn't matter; you just get a warning if
+            the option file does not matter; you merely get a warning if
             you are not the superuser and the <command>mysqld</command>
             processes are started under your own Unix account.
           </para>
@@ -1614,9 +1614,9 @@
             <emphasis role="bold">Important</emphasis>: Make sure that
             the data directory is fully accessible to the Unix account
             that the specific <command>mysqld</command> process is
-            started as. <emphasis>Do not</emphasis> use the Unix root
-            account for this, unless you <emphasis>know</emphasis> what
-            you are doing.
+            started as. Do <emphasis>not</emphasis> use the Unix root
+            account for this, unless you know 
+            <emphasis>exactly</emphasis> what you are doing.
           </para>
         </listitem>
 
@@ -1630,10 +1630,10 @@
             <command>mysqld</command> processes. Beware of the dangers
             of using multiple <command>mysqld</command> servers with the
             same data directory. Use separate data directories, unless
-            you <emphasis>know</emphasis> what you are doing. Starting
-            multiple servers with the same data directory <emphasis>does
-            not</emphasis> give you extra performance in a threaded
-            system. See <xref linkend="multiple-servers"/>.
+            you know <emphasis>exactly</emphasis> what you are doing. 
+            Starting multiple servers with the same data directory 
+            does <emphasis>not</emphasis> give you extra performance in 
+            a threaded system. See <xref linkend="multiple-servers"/>.
           </para>
         </listitem>
 
@@ -1702,700 +1702,6 @@
 
   </section>
 
-  <section id="instance-manager">
-
-    <title id='title-instance-manager'>&title-instance-manager;</title>
-
-    <para>
-      This section discusses use of the MySQL Instance Manager. MySQL
-      Instance Manager (IM) is a daemon running on a TCP/IP port, which
-      serves for monitoring and management of MySQL Database Server
-      instances. MySQL Instance Manager is currently available for
-      unix-like operating systems.
-    </para>
-
-    <para>
-      MySQL Instance Manager is included in MySQL distributions from
-      version 5.0.3. MySQL Instance Manager can be used to start and
-      stop the MySQL Server, <emphasis role="bold">even from a remote
-      host</emphasis>, instead of the mysqld_safe script. MySQL Instance
-      Manager also implements the functionality (and most of the syntax)
-      of the <command>mysqld_multi</command> script. A more detailed
-      description of the MySQL Instance Manager follows.
-    </para>
-
-    <section id="instance-manager-startup-process">
-
-      <title id='title-instance-manager-startup-process'>&title-instance-manager-startup-process;</title>
-
-      <para>
-        Normally, the MySQL Database Server is started with the
-        <command>mysql.server</command> script, which usually resides in
-        the <literal>/etc/init.d/</literal> folder. In MySQL 5.0.3 this
-        script invokes <command>mysqlmanager</command> (the MySQL
-        Instance Manager binary) to start MySQL. In prior versions of
-        MySQL the <command>mysqld_safe</command> script is used for this
-        purpose. Starting from MySQL 5.0.4 the behaviour of the init
-        script was changed again to incorporate both setup schemes. In
-        5.0.4 the init startup script uses the old scheme (invoking
-        <command>mysqld_safe</command>) by default, but one can set the
-        <literal>use_mysqld_safe</literal> variable in the script to
-        <literal>0</literal> (zero) to use the MySQL Instance Manager to
-        start a server.
-      </para>
-
-      <para>
-        Instance Manager behaviour in this case depends on the options
-        given in the MySQL configuration file. If there is no
-        configuration file, the MySQL Instance Manager creates an
-        instance named <literal>mysqld</literal> and attempts to start
-        it with default (compiled-in) configuration values. This means
-        that the IM cannot guess the placement of
-        <command>mysqld</command> if it is not installed in the default
-        location. If you have installed the MySQL server in a
-        non-standard location you should use a configuration file.
-      </para>
-
-      <para>
-        If there is a configuration file, the IM will parse the
-        configuration file in search of <literal>[mysqld]</literal>
-        sections (E.g. <literal>[mysqld]</literal>,
-        <literal>[mysqld1]</literal>, <literal>[mysqld2]</literal>,
-        etc.) Each such section specifies an instance. At startup the IM
-        will start all found instances. The IM stops all instances at
-        shutdown by default.
-      </para>
-
-      <para>
-        Note that there is a special option which is recognized only by
-        the IM called <literal>mysqld-path</literal>
-        (<literal>mysqld-path =
-        &lt;path-to-mysqld-binary&gt;</literal>). Use this variable to
-        let the IM know where the mysqld binary resides. You should also
-        set <literal>basedir</literal> and <literal>datadir</literal>
-        options for the server.
-      </para>
-
-      <para>
-        The typical startup/shutdown cycle for a MySQL server with the
-        MySQL Instance Manager enabled is as follows:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            The MySQL Instance Manager is started with
-            <command>/etc/init.d/mysql</command> script.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            The MySQL Instance Manager starts all instances and monitors
-            them.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            If a server instance fails the MySQL Instance Manager
-            restarts it.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            If the MySQL Instance Manager is shut down (for instance
-            with the <command>/etc/init.d/mysql stop</command> command),
-            all instances are shut down by the MySQL Instance Manager.
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-    </section>
-
-    <section id="instance-manager-security">
-
-      <title id='title-instance-manager-security'>&title-instance-manager-security;</title>
-
-      <para>
-        Communication with the MySQL Instance Manager is handled using
-        the MySQL client-server protocol. As such, you can connect to
-        the IM using the standard <command>mysql</command> client
-        program, as well as the MySQL C API. The IM supports the new
-        version of the MySQL client-server protocol, so one should use
-        client tools and libraries distributed along with mysql-4.1 or
-        later.
-      </para>
-
-      <para>
-        The IM stores its user information in a password file. Default
-        placement for the password file is
-        <filename>/etc/mysqlmanager.passwd</filename>
-      </para>
-
-      <para>
-        Password entries look like the following:
-      </para>
-
-<programlisting>
-petr:*35110DC9B4D8140F5DE667E28C72DD2597B5C848
-</programlisting>
-
-      <para>
-        To generate such an entry one should invoke IM with the
-        <command>--passwd</command> option. Then the output can be
-        redirected to the <filename>/etc/mysqlmanager.passwd</filename>
-        file to add a new user. The sample command is given below.
-      </para>
-
-<programlisting>
-./mysqlmanager --passwd &gt;&gt; /etc/mysqlmanager.passwd
-Creating record for new user.
-Enter user name: mike
-Enter password: &lt;password&gt;
-Re-type password: &lt;password&gt;
-</programlisting>
-
-      <para>
-        The following line is added to
-        <filename>/etc/mysqlmanager.passwd</filename>:
-      </para>
-
-<programlisting>
-mike:*00A51F3F48415C7D4E8908980D443C29C69B60C9
-</programlisting>
-
-      <para>
-        If there are no entries in the
-        <filename>/etc/mysqlmanager.passwd</filename> file one cannot
-        connect to the IM.
-      </para>
-
-    </section>
-
-    <section id="instance-manager-command-line-options">
-
-      <title id='title-instance-manager-command-line-options'>&title-instance-manager-command-line-options;</title>
-
-      <para>
-        The MySQL Instance Manager supports a number of command line
-        options. A brief listing is available by executing the
-        <command>./mysqlmanager --help</command> command. The following
-        commands are available:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            <literal>-?, --help</literal>
-          </para>
-
-          <para>
-            Display the help and exit.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--log=name</literal>
-          </para>
-
-          <para>
-            Path to the IM log file. This used with the
-            <command>--run-as-service</command> option.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--pid-file=name</literal>
-          </para>
-
-          <para>
-            Pid file to use. By default it is
-            <filename>mysqlmanager.pid</filename>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--socket=name</literal>
-          </para>
-
-          <para>
-            Socket file to use for connection. By default it is
-            <filename>/tmp/mysqlmanager.sock</filename>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>-P, --passwd</literal>
-          </para>
-
-          <para>
-            Prepare entry for passwd file and exit.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--bind-address=name</literal>
-          </para>
-
-          <para>
-            Bind address to use for connections.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--port=#</literal>
-          </para>
-
-          <para>
-            Port number to use for connections (default port number,
-            assigned by IANA, is 2273).
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--password-file=name</literal>
-          </para>
-
-          <para>
-            Look for the Instance Manager users and passwords here. The
-            default one is
-            <filename>/etc/mysqlmanager.passwd</filename>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--default-mysqld-path=name</literal>
-          </para>
-
-          <para>
-            Where to look for MySQL Server binary, if no path was
-            provided in the instance section. E.g.
-            <literal>default-mysqld-path = /usr/sbin/mysqld</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--monitoring-interval=#</literal>
-          </para>
-
-          <para>
-            Interval to monitor instances in seconds. Instance manager
-            will try to connect to each of monitored instances to check
-            whether they are alive/not hanging. In the case of a failure
-            IM will perform several (in fact many) attempts to restart
-            the instance. One can disable this behaviour for particular
-            instances with the <literal>nonguarded</literal> option in
-            the appropriate instance section. If no value was given, the
-            default of 20 seconds will be used.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--run-as-service</literal>
-          </para>
-
-          <para>
-            Daemonize and start the angel process. The angel process is
-            simple and unlikely to crash. It will restart the IM itself
-            in case of a failure.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>--user=name</literal>
-          </para>
-
-          <para>
-            Username to start and run the
-            <command>mysqlmanager</command> under. It is recommended to
-            run <command>mysqlmanager</command> under the same user
-            account used to run the <command>mysqld</command> server.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>-V, --version</literal>
-          </para>
-
-          <para>
-            Output version information and exit.
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-    </section>
-
-    <section id="instance-manager-configuration-files">
-
-      <title id='title-instance-manager-configuration-files'>&title-instance-manager-configuration-files;</title>
-
-      <para>
-        Instance Manager uses the standard <filename>my.cnf</filename>
-        file. It uses the <literal>[manager]</literal> section to read
-        options for itself and the <literal>[mysqld]</literal> sections
-        to create instances. The <literal>[manager]</literal> section
-        contains any of the options listed above. An example
-        <literal>[manager]</literal> section is given below:
-      </para>
-
-<programlisting>
-# MySQL Instance Manager options section
-[manager]
-default-mysqld-path = /usr/local/mysql/libexec/mysqld
-socket=/tmp/manager.sock
-pid-file=/tmp/manager.pid
-password-file = /home/cps/.mysqlmanager.passwd
-monitoring-interval = 2
-port = 1999
-bind-address = 192.168.1.5
-</programlisting>
-
-      <para>
-        Instance sections specify options given to each instance at
-        startup. These are mainly common MySQL server options, but there
-        are some IM-specific options:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            <literal>mysqld-path =
-            &lt;path-to-mysqld-binary&gt;</literal>
-          </para>
-
-          <para>
-            The path to the <command>mysqld</command> server binary.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>shutdown-delay = #</literal>
-          </para>
-
-          <para>
-            A number of seconds IM should wait for the instance to shut
-            down. Default time is 35 seconds. After the delay expires,
-            the IM assumes that the instance is hanging and attempts to
-            kill -9 it. If you use InnoDB with large tables, you should
-            increase this value.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>nonguarded</literal>
-          </para>
-
-          <para>
-            This option should be set if you want to disable IM
-            monitoring functionality for a certain instance.
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      <para>
-        Several sample instance sections are given below.
-      </para>
-
-<programlisting>
-[mysqld]
-mysqld-path=/usr/local/mysql/libexec/mysqld
-socket=/tmp/mysql.sock
-port=3307
-server_id=1
-skip-stack-trace
-core-file
-skip-bdb
-log-bin
-log-error
-log=mylog
-log-slow-queries
-
-[mysqld2]
-nonguarded
-port=3308
-server_id=2
-mysqld-path= /home/cps/mysql/trees/mysql-4.1/sql/mysqld
-socket     = /tmp/mysql.sock4
-pid-file   = /tmp/hostname.pid4
-datadir= /home/cps/mysql_data/data_dir1
-language=/home/cps/mysql/trees/mysql-4.1/sql/share/english
-log-bin
-log=/tmp/fordel.log
-</programlisting>
-
-    </section>
-
-    <section id="instance-manager-commands">
-
-      <title id='title-instance-manager-commands'>&title-instance-manager-commands;</title>
-
-      <para>
-        Once you've set up a password file for the MySQL Instance
-        Manager and the IM is running, you can connect to it. You can
-        use the <command>mysql</command> client tool connect through a
-        standard MySQL API. Below goes the list of commands the MySQL
-        Instance Manager currently accepts, with samples.
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            <literal>START INSTANCE &lt;instance_name&gt;</literal>
-          </para>
-
-          <para>
-            This command will attempt to start an instance:
-          </para>
-
-<programlisting>
-mysql&gt; start instance mysqld4;
-Query OK, 0 rows affected (0,00 sec)
-</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>STOP INSTANCE &lt;instance_name&gt;</literal>
-          </para>
-
-          <para>
-            This will attempt to stop an instance:
-          </para>
-
-<programlisting>
-mysql&gt; stop instance mysqld4;
-Query OK, 0 rows affected (0,00 sec)
-</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>SHOW INSTANCES</literal>
-          </para>
-
-          <para>
-            Show the names of all loaded instances:
-          </para>
-
-<programlisting>
-mysql&gt; show instances;
-+---------------+---------+
-| instance_name | status  |
-+---------------+---------+
-| mysqld3       | offline |
-| mysqld4       | online  |
-| mysqld2       | offline |
-+---------------+---------+
-3 rows in set (0,04 sec)
-</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>SHOW INSTANCE STATUS
-            &lt;instance_name&gt;</literal>
-          </para>
-
-          <para>
-            Show the status and the version info of selected instance:
-          </para>
-
-<programlisting>
-mysql&gt; show instance status mysqld3;
-+---------------+--------+---------+
-| instance_name | status | version |
-+---------------+--------+---------+
-| mysqld3       | online | unknown |
-+---------------+--------+---------+
-1 row in set (0.00 sec)
-</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>SHOW INSTANCE OPTIONS
-            &lt;instance_name&gt;</literal>
-          </para>
-
-          <para>
-            Show options used by an instance:
-          </para>
-
-<programlisting>
-mysql&gt; show instance options mysqld3;
-+---------------+---------------------------------------------------+
-| option_name   | value                                             |
-+---------------+---------------------------------------------------+
-| instance_name | mysqld3                                           |
-| mysqld-path   | /home/cps/mysql/trees/mysql-4.1/sql/mysqld        |
-| port          | 3309                                              |
-| socket        | /tmp/mysql.sock3                                  |
-| pid-file      | hostname.pid3                                     |
-| datadir       | /home/cps/mysql_data/data_dir1/                   |
-| language      | /home/cps/mysql/trees/mysql-4.1/sql/share/english |
-+---------------+---------------------------------------------------+
-7 rows in set (0.01 sec)
-</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>SHOW &lt;instance_name&gt; LOG FILES</literal>
-          </para>
-
-          <para>
-            The command provides a listing of all log files used by the
-            instance. The result set contains the path to the log file
-            and the log file size. If no log file path is specified in
-            the configuration file (i.e.
-            <literal>log=/var/mysql.log</literal>), the IM tries to
-            guess its placement. If the IM is unable to guess the
-            logfile placement you should specify the log file location
-            explicitly.
-          </para>
-
-<programlisting>
-mysql&gt; show mysqld log files;
-+-------------+------------------------------------+----------+
-| Logfile     | Path                               | Filesize |
-+-------------+------------------------------------+----------+
-| ERROR LOG   | /home/cps/var/mysql/owlet.err      | 9186     |
-| GENERAL LOG | /home/cps/var/mysql/owlet.log      | 471503   |
-| SLOW LOG    | /home/cps/var/mysql/owlet-slow.log | 4463     |
-+-------------+------------------------------------+----------+
-3 rows in set (0.01 sec)
-</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>SHOW &lt;instance_name&gt; LOG {ERROR | SLOW |
-            GENERAL} size[,offset_from_end]</literal>
-          </para>
-
-          <para>
-            This command retrieves a portion of the specified log file.
-            Because most users are interested in the latest log
-            messages, the <literal>size</literal> parameter defines the
-            number of bytes you would like to retrieve starting from the
-            log end. You can retrieve data from the middle of the log
-            file by specifying the optional
-            <literal>offset_from_end</literal> parameter. The following
-            example retrieves 21 bytes of data, starting 23 bytes from
-            the end of the log file and ending 2 bytes from the end of
-            the log file:
-          </para>
-
-<programlisting>
-mysql&gt; show mysqld log general 21, 2;
-+---------------------+
-| Log                 |
-+---------------------+
-| using password: YES |
-+---------------------+
-1 row in set (0.00 sec)
-</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>SET
-            instance_name.option_name=option_value</literal>
-          </para>
-
-          <para>
-            This commands edits the specified instance's configuration
-            file to change/add instance options. The IM assumes that the
-            configuration file is located at
-            <filename>/etc/my.cnf</filename>. You should check that the
-            file exists and has appropriate permissions.
-          </para>
-
-<programlisting>
-mysql&gt; set mysqld2.port=3322;
-Query OK, 0 rows affected (0.00 sec)
-</programlisting>
-
-          <para>
-            Changes made to the configuration file will not take effect
-            until the MySQL server is restarted. In addition, these
-            changes are not stored in the instance manager's local cache
-            of instance settings until a <literal>FLUSH
-            INSTANCES</literal> command is executed.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>UNSET instance_name.option_name</literal>
-          </para>
-
-          <para>
-            This command removes an option from an instance's
-            configuration file.
-          </para>
-
-<programlisting>
-mysql&gt; unset mysqld2.port;
-Query OK, 0 rows affected (0.00 sec)
-</programlisting>
-
-          <para>
-            Changes made to the configuration file will not take effect
-            until the MySQL server is restarted. In addition, these
-            changes are not stored in the instance manager's local cache
-            of instance settings until a <literal>FLUSH
-            INSTANCES</literal> command is executed.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>FLUSH INSTANCES</literal>
-          </para>
-
-          <para>
-            This command forces IM to reread the configuration file and
-            to refresh internal structures. This command should be
-            performed after editing the configuration file. This command
-            does not restart instances:
-          </para>
-
-<programlisting>
-mysql&gt; flush instances;
-Query OK, 0 rows affected (0.04 sec)
-</programlisting>
-        </listitem>
-
-      </itemizedlist>
-
-    </section>
-
-  </section>
-
   <section id="configuring-mysql">
 
     <title id='title-configuring-mysql'>&title-configuring-mysql;</title>
@@ -2480,7 +1786,7 @@
       <para>
         <command>mysqld</command> accepts many command-line options. For
         a list, execute <command>mysqld --help</command>. Before MySQL
-        4.1.1, <literal>--help</literal> prints the full help message.
+        4.1.1, <option>--help</option> prints the full help message.
         As of 4.1.1, it prints a brief message; to see the full list,
         use <command>mysqld --verbose --help</command>.
       </para>
@@ -2539,21 +1845,21 @@
 
         <listitem>
           <para>
-            <literal>--help, -?</literal>
+            <option>--help, -?</option>
           </para>
 
           <para>
             Display a short help message and exit. Before MySQL 4.1.1,
-            <literal>--help</literal> displays the full help message. As
+            <option>--help</option> displays the full help message. As
             of 4.1.1, it displays an abbreviated message only. Use both
-            the <literal>--verbose</literal> and
-            <literal>--help</literal> options to see the full message.
+            the <option>--verbose</option> and
+            <option>--help</option> options to see the full message.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--allow-suspicious-udfs</literal>
+            <option>--allow-suspicious-udfs</option>
           </para>
 
           <para>
@@ -2563,20 +1869,20 @@
             only UDFs that have at least one auxiliary symbol can be
             loaded. This prevents attempts at loading functions from
             shared object files other than those containing legitimate
-            UDFs. This option was added in MySQL 4.0.24, 4.1.10a, and
-            5.0.3. See <xref linkend="udf-security"/>.
+            UDFs. This option was added in MySQL 4.0.24, and 4.1.10a. 
+            See <xref linkend="udf-security"/>.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--ansi</literal>
+            <option>--ansi</option>
           </para>
 
           <para>
             Use standard SQL syntax instead of MySQL syntax. See
             <xref linkend="ansi-mode"/>. For more precise control over
-            the server SQL mode, use the <literal>--sql-mode</literal>
+            the server SQL mode, use the <option>--sql-mode</option>
             option instead.
           </para>
         </listitem>
@@ -2595,7 +1901,7 @@
 
         <listitem>
           <para>
-            <literal>--big-tables</literal>
+            <option>--big-tables</option>
           </para>
 
           <para>
@@ -2611,7 +1917,7 @@
 
         <listitem>
           <para>
-            <literal>--bind-address=<replaceable>IP</replaceable></literal>
+            <option>--bind-address=<replaceable>IP</replaceable></option>
           </para>
 
           <para>
@@ -2621,12 +1927,12 @@
 
         <listitem>
           <para>
-            <literal>--console</literal>
+            <option>--console</option>
           </para>
 
           <para>
             Write the error log messages to stderr/stdout even if
-            <literal>--log-error</literal> is specified. On Windows,
+            <option>--log-error</option> is specified. On Windows,
             <command>mysqld</command> does not close the console screen
             if this option is used.
           </para>
@@ -2634,7 +1940,7 @@
 
         <listitem>
           <para>
-            <literal>--character-sets-dir=<replaceable>path</replaceable></literal>
+            <option>--character-sets-dir=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -2645,7 +1951,7 @@
 
         <listitem>
           <para>
-            <literal>--chroot=<replaceable>path</replaceable></literal>
+            <option>--chroot=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -2662,7 +1968,7 @@
 
         <listitem>
           <para>
-            <literal>--character-set-server=<replaceable>charset</replaceable></literal>
+            <option>--character-set-server=<replaceable>charset</replaceable></option>
           </para>
 
           <para>
@@ -2674,23 +1980,23 @@
 
         <listitem>
           <para>
-            <literal>--core-file</literal>
+            <option>--core-file</option>
           </para>
 
           <para>
             Write a core file if <command>mysqld</command> dies. For
             some systems, you must also specify the
-            <literal>--core-file-size</literal> option to
+            <option>--core-file-size</option> option to
             <command>mysqld_safe</command>. See
             <xref linkend="mysqld-safe"/>. Note that on some systems,
             such as Solaris, you do not get a core file if you are also
-            using the <literal>--user</literal> option.
+            using the <option>--user</option> option.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--collation-server=<replaceable>collation</replaceable></literal>
+            <option>--collation-server=<replaceable>collation</replaceable></option>
           </para>
 
           <para>
@@ -2718,7 +2024,7 @@
           </para>
 
           <para>
-            If MySQL is configured with <literal>--with-debug</literal>,
+            If MySQL is configured with <option>--with-debug</option>,
             you can use this option to get a trace file of what
             <command>mysqld</command> is doing. The
             <replaceable>debug_options</replaceable> string often is
@@ -2729,45 +2035,45 @@
 
         <listitem>
           <para>
-            <literal>--default-character-set=<replaceable>charset</replaceable></literal>
+            <option>--default-character-set=<replaceable>charset</replaceable></option>
           </para>
 
           <para>
             Use <replaceable>charset</replaceable> as the default
             character set. This option is deprecated in favor of
-            <literal>--character-set-server</literal> as of MySQL 4.1.3.
+            <option>--character-set-server</option> as of MySQL 4.1.3.
             See <xref linkend="character-sets"/>.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--default-collation=<replaceable>collation</replaceable></literal>
+            <option>--default-collation=<replaceable>collation</replaceable></option>
           </para>
 
           <para>
             Use <replaceable>collation</replaceable> as the default
             collation. This option is deprecated in favor of
-            <literal>--collation-server</literal> as of MySQL 4.1.3. See
+            <option>--collation-server</option> as of MySQL 4.1.3. See
             <xref linkend="character-sets"/>.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--default-storage-engine=<replaceable>type</replaceable></literal>
+            <option>--default-storage-engine=<replaceable>type</replaceable></option>
           </para>
 
           <para>
             This option is a synonym for
-            <literal>--default-table-type</literal>. It is available as
+            <option>--default-table-type</option>. It is available as
             of MySQL 4.1.2.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--default-table-type=<replaceable>type</replaceable></literal>
+            <option>--default-table-type=<replaceable>type</replaceable></option>
           </para>
 
           <para>
@@ -2778,7 +2084,7 @@
 
         <listitem>
           <para>
-            <literal>--default-time-zone=<replaceable>type</replaceable></literal>
+            <option>--default-time-zone=<replaceable>type</replaceable></option>
           </para>
 
           <para>
@@ -2793,7 +2099,7 @@
 
         <listitem>
           <para>
-            <literal>--delay-key-write[= OFF | ON | ALL]</literal>
+            <option>--delay-key-write[= OFF | ON | ALL]</option>
           </para>
 
           <para>
@@ -2821,19 +2127,19 @@
 
         <listitem>
           <para>
-            <literal>--delay-key-write-for-all-tables</literal>
+            <option>--delay-key-write-for-all-tables</option>
           </para>
 
           <para>
-            Old form of <literal>--delay-key-write=ALL</literal> for use
+            Old form of <option>--delay-key-write=ALL</option> for use
             prior to MySQL 4.0.3. As of 4.0.3, use
-            <literal>--delay-key-write</literal> instead.
+            <option>--delay-key-write</option> instead.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--des-key-file=<replaceable>file_name</replaceable></literal>
+            <option>--des-key-file=<replaceable>file_name</replaceable></option>
           </para>
 
           <para>
@@ -2845,7 +2151,7 @@
 
         <listitem>
           <para>
-            <literal>--enable-named-pipe</literal>
+            <option>--enable-named-pipe</option>
           </para>
 
           <para>
@@ -2865,22 +2171,23 @@
 
           <para>
             This is a bit mask of different flags you can use for
-            debugging the <command>mysqld</command> server. Do not use
-            this option unless you know exactly what it does!
+            debugging the <command>mysqld</command> server. Do 
+            <emphasis>not</emphasis> use this option unless you know 
+            <emphasis>exactly</emphasis> what it does.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--external-locking</literal>
+            <option>--external-locking</option>
           </para>
-
+<!--  TODO: Version info for this option? [js]  -->
           <para>
             Enable system locking. Note that if you use this option on a
             system on which <literal>lockd</literal> does not fully work
             (as on Linux), it is easy for <command>mysqld</command> to
             deadlock. This option previously was named
-            <literal>--enable-locking</literal>.
+            <option>--enable-locking</option>.
           </para>
 
           <para>
@@ -2902,7 +2209,7 @@
             <listitem>
               <para>
                 You should not use
-                <literal>--delay-key-write=ALL</literal> or
+                <option>--delay-key-write=ALL</option> or
                 <literal>DELAY_KEY_WRITE=1</literal> on any shared
                 tables.
               </para>
@@ -2912,7 +2219,7 @@
 
           <para>
             The easiest way to ensure this is to always use
-            <literal>--external-locking</literal> together with
+            <option>--external-locking</option> together with
             <literal>--delay-key-write=OFF
             --query-cache-size=0</literal>.
           </para>
@@ -2925,7 +2232,7 @@
 
         <listitem>
           <para>
-            <literal>--flush</literal>
+            <option>--flush</option>
           </para>
 
           <para>
@@ -2938,7 +2245,7 @@
 
         <listitem>
           <para>
-            <literal>--init-file=<replaceable>file</replaceable></literal>
+            <option>--init-file=<replaceable>file</replaceable></option>
           </para>
 
           <para>
@@ -2950,7 +2257,7 @@
 
         <listitem>
           <para>
-            <literal>--innodb-safe-binlog</literal>
+            <option>--innodb-safe-binlog</option>
           </para>
 
           <para>
@@ -2977,48 +2284,13 @@
 
         <listitem>
           <para>
-            <literal>--large-pages</literal>
-          </para>
-
-          <para>
-            Some hardware/operating system architectures support memory
-            pages greater than the default (usually 4 KB). The actual
-            implementation of this support depends on the underlying
-            hardware and OS. Applications that perform a lot of memory
-            access may obtain performance improvements by using large
-            pages due to reduced Translation Lookaside Buffer (TLB)
-            misses.
-          </para>
-
-          <para>
-            Currently, MySQL supports only the Linux implementation of
-            large pages support (which is called HugeTLB in Linux). We
-            have plans to extend this support to FreeBSD, Solaris and
-            possibly other platforms.
-          </para>
-
-          <para>
-            Before large pages can be used on Linux, it is necessary to
-            configure the HugeTLB memory pool. For reference, consult
-            the <filename>hugetlbpage.txt</filename> file in the Linux
-            kernel source.
-          </para>
-
-          <para>
-            This option is disabled by default. It was added in MySQL
-            5.0.3.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             <literal>--log[=<replaceable>file</replaceable>], -l
             [<replaceable>file</replaceable>]</literal>
           </para>
 
           <para>
             Log connections and queries to this file. See
-            <xref linkend="query-log"/>. If you don't specify a
+            <xref linkend="query-log"/>. If you do not specify a
             filename, MySQL uses
             <filename><replaceable>host_name</replaceable>.log</filename>
             as the filename.
@@ -3027,7 +2299,7 @@
 
         <listitem>
           <para>
-            <literal>--log-bin=[<replaceable>file</replaceable>]</literal>
+            <option>--log-bin=[<replaceable>file</replaceable>]</option>
           </para>
 
           <para>
@@ -3043,14 +2315,14 @@
 
         <listitem>
           <para>
-            <literal>--log-bin-index[=<replaceable>file</replaceable>]</literal>
+            <option>--log-bin-index[=<replaceable>file</replaceable>]</option>
           </para>
 
           <para>
             The index file for binary log filenames. See
-            <xref linkend="binary-log"/>. If you don't specify a
+            <xref linkend="binary-log"/>. If you do not specify a
             filename, and if you didn't specify one in
-            <literal>--log-bin</literal>, MySQL uses
+            <option>--log-bin</option>, MySQL uses
             <filename><replaceable>host_name</replaceable>-bin.index</filename>
             as the filename.
           </para>
@@ -3058,12 +2330,12 @@
 
         <listitem>
           <para>
-            <literal>--log-error[=<replaceable>file</replaceable>]</literal>
+            <option>--log-error[=<replaceable>file</replaceable>]</option>
           </para>
 
           <para>
             Log errors and startup messages to this file. See
-            <xref linkend="error-log"/>. If you don't specify a
+            <xref linkend="error-log"/>. If you do not specify a
             filename, MySQL uses
             <filename><replaceable>host_name</replaceable>.err</filename>
             as the filename. If the filename has no extension, an
@@ -3073,7 +2345,7 @@
 
         <listitem>
           <para>
-            <literal>--log-isam[=<replaceable>file</replaceable>]</literal>
+            <option>--log-isam[=<replaceable>file</replaceable>]</option>
           </para>
 
           <para>
@@ -3085,7 +2357,7 @@
 
         <listitem>
           <para>
-            <literal>--log-long-format</literal>
+            <option>--log-long-format</option>
           </para>
 
           <para>
@@ -3093,15 +2365,15 @@
             binary update log, and slow queries log, whatever log has
             been activated). For example, username and timestamp are
             logged for queries. Before MySQL 4.1, if you are using
-            <literal>--log-slow-queries</literal> and
-            <literal>--log-long-format</literal>, queries that are not
+            <option>--log-slow-queries</option> and
+            <option>--log-long-format</option>, queries that are not
             using indexes also are logged to the slow query log.
-            <literal>--log-long-format</literal> is deprecated as of
+            <option>--log-long-format</option> is deprecated as of
             MySQL version 4.1, when
-            <literal>--log-short-format</literal> was introduced. (Long
+            <option>--log-short-format</option> was introduced. (Long
             log format is the default setting since version 4.1.) Also
             note that starting with MySQL 4.1, the
-            <literal>--log-queries-not-using-indexes</literal> option is
+            <option>--log-queries-not-using-indexes</option> option is
             available for the purpose of logging queries that do not use
             indexes to the slow query log.
           </para>
@@ -3109,12 +2381,12 @@
 
         <listitem>
           <para>
-            <literal>--log-queries-not-using-indexes</literal>
+            <option>--log-queries-not-using-indexes</option>
           </para>
 
           <para>
             If you are using this option with
-            <literal>--log-slow-queries</literal>, then queries that are
+            <option>--log-slow-queries</option>, then queries that are
             not using indexes also are logged to the slow query log.
             This option is available as of MySQL 4.1. See
             <xref linkend="slow-query-log"/>.
@@ -3123,7 +2395,7 @@
 
         <listitem>
           <para>
-            <literal>--log-short-format</literal>
+            <option>--log-short-format</option>
           </para>
 
           <para>
@@ -3136,7 +2408,7 @@
 
         <listitem>
           <para>
-            <literal>--log-slow-admin-statements</literal>
+            <option>--log-slow-admin-statements</option>
           </para>
 
           <para>
@@ -3154,7 +2426,7 @@
 
         <listitem>
           <para>
-            <literal>--log-slow-queries[=<replaceable>file</replaceable>]</literal>
+            <option>--log-slow-queries[=<replaceable>file</replaceable>]</option>
           </para>
 
           <para>
@@ -3162,15 +2434,14 @@
             <literal>long_query_time</literal> seconds to execute to
             this file. See <xref linkend="slow-query-log"/>. Note that
             the default for the amount of information logged has changed
-            in MySQL 4.1. See the <literal>--log-long-format</literal>
-            and <literal>--log-short-format</literal> options for
-            details.
+            in MySQL 4.1. See the <option>--log-long-format</option> and 
+            <option>--log-short-format</option> options for details.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--log-update[=<replaceable>file</replaceable>]</literal>
+            <option>--log-update[=<replaceable>file</replaceable>]</option>
           </para>
 
           <para>
@@ -3178,14 +2449,14 @@
             <replaceable>#</replaceable> is a unique number if not
             given. See <xref linkend="update-log"/>. The update log is
             now deprecated; you should use the binary log instead
-            (<literal>--log-bin</literal>). See
+            (<option>--log-bin</option>). See
             <xref linkend="binary-log"/>.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--log-warnings, -W</literal>
+            <option>--log-warnings, -W</option>
           </para>
 
           <para>
@@ -3195,21 +2466,21 @@
             (you get more information about what is happening, such as
             messages about network failures and reconnections). This
             option is enabled by default as of MySQL 4.0.19 and 4.1.2;
-            to disable it, use <literal>--skip-log-warnings</literal>.
+            to disable it, use <option>--skip-log-warnings</option>.
             As of MySQL 4.0.21 and 4.1.3, aborted connections are not
             logged to the error log unless the value is greater than 1.
             See <xref linkend="communication-errors"/>.
           </para>
 
           <para>
-            This option was named <literal>--warnings</literal> before
+            This option was named <option>--warnings</option> before
             MySQL 4.0.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--low-priority-updates</literal>
+            <option>--low-priority-updates</option>
           </para>
 
           <para>
@@ -3226,7 +2497,7 @@
 
         <listitem>
           <para>
-            <literal>--memlock</literal>
+            <option>--memlock</option>
           </para>
 
           <para>
@@ -3259,7 +2530,7 @@
             <literal>MyISAM</literal> table, checks whether the table is
             marked as crashed or wasn't closed properly. (The last
             option works only if you are running with
-            <literal>--skip-external-locking</literal>.) If this is the
+            <option>--skip-external-locking</option>.) If this is the
             case, <command>mysqld</command> runs a check on the table.
             If the table was corrupted, <command>mysqld</command>
             attempts to repair it.
@@ -3281,7 +2552,7 @@
                 <row>
                   <entry><literal>DEFAULT</literal></entry>
                   <entry>The same as not giving any option to
-                    <literal>--myisam-recover</literal>.</entry>
+                    <option>--myisam-recover</option>.</entry>
                 </row>
                 <row>
                   <entry><literal>BACKUP</literal></entry>
@@ -3297,7 +2568,7 @@
                 </row>
                 <row>
                   <entry><literal>QUICK</literal></entry>
-                  <entry>Don't check the rows in the table if there aren't any delete blocks.</entry>
+                  <entry>do not check the rows in the table if there are not any delete blocks.</entry>
                 </row>
               </tbody>
             </tgroup>
@@ -3320,7 +2591,7 @@
 
         <listitem>
           <para>
-            <literal>--ndb-connectstring=<replaceable>connect_string</replaceable></literal>
+            <option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
           </para>
 
           <para>
@@ -3334,7 +2605,7 @@
 
         <listitem>
           <para>
-            <literal>--ndbcluster</literal>
+            <option>--ndbcluster</option>
           </para>
 
           <para>
@@ -3351,11 +2622,11 @@
 
         <listitem>
           <para>
-            <literal>--new</literal>
+            <option>--new</option>
           </para>
 
           <para>
-            The <literal>--new</literal> option can be used to make the
+            The <option>--new</option> option can be used to make the
             server behave as 4.1 in certain respects, easing a 4.0 to
             4.1 upgrade:
 
@@ -3390,7 +2661,7 @@
 
         <listitem>
           <para>
-            <literal>--old-passwords</literal>
+            <option>--old-passwords</option>
           </para>
 
           <para>
@@ -3403,7 +2674,7 @@
 
         <listitem>
           <para>
-            <literal>--old-protocol, -o</literal>
+            <option>--old-protocol, -o</option>
           </para>
 
           <para>
@@ -3414,7 +2685,7 @@
 
         <listitem>
           <para>
-            <literal>--one-thread</literal>
+            <option>--one-thread</option>
           </para>
 
           <para>
@@ -3426,7 +2697,7 @@
 
         <listitem>
           <para>
-            <literal>--open-files-limit=<replaceable>count</replaceable></literal>
+            <option>--open-files-limit=<replaceable>count</replaceable></option>
           </para>
 
           <para>
@@ -3445,7 +2716,7 @@
 
         <listitem>
           <para>
-            <literal>--pid-file=<replaceable>path</replaceable></literal>
+            <option>--pid-file=<replaceable>path</replaceable></option>
           </para>
 
           <para>
@@ -3468,7 +2739,7 @@
 
         <listitem>
           <para>
-            <literal>--safe-mode</literal>
+            <option>--safe-mode</option>
           </para>
 
           <para>
@@ -3478,14 +2749,14 @@
 
         <listitem>
           <para>
-            <literal>--safe-show-database</literal>
+            <option>--safe-show-database</option>
           </para>
 
           <para>
             With this option, the <literal>SHOW DATABASES</literal>
             statement displays only the names of those databases for
             which the user has some kind of privilege. As of MySQL
-            4.0.2, this option is deprecated and doesn't do anything (it
+            4.0.2, this option is deprecated and does not do anything (it
             is enabled by default), because there is a <literal>SHOW
             DATABASES</literal> privilege that can be used to control
             access to database names on a per-account basis. See
@@ -3495,12 +2766,12 @@
 
         <listitem>
           <para>
-            <literal>--safe-user-create</literal>
+            <option>--safe-user-create</option>
           </para>
 
           <para>
-            If this is enabled, a user can't create new users with the
-            <literal>GRANT</literal> statement, if the user doesn't have
+            If this is enabled, a user cannot create new users with the
+            <literal>GRANT</literal> statement, if the user does not have
             the <literal>INSERT</literal> privilege for the
             <literal>mysql.user</literal> table or any column in the
             table.
@@ -3509,7 +2780,7 @@
 
         <listitem>
           <para>
-            <literal>--secure-auth</literal>
+            <option>--secure-auth</option>
           </para>
 
           <para>
@@ -3520,7 +2791,7 @@
 
         <listitem>
           <para>
-            <literal>--shared-memory</literal>
+            <option>--shared-memory</option>
           </para>
 
           <para>
@@ -3532,7 +2803,7 @@
 
         <listitem>
           <para>
-            <literal>--shared-memory-base-name=<replaceable>name</replaceable></literal>
+            <option>--shared-memory-base-name=<replaceable>name</replaceable></option>
           </para>
 
           <para>
@@ -3543,7 +2814,7 @@
 
         <listitem>
           <para>
-            <literal>--skip-bdb</literal>
+            <option>--skip-bdb</option>
           </para>
 
           <para>
@@ -3555,7 +2826,7 @@
 
         <listitem>
           <para>
-            <literal>--skip-concurrent-insert</literal>
+            <option>--skip-concurrent-insert</option>
           </para>
 
           <para>
@@ -3567,36 +2838,35 @@
 
         <listitem>
           <para>
-            <literal>--skip-delay-key-write</literal>
+            <option>--skip-delay-key-write</option>
           </para>
 
           <para>
             Ignore the <literal>DELAY_KEY_WRITE</literal> option for all
             tables. As of MySQL 4.0.3, you should use
-            <literal>--delay-key-write=OFF</literal> instead. See
+            <option>--delay-key-write=OFF</option> instead. See
             <xref linkend="server-parameters"/>.
           </para>
         </listitem>
-
+<!--  TODO: Version info? [js]  -->
         <listitem>
           <para>
-            <literal>--skip-external-locking</literal>
+            <option>--skip-external-locking</option>
           </para>
-
           <para>
-            Don't use system locking. To use <command>isamchk</command>
+            do not use system locking. To use <command>isamchk</command>
             or <command>myisamchk</command>, you must shut down the
             server. See <xref linkend="stability"/>. In MySQL 3.23, you
             can use <literal>CHECK TABLE</literal> and <literal>REPAIR
             TABLE</literal> to check and repair
             <literal>MyISAM</literal> tables. This option previously was
-            named <literal>--skip-locking</literal>.
+            named <option>--skip-locking</option>.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--skip-grant-tables</literal>
+            <option>--skip-grant-tables</option>
           </para>
 
           <para>
@@ -3612,7 +2882,7 @@
 
         <listitem>
           <para>
-            <literal>--skip-host-cache</literal>
+            <option>--skip-host-cache</option>
           </para>
 
           <para>
@@ -3624,7 +2894,7 @@
 
         <listitem>
           <para>
-            <literal>--skip-innodb</literal>
+            <option>--skip-innodb</option>
           </para>
 
           <para>
@@ -3637,7 +2907,7 @@
 
         <listitem>
           <para>
-            <literal>--skip-isam</literal>
+            <option>--skip-isam</option>
           </para>
 
           <para>
@@ -3651,7 +2921,7 @@
 
         <listitem>
           <para>
-            <literal>--skip-name-resolve</literal>
+            <option>--skip-name-resolve</option>
           </para>
 
           <para>
@@ -3665,26 +2935,25 @@
 
         <listitem>
           <para>
-            <literal>--skip-ndbcluster</literal>
+            <option>--skip-ndbcluster</option>
           </para>
 
           <para>
             Disable the <literal>NDB Cluster</literal> storage engine.
             This is the default for binaries that were built with
             <literal>NDB Cluster</literal> storage engine support, this
-            means that the system only allocates memory and other
-            resources for this storage engine if it is explicitly
-            enabled.
+            means that the system allocates memory and other resources 
+            for this storage engine only if it is explicitly enabled.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--skip-networking</literal>
+            <option>--skip-networking</option>
           </para>
 
           <para>
-            Don't listen for TCP/IP connections at all. All interaction
+            Do not listen for TCP/IP connections at all. All interaction
             with <command>mysqld</command> must be made via named pipes
             or shared memory (on Windows) or Unix socket files (on
             Unix). This option is highly recommended for systems where
@@ -3694,29 +2963,29 @@
 
         <listitem>
           <para>
-            <literal>--skip-new</literal>
+            <option>--skip-new</option>
           </para>
 
           <para>
-            Don't use new, possibly wrong routines.
+            do not use new, possibly wrong routines.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--skip-symlink</literal>
+            <option>--skip-symlink</option>
           </para>
 
           <para>
             This is the old form of
-            <literal>--skip-symbolic-links</literal>, for use before
-            MySQL 4.0.13.
+            <option>--skip-symbolic-links</option>, for use before MySQL 
+            4.0.13.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--standalone</literal>
+            <option>--standalone</option>
           </para>
 
           <para>
@@ -3727,7 +2996,8 @@
 
         <listitem>
           <para>
-            <literal>--symbolic-links, --skip-symbolic-links</literal>
+            <option>--symbolic-links</option>, 
+            <option>--skip-symbolic-links</option>
           </para>
 
           <para>
@@ -3741,7 +3011,7 @@
               <para>
                 On Windows, enabling symbolic links allows you to
                 establish a symbolic link to a database directory by
-                creating a <literal>directory.sym</literal> file that
+                creating a <filename>directory.sym</filename> file that
                 contains the path to the real directory. See
                 <xref linkend="windows-symbolic-links"/>.
               </para>
@@ -3769,22 +3039,22 @@
 
         <listitem>
           <para>
-            <literal>--skip-safemalloc</literal>
+            <option>--skip-safemalloc</option>
           </para>
 
           <para>
             If MySQL is configured with
-            <literal>--with-debug=full</literal>, all MySQL programs
-            check for memory overruns during each memory allocation and
-            memory freeing operation. This checking is very slow, so for
-            the server you can avoid it when you don't need it by using
-            the <literal>--skip-safemalloc</literal> option.
+            <option>--with-debug=full</option>, all MySQL programs check 
+            for memory overruns during each memory allocation and memory 
+            freeing operation. This checking is very slow, so for the 
+            server you can avoid it when you do not need it by using the 
+            <option>--skip-safemalloc</option> option.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--skip-show-database</literal>
+            <option>--skip-show-database</option>
           </para>
 
           <para>
@@ -3801,11 +3071,11 @@
 
         <listitem>
           <para>
-            <literal>--skip-stack-trace</literal>
+            <option>--skip-stack-trace</option>
           </para>
 
           <para>
-            Don't write stack traces. This option is useful when you are
+            do not write stack traces. This option is useful when you are
             running <command>mysqld</command> under a debugger. On some
             systems, you also must use this option to get a core file.
             See <xref linkend="debugging-server"/>.
@@ -3814,7 +3084,7 @@
 
         <listitem>
           <para>
-            <literal>--skip-thread-priority</literal>
+            <option>--skip-thread-priority</option>
           </para>
 
           <para>
@@ -3824,18 +3094,14 @@
 
         <listitem>
           <para>
-            <literal>--socket=<replaceable>path</replaceable></literal>
-
-<!--  Put the Unix description first, because the option name relates directly -->
-          </para>
-
-          <para>
-<!--  to the Unix meaning. Putting the Windows meaning first makes this more -->
+            <option>--socket=<replaceable>path</replaceable></option>
           </para>
 
-          <para>
-<!--  confusing. -->
-          </para>
+<!--  
+      Put the Unix description first, because the option name relates 
+      directly to the Unix meaning. Putting the Windows meaning first 
+      makes this more confusing. 
+-->
 
           <para>
             On Unix, this option specifies the Unix socket file to use
@@ -3845,19 +3111,16 @@
             use a named pipe. The default value is
             <literal>MySQL</literal>.
           </para>
-
-          <para>
-<!--  TODO: some of these option values currently are unimplemented. -->
-          </para>
-
-          <para>
-<!--  Need to say which ones. -->
-          </para>
         </listitem>
+        
+<!--  
+      TODO: some of these option values currently are unimplemented. 
+      Need to say which ones. 
+-->
 
         <listitem>
           <para>
-            <literal>--sql-mode=<replaceable>value</replaceable>[,<replaceable>value</replaceable>[,<replaceable>value</replaceable>...]]</literal>
+            <option>--sql-mode=<replaceable>value</replaceable>[,<replaceable>value</replaceable>[,<replaceable>value</replaceable>...]]</option>
           </para>
 
           <para>
@@ -3869,7 +3132,7 @@
 
         <listitem>
           <para>
-            <literal>--temp-pool</literal>
+            <option>--temp-pool</option>
           </para>
 
           <para>
@@ -3878,14 +3141,14 @@
             name for each new file. This works around a problem in the
             Linux kernel dealing with creating many new files with
             different names. With the old behavior, Linux seems to
-            <quote>leak</quote> memory, because it's being allocated to
+            <quote>leak</quote> memory, because it is being allocated to
             the directory entry cache rather than to the disk cache.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--transaction-isolation=<replaceable>level</replaceable></literal>
+            <option>--transaction-isolation=<replaceable>level</replaceable></option>
           </para>
 
           <para>
@@ -3909,12 +3172,12 @@
             files. It might be useful if your default
             <literal>/tmp</literal> directory resides on a partition
             that is too small to hold temporary tables. Starting from
-            MySQL 4.1, this option accepts several paths that are used
+            MySQL 4.1.0, this option accepts several paths that are used
             in round-robin fashion. Paths should be separated by colon
             characters ('<literal>:</literal>') on Unix and semicolon
             characters ('<literal>;</literal>') on Windows, NetWare, and
             OS/2. If the MySQL server is acting as a replication slave,
-            you should not set <literal>--tmpdir</literal> to point to a
+            you should not set <option>--tmpdir</option> to point to a
             directory on a memory-based filesystem or to a directory
             that is cleared when the server host restarts. A replication
             slave needs some of its temporary files to survive a machine
@@ -3953,29 +3216,29 @@
           <para>
             Starting from MySQL 3.23.56 and 4.0.12: To avoid a possible
             security hole where a user adds a
-            <literal>--user=root</literal> option to some
+            <option>--user=root</option> option to a
             <filename>my.cnf</filename> file (thus causing the server to
             run as <literal>root</literal>), <command>mysqld</command>
-            uses only the first <literal>--user</literal> option
-            specified and produces a warning if there are multiple
-            <literal>--user</literal> options. Options in
+            uses only the first <option>--user</option> option specified 
+            and produces a warning if there are multiple
+            <option>--user</option> options. Options in
             <filename>/etc/my.cnf</filename> and
             <filename>$MYSQL_HOME/my.cnf</filename> are processed before
             command-line options, so it is recommended that you put a
-            <literal>--user</literal> option in
+            <option>--user</option> option in
             <filename>/etc/my.cnf</filename> and specify a value other
             than <literal>root</literal>. The option in
             <filename>/etc/my.cnf</filename> is found before any other
-            <literal>--user</literal> options, which ensures that the
+            <option>--user</option> options, which ensures that the
             server runs as a user other than <literal>root</literal>,
             and that a warning results if any other
-            <literal>--user</literal> option is found.
+            <option>--user</option> option is found.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>--version, -V</literal>
+            <option>--version, -V</option>
           </para>
 
           <para>
@@ -3988,8 +3251,8 @@
       <para>
         As of MySQL 4.0, you can assign a value to a server system
         variable by using an option of the form
-        <literal>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>.
-        For example, <literal>--key_buffer_size=32M</literal> sets the
+        <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>.
+        For example, <option>--key_buffer_size=32M</option> sets the
         <literal>key_buffer_size</literal> variable to a value of 32MB.
       </para>
 
@@ -4002,9 +3265,8 @@
 
       <para>
         It is also possible to set variables by using
-        <literal>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
-        or <literal>-O
-        <replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
+        <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+        or <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
         syntax. However, this syntax is deprecated as of MySQL 4.0.
       </para>
 
@@ -4025,7 +3287,7 @@
         If you want to restrict the maximum value that a startup option
         can be set to with <literal>SET</literal>, you can define this
         by using the
-        <literal>--maximum-<replaceable>var_name</replaceable></literal>
+        <option>--maximum-<replaceable>var_name</replaceable></option>
         command-line option.
       </para>
 
@@ -4052,9 +3314,9 @@
       <para>
         You can set the default SQL mode by starting
         <command>mysqld</command> with the
-        <literal>--sql-mode="<replaceable>modes</replaceable>"</literal>
+        <option>--sql-mode="<replaceable>modes</replaceable>"</option>
         option. The value also can be empty
-        (<literal>--sql-mode=""</literal>) if you want to reset it.
+        (<option>--sql-mode=""</option>) if you want to reset it.
       </para>
 
       <para>
@@ -4077,83 +3339,16 @@
         @@sql_mode</literal> statement. The default value is empty (no
         modes set).
       </para>
+      
+      <indexterm type="concept">
+        <primary>ANSI SQL mode</primary>
+      </indexterm>
 
       <para>
-        The most important <literal>sql_mode</literal> values are
-        probably these:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
-              <primary>ANSI SQL mode</primary>
-            </indexterm>
-
-            <literal>ANSI</literal>
-          </para>
-
-          <para>
-            Change syntax and behavior to be more conformant to standard
-            SQL. (New in MySQL 4.1.1)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
-              <primary>STRICT_TRANS_TABLES SQL mode</primary>
-            </indexterm>
-
-            <literal>STRICT_TRANS_TABLES</literal>
-          </para>
-
-          <para>
-            If a value could not be inserted as given into a
-            transactional table, abort the statement. For a
-            non-transactional table, abort the statement if the value
-            occurs in a single-row statement or the first row of a
-            multiple-row statement. More detail is given later in this
-            section. (New in MySQL 5.0.2)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
-              <primary>TRADITIONAL SQL mode</primary>
-            </indexterm>
-
-            <literal>TRADITIONAL</literal>
-          </para>
-
-          <para>
-            Make MySQL behave like a <quote>traditional</quote> SQL
-            database system. A simple description of this mode is
-            <quote>give an error instead of a warning</quote> when
-            inserting an incorrect value into a column.
-            <emphasis role="bold">Note</emphasis>: The
-            <literal>INSERT</literal>/<literal>UPDATE</literal> aborts
-            as soon as the error is noticed. This may not be what you
-            want if you are using a non-transactional storage engine,
-            because data changes made prior to the error are not be
-            rolled back, resulting in a <quote>partially done</quote>
-            update. (New in MySQL 5.0.2)
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      <para>
-        <indexterm type="concept">
-          <primary>STRICT SQL mode</primary>
-        </indexterm>
-
-        When this manual refers to <quote>strict mode,</quote> it means
-        a mode where at least one of
-        <literal>STRICT_TRANS_TABLES</literal> or
-        <literal>STRICT_ALL_TABLES</literal> is enabled.
+        The most important <literal>sql_mode</literal> value is 
+        <literal>ANSI</literal>, which changes syntax and behavior to be 
+        more conformant to standard SQL. This mode is available 
+        beginning in MySQL 4.1.1
       </para>
 
       <para>
@@ -4165,39 +3360,6 @@
         <listitem>
           <para>
             <indexterm type="concept">
-              <primary>ALLOW_INVALID_DATES SQL mode</primary>
-            </indexterm>
-
-            <literal>ALLOW_INVALID_DATES</literal>
-          </para>
-
-          <para>
-            Don't do full checking of dates in strict mode. Check only
-            that the month is in the range from 1 to 12 and the day is
-            in the range from 1 to 31. This is very convenient for Web
-            applications where you obtain year, month, and day in three
-            different fields and you want to store exactly what the user
-            inserted (without date validation). This mode applies to
-            <literal>DATE</literal> and <literal>DATETIME</literal>
-            columns. It does not apply <literal>TIMESTAMP</literal>
-            columns, which always require a valid date.
-          </para>
-
-          <para>
-            This mode is new in MySQL 5.0.2. Before 5.0.2, this was the
-            default MySQL date-handling mode. As of 5.0.2, enabling
-            strict mode causes the server to require that month and day
-            values be legal, not just in the range from 1 to 12 and 1 to
-            31. For example, <literal>'2004-04-31'</literal> is legal
-            with strict mode disabled, but illegal with strict mode
-            enabled. To allow such dates in strict mode, enable
-            <literal>ALLOW_INVALID_DATES</literal> as well.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
               <primary>ANSI_QUOTES SQL mode</primary>
             </indexterm>
 
@@ -4218,62 +3380,6 @@
         <listitem>
           <para>
             <indexterm type="concept">
-              <primary>ERROR_FOR_DIVISION_BY_ZERO SQL mode</primary>
-            </indexterm>
-
-            <literal>ERROR_FOR_DIVISION_BY_ZERO</literal>
-          </para>
-
-          <para>
-            Produce an error in strict mode (otherwise a warning) when
-            we encounter a division by zero (or
-            <literal>MOD(X,0)</literal>) during an
-            <literal>INSERT</literal> or <literal>UPDATE</literal>, or
-            in any expression (for example, in a select list or
-            <literal>WHERE</literal> clause) that involves table data
-            and a division by zero. If this mode is not given, MySQL
-            instead returns <literal>NULL</literal> for divisions by
-            zero. If used in <literal>INSERT IGNORE</literal> or
-            <literal>UPDATE IGNORE</literal>, MySQL generates a warning
-            for divisions by zero, but the result of the operation is
-            <literal>NULL</literal>. (New in MySQL 5.0.2)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
-              <primary>HIGH_NOT_PRECEDENCE SQL mode</primary>
-            </indexterm>
-
-            <literal>HIGH_NOT_PRECEDENCE</literal>
-          </para>
-
-          <para>
-            From MySQL 5.0.2 on, the <literal>NOT</literal> operator
-            precedence is handled so that expressions such as
-            <literal>NOT a BETWEEN b AND c</literal> are parsed as
-            <literal>NOT (a BETWEEN b AND c)</literal>. Before MySQL
-            5.0.2, the expression is parsed as <literal>(NOT a) BETWEEN
-            b AND c</literal>. The old higher-precedence behavior can be
-            obtained by enabling the
-            <literal>HIGH_NOT_PRECEDENCE</literal> SQL mode. (New in
-            MySQL 5.0.2)
-          </para>
-
-<programlisting>
-mysql&gt; SET sql_mode = '';
-mysql&gt; SELECT NOT 1 BETWEEN -5 AND 5;
-        -&gt; 0
-mysql&gt; SET sql_mode = 'broken_not';
-mysql&gt; SELECT NOT 1 BETWEEN -5 AND 5;
-        -&gt; 1
-</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
               <primary>IGNORE_SPACE SQL mode</primary>
             </indexterm>
 
@@ -4291,13 +3397,11 @@
             <literal>mysql</literal> database and the
             <literal>User</literal> column in that table become
             reserved, so you must quote them:
-          </para>
 
 <programlisting>
 SELECT "User" FROM mysql."user";
 </programlisting>
 
-          <para>
             (New in MySQL 4.0.0)
           </para>
         </listitem>
@@ -4305,22 +3409,6 @@
         <listitem>
           <para>
             <indexterm type="concept">
-              <primary>NO_AUTO_CREATE_USER SQL mode</primary>
-            </indexterm>
-
-            <literal>NO_AUTO_CREATE_USER</literal>
-          </para>
-
-          <para>
-            Prevent <literal>GRANT</literal> from automatically creating
-            new users if it would otherwise do so, unless a password
-            also is specified. (New in MySQL 5.0.2)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
               <primary>NO_AUTO_VALUE_ON_ZERO SQL mode</primary>
             </indexterm>
 
@@ -4359,23 +3447,6 @@
         <listitem>
           <para>
             <indexterm type="concept">
-              <primary>NO_BACKSLASH_ESCAPES SQL mode</primary>
-            </indexterm>
-
-            <literal>NO_BACKSLASH_ESCAPES</literal>
-          </para>
-
-          <para>
-            Disable the use of the backslash character
-            ('<literal>\</literal>') as an escape character within
-            strings. With this mode enabled, backslash becomes any
-            ordinary character like any other. (New in MySQL 5.0.1)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
               <primary>NO_DIR_IN_CREATE SQL mode</primary>
             </indexterm>
 
@@ -4390,6 +3461,8 @@
           </para>
         </listitem>
 
+<!--  [js]  Does not appear to be available in 4.1? -->
+<!--
         <listitem>
           <para>
             <literal>NO_ENGINE_SUBSTITUTION</literal>
@@ -4400,7 +3473,7 @@
             requested storage engine is disabled or not compiled in.
           </para>
         </listitem>
-
+-->
         <listitem>
           <para>
             <indexterm type="concept">
@@ -4411,7 +3484,7 @@
           </para>
 
           <para>
-            Don't print MySQL-specific column options in the output of
+            do not print MySQL-specific column options in the output of
             <literal>SHOW CREATE TABLE</literal>. This mode is used by
             <command>mysqldump</command> in portability mode. (New in
             MySQL 4.1.1)
@@ -4428,7 +3501,7 @@
           </para>
 
           <para>
-            Don't print MySQL-specific index options in the output of
+            do not print MySQL-specific index options in the output of
             <literal>SHOW CREATE TABLE</literal>. This mode is used by
             <command>mysqldump</command> in portability mode. (New in
             MySQL 4.1.1)
@@ -4445,7 +3518,7 @@
           </para>
 
           <para>
-            Don't print MySQL-specific table options (such as
+            do not print MySQL-specific table options (such as
             <literal>ENGINE</literal>) in the output of <literal>SHOW
             CREATE TABLE</literal>. This mode is used by
             <command>mysqldump</command> in portability mode. (New in
@@ -4463,7 +3536,7 @@
           </para>
 
           <para>
-            In subtraction operations, don't mark the result as
+            In subtraction operations, do not mark the result as
             <literal>UNSIGNED</literal> if one of the operands is
             unsigned. Note that this makes <literal>UNSIGNED
             BIGINT</literal> not 100% usable in all contexts. See
@@ -4474,42 +3547,6 @@
         <listitem>
           <para>
             <indexterm type="concept">
-              <primary>NO_ZERO_DATE SQL mode</primary>
-            </indexterm>
-
-            <literal>NO_ZERO_DATE</literal>
-          </para>
-
-          <para>
-            In strict mode, don't allow <literal>'0000-00-00'</literal>
-            as a valid date. You can still insert zero dates with the
-            <literal>IGNORE</literal> option. When not in strict mode,
-            the date is accepted but a warning is generated. (New in
-            MySQL 5.0.2)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
-              <primary>NO_ZERO_IN_DATE SQL mode</primary>
-            </indexterm>
-
-            <literal>NO_ZERO_IN_DATE</literal>
-          </para>
-
-          <para>
-            In strict mode, don't accept dates where the month or day
-            part is 0. If used with the <literal>IGNORE</literal>
-            option, we insert a <literal>'0000-00-00'</literal> date for
-            any such date. When not in strict mode, the date is accepted
-            but a warning is generated. (New in MySQL 5.0.2)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
               <primary>ONLY_FULL_GROUP_BY SQL mode</primary>
             </indexterm>
 
@@ -4517,7 +3554,7 @@
           </para>
 
           <para>
-            Don't allow queries that in the <literal>GROUP BY</literal>
+            Do not allow queries that in the <literal>GROUP BY</literal>
             part refer to a not selected column. (New in MySQL 4.0.0)
           </para>
         </listitem>
@@ -4554,119 +3591,12 @@
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            <indexterm type="concept">
-              <primary>STRICT_ALL_TABLES SQL mode</primary>
-            </indexterm>
-
-            <literal>STRICT_ALL_TABLES</literal>
-          </para>
-
-          <para>
-            Enable strict mode for all storage engines. Invalid data
-            values are rejected. Additional detail follows. (New in
-            MySQL 5.0.2)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <indexterm type="concept">
-              <primary>STRICT_TRANS_TABLES SQL mode</primary>
-            </indexterm>
-
-            <literal>STRICT_TRANS_TABLES</literal>
-          </para>
-
-          <para>
-            Enable strict mode for transactional storage engines, and
-            when possible for non-transactional storage engines.
-            Additional detail follows. (New in MySQL 5.0.2)
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      <para>
-        Strict mode controls how MySQL handles input values that are
-        invalid or missing. A value can be invalid for several reasons.
-        For example, it might have the wrong data type for the column,
-        or it might be out of range. A value is missing when a new row
-        to be inserted does not contain a value for a column that has no
-        explicit <literal>DEFAULT</literal> clause in its definition.
-      </para>
-
-      <para>
-        For transactional tables, an error occurs for invalid or missing
-        values in a statement when either of the
-        <literal>STRICT_ALL_TABLES</literal> or
-        <literal>STRICT_TRANS_TABLES</literal> modes are enabled. The
-        statement is aborted and rolled back.
-      </para>
-
-      <para>
-        For non-transactional tables, the behavior is the same for
-        either mode, if the bad value occurs in the first row to be
-        inserted or updated. The statement is aborted and the table
-        remains unchanged. If the statement inserts or modifies multiple
-        rows and the bad value occurs in the second or later row, the
-        result depends on which strict option is enabled:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            For <literal>STRICT_ALL_TABLES</literal>, MySQL returns an
-            error and ignores the rest of the rows. However, in this
-            case, the earlier rows still have been inserted or updated.
-            This means that you might get a partial update, which might
-            not be what you want. To avoid this, it's best to use
-            single-row statements because these can be aborted without
-            changing the table.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            For <literal>STRICT_TRANS_TABLES</literal>, MySQL converts
-            an invalid value to the closest valid value for the column
-            and insert the adjusted value. If a value is missing, MySQL
-            inserts the implicit default value for the column data type.
-            In either case, MySQL generates a warning rather than an
-            error and continues processing the statement. Implicit
-            defaults are described in <xref linkend="create-table"/>.
-          </para>
-        </listitem>
-
       </itemizedlist>
 
       <para>
-        Strict mode disallows invalid date values such as
-        <literal>'2004-04-31'</literal>. It does not disallow dates with
-        zero parts such as <literal>2004-04-00'</literal> or
-        <quote>zero</quote> dates. To disallow these as well, enable the
-        <literal>NO_ZERO_IN_DATE</literal> and
-        <literal>NO_ZERO_DATE</literal> SQL modes in addition to strict
-        mode.
-      </para>
-
-      <para>
-        If you are not using strict mode (that is, neither
-        <literal>STRICT_TRANS_TABLES</literal> nor
-        <literal>STRICT_ALL_TABLES</literal> is enabled), MySQL inserts
-        adjusted values for invalid or missing values and produces
-        warnings. In strict mode, you can produce this behavior by using
-        <literal>INSERT IGNORE</literal> or <literal>UPDATE
-        IGNORE</literal>. See <xref linkend="show-warnings"/>.
-      </para>
-
-      <para>
         The following special modes are provided as shorthand for
         combinations of mode values from the preceding list. All are
-        available as of MySQL 4.1.1, except
-        <literal>TRADITIONAL</literal> (5.0.2).
+        available as of MySQL 4.1.1.
       </para>
 
       <para>
@@ -4691,8 +3621,8 @@
             Equivalent to <literal>REAL_AS_FLOAT</literal>,
             <literal>PIPES_AS_CONCAT</literal>,
             <literal>ANSI_QUOTES</literal>,
-            <literal>IGNORE_SPACE</literal>. Before MySQL 4.1.11 and
-            5.0.3, <literal>ANSI</literal> also includes
+            <literal>IGNORE_SPACE</literal>. Before MySQL 4.1.11, 
+            <literal>ANSI</literal> also includes
             <literal>ONLY_FULL_GROUP_BY</literal>. See
             <xref linkend="ansi-mode"/>.
           </para>
@@ -4825,31 +3755,12 @@
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            <indexterm type="concept">
-              <primary>TRADITIONAL SQL mode</primary>
-            </indexterm>
-
-            <literal>TRADITIONAL</literal>
-          </para>
-
-          <para>
-            Equivalent to <literal>STRICT_TRANS_TABLES</literal>,
-            <literal>STRICT_ALL_TABLES</literal>,
-            <literal>NO_ZERO_IN_DATE</literal>,
-            <literal>NO_ZERO_DATE</literal>,
-            <literal>ERROR_FOR_DIVISION_BY_ZERO</literal>,
-            <literal>NO_AUTO_CREATE_USER</literal>.
-          </para>
-        </listitem>
-
       </itemizedlist>
 
-<!--  TODO: not a great node name; there is also a System Variables node. -->
-
     </section>
 
+<!--  TODO: not a great node name; there is also a System Variables node. -->
+
     <section id="server-system-variables">
 
       <title id='title-server-system-variables'>&title-server-system-variables;</title>
@@ -4880,9 +3791,10 @@
         <literal>SET</literal> statement.
       </para>
 
-<!--  NOTE: next few paragraphs also appear in @node System Variables. -->
-
-<!--  If you make changes one place, change them both. -->
+<!--  
+      NOTE: The next few paragraphs also appear in system-variables. If 
+      you make changes one place, change them both. 
+-->
 
       <para>
         Beginning with MySQL 4.0.3, the <command>mysqld</command> server
@@ -4986,11 +3898,11 @@
         If you want to restrict the maximum value to which a system
         variable can be set with the <literal>SET</literal> statement,
         you can specify this maximum by using an option of the form
-        <literal>--maximum-<replaceable>var_name</replaceable></literal>
+        <option>--maximum-<replaceable>var_name</replaceable></option>
         at server startup. For example, to prevent the value of
         <literal>query_cache_size</literal> from being increased to more
         than 32MB at runtime, use the option
-        <literal>--maximum-query_cache_size=32M</literal>. This feature
+        <option>--maximum-query_cache_size=32M</option>. This feature
         is available as of MySQL 4.0.2.
       </para>
 
@@ -5002,198 +3914,204 @@
 
 <programlisting>
 mysql&gt; SHOW VARIABLES;
-+---------------------------------+-------------------------------------------------------------+
-| Variable_name                   | Value                                                       |
-+---------------------------------+-------------------------------------------------------------+
-| auto_increment_increment        | 1                                                           |
-| auto_increment_offset           | 1                                                           |
-| back_log                        | 50                                                          |
-| basedir                         | /usr/local/mysql                                            |
-| bdb_cache_size                  | 8388600                                                     |
-| bdb_home                        | /usr/local/mysql                                            |
-| bdb_log_buffer_size             | 131072                                                      |
-| bdb_logdir                      |                                                             |
-| bdb_max_lock                    | 10000                                                       |
-| bdb_shared_data                 | OFF                                                         |
-| bdb_tmpdir                      | /tmp/                                              |
-| binlog_cache_size               | 32768                                                       |
-| bulk_insert_buffer_size         | 8388608                                                     |
-| character_set_client            | latin1                                                      |
-| character_set_connection        | latin1                                                      |
-| character_set_database          | latin1                                                      |
-| character_set_results           | latin1                                                      |
-| character_set_server            | latin1                                                      |
-| character_set_system            | utf8                                                        |
-| character_sets_dir              | /usr/local/mysql/share/charsets/                            |
-| collation_connection            | latin1_swedish_ci                                           |
-| collation_database              | latin1_swedish_ci                                           |
-| collation_server                | latin1_swedish_ci                                           |
-| concurrent_insert               | 1                                                           |
-| connect_timeout                 | 5                                                           |
-| datadir                         | /usr/local/mysql/data/                                      |
-| date_format                     | %Y-%m-%d                                                    |
-| datetime_format                 | %Y-%m-%d %H:%i:%s                                           |
-| default_week_format             | 0                                                           |
-| delay_key_write                 | ON                                                          |
-| delayed_insert_limit            | 100                                                         |
-| delayed_insert_timeout          | 300                                                         |
-| delayed_queue_size              | 1000                                                        |
-| expire_logs_days                | 0                                                           |
-| flush                           | OFF                                                         |
-| flush_time                      | 1800                                                        |
-| ft_boolean_syntax               | + -&gt;&lt;()~*:""&amp;|                                              |
-| ft_max_word_len                 | 84                                                          |
-| ft_min_word_len                 | 4                                                           |
-| ft_query_expansion_limit        | 20                                                          |
-| ft_stopword_file                | (built-in)                                                  |
-| group_concat_max_len            | 1024                                                        |
-| have_archive                    | NO                                                          |
-| have_bdb                        | YES                                                         |
-| have_compress                   | YES                                                         |
-| have_crypt                      | NO                                                          |
-| have_csv                        | NO                                                          |
-| have_example_engine             | NO                                                          |
-| have_geometry                   | YES                                                         |
-| have_innodb                     | YES                                                         |
-| have_isam                       | NO                                                          |
-| have_ndbcluster                 | NO                                                          |
-| have_openssl                    | YES                                                         |
-| have_query_cache                | YES                                                         |
-| have_raid                       | NO                                                          |
-| have_rtree_keys                 | YES                                                         |
-| have_symlink                    | YES                                                         |
-| init_connect                    |                                                             |
-| init_file                       |                                                             |
-| init_slave                      |                                                             |
-| innodb_additional_mem_pool_size | 2097152                                                     |
-| innodb_autoextend_increment     | 8                                                           |
-| innodb_buffer_pool_awe_mem_mb   | 0                                                           |
-| innodb_buffer_pool_size         | 8388608                                                     |
-| innodb_data_file_path           | ibdata1:10M:autoextend                                      |
-| innodb_data_home_dir            |                                                             |
-| innodb_fast_shutdown            | 1                                                           |
-| innodb_file_io_threads          | 4                                                           |
-| innodb_file_per_table           | OFF                                                         |
-| innodb_locks_unsafe_for_binlog  | OFF                                                         |
-| innodb_flush_log_at_trx_commit  | 1                                                           |
-| innodb_flush_method             |                                                             |
-| innodb_force_recovery           | 0                                                           |
-| innodb_lock_wait_timeout        | 50                                                          |
-| innodb_log_arch_dir             |                                                             |
-| innodb_log_archive              | OFF                                                         |
-| innodb_log_buffer_size          | 1048576                                                     |
-| innodb_log_file_size            | 10485760                                                    |
-| innodb_log_files_in_group       | 2                                                           |
-| innodb_log_group_home_dir       | ./                                                          |
-| innodb_max_dirty_pages_pct      | 90                                                          |
-| innodb_max_purge_lag            | 0                                                           |
-| innodb_mirrored_log_groups      | 1                                                           |
-| innodb_open_files               | 300                                                         |
-| innodb_table_locks              | ON                                                          |
-| innodb_thread_concurrency       | 8                                                           |
-| interactive_timeout             | 28800                                                       |
-| join_buffer_size                | 131072                                                      |
-| key_buffer_size                 | 4194304                                                     |
-| key_cache_age_threshold         | 300                                                         |
-| key_cache_block_size            | 1024                                                        |
-| key_cache_division_limit        | 100                                                         |
-| language                        | /usr/local/mysql/share/english/                             |
-| large_files_support             | ON                                                          |
-| license                         | GPL                                                         |
-| local_infile                    | ON                                                          |
-| log                             | OFF                                                         |
-| log_bin                         | OFF                                                         |
-| log_error                       | ./gigan.err                                                 |
-| log_slave_updates               | OFF                                                         |
-| log_slow_queries                | OFF                                                         |
-| log_update                      | OFF                                                         |
-| log_warnings                    | 1                                                           |
-| long_query_time                 | 10                                                          |
-| low_priority_updates            | OFF                                                         |
-| lower_case_file_system          | OFF                                                         |
-| lower_case_table_names          | 1                                                           |
-| max_allowed_packet              | 1048576                                                     |
-| max_binlog_cache_size           | 4294967295                                                  |
-| max_binlog_size                 | 1073741824                                                  |
-| max_connect_errors              | 10                                                          |
-| max_connections                 | 100                                                         |
-| max_delayed_threads             | 20                                                          |
-| max_error_count                 | 64                                                          |
-| max_heap_table_size             | 16777216                                                    |
-| max_insert_delayed_threads      | 20                                                          |
-| max_join_size                   | 4294967295                                                  |
-| max_length_for_sort_data        | 1024                                                        |
-| max_relay_log_size              | 0                                                           |
-| max_seeks_for_key               | 4294967295                                                  |
-| max_sort_length                 | 1024                                                        |
-| max_tmp_tables                  | 32                                                          |
-| max_user_connections            | 0                                                           |
-| max_write_lock_count            | 4294967295                                                  |
-| myisam_data_pointer_size        | 4                                                           |
-| myisam_max_sort_file_size       | 107374182400                                                |
-| myisam_recover_options          | OFF                                                         |
-| myisam_repair_threads           | 1                                                           |
-| myisam_sort_buffer_size         | 8388608                                                     |
-| named_pipe                      | OFF                                                         |
-| net_buffer_length               | 16384                                                       |
-| net_read_timeout                | 30                                                          |
-| net_retry_count                 | 10                                                          |
-| net_write_timeout               | 60                                                          |
-| new                             | OFF                                                         |
-| old_passwords                   | OFF                                                         |
-| open_files_limit                | 622                                                         |
-| optimizer_prune_level           | 1                                                           |
-| optimizer_search_depth          | 62                                                          |
-| pid_file                        | /usr/local/mysql/gigan.pid                                  |
-| port                            | 3306                                                        |
-| preload_buffer_size             | 32768                                                       |
-| protocol_version                | 10                                                          |
-| query_alloc_block_size          | 8192                                                        |
-| query_cache_limit               | 1048576                                                     |
-| query_cache_min_res_unit        | 4096                                                        |
-| query_cache_size                | 0                                                           |
-| query_cache_type                | ON                                                          |
-| query_cache_wlock_invalidate    | OFF                                                         |
-| query_prealloc_size             | 8192                                                        |
-| range_alloc_block_size          | 2048                                                        |
-| read_buffer_size                | 61440                                                       |
-| read_only                       | OFF                                                         |
-| read_rnd_buffer_size            | 258048                                                      |
-| relay_log_purge                 | ON                                                          |
-| rpl_recovery_rank               | 0                                                           |
-| secure_auth                     | OFF                                                         |
-| shared_memory                   | OFF                                                         |
-| shared_memory_base_name         | MYSQL                                                       |
-| server_id                       | 0                                                           |
-| skip_external_locking           | ON                                                          |
-| skip_networking                 | OFF                                                         |
-| skip_show_database              | OFF                                                         |
-| slave_net_timeout               | 3600                                                        |
-| slow_launch_time                | 2                                                           |
-| socket                          | /tmp/mysql.sock                                             |
-| sort_buffer_size                | 217080                                                      |
-| sql_mode                        |                                                             |
-| storage_engine                  | MyISAM                                                      |
-| sync_binlog                     | 0                                                           |
-| sync_frm                        | ON                                                          |
-| system_time_zone                | E. Australia Standard Time                                  |
-| table_cache                     | 256                                                         |
-| table_type                      | MyISAM                                                      |
-| thread_cache_size               | 0                                                           |
-| thread_stack                    | 196608                                                      |
-| time_format                     | %H:%i:%s                                                    |
-| time_zone                       | SYSTEM                                                      |
-| tmp_table_size                  | 5242880                                                     |
-| tmpdir                          | /tmp/                                                       |
-| transaction_alloc_block_size    | 8192                                                        |
-| transaction_prealloc_size       | 4096                                                        |
-| tx_isolation                    | REPEATABLE-READ                                             |
-| updatable_views_with_limit      | YES                                                         |
-| version                         | 5.0.2-alpha-max                                             |
-| version_bdb                     | Sleepycat Software: Berkeley DB 4.1.24: (December  1, 2004) |
-| version_comment                 | Source distribution                                         |
-| wait_timeout                    | 28800                                                       |
-+---------------------------------+-------------------------------------------------------------+
++---------------------------------+---------------------------------------------------------+
+| Variable_name                   | Value                                                   |
++---------------------------------+---------------------------------------------------------+
+| back_log                        | 50                                                      |
+| basedir                         | /usr/local/mysql                                        |
+| bdb_cache_size                  | 8388600                                                 |
+| bdb_home                        | /usr/local/mysql                                        |
+| bdb_log_buffer_size             | 32768                                                   |
+| bdb_logdir                      |                                                         |
+| bdb_max_lock                    | 10000                                                   |
+| bdb_shared_data                 | OFF                                                     |
+| bdb_tmpdir                      | /tmp/                                                   |
+| binlog_cache_size               | 32768                                                   |
+| bulk_insert_buffer_size         | 8388608                                                 |
+| character_set_client            | latin1                                                  |
+| character_set_connection        | latin1                                                  |
+| character_set_database          | latin1                                                  |
+| character_set_results           | latin1                                                  |
+| character_set_server            | latin1                                                  |
+| character_set_system            | utf8                                                    |
+| character_sets_dir              | /usr/local/mysql/share/charsets/                        |
+| collation_connection            | latin1_swedish_ci                                       |
+| collation_database              | latin1_swedish_ci                                       |
+| collation_server                | latin1_swedish_ci                                       |
+| concurrent_insert               | ON                                                      |
+| connect_timeout                 | 5                                                       |
+| datadir                         | /usr/local/mysql/data/                                          |
+| date_format                     | %Y-%m-%d                                                |
+| datetime_format                 | %Y-%m-%d %H:%i:%s                                       |
+| default_week_format             | 0                                                       |
+| delay_key_write                 | ON                                                      |
+| delayed_insert_limit            | 100                                                     |
+| delayed_insert_timeout          | 300                                                     |
+| delayed_queue_size              | 1000                                                    |
+| expire_logs_days                | 0                                                       |
+| flush                           | OFF                                                     |
+| flush_time                      | 1800                                                    |
+| ft_boolean_syntax               | + -&gt;&lt;()~*:""&amp;|                                          |
+| ft_max_word_len                 | 84                                                      |
+| ft_min_word_len                 | 4                                                       |
+| ft_query_expansion_limit        | 20                                                      |
+| ft_stopword_file                | (built-in)                                              |
+| group_concat_max_len            | 1024                                                    |
+| have_archive                    | NO                                                      |
+| have_bdb                        | YES                                                     |
+| have_blackhole_engine           | NO                                                      |
+| have_compress                   | YES                                                     |
+| have_crypt                      | NO                                                      |
+| have_csv                        | NO                                                      |
+| have_example_engine             | NO                                                      |
+| have_geometry                   | YES                                                     |
+| have_innodb                     | YES                                                     |
+| have_isam                       | NO                                                      |
+| have_ndbcluster                 | NO                                                      |
+| have_openssl                    | NO                                                      |
+| have_query_cache                | YES                                                     |
+| have_raid                       | NO                                                      |
+| have_rtree_keys                 | YES                                                     |
+| have_symlink                    | YES                                                     |
+| init_connect                    |                                                         |
+| init_file                       |                                                         |
+| init_slave                      |                                                         |
+| innodb_additional_mem_pool_size | 1048576                                                 |
+| innodb_autoextend_increment     | 8                                                       |
+| innodb_buffer_pool_awe_mem_mb   | 0                                                       |
+| innodb_buffer_pool_size         | 8388608                                                 |
+| innodb_data_file_path           | ibdata1:10M:autoextend                                  |
+| innodb_data_home_dir            |                                                         |
+| innodb_fast_shutdown            | ON                                                      |
+| innodb_file_io_threads          | 4                                                       |
+| innodb_file_per_table           | OFF                                                     |
+| innodb_flush_log_at_trx_commit  | 1                                                       |
+| innodb_flush_method             |                                                         |
+| innodb_force_recovery           | 0                                                       |
+| innodb_lock_wait_timeout        | 50                                                      |
+| innodb_locks_unsafe_for_binlog  | OFF                                                     |
+| innodb_log_arch_dir             |                                                         |
+| innodb_log_archive              | OFF                                                     |
+| innodb_log_buffer_size          | 1048576                                                 |
+| innodb_log_file_size            | 5242880                                                 |
+| innodb_log_files_in_group       | 2                                                       |
+| innodb_log_group_home_dir       | ./                                                      |
+| innodb_max_dirty_pages_pct      | 90                                                      |
+| innodb_max_purge_lag            | 0                                                       |
+| innodb_mirrored_log_groups      | 1                                                       |
+| innodb_open_files               | 300                                                     |
+| innodb_table_locks              | ON                                                      |
+| innodb_thread_concurrency       | 8                                                       |
+| interactive_timeout             | 28800                                                   |
+| join_buffer_size                | 131072                                                  |
+| key_buffer_size                 | 16777216                                                |
+| key_cache_age_threshold         | 300                                                     |
+| key_cache_block_size            | 1024                                                    |
+| key_cache_division_limit        | 100                                                     |
+| language                        | /usr/local/mysql/share/english/                         |
+| large_files_support             | ON                                                      |
+| license                         | GPL                                                     |
+| local_infile                    | ON                                                      |
+| log                             | ON                                                      |
+| log_bin                         | ON                                                      |
+| log_error                       | ./megalon.err                                           |
+| log_slave_updates               | OFF                                                     |
+| log_slow_queries                | OFF                                                     |
+| log_update                      | OFF                                                     |
+| log_warnings                    | 1                                                       |
+| long_query_time                 | 10                                                      |
+| low_priority_updates            | OFF                                                     |
+| lower_case_file_system          | OFF                                                     |
+| lower_case_table_names          | 1                                                       |
+| max_allowed_packet              | 1048576                                                 |
+| max_binlog_cache_size           | 4294967295                                              |
+| max_binlog_size                 | 1073741824                                              |
+| max_connect_errors              | 10                                                      |
+| max_connections                 | 100                                                     |
+| max_delayed_threads             | 20                                                      |
+| max_error_count                 | 64                                                      |
+| max_heap_table_size             | 16777216                                                |
+| max_insert_delayed_threads      | 20                                                      |
+| max_join_size                   | 4294967295                                              |
+| max_length_for_sort_data        | 1024                                                    |
+| max_relay_log_size              | 0                                                       |
+| max_seeks_for_key               | 4294967295                                              |
+| max_sort_length                 | 1024                                                    |
+| max_tmp_tables                  | 32                                                      |
+| max_user_connections            | 0                                                       |
+| max_write_lock_count            | 4294967295                                              |
+| myisam_data_pointer_size        | 4                                                       |
+| myisam_max_extra_sort_file_size | 2147483648                                              |
+| myisam_max_sort_file_size       | 2147483647                                              |
+| myisam_recover_options          | OFF                                                     |
+| myisam_repair_threads           | 1                                                       |
+| myisam_sort_buffer_size         | 8388608                                                 |
+| named_pipe                      | OFF                                                     |
+| net_buffer_length               | 16384                                                   |
+| net_read_timeout                | 30                                                      |
+| net_retry_count                 | 10                                                      |
+| net_write_timeout               | 60                                                      |
+| new                             | OFF                                                     |
+| old_passwords                   | OFF                                                     |
+| open_files_limit                | 510                                                     |
+| pid_file                        | /usr/local/mysql/megalon.pid                            |
+| port                            | 3306                                                    |
+| preload_buffer_size             | 32768                                                   |
+| protocol_version                | 10                                                      |
+| query_alloc_block_size          | 8192                                                    |
+| query_cache_limit               | 1048576                                                 |
+| query_cache_min_res_unit        | 4096                                                    |
+| query_cache_size                | 0                                                       |
+| query_cache_type                | ON                                                      |
+| query_cache_wlock_invalidate    | OFF                                                     |
+| query_prealloc_size             | 8192                                                    |
+| range_alloc_block_size          | 2048                                                    |
+| read_buffer_size                | 131072                                                  |
+| read_only                       | OFF                                                     |
+| read_rnd_buffer_size            | 262144                                                  |
+| relay_log_purge                 | ON                                                      |
+| relay_log_space_limit           | 0                                                       |
+| rpl_recovery_rank               | 0                                                       |
+| secure_auth                     | OFF                                                     |
+| shared_memory                   | OFF                                                     |
+| shared_memory_base_name         | MYSQL                                                   |
+| server_id                       | 1                                                       |
+| skip_external_locking           | ON                                                      |
+| skip_networking                 | OFF                                                     |
+| skip_show_database              | OFF                                                     |
+| slave_net_timeout               | 3600                                                    |
+| slave_transaction_retries       | 0                                                       |
+| slow_launch_time                | 2                                                       |
+| sort_buffer_size                | 2097144                                                 |
+| sql_mode                        |                                                         |
+| storage_engine                  | MyISAM                                                  |
+| sql_notes                       | ON                                                      |
+| sql_warnings                    | ON                                                      |
+| sync_binlog                     | 0                                                       |
+| sync_replication                | 0                                                       |
+| sync_replication_slave_id       | 0                                                       |
+| sync_replication_timeout        | 0                                                       |
+| sync_frm                        | ON                                                      |
+| system_time_zone                | E. Australia Standard Time                              |
+| table_cache                     | 64                                                      |
+| table_type                      | MyISAM                                                  |
+| thread_cache_size               | 0                                                       |
+| thread_stack                    | 196608                                                  |
+| time_format                     | %H:%i:%s                                                |
+| time_zone                       | SYSTEM                                                  |
+| tmp_table_size                  | 33554432                                                |
+| tmpdir                          |                                                         |
+| transaction_alloc_block_size    | 8192                                                    |
+| transaction_prealloc_size       | 4096                                                    |
+| tx_isolation                    | REPEATABLE-READ                                         |
+| version                         | 4.1.13-max-log                                          |
+| version_bdb                     | Sleepycat Software: Berkeley DB 4.1.24: (July 28, 2005) |
+| version_comment                 | MySQL Community Edition - Max (GPL)                     |
+| version_compile_machine         | i686                                                    |
+| version_compile_os              | pc-linux-gnu                                            |
+| wait_timeout                    | 28800                                                   |
++---------------------------------+---------------------------------------------------------+
+193 rows in set (0.00 sec)
 </programlisting>
 
       <indexterm type="concept">
@@ -5220,265 +4138,6 @@
 
       <itemizedlist>
 
-<!--   Need to move examples to appropriate section of Replication chapter once -->
-
-<!--   particulars of multiple-master replication setup are determined. (E.g. how -->
-
-<!--   to CHANGE MASTER TO in such circumstances.) -->
-
-        <listitem>
-          <para>
-            <literal>auto_increment_increment</literal>
-          </para>
-
-          <para>
-            <literal>auto_increment_increment</literal> and
-            <literal>auto_increment_offset</literal> are intended for
-            use with master-to-master replication, and can be used to
-            control the operation of <literal>AUTO_INCREMENT</literal>
-            columns. Both variables can be set globally or locally, and
-            each can assume an integer value between 1 and 65,535
-            inclusive. Setting the value of either of these two
-            variables to 0 will cause its value to be set to 1 instead.
-            Attempting to set the value of either of these two variables
-            to an integer greater than 65,535 or less than 0 will cause
-            its value to be set to 65,535 instead. Attempting to set the
-            value of <literal>auto_increment_increment</literal> or of
-            <literal>auto_increment_offset</literal> to a non-integer
-            value gives rise to an error, and the actual value of the
-            variable remains unchanged in such a case.
-          </para>
-
-          <para>
-            These two variables effect <literal>AUTO_INCREMENT</literal>
-            column behaviour as follows:
-          </para>
-
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                <literal>auto_increment_increment</literal> controls the
-                interval by which the column value is incremented. For
-                example:
-              </para>
-
-<programlisting>
-  mysql&gt; SHOW VARIABLES LIKE 'auto_inc%';
-  +--------------------------+-------+
-  | Variable_name            | Value |
-  +--------------------------+-------+
-  | auto_increment_increment | 1     |
-  | auto_increment_offset    | 1     |
-  +--------------------------+-------+
-  2 rows in set (0.00 sec)
-
-  mysql&gt; CREATE TABLE autoinc1 (col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
-  Query OK, 0 rows affected (0.04 sec)
-
-  mysql&gt; SET @auto_increment_increment=10;
-  Query OK, 0 rows affected (0.00 sec)
-
-  mysql&gt; SHOW VARIABLES LIKE 'auto_inc%';
-  +--------------------------+-------+
-  | Variable_name            | Value |
-  +--------------------------+-------+
-  | auto_increment_increment | 10    |
-  | auto_increment_offset    | 1     |
-  +--------------------------+-------+
-  2 rows in set (0.01 sec)
-
-  mysql&gt; INSERT INTO autoinc1 VALUES (NULL), (NULL), (NULL), (NULL);
-  Query OK, 4 rows affected (0.00 sec)
-  Records: 4  Duplicates: 0  Warnings: 0
-
-  mysql&gt; SELECT col FROM autoinc1;
-  +-----+
-  | col |
-  +-----+
-  |   1 |
-  |  11 |
-  |  21 |
-  |  31 |
-  +-----+
-  4 rows in set (0.00 sec)
-</programlisting>
-
-              <para>
-                (Note how <literal>SHOW VARIABLES</literal> is used here
-                to obtain the current values for these variables.)
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <literal>auto_increment_offset</literal> determines the
-                starting point for the <literal>AUTO_INCREMENT</literal>
-                column value. Consider the following, assuming that
-                these commands are executed during the same session as
-                the previous example:
-              </para>
-
-<programlisting>
-  mysql&gt; SET @auto_increment_offset=5;
-  Query OK, 0 rows affected (0.00 sec)
-
-  mysql&gt; SHOW VARIABLES LIKE 'auto_inc%';
-  +--------------------------+-------+
-  | Variable_name            | Value |
-  +--------------------------+-------+
-  | auto_increment_increment | 10    |
-  | auto_increment_offset    | 5     |
-  +--------------------------+-------+
-  2 rows in set (0.00 sec)
-
-  mysql&gt; CREATE TABLE autoinc2 (col INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
-  Query OK, 0 rows affected (0.06 sec)
-
-  mysql&gt; INSERT INTO autoinc2 VALUES (NULL), (NULL), (NULL), (NULL);
-  Query OK, 4 rows affected (0.00 sec)
-  Records: 4  Duplicates: 0  Warnings: 0
-
-  mysql&gt; SELECT col FROM autoinc2;
-  +-----+
-  | col |
-  +-----+
-  |   5 |
-  |  15 |
-  |  25 |
-  |  35 |
-  +-----+
-  4 rows in set (0.02 sec)
-
-</programlisting>
-
-              <para>
-                If the value of <literal>auto_increment_offset</literal>
-                is greater than that of
-                <literal>auto_increment_increment</literal>, then the
-                value of <literal>auto_increment_offset</literal> is
-                ignored.
-              </para>
-            </listitem>
-
-          </itemizedlist>
-
-          <para>
-            Should one or both of these variables be changed and then
-            new rows inserted into a table containing an
-            <literal>AUTO_INCREMENT</literal> column, the results may
-            seem counterintuitive, as the series of
-            <literal>AUTO_INCREMENT</literal> values is calculated
-            without regard to any values already present in the column,
-            and the next value inserted is the least value in the series
-            that is greater than the maximum existing value in the
-            <literal>AUTO_INCREMENT</literal> column. In other words,
-            the series is calculated like so:
-          </para>
-
-          <para>
-            <literal>auto_increment_offset +
-            <replaceable>N</replaceable> *
-            auto_increment_increment</literal>
-          </para>
-
-          <para>
-            where <replaceable>N</replaceable> is a positive integer
-            value in the series [1, 2, 3, ...]. For example:
-          </para>
-
-<programlisting>
-mysql&gt; SHOW VARIABLES LIKE 'auto_inc%';
-+--------------------------+-------+
-| Variable_name            | Value |
-+--------------------------+-------+
-| auto_increment_increment | 10    |
-| auto_increment_offset    | 5     |
-+--------------------------+-------+
-2 rows in set (0.00 sec)
-
-mysql&gt; SELECT col FROM autoinc1;
-+-----+
-| col |
-+-----+
-|   1 |
-|  11 |
-|  21 |
-|  31 |
-+-----+
-4 rows in set (0.00 sec)
-
-mysql&gt; INSERT INTO autoinc1 VALUES (NULL), (NULL), (NULL), (NULL);
-Query OK, 4 rows affected (0.00 sec)
-Records: 4  Duplicates: 0  Warnings: 0
-
-mysql&gt; SELECT col FROM autoinc1;
-+-----+
-| col |
-+-----+
-|   1 |
-|  11 |
-|  21 |
-|  31 |
-|  35 |
-|  45 |
-|  55 |
-|  65 |
-+-----+
-8 rows in set (0.00 sec)
-</programlisting>
-
-          <para>
-            The values shown for
-            <literal>auto_increment_increment</literal> and
-            <literal>auto_increment_offset</literal> generate the series
-            5 + <replaceable>N</replaceable> * 10, that is, [5, 15, 25,
-            35, 45, ...]. The greatest value present in the
-            <literal>col</literal> column prior to the
-            <literal>INSERT</literal> is 31, and the next available
-            value in the <literal>AUTO_INCREMENT</literal> series is 35,
-            so the inserted values for <literal>col</literal> begin at
-            that point and the results are as shown for the
-            <literal>SELECT</literal> query.
-          </para>
-
-          <para>
-            It is important to remember that it is not possible to
-            confine the effects of these two variables to a single
-            table, and thus they do not take the place of the sequences
-            offered by some other database management systems; these
-            variables control the behaviour of all
-            <literal>AUTO_INCREMENT</literal> columns in
-            <emphasis role="bold">all</emphasis> tables on the MySQL
-            server. If one of these variables is set globally, then its
-            effects persist until the global value is changed or
-            overridden by setting them locally, or until
-            <literal>mysqld</literal> is restarted; if set locally, then
-            the new value affects <literal>AUTO_INCREMENT</literal>
-            columns for all tables into which new rows are inserted by
-            the current user for the duration of the session, unless the
-            values are changed during that session.
-          </para>
-
-          <para>
-            The <literal>auto_increment_increment</literal> variable was
-            added in MySQL 5.0.2. Its default value is 1. See
-            <xref linkend="replication"/>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>auto_increment_offset</literal>
-          </para>
-
-          <para>
-            This variable was introduced in MySQL 5.0.2. Its default
-            value is 1. For particulars, see the description for
-            <literal>auto_increment_increment</literal>.
-          </para>
-        </listitem>
-
         <listitem>
           <para>
             <literal>ansi_mode</literal>
@@ -5486,7 +4145,7 @@
 
           <para>
             This is <literal>ON</literal> if <command>mysqld</command>
-            was started with <literal>--ansi</literal>. See
+            was started with <option>--ansi</option>. See
             <xref linkend="ansi-mode"/>. This variable was added in
             MySQL 3.23.6 and removed in 3.23.41. See the description for
             <literal>sql_mode</literal>.
@@ -5530,7 +4189,7 @@
 
           <para>
             The MySQL installation base directory. This variable can be
-            set with the <literal>--basedir</literal> option.
+            set with the <option>--basedir</option> option.
           </para>
         </listitem>
 
@@ -5541,9 +4200,9 @@
 
           <para>
             The size of the buffer that is allocated for caching indexes
-            and rows for <literal>BDB</literal> tables. If you don't use
+            and rows for <literal>BDB</literal> tables. If you do not use
             <literal>BDB</literal> tables, you should start
-            <command>mysqld</command> with <literal>--skip-bdb</literal>
+            <command>mysqld</command> with <option>--skip-bdb</option>
             to not waste memory for this cache. This variable was added
             in MySQL 3.23.14.
           </para>
@@ -5569,11 +4228,11 @@
 
           <para>
             The size of the buffer that is allocated for caching indexes
-            and rows for <literal>BDB</literal> tables. If you don't use
+            and rows for <literal>BDB</literal> tables. If you do not use
             <literal>BDB</literal> tables, you should set this to 0 or
             start <command>mysqld</command> with
-            <literal>--skip-bdb</literal> to not waste memory for this
-            cache. This variable was added in MySQL 3.23.31.
+            <option>--skip-bdb</option> in order not to waste memory for 
+            this cache. This variable was added in MySQL 3.23.31.
           </para>
         </listitem>
 
@@ -5585,8 +4244,8 @@
           <para>
             The directory where the <literal>BDB</literal> storage
             engine writes its log files. This variable can be set with
-            the <literal>--bdb-logdir</literal> option. This variable
-            was added in MySQL 3.23.14.
+            the <option>--bdb-logdir</option> option. This variable was 
+            added in MySQL 3.23.14.
           </para>
         </listitem>
 
@@ -5620,8 +4279,8 @@
 
           <para>
             This is <literal>ON</literal> if you are using
-            <literal>--bdb-shared-data</literal>. This variable was
-            added in MySQL 3.23.29.
+            <option>--bdb-shared-data</option>. This variable was added 
+            in MySQL 3.23.29.
           </para>
         </listitem>
 
@@ -5631,8 +4290,8 @@
           </para>
 
           <para>
-            The value of the <literal>--bdb-tmpdir</literal> option.
-            This variable was added in MySQL 3.23.14.
+            The value of the <option>--bdb-tmpdir</option> option. This 
+            variable was added in MySQL 3.23.14.
           </para>
         </listitem>
 
@@ -5657,7 +4316,7 @@
             allocated for each client if the server supports any
             transactional storage engines and, starting from MySQL
             4.1.2, if the server has binary log enabled
-            (<literal>--log-bin</literal> option). If you often use big,
+            (<option>--log-bin</option> option). If you often use large,
             multiple-statement transactions, you can increase this to
             get more performance. The
             <literal>Binlog_cache_use</literal> and
@@ -5843,44 +4502,9 @@
             statements to run concurrently for <literal>MyISAM</literal>
             tables that have no free blocks in the middle. You can turn
             this option off by starting <command>mysqld</command> with
-            <literal>--safe</literal> or <literal>--skip-new</literal>.
-            This variable was added in MySQL 3.23.7.
+            <option>--safe</option> or <option>--skip-new</option>. This 
+            variable was added in MySQL 3.23.7.
           </para>
-
-          <para>
-            In MySQL 5.0.6 this variable was changed to an integer that
-            takes 3 values:
-          </para>
-
-          <informaltable>
-            <tgroup cols="2">
-              <colspec colwidth="10*"/>
-              <colspec colwidth="75*"/>
-              <tbody>
-                <row>
-                  <entry><emphasis role="bold">Value</emphasis></entry>
-                  <entry><emphasis role="bold">Description</emphasis></entry>
-                </row>
-                <row>
-                  <entry>0</entry>
-                  <entry>Off</entry>
-                </row>
-                <row>
-                  <entry>1</entry>
-                  <entry>(Default) Enables concurrent insert for MyISAM tables that doesn't have
-                    holes</entry>
-                </row>
-                <row>
-                  <entry>2</entry>
-                  <entry>Enables concurrent inserts for all MyISAM tables. If table has a hole
-                    and is in use by another thread the new row will be
-                    inserted at end of table. If table is not in use
-                    then MySQL will do a normal read lock and insert the
-                    new row into the hole.</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </informaltable>
         </listitem>
 
         <listitem>
@@ -5918,33 +4542,23 @@
 
           <para>
             The MySQL data directory. This variable can be set with the
-            <literal>--datadir</literal> option.
-          </para>
-
-          <para>
-<!--  TODO: uncomment when implemented -->
-          </para>
-
-          <para>
-<!--  @item date_format -->
-          </para>
-
-          <para>
-<!--  ADD DESCRIPTION -->
-          </para>
-
-          <para>
-<!--  TODO: uncomment when implemented -->
-          </para>
-
-          <para>
-<!--  @item datetime_format -->
-          </para>
-
-          <para>
-<!--  ADD DESCRIPTION -->
+            <option>--datadir</option> option.
           </para>
         </listitem>
+        
+<!--  
+      TODO: uncomment when implemented 
+      
+      @item date_format 
+      [ADD DESCRIPTION] 
+-->
+
+<!--  
+      TODO: uncomment when implemented
+      
+      @item datetime_format 
+      [ADD DESCRIPTION] 
+-->
 
         <listitem>
           <para>
@@ -6006,14 +4620,14 @@
             closed. This speeds up writes on keys a lot, but if you use
             this feature, you should add automatic checking of all
             <literal>MyISAM</literal> tables by starting the server with
-            the <literal>--myisam-recover</literal> option (for example,
-            <literal>--myisam-recover=BACKUP,FORCE</literal>). See
+            the <option>--myisam-recover</option> option (for example,
+            <option>--myisam-recover=BACKUP,FORCE</option>). See
             <xref linkend="server-options"/> and
             <xref linkend="myisam-start"/>.
           </para>
 
           <para>
-            Note that <literal>--external-locking</literal> doesn't
+            Note that <option>--external-locking</option> does not
             offer any protection against index corruption for tables
             that use delayed key writes.
           </para>
@@ -6085,7 +4699,7 @@
           <para>
             This is <literal>ON</literal> if you have started
             <command>mysqld</command> with the
-            <literal>--flush</literal> option. This variable was added
+            <option>--flush</option> option. This variable was added
             in MySQL 3.22.9.
           </para>
         </listitem>
@@ -6279,7 +4893,7 @@
           <para>
             <literal>YES</literal> if <command>mysqld</command> supports
             <literal>BDB</literal> tables. <literal>DISABLED</literal>
-            if <literal>--skip-bdb</literal> is used. This variable was
+            if <option>--skip-bdb</option> is used. This variable was
             added in MySQL 3.23.30.
           </para>
         </listitem>
@@ -6333,22 +4947,6 @@
             <literal>EXAMPLE</literal> tables, <literal>NO</literal> if
             not. This variable was added in MySQL 4.1.4.
           </para>
-
-          <para>
-<!--  TODO: Uncomment after have_federated_db gets renamed to _engine -->
-          </para>
-
-          <para>
-<!--  @item have_federated_engine -->
-          </para>
-
-          <para>
-<!--  @code{YES} if @command{mysqld} supports @code{FEDERATED} tables, @code{NO} -->
-          </para>
-
-          <para>
-<!--  if not.  This variable was added in MySQL 5.0.3. -->
-          </para>
         </listitem>
 
         <listitem>
@@ -6371,7 +4969,7 @@
             <literal>YES</literal> if <command>mysqld</command> supports
             <literal>InnoDB</literal> tables.
             <literal>DISABLED</literal> if
-            <literal>--skip-innodb</literal> is used. This variable was
+            <option>--skip-innodb</option> is used. This variable was
             added in MySQL 3.23.37.
           </para>
         </listitem>
@@ -6384,7 +4982,7 @@
           <para>
             <literal>YES</literal> if <command>mysqld</command> supports
             <literal>ISAM</literal> tables. <literal>DISABLED</literal>
-            if <literal>--skip-isam</literal> is used. This variable was
+            if <option>--skip-isam</option> is used. This variable was
             added in MySQL 3.23.30.
           </para>
         </listitem>
@@ -6398,7 +4996,7 @@
             <literal>YES</literal> if <command>mysqld</command> supports
             <literal>NDB Cluster</literal> tables.
             <literal>DISABLED</literal> if
-            <literal>--skip-ndbcluster</literal> is used. This variable
+            <option>--skip-ndbcluster</option> is used. This variable
             was added in MySQL 4.1.2.
           </para>
         </listitem>
@@ -6456,31 +5054,25 @@
             <literal>have_symlink</literal>
           </para>
 
+<!--  TODO: also used on Windows for dir symlinking? -->
+
           <para>
             Whether symbolic link support is enabled. This is required
             on Unix for support of the <literal>DATA DIRECTORY</literal>
             and <literal>INDEX DIRECTORY</literal> table options.
-
-<!--  TODO: also used on Windows for dir symlinking? -->
           </para>
 
           <para>
             This variable was added in MySQL 4.0.0.
           </para>
-
-          <para>
-<!--  TODO: it may be that init_connect/init_slave should be discussed in -->
-          </para>
-
-          <para>
-<!--  a separate section that describes how to control client/slave startup. -->
-          </para>
-
-          <para>
-<!--  Move the examples to such a section if it is written. -->
-          </para>
         </listitem>
 
+<!--  
+      TODO: it may be that init_connect/init_slave should be discussed 
+      in a separate section that describes how to control client/slave 
+      startup. Move the examples to such a section if this is done. 
+-->
+
         <listitem>
           <para>
             <literal>init_connect</literal>
@@ -6531,7 +5123,7 @@
 
           <para>
             The name of the file specified with the
-            <literal>--init-file</literal> option when you start the
+            <option>--init-file</option> option when you start the 
             server. This is a file containing SQL statements that you
             want the server to execute when it starts. Each statement
             must be on a single line and should not include comments.
@@ -6594,14 +5186,6 @@
             complex join between several tables for which indexes are
             not used, multiple join buffers might be necessary.
           </para>
-
-          <para>
-<!--  Make texi2html support index @anchor{Index cache size}. Then change -->
-          </para>
-
-          <para>
-<!--  some xrefs to point here -->
-          </para>
         </listitem>
 
         <listitem>
@@ -6708,9 +5292,9 @@
           </para>
 
           <para>
-            As of MySQL 4.1, it is possible to create multiple MyISAM
-            key caches. The size limit of 4GB applies to each cache
-            individually, not as a group. See
+            As of MySQL 4.1, it is possible to create multiple 
+            <literal>MyISAM</literal> key caches. The size limit of 4GB 
+            applies to each cache individually, not as a group. See
             <xref linkend="myisam-key-cache"/>.
           </para>
         </listitem>
@@ -6819,8 +5403,8 @@
 
           <para>
             Whether <command>mysqld</command> was locked in memory with
-            <literal>--memlock</literal>. This variable was added in
-            MySQL 3.23.25.
+            <option>--memlock</option>. This variable was added in MySQL 
+            3.23.25.
           </para>
         </listitem>
 
@@ -6921,7 +5505,7 @@
             If a query takes longer than this many seconds, the
             <literal>Slow_queries</literal> status variable is
             incremented. If you are using the
-            <literal>--log-slow-queries</literal> option, the query is
+            <option>--log-slow-queries</option> option, the query is
             logged to the slow query log file. This value is measured in
             real time, not CPU time, so a query that is under the
             threshold on a lightly loaded system might be above the
@@ -6942,7 +5526,7 @@
             WRITE</literal> statements wait until there is no pending
             <literal>SELECT</literal> or <literal>LOCK TABLE
             READ</literal> on the affected table. This variable
-            previously was named
+            previously was named 
             <literal>sql_low_priority_updates</literal>. It was added in
             MySQL 3.22.5.
           </para>
@@ -6968,29 +5552,33 @@
           </para>
 
           <para>
-            If set to 1, table names are stored in lowercase on disk and
-            table name comparisons are not case sensitive. This variable
-            was added in MySQL 3.23.6. If set to 2 (new in 4.0.18),
-            table names are stored as given but compared in lowercase.
-            From MySQL 4.0.2, this option also applies to database
-            names. From 4.1.1, it also applies to table aliases. See
+            If set to <literal>1</literal>, table names are stored in 
+            lowercase on disk and table name comparisons are not case 
+            sensitive. This variable was added in MySQL 3.23.6. If set 
+            to <literal>2</literal> (new in 4.0.18), table names are 
+            stored as given but compared in lowercase. From MySQL 4.0.2, 
+            this option also applies to database names. From 4.1.1, it 
+            also applies to table aliases. See
             <xref linkend="name-case-sensitivity"/>.
           </para>
 
           <para>
-            If you are using <literal>InnoDB</literal> tables, you
-            should set this variable to 1 on all platforms to force
+            <emphasis role="bold">Note</emphasis>: If you are using 
+            <literal>InnoDB</literal> tables, you should set this 
+            variable to <literal>1</literal> on all platforms to force
             names to be converted to lowercase.
           </para>
 
           <para>
-            You should <emphasis>not</emphasis> set this variable to 0
-            if you are running MySQL on a system that does not have
-            case-sensitive filenames (such as Windows or Mac OS X). New
-            in 4.0.18: If this variable is not set at startup and the
-            filesystem on which the data directory is located does not
-            have case-sensitive filenames, MySQL automatically sets
-            <literal>lower_case_table_names</literal> to 2.
+            You should <emphasis>not</emphasis> set this variable to 
+            <literal>0</literal> if you are running MySQL on a system 
+            that does not have case-sensitive filenames (such as Windows 
+            or Mac OS X). <emphasis>New in 4.0.18</emphasis>: If this 
+            variable is not set at startup and the filesystem on which 
+            the data directory is located does not have case-sensitive 
+            filenames, MySQL automatically sets
+            <literal>lower_case_table_names</literal> to 
+            <literal>2</literal>.
           </para>
         </listitem>
 
@@ -7013,7 +5601,7 @@
           </para>
 
           <para>
-            You must increase this value if you are using big
+            You must increase this value if you are using large
             <literal>BLOB</literal> columns or long strings. It should
             be as big as the biggest <literal>BLOB</literal> you want to
             use. The protocol limit for
@@ -7099,15 +5687,16 @@
           </para>
 
           <para>
-            Don't start more than this number of threads to handle
+            Do not start more than this number of threads to handle
             <literal>INSERT DELAYED</literal> statements. If you try to
             insert data into a new table after all <literal>INSERT
             DELAYED</literal> threads are in use, the row is inserted as
             if the <literal>DELAYED</literal> attribute wasn't
-            specified. If you set this to 0, MySQL never creates a
-            thread to handle <literal>DELAYED</literal> rows; in effect,
-            this disables <literal>DELAYED</literal> entirely. This
-            variable was added in MySQL 3.23.0.
+            specified. If you set this to <literal>0</literal>, MySQL 
+            never creates a thread to handle <literal>DELAYED</literal> 
+            rows; in effect, doing so disables 
+            <literal>DELAYED</literal> entirely. This variable was added 
+            in MySQL 3.23.0.
           </para>
         </listitem>
 
@@ -7161,7 +5750,7 @@
           </para>
 
           <para>
-            Don't allow <literal>SELECT</literal> statements that
+            do not allow <literal>SELECT</literal> statements that
             probably need to examine more than
             <literal>max_join_size</literal> rows (for single-table
             statements) or row combinations (for multiple-table
@@ -7222,8 +5811,9 @@
             use <literal>max_binlog_size</literal> for both binary logs
             and relay logs. You must set
             <literal>max_relay_log_size</literal> to between 4096 bytes
-            and 1GB (inclusive), or to 0. The default value is 0. This
-            variable was added in MySQL 4.0.14. See
+            and 1GB (inclusive), or to <literal>0</literal>. The default 
+            value is <literal>0</literal>. This variable was added in 
+            MySQL 4.0.14. See
             <xref linkend="replication-implementation-details"/>.
           </para>
         </listitem>
@@ -7240,8 +5830,8 @@
             searching for matching rows in a table by scanning a key,
             regardless of the actual cardinality of the key (see
             <xref linkend="show-index"/>). By setting this to a low
-            value (100?), you can force MySQL to prefer keys instead of
-            table scans.
+            value (say, <literal>100</literal>), you can force MySQL to 
+            prefer keys instead of table scans.
           </para>
 
           <para>
@@ -7269,7 +5859,7 @@
 
           <para>
             The maximum number of temporary tables a client can keep
-            open at the same time. (This option doesn't yet do
+            open at the same time. (This option does not yet do
             anything.)
           </para>
         </listitem>
@@ -7281,17 +5871,13 @@
 
           <para>
             The maximum number of simultaneous connections allowed to
-            any given MySQL account. A value of 0 means <quote>no
-            limit.</quote> This variable was added in MySQL 3.23.34.
+            any given MySQL account. A value of <literal>0</literal> 
+            means <quote>no limit</quote>. This variable was added in 
+            MySQL 3.23.34.
           </para>
 
           <para>
-            Before MySQL 5.0.3, this variable has only a global form.
-            Beginning with MySQL 5.0.3, it also has a read-only session
-            form. The session variable has the same value as the global
-            variable unless the current account has a non-zero
-            <literal>MAX_USER_CONNECTIONS</literal> resource limit. In
-            that case, the session value reflects the account limit.
+            This variable has only a global form.
           </para>
         </listitem>
 
@@ -7308,23 +5894,6 @@
 
         <listitem>
           <para>
-            <literal>multi_read_range</literal>
-          </para>
-
-          <para>
-            Specifies the maximum number of ranges to send to a storage
-            engine during range selects. The default value is 256.
-            Sending multiple ranges to an engine is a feature that can
-            improve the performance of certain selects dramatically,
-            particularly for <literal>NDBCLUSTER</literal>. This engine
-            needs to send the range requests to all nodes, and sending
-            many of those requests at once reduces the communication
-            costs significantly. This variable was added in MySQL 5.0.3.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             <literal>myisam_data_pointer_size</literal>
           </para>
 
@@ -7334,8 +5903,8 @@
             <literal>MyISAM</literal> tables when no
             <literal>MAX_ROWS</literal> option is specified. This
             variable cannot be less than 2 or larger than 7. The default
-            value is 4. This variable was added in MySQL 4.1.2. See
-            <xref linkend="full-table"/>.
+            value is <literal>4</literal>. This variable was added in 
+            MySQL 4.1.2. See <xref linkend="full-table"/>.
           </para>
         </listitem>
 
@@ -7353,7 +5922,7 @@
             cache method to create the index. This variable was added in
             MySQL 3.23.37. <emphasis role="bold">Note</emphasis>: The
             value is given in megabytes before 4.0.3 and in bytes
-            thereafter. This variable was removed in MySQL 5.0.6.
+            thereafter.
           </para>
         </listitem>
 
@@ -7381,7 +5950,7 @@
           </para>
 
           <para>
-            The value of the <literal>--myisam-recover</literal> option.
+            The value of the <option>--myisam-recover</option> option.
             This variable was added in MySQL 3.23.36.
           </para>
         </listitem>
@@ -7519,7 +6088,7 @@
             <command>mysqld</command> to open. This is the real value
             allowed by the system and might be different from the value
             you gave <command>mysqld</command> as a startup option. The
-            value is 0 on systems where MySQL can't change the number of
+            value is 0 on systems where MySQL cannot change the number of
             open files. This variable was added in MySQL 3.23.20.
           </para>
         </listitem>
@@ -7567,7 +6136,7 @@
 
           <para>
             The pathname of the process ID (PID) file. This variable can
-            be set with the <literal>--pid-file</literal> option. This
+            be set with the <option>--pid-file</option> option. This
             variable was added in MySQL 3.23.23.
           </para>
         </listitem>
@@ -7579,7 +6148,7 @@
 
           <para>
             The port on which the server listens for TCP/IP connections.
-            This variable can be set with the <literal>--port</literal>
+            This variable can be set with the <option>--port</option>
             option.
           </para>
         </listitem>
@@ -7626,7 +6195,7 @@
           </para>
 
           <para>
-            Don't cache results that are bigger than this. The default
+            do not cache results that are bigger than this. The default
             value is 1MB. This variable was added in MySQL 4.0.1.
           </para>
         </listitem>
@@ -7682,7 +6251,7 @@
                 </row>
                 <row>
                   <entry><literal>0</literal> or <literal>OFF</literal></entry>
-                  <entry>Don't cache or retrieve results. Note that this does not deallocate the
+                  <entry>do not cache or retrieve results. Note that this does not deallocate the
                     query cache buffer. To do that, you should set
                     <literal>query_cache_size</literal> to 0.</entry>
                 </row>
@@ -7738,7 +6307,7 @@
             need for the server to perform memory allocation during
             query execution operations.
 
-<!--  It won't necessarily eliminate allocation completely; server *may* still -->
+<!--  It will not necessarily eliminate allocation completely; server *may* still -->
           </para>
 
           <para>
@@ -7831,7 +6400,7 @@
           </para>
 
           <para>
-            Don't show databases for which the user has no database or
+            do not show databases for which the user has no database or
             table privileges. This can improve security if you're
             concerned about people being able to see what databases
             other users have. See also
@@ -7852,7 +6421,7 @@
 
           <para>
             If the MySQL server has been started with the
-            <literal>--secure-auth</literal> option, it blocks
+            <option>--secure-auth</option> option, it blocks
             connections from all accounts that have passwords stored in
             the old (pre-4.1) format. In that case, the value of this
             variable is <literal>ON</literal>, otherwise it is
@@ -7872,7 +6441,7 @@
           </para>
 
           <para>
-<!--  TODO: this doesn't really belong here in a discussion of server variables -->
+<!--  TODO: this does not really belong here in a discussion of server variables -->
           </para>
 
           <para>
@@ -7888,7 +6457,7 @@
           </para>
 
           <para>
-            The value of the <literal>--server-id</literal> option. It
+            The value of the <option>--server-id</option> option. It
             is used for master and slave replication servers. This
             variable was added in MySQL 3.23.26.
           </para>
@@ -7956,7 +6525,7 @@
 
           <para>
             This prevents people from using the <literal>SHOW
-            DATABASES</literal> statement if they don't have the
+            DATABASES</literal> statement if they do not have the
             <literal>SHOW DATABASES</literal> privilege. This can
             improve security if you're concerned about people being able
             to see what databases other users have. See also
@@ -8164,7 +6733,7 @@
             <literal>system_time_zone</literal>. Typically the time zone
             is specified by the <literal>TZ</literal> environment
             variable. It also can be specified using the
-            <literal>--timezone</literal> option of the
+            <option>--timezone</option> option of the
             <command>mysqld_safe</command> script. This variable was
             added in MySQL 4.1.3.
           </para>
@@ -8182,7 +6751,7 @@
             you need to increase the table cache by checking the
             <literal>Opened_tables</literal> status variable. See
             <xref linkend="server-status-variables"/>. If the value of
-            <literal>Opened_tables</literal> is large and you don't do
+            <literal>Opened_tables</literal> is large and you do not do
             <literal>FLUSH TABLES</literal> a lot (which just forces all
             tables to be closed and reopened), then you should increase
             the value of the <literal>table_cache</literal> variable.
@@ -8202,7 +6771,7 @@
           <para>
             The default table type (storage engine). To set the table
             type at server startup, use the
-            <literal>--default-table-type</literal> option. This
+            <option>--default-table-type</option> option. This
             variable was added in MySQL 3.23.0. See
             <xref linkend="server-options"/>.
           </para>
@@ -8222,7 +6791,7 @@
             cache if possible, and only when the cache is empty is a new
             thread created. This variable can be increased to improve
             performance if you have a lot of new connections. (Normally
-            this doesn't give a notable performance improvement if you
+            this does not give a notable performance improvement if you
             have a good thread implementation.) By examining the
             difference between the <literal>Connections</literal> and
             <literal>Threads_created</literal> status variables (see
@@ -8282,7 +6851,7 @@
             <literal>'SYSTEM'</literal> (use the value of
             <literal>system_time_zone</literal>), but can be specified
             explicitly at server startup time with the
-            <literal>--default-time-zone</literal> option. This variable
+            <option>--default-time-zone</option> option. This variable
             was added in MySQL 4.1.3.
           </para>
         </listitem>
@@ -8296,7 +6865,7 @@
             The time zone for the server. This is set from the
             <literal>TZ</literal> environment variable when
             <command>mysqld</command> is started. The time zone also can
-            be set by giving a <literal>--timezone</literal> argument to
+            be set by giving a <option>--timezone</option> argument to
             <command>mysqld_safe</command>. This variable was added in
             MySQL 3.23.15. As of MySQL 4.1.3, it is obsolete and has
             been replaced by the <literal>system_time_zone</literal>
@@ -8466,7 +7035,7 @@
 
           <para>
             The <command>configure</command> script has a
-            <literal>--with-comment</literal> option that allows a
+            <option>--with-comment</option> option that allows a
             comment to be specified when building MySQL. This variable
             contains the value of that comment. This variable was added
             in MySQL 4.0.17.
@@ -8579,7 +7148,7 @@
                 <entry>string</entry>
                 <entry><literal>GLOBAL</literal> | <literal>SESSION</literal>
 
-<!--  Don't advertise this variable as being dynamic... -->
+<!--  do not advertise this variable as being dynamic... -->
 
 <!--  @item @code{character_set_database} @tab string @tab @code{GLOBAL} | @code{SESSION} --></entry>
               </row>
@@ -8598,7 +7167,7 @@
                 <entry>string</entry>
                 <entry><literal>GLOBAL</literal> | <literal>SESSION</literal>
 
-<!--  Don't advertise this variable as being dynamic... -->
+<!--  do not advertise this variable as being dynamic... -->
 
 <!--  @item @code{collation_database} @tab string @tab @code{GLOBAL} | @code{SESSION} --></entry>
               </row>
@@ -9626,7 +8195,7 @@
             position. This is high if you are doing a lot of queries
             that require sorting of the result. You probably have a lot
             of queries that require MySQL to scan whole tables or you
-            have joins that don't use keys properly.
+            have joins that do not use keys properly.
           </para>
         </listitem>
 
@@ -9725,7 +8294,7 @@
           <para>
             The number of latched pages in <literal>InnoDB</literal>
             buffer pool. These are pages currently being read or written
-            or that can't be flushed or removed for some other reason.
+            or that cannot be flushed or removed for some other reason.
             Added in MySQL 5.0.2.
           </para>
         </listitem>
@@ -10782,7 +9351,7 @@
         </para>
 
 <programlisting>
-Error: Can't create thread to kill server
+Error: cannot create thread to kill server
 </programlisting>
       </listitem>
 
@@ -11237,7 +9806,7 @@
           <para>
             (This works under Linux and should work with small
             modifications under other systems.) Warning: If you do not
-            see plaintext data, this doesn't always mean that the
+            see plaintext data, this does not always mean that the
             information actually is encrypted. If you need high
             security, you should consult with a security expert.
           </para>
@@ -11335,14 +9904,14 @@
 
         <listitem>
           <para>
-            Don't run the MySQL server as the Unix
+            do not run the MySQL server as the Unix
             <literal>root</literal> user. This is very dangerous,
             because any user with the <literal>FILE</literal> privilege
             is able to create files as <literal>root</literal> (for
             example, <literal>~root/.bashrc</literal>). To prevent this,
             <command>mysqld</command> refuses to run as
             <literal>root</literal> unless that is specified explicitly
-            using a <literal>--user=root</literal> option.
+            using a <option>--user=root</option> option.
           </para>
 
           <para>
@@ -11382,8 +9951,8 @@
 
         <listitem>
           <para>
-            Don't allow the use of symlinks to tables. (This can be
-            disabled with the <literal>--skip-symbolic-links</literal>
+            do not allow the use of symlinks to tables. (This can be
+            disabled with the <option>--skip-symbolic-links</option>
             option.) This is especially important if you run
             <command>mysqld</command> as <literal>root</literal>,
             because anyone that has write access to the server's data
@@ -11402,7 +9971,7 @@
 
         <listitem>
           <para>
-            Don't grant the <literal>PROCESS</literal> or
+            do not grant the <literal>PROCESS</literal> or
             <literal>SUPER</literal> privilege to non-administrative
             users. The output of <command>mysqladmin
             processlist</command> shows the text of the currently
@@ -11430,7 +9999,7 @@
 
         <listitem>
           <para>
-            Don't grant the <literal>FILE</literal> privilege to
+            do not grant the <literal>FILE</literal> privilege to
             non-administrative users. Any user that has this privilege
             can write a file anywhere in the filesystem with the
             privileges of the <command>mysqld</command> daemon! To make
@@ -11456,7 +10025,7 @@
 
         <listitem>
           <para>
-            If you don't trust your DNS, you should use IP numbers
+            If you do not trust your DNS, you should use IP numbers
             rather than hostnames in the grant tables. In any case, you
             should be very careful about creating grant table entries
             using hostname values that contain wildcards!
@@ -11494,7 +10063,7 @@
 
         <listitem>
           <para>
-            <literal>--allow-suspicious-udfs</literal>
+            <option>--allow-suspicious-udfs</option>
           </para>
 
           <para>
@@ -11511,12 +10080,12 @@
 
         <listitem>
           <para>
-            <literal>--local-infile[={0|1}]</literal>
+            <option>--local-infile[={0|1}]</option>
           </para>
 
           <para>
             If you start the server with
-            <literal>--local-infile=0</literal>, clients cannot use
+            <option>--local-infile=0</option>, clients cannot use
             <literal>LOCAL</literal> in <literal>LOAD DATA</literal>
             statements. See <xref linkend="load-data-local"/>.
           </para>
@@ -11524,7 +10093,7 @@
 
         <listitem>
           <para>
-            <literal>--old-passwords</literal>
+            <option>--old-passwords</option>
           </para>
 
           <para>
@@ -11537,14 +10106,14 @@
 
         <listitem>
           <para>
-            <literal>--safe-show-database</literal>
+            <option>--safe-show-database</option>
           </para>
 
           <para>
             With this option, the <literal>SHOW DATABASES</literal>
             statement displays the names of only those databases for
             which the user has some kind of privilege. As of MySQL
-            4.0.2, this option is deprecated and doesn't do anything (it
+            4.0.2, this option is deprecated and does not do anything (it
             is enabled by default), because there is a <literal>SHOW
             DATABASES</literal> privilege that can be used to control
             access to database names on a per-account basis. See
@@ -11554,7 +10123,7 @@
 
         <listitem>
           <para>
-            <literal>--safe-user-create</literal>
+            <option>--safe-user-create</option>
           </para>
 
           <para>
@@ -11572,7 +10141,7 @@
 </programlisting>
 
           <para>
-            This ensures that the user can't change any privilege
+            This ensures that the user cannot change any privilege
             columns directly, but has to use the
             <literal>GRANT</literal> statement to give privileges to
             other users.
@@ -11581,7 +10150,7 @@
 
         <listitem>
           <para>
-            <literal>--secure-auth</literal>
+            <option>--secure-auth</option>
           </para>
 
           <para>
@@ -11592,7 +10161,7 @@
 
         <listitem>
           <para>
-            <literal>--skip-grant-tables</literal>
+            <option>--skip-grant-tables</option>
           </para>
 
           <para>
@@ -11608,7 +10177,7 @@
 
         <listitem>
           <para>
-            <literal>--skip-name-resolve</literal>
+            <option>--skip-name-resolve</option>
           </para>
 
           <para>
@@ -11620,11 +10189,11 @@
 
         <listitem>
           <para>
-            <literal>--skip-networking</literal>
+            <option>--skip-networking</option>
           </para>
 
           <para>
-            Don't allow TCP/IP connections over the network. All
+            do not allow TCP/IP connections over the network. All
             connections to <command>mysqld</command> must be made via
             Unix socket files. This option is unsuitable when using a
             MySQL version prior to 3.23.27 with the MIT-pthreads
@@ -11635,7 +10204,7 @@
 
         <listitem>
           <para>
-            <literal>--skip-show-database</literal>
+            <option>--skip-show-database</option>
           </para>
 
           <para>
@@ -11712,15 +10281,15 @@
           <para>
             By default, all MySQL clients and libraries in binary
             distributions are compiled with the
-            <literal>--enable-local-infile</literal> option, to be
+            <option>--enable-local-infile</option> option, to be
             compatible with MySQL 3.23.48 and before.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            If you build MySQL from source but don't use the
-            <literal>--enable-local-infile</literal> option to
+            If you build MySQL from source but do not use the
+            <option>--enable-local-infile</option> option to
             <command>configure</command>, <literal>LOAD DATA
             LOCAL</literal> cannot be used by any client unless it is
             written explicitly to invoke <literal>mysql_options(...
@@ -11734,7 +10303,7 @@
             You can disable all <literal>LOAD DATA LOCAL</literal>
             commands from the server side by starting
             <command>mysqld</command> with the
-            <literal>--local-infile=0</literal> option.
+            <option>--local-infile=0</option> option.
           </para>
         </listitem>
 
@@ -11742,10 +10311,10 @@
           <para>
             For the <command>mysql</command> command-line client,
             <literal>LOAD DATA LOCAL</literal> can be enabled by
-            specifying the <literal>--local-infile[=1]</literal> option,
-            or disabled with the <literal>--local-infile=0</literal>
+            specifying the <option>--local-infile[=1]</option> option,
+            or disabled with the <option>--local-infile=0</option>
             option. Similarly, for <command>mysqlimport</command>, the
-            <literal>--local</literal> or <literal>-L</literal> option
+            <option>--local</option> or <option>-L</option> option
             enables local data file loading. In any case, successful use
             of a local loading operation requires that the server is
             enabled to allow it.
@@ -12658,7 +11227,7 @@
         A useful diagnostic tool is the <command>mysqlaccess</command>
         script, which Yves Carlier has provided for the MySQL
         distribution. Invoke <command>mysqlaccess</command> with the
-        <literal>--help</literal> option to find out how it works. Note
+        <option>--help</option> option to find out how it works. Note
         that <command>mysqlaccess</command> checks access using only the
         <literal>user</literal>, <literal>db</literal>, and
         <literal>host</literal> tables. It does not check table, column,
@@ -13058,7 +11627,7 @@
         DATABASE</literal> statement. Accounts that do not have this
         privilege see only databases for which they have some
         privileges, and cannot use the statement at all if the server
-        was started with the <literal>--skip-show-database</literal>
+        was started with the <option>--skip-show-database</option>
         option.
       </para>
 
@@ -13226,18 +11795,18 @@
       <para>
         Alternate forms of the <literal>-h</literal>,
         <literal>-u</literal>, and <literal>-p</literal> options are
-        <literal>--host=<replaceable>host_name</replaceable></literal>,
-        <literal>--user=<replaceable>user_name</replaceable></literal>,
+        <option>--host=<replaceable>host_name</replaceable></option>,
+        <option>--user=<replaceable>user_name</replaceable></option>,
         and
-        <literal>--password=<replaceable>your_pass</replaceable></literal>.
+        <option>--password=<replaceable>your_pass</replaceable></option>.
         Note that there is <emphasis>no space</emphasis> between
-        <literal>-p</literal> or <literal>--password=</literal> and the
+        <literal>-p</literal> or <option>--password=</option> and the
         password following it.
       </para>
 
       <para>
         If you use a <literal>-p</literal> or
-        <literal>--password</literal> option but do not specify the
+        <option>--password</option> option but do not specify the
         password value, the client program prompts you to enter the
         password. The password is not displayed as you enter it. This is
         more secure than giving the password on the command line. Any
@@ -13598,7 +12167,7 @@
         correct. (This is done without the encrypted password ever
         traveling over the connection.) From MySQL's point of view, the
         encrypted password is the REAL password, so you should not give
-        anyone access to it! In particular, don't give
+        anyone access to it! In particular, do not give
         non-administrative users read access to the tables in the
         <literal>mysql</literal> database!
       </para>
@@ -14094,7 +12663,7 @@
         Access is granted if the row allows the requested operation and
         denied otherwise. For example, if you want to execute
         <command>mysqladmin shutdown</command> but your
-        <literal>user</literal> table row doesn't grant the
+        <literal>user</literal> table row does not grant the
         <literal>SHUTDOWN</literal> privilege to you, the server denies
         access without even checking the <literal>db</literal> or
         <literal>host</literal> tables. (They contain no
@@ -14333,7 +12902,7 @@
         If you change the grant tables directly but forget to reload
         them, your changes have <emphasis>no effect</emphasis> until you
         restart the server. This may leave you wondering why your
-        changes don't seem to make any difference!
+        changes do not seem to make any difference!
       </para>
 
     </section>
@@ -14367,9 +12936,9 @@
 
 <programlisting>
 shell&gt; mysql
-ERROR 2003: Can't connect to MySQL server on '<replaceable>host_name</replaceable>' (111)
+ERROR 2003: cannot connect to MySQL server on '<replaceable>host_name</replaceable>' (111)
 shell&gt; mysql
-ERROR 2002: Can't connect to local MySQL server through socket
+ERROR 2002: cannot connect to local MySQL server through socket
 '/tmp/mysql.sock' (111)
 </programlisting>
 
@@ -14378,8 +12947,8 @@
             trying to connect using a TCP/IP port, named pipe, or Unix
             socket file different from those on which the server is
             listening. To correct this when you invoke a client program,
-            specify a <literal>--port</literal> option to indicate the
-            proper port, or a <literal>--socket</literal> option to
+            specify a <option>--port</option> option to indicate the
+            proper port, or a <option>--socket</option> option to
             indicate the proper named pipe or Unix socket file. To find
             out where the socket file is, you can do:
           </para>
@@ -14487,7 +13056,7 @@
         <listitem>
           <para>
             If you try to connect as <literal>root</literal> and get the
-            following error, it means that you don't have an row in the
+            following error, it means that you do not have an row in the
             <literal>user</literal> table with a <literal>User</literal>
             column value of <literal>'root'</literal> and that
             <command>mysqld</command> cannot resolve the hostname for
@@ -14500,7 +13069,7 @@
 
           <para>
             In this case, you must restart the server with the
-            <literal>--skip-grant-tables</literal> option and edit your
+            <option>--skip-grant-tables</option> option and edit your
             <filename>/etc/hosts</filename> or
             <filename>\windows\hosts</filename> file to add an entry for
             your host.
@@ -14528,7 +13097,7 @@
             Remember that client programs use connection parameters
             specified in option files or environment variables. If a
             client program seems to be sending incorrect default
-            connection parameters when you don't specify them on the
+            connection parameters when you do not specify them on the
             command line, check your environment and any applicable
             option files. For example, if you get <literal>Access
             denied</literal> when you run a client without any options,
@@ -14538,7 +13107,7 @@
 
           <para>
             You can suppress the use of option files by a client program
-            by invoking it with the <literal>--no-defaults</literal>
+            by invoking it with the <option>--no-defaults</option>
             option. For example:
           </para>
 
@@ -14568,7 +13137,7 @@
             If the preceding error occurs even when you haven't
             specified a password, it means that you have an incorrect
             password listed in some option file. Try the
-            <literal>--no-defaults</literal> option as described in the
+            <option>--no-defaults</option> option as described in the
             previous item.
           </para>
 
@@ -14580,7 +13149,7 @@
           <para>
             If you have lost or forgotten the <literal>root</literal>
             password, you can restart <command>mysqld</command> with
-            <literal>--skip-grant-tables</literal> to change the
+            <option>--skip-grant-tables</option> to change the
             password. See <xref linkend="resetting-permissions"/>.
           </para>
         </listitem>
@@ -14634,10 +13203,10 @@
 
           <para>
             To avoid this problem on such systems, you can use a
-            <literal>--host=127.0.0.1</literal> option to name the
+            <option>--host=127.0.0.1</option> option to name the
             server host explicitly. This will make a TCP/IP connection
             to the local <command>mysqld</command> server. You can also
-            use TCP/IP by specifying a <literal>--host</literal> option
+            use TCP/IP by specifying a <option>--host</option> option
             that uses the actual hostname of the local host. In this
             case, the hostname must be specified in a
             <literal>user</literal> table row on the server host, even
@@ -14701,11 +13270,11 @@
           </para>
 
           <para>
-            If you don't know the IP number or hostname of the machine
+            If you do not know the IP number or hostname of the machine
             from which you are connecting, you should put an row with
             <literal>'%'</literal> as the <literal>Host</literal> column
             value in the <literal>user</literal> table and restart
-            <command>mysqld</command> with the <literal>--log</literal>
+            <command>mysqld</command> with the <option>--log</option>
             option on the server machine. After trying to connect from
             the client machine, the information in the MySQL log
             indicates how you really did connect. (Then change the
@@ -14723,7 +13292,7 @@
             upgrade your operating system or <literal>glibc</literal>,
             or download a source distribution of MySQL version and
             compile it yourself. A source RPM is normally trivial to
-            compile and install, so this isn't a big problem.
+            compile and install, so this is not a big problem.
           </para>
         </listitem>
 
@@ -14777,14 +13346,14 @@
             <listitem>
               <para>
                 Start <command>mysqld</command> with the
-                <literal>--skip-name-resolve</literal> option.
+                <option>--skip-name-resolve</option> option.
               </para>
             </listitem>
 
             <listitem>
               <para>
                 Start <command>mysqld</command> with the
-                <literal>--skip-host-cache</literal> option.
+                <option>--skip-host-cache</option> option.
               </para>
             </listitem>
 
@@ -14858,7 +13427,7 @@
             <replaceable>user_name</replaceable></literal> works when
             executed on the server host, but <literal>mysql -h
             <replaceable>host_name</replaceable> -u
-            <replaceable>user_name</replaceable></literal> doesn't work
+            <replaceable>user_name</replaceable></literal> does not work
             when executed on a remote client host, you have not enabled
             access to the server for the given username from the remote
             host.
@@ -14867,7 +13436,7 @@
 
         <listitem>
           <para>
-            If you can't figure out why you get <literal>Access
+            If you cannot figure out why you get <literal>Access
             denied</literal>, remove from the <literal>user</literal>
             table all entries that have <literal>Host</literal> values
             containing wildcards (entries that contain
@@ -14877,7 +13446,7 @@
             <literal>User</literal>=<literal>'<replaceable>some_user</replaceable>'</literal>,
             thinking that this allows you to specify
             <literal>localhost</literal> to connect from the same
-            machine. The reason that this doesn't work is that the
+            machine. The reason that this does not work is that the
             default privileges include an entry with
             <literal>Host</literal>=<literal>'localhost'</literal> and
             <literal>User</literal>=<literal>''</literal>. Because that
@@ -14921,7 +13490,7 @@
             <literal>Access denied</literal> message whenever you issue
             a <literal>SELECT ... INTO OUTFILE</literal> or
             <literal>LOAD DATA INFILE</literal> statement, your entry in
-            the <literal>user</literal> table doesn't have the
+            the <literal>user</literal> table does not have the
             <literal>FILE</literal> privilege enabled.
           </para>
         </listitem>
@@ -14938,9 +13507,9 @@
             your changes have no effect until the next time the server
             is restarted. Remember that after you change the
             <literal>root</literal> password with an
-            <literal>UPDATE</literal> command, you won't need to specify
+            <literal>UPDATE</literal> command, you will not need to specify
             the new password until after you flush the privileges,
-            because the server won't know you've changed the password
+            because the server will not know you've changed the password
             yet!
           </para>
         </listitem>
@@ -14968,7 +13537,7 @@
             the problem lies with your program, not with the access
             privileges. (There is no space between <literal>-p</literal>
             and the password; you can also use the
-            <literal>--password=<replaceable>your_pass</replaceable></literal>
+            <option>--password=<replaceable>your_pass</replaceable></option>
             syntax to specify the password. If you use the
             <literal>-p</literal> option alone, MySQL prompts you for
             the password.)
@@ -14978,7 +13547,7 @@
         <listitem>
           <para>
             For testing, start the <command>mysqld</command> server with
-            the <literal>--skip-grant-tables</literal> option. Then you
+            the <option>--skip-grant-tables</option> option. Then you
             can change the MySQL grant tables and use the
             <command>mysqlaccess</command> script to check whether your
             modifications have the desired effect. When you are
@@ -14986,7 +13555,7 @@
             flush-privileges</command> to tell the
             <command>mysqld</command> server to start using the new
             grant tables. (Reloading the grant tables overrides the
-            <literal>--skip-grant-tables</literal> option. This allows
+            <option>--skip-grant-tables</option> option. This allows
             you to tell the server to begin using the grant tables again
             without stopping and restarting it.)
           </para>
@@ -14996,7 +13565,7 @@
           <para>
             If everything else fails, start the
             <command>mysqld</command> server with a debugging option
-            (for example, <literal>--debug=d,general,query</literal>).
+            (for example, <option>--debug=d,general,query</option>).
             This prints host and user information about attempted
             connections, as well as information about each command
             issued. See <xref linkend="making-trace-files"/>.
@@ -15013,7 +13582,7 @@
             <command>mysqlbug</command> script. See
             <xref linkend="bug-reports"/>. In some cases, you may need
             to restart <command>mysqld</command> with
-            <literal>--skip-grant-tables</literal> to run
+            <option>--skip-grant-tables</option> to run
             <command>mysqldump</command>.
           </para>
         </listitem>
@@ -15305,10 +13874,10 @@
         The way in which the server generates password hashes for
         connected clients is affected by the width of the
         <literal>Password</literal> column and by the
-        <literal>--old-passwords</literal> option. A 4.1 server
+        <option>--old-passwords</option> option. A 4.1 server
         generates long hashes only if certain conditions are met: The
         <literal>Password</literal> column must be wide enough to hold
-        long values and the <literal>--old-passwords</literal> option
+        long values and the <option>--old-passwords</option> option
         must not be given. These conditions apply as follows:
       </para>
 
@@ -15337,7 +13906,7 @@
             <literal>PASSWORD()</literal>, <literal>GRANT</literal>, and
             <literal>SET PASSWORD</literal> generate long hashes unless
             the server was started with the
-            <literal>--old-passwords</literal> option. That option
+            <option>--old-passwords</option> option. That option
             forces the server to generate short password hashes instead.
           </para>
         </listitem>
@@ -15345,16 +13914,16 @@
       </itemizedlist>
 
       <para>
-        The purpose of the <literal>--old-passwords</literal> option is
+        The purpose of the <option>--old-passwords</option> option is
         to allow you to maintain backward compatibility with pre-4.1
         clients under circumstances where the server would otherwise
-        generate long password hashes. The option doesn't affect
+        generate long password hashes. The option does not affect
         authentication (4.1 clients can still use accounts that have
         long password hashes), but it does prevent creation of a long
         password hash in the <literal>user</literal> table as the result
         of a password-changing operation. Were that to occur, the
         account no longer could be used by pre-4.1 clients. Without the
-        <literal>--old-passwords</literal> option, the following
+        <option>--old-passwords</option> option, the following
         undesirable scenario is possible:
       </para>
 
@@ -15370,7 +13939,7 @@
         <listitem>
           <para>
             The client changes its own password. Without
-            <literal>--old-passwords</literal>, this results in the
+            <option>--old-passwords</option>, this results in the
             account having a long password hash.
           </para>
         </listitem>
@@ -15391,8 +13960,8 @@
       <para>
         This scenario illustrates that, if you must support older
         pre-4.1 clients, it is dangerous to run a 4.1 server without
-        using the <literal>--old-passwords</literal> option. By running
-        the server with <literal>--old-passwords</literal>,
+        using the <option>--old-passwords</option> option. By running
+        the server with <option>--old-passwords</option>,
         password-changing operations do not generate long password
         hashes and thus do not cause accounts to become inaccessible to
         older clients. (Those clients cannot inadvertently lock
@@ -15401,13 +13970,13 @@
       </para>
 
       <para>
-        The downside of the <literal>--old-passwords</literal> option is
+        The downside of the <option>--old-passwords</option> option is
         that any passwords you create or change use short hashes, even
         for 4.1 clients. Thus, you lose the additional security provided
         by long password hashes. If you want to create an account that
         has a long hash (for example, for use by 4.1 clients), you must
         do so while running the server without
-        <literal>--old-passwords</literal>.
+        <option>--old-passwords</option>.
       </para>
 
       <para>
@@ -15448,7 +14017,7 @@
 
         <listitem>
           <para>
-            The <literal>--old-passwords</literal> option can be used
+            The <option>--old-passwords</option> option can be used
             but is superfluous because with a short
             <literal>Password</literal> column, the server generates
             only short password hashes anyway.
@@ -15460,7 +14029,7 @@
       <para>
         <emphasis role="bold">Scenario 2:</emphasis> Long
         <literal>Password</literal> column; server not started with
-        <literal>--old-passwords</literal> option:
+        <option>--old-passwords</option> option:
       </para>
 
       <itemizedlist>
@@ -15537,7 +14106,7 @@
       <para>
         <emphasis role="bold">Scenario 3:</emphasis> Long
         <literal>Password</literal> column; server started with
-        <literal>--old-passwords</literal> option:
+        <option>--old-passwords</option> option:
       </para>
 
       <itemizedlist>
@@ -15554,7 +14123,7 @@
             4.1 clients can authenticate for accounts that have short or
             long hashes (but note that it is possible to create long
             hashes only when the server is started without
-            <literal>--old-passwords</literal>).
+            <option>--old-passwords</option>).
           </para>
         </listitem>
 
@@ -15580,11 +14149,11 @@
 
       <para>
         In this scenario, you cannot create accounts that have long
-        password hashes, because the <literal>--old-passwords</literal>
+        password hashes, because the <option>--old-passwords</option>
         option prevents generation of long hashes. Also, if you create
         an account with a long hash before using the
-        <literal>--old-passwords</literal> option, changing the
-        account's password while <literal>--old-passwords</literal> is
+        <option>--old-passwords</option> option, changing the
+        account's password while <option>--old-passwords</option> is
         in effect results in the account being given a short password,
         causing it to lose the security benefits of a longer hash.
       </para>
@@ -15606,11 +14175,11 @@
       </para>
 
       <para>
-        In scenario 3, <literal>--old-passwords</literal> prevents
+        In scenario 3, <option>--old-passwords</option> prevents
         accounts with short hashes from becoming inaccessible, but
         password-changing operations cause accounts with long hashes to
         revert to short hashes, and you cannot change them back to long
-        hashes while <literal>--old-passwords</literal> is in effect.
+        hashes while <option>--old-passwords</option> is in effect.
       </para>
 
       <section id="application-password-use">
@@ -15777,9 +14346,9 @@
             username, but that is for convenience only. The default can
             be overridden easily, because client programs allow any
             username to be specified with a <literal>-u</literal> or
-            <literal>--user</literal> option. Because this means that
+            <option>--user</option> option. Because this means that
             anyone can attempt to connect to the server using any
-            username, you can't make a database secure in any way unless
+            username, you cannot make a database secure in any way unless
             all MySQL accounts have passwords. Anyone who specifies a
             username for an account that has no password is able to
             connect successfully to the server.
@@ -15803,7 +14372,7 @@
             <literal>User</literal> column in the
             <literal>mysql</literal> database tables, this will likely
             result in strange and unpredictable effects. (Altering
-            privilege tables isn't supported, anyway.) Operating system
+            privilege tables is not supported, anyway.) Operating system
             usernames might have a different maximum length. For
             example, Unix usernames typically are limited to eight
             characters.
@@ -15884,7 +14453,7 @@
         The preceding commands include the password value on the command
         line, which can be a security risk. See
         <xref linkend="password-security"/>. To avoid this, specify the
-        <literal>--password</literal> or <literal>-p</literal> option
+        <option>--password</option> or <option>-p</option> option
         without any following password value:
       </para>
 
@@ -15905,7 +14474,7 @@
         On some systems, the library call that MySQL uses to prompt for
         a password automatically limits the password to eight
         characters. That is a problem with the system library, not with
-        MySQL. Internally, MySQL doesn't have any limit for the length
+        MySQL. Internally, MySQL does not have any limit for the length
         of the password. To work around the problem, change your MySQL
         password to a value that is eight or fewer characters long, or
         put your password in an option file.
@@ -16010,7 +14579,7 @@
       <para>
         If you have assigned a password to the <literal>root</literal>
         account, you'll also need to supply a
-        <literal>--password</literal> or <literal>-p</literal> option
+        <option>--password</option> or <option>-p</option> option
         for this <command>mysql</command> command and also for those
         later in this section.
       </para>
@@ -16453,7 +15022,7 @@
         <literal>max_updates</literal>,
         <literal>max_connections</literal>, and
         <literal>max_user_connections</literal> columns. If your
-        <literal>user</literal> table doesn't have these columns, it
+        <literal>user</literal> table does not have these columns, it
         must be upgraded; see <xref linkend="upgrading-grant-tables"/>.
       </para>
 
@@ -16535,7 +15104,7 @@
         all such cases, an appropriate error message is issued.
       </para>
 
-<!--  TODO: this isn't correct for pre-5.0.3, where counting is per user+actual -->
+<!--  TODO: this is not correct for pre-5.0.3, where counting is per user+actual -->
 
 <!--  host. -->
 
@@ -16808,7 +15377,7 @@
           <para>
             Use a
             <literal>-p<replaceable>your_pass</replaceable></literal> or
-            <literal>--password=<replaceable>your_pass</replaceable></literal>
+            <option>--password=<replaceable>your_pass</replaceable></option>
             option on the command line. For example:
           </para>
 
@@ -16829,7 +15398,7 @@
 
         <listitem>
           <para>
-            Use a <literal>-p</literal> or <literal>--password</literal>
+            Use a <literal>-p</literal> or <option>--password</option>
             option with no password value specified. In this case, the
             client program solicits the password from the terminal:
           </para>
@@ -16955,7 +15524,7 @@
 
       <para>
         Using MySQL's built-in yaSSL support makes it easier to use
-        secure connections. You don't have to install OpenSSL and
+        secure connections. You do not have to install OpenSSL and
         perform the other steps described in
         <xref linkend="secure-requirements"/>. Apart from that, most
         of the information given in this section applies to OpenSSL as
@@ -16996,7 +15565,7 @@
           being sent or received. They could even change the data while
           it is in transit between client and server. To improve
           security a little, you can compress client/server traffic by
-          using the <literal>--compress</literal> option when invoking
+          using the <option>--compress</option> option when invoking
           client programs. However, this does not foil a determined
           attacker.
         </para>
@@ -17059,7 +15628,7 @@
           programs, your system must be able to support OpenSSL and your
           version of MySQL must be 4.0.0 or newer.
           If you're using a MySQL version with built-in yaSSL support
-          (as of version 5.0.10), don't read this section, but rather
+          (as of version 5.0.10), do not read this section, but rather
           <xref linkend="secure-using-yassl"/>.
         </para>
 
@@ -17082,8 +15651,8 @@
             <para>
               When you configure MySQL, run the
               <command>configure</command> script with the
-              <literal>--with-vio</literal> and
-              <literal>--with-openssl</literal> options.
+              <option>--with-vio</option> and
+              <option>--with-openssl</option> options.
             </para>
           </listitem>
 
@@ -17134,7 +15703,7 @@
 
         <para>
           Using MySQL's built-in yaSSL support makes it easier to use
-          secure connections. You don't have to install OpenSSL and
+          secure connections. You do not have to install OpenSSL and
           perform the other steps described in
           <xref linkend="secure-requirements"/>. Also, both MySQL and
           yaSSL employ the same licensing model.
@@ -17177,15 +15746,15 @@
 </programlisting>
           <itemizedlist>
            <listitem><para>
-            <literal>--ssl-ca</literal> identifies the 
+            <option>--ssl-ca</option> identifies the 
             Certificate Authority certificate.
            </para></listitem>
            <listitem><para>
-            <literal>--ssl-cert</literal> identifies the server 
+            <option>--ssl-cert</option> identifies the server 
             certificate.
            </para></listitem>
            <listitem><para>
-            <literal>--ssl-key</literal> identifies the client 
+            <option>--ssl-key</option> identifies the client 
             certificate.
            </para></listitem>
           </itemizedlist>
@@ -17527,7 +16096,7 @@
               option is unnecessary.
             </para>
 
-<!--  TODO: isn't preceding sentence also true for X509, SUBJECT, and CIPHER? -->
+<!--  TODO: is not preceding sentence also true for X509, SUBJECT, and CIPHER? -->
 
 <programlisting>
 mysql&gt; GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'
@@ -17638,7 +16207,7 @@
 
           <listitem>
             <para>
-              <literal>--ssl</literal>
+              <option>--ssl</option>
             </para>
 
             <para>
@@ -17647,21 +16216,21 @@
               the client to connect to the server using SSL. This option
               is not sufficient in itself to cause an SSL connection to
               be used. You must also specify the
-              <literal>--ssl-ca</literal>,
-              <literal>--ssl-cert</literal>, and
-              <literal>--ssl-key</literal> options.
+              <option>--ssl-ca</option>,
+              <option>--ssl-cert</option>, and
+              <option>--ssl-key</option> options.
             </para>
 
             <para>
               This option is more often used in its opposite form to
               indicate that SSL should <emphasis>not</emphasis> be used.
               To do this, specify the option as
-              <literal>--skip-ssl</literal> or
-              <literal>--ssl=0</literal>.
+              <option>--skip-ssl</option> or
+              <option>--ssl=0</option>.
             </para>
 
             <para>
-              Note that use of <literal>--ssl</literal> doesn't
+              Note that use of <option>--ssl</option> does not
               <emphasis>require</emphasis> an SSL connection. For
               example, if the server or client is compiled without SSL
               support, a normal unencrypted connection is used.
@@ -17679,7 +16248,7 @@
 
           <listitem>
             <para>
-              <literal>--ssl-ca=<replaceable>file_name</replaceable></literal>
+              <option>--ssl-ca=<replaceable>file_name</replaceable></option>
             </para>
 
             <para>
@@ -17689,7 +16258,7 @@
 
           <listitem>
             <para>
-              <literal>--ssl-capath=<replaceable>directory_name</replaceable></literal>
+              <option>--ssl-capath=<replaceable>directory_name</replaceable></option>
             </para>
 
             <para>
@@ -17700,7 +16269,7 @@
 
           <listitem>
             <para>
-              <literal>--ssl-cert=<replaceable>file_name</replaceable></literal>
+              <option>--ssl-cert=<replaceable>file_name</replaceable></option>
             </para>
 
             <para>
@@ -17711,7 +16280,7 @@
 
           <listitem>
             <para>
-              <literal>--ssl-cipher=<replaceable>cipher_list</replaceable></literal>
+              <option>--ssl-cipher=<replaceable>cipher_list</replaceable></option>
             </para>
 
             <para>
@@ -17721,13 +16290,13 @@
             </para>
 
             <para>
-              Example: <literal>--ssl-cipher=ALL:-AES:-EXP</literal>
+              Example: <option>--ssl-cipher=ALL:-AES:-EXP</option>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>--ssl-key=<replaceable>file_name</replaceable></literal>
+              <option>--ssl-key=<replaceable>file_name</replaceable></option>
             </para>
 
             <para>
@@ -17852,7 +16421,7 @@
 
     <title id='title-disaster-prevention'>&title-disaster-prevention;</title>
 
-<!--  TODO: a lot of the information here assumes MyISAM implicitly and won't -->
+<!--  TODO: a lot of the information here assumes MyISAM implicitly and will not -->
 
 <!--  necessarily work for other storage engines. -->
 
@@ -17934,7 +16503,7 @@
             You can also simply copy all table files
             (<filename>*.frm</filename>, <filename>*.MYD</filename>, and
             <filename>*.MYI</filename> files) as long as the server
-            isn't updating anything. The <command>mysqlhotcopy</command>
+            is not updating anything. The <command>mysqlhotcopy</command>
             script uses this method. (But note that these methods do not
             work if your database contains <literal>InnoDB</literal>
             tables. <literal>InnoDB</literal> does not store table
@@ -17953,7 +16522,7 @@
         <listitem>
           <para>
             Stop <command>mysqld</command> if it's running, then start
-            it with the <literal>--log-bin[=file_name]</literal> option.
+            it with the <option>--log-bin[=file_name]</option> option.
             See <xref linkend="binary-log"/>. The binary log files
             provide you with the information you need to replicate
             changes to the database that are made subsequent to the
@@ -17971,7 +16540,7 @@
 
       <para>
         MySQL supports incremental backups: You need to start the server
-        with the <literal>--log-bin</literal> option to enable binary
+        with the <option>--log-bin</option> option to enable binary
         logging; see <xref linkend="binary-log"/>. At the moment you
         want to make an incremental backup (containing all changes that
         happened since the last full or incremental backup), you should
@@ -17998,7 +16567,7 @@
         commands, you should also back up any
         <filename>SQL_LOAD-*</filename> files that may exist in the
         directory specified by the
-        <literal>--slave-load-tmpdir</literal> option. (This location
+        <option>--slave-load-tmpdir</option> option. (This location
         defaults to the value of the <literal>tmpdir</literal> variable
         if not specified.) The slave needs these files to resume
         replication of any interrupted <literal>LOAD DATA
@@ -18012,7 +16581,7 @@
         of all cases. If <command>myisamchk</command> fails, try the
         following procedure. Note that it works only if you have enabled
         binary logging by starting MySQL with the
-        <literal>--log-bin</literal> option; see
+        <option>--log-bin</option> option; see
         <xref linkend="binary-log"/>.
       </para>
 
@@ -18186,7 +16755,7 @@
 
       <para>
         The example commands do not include options such as
-        <literal>--user</literal> and <literal>--password</literal> for
+        <option>--user</option> and <option>--password</option> for
         the <command>mysqldump</command> and <command>mysql</command>
         programs. You should include such options as necessary so that
         the MySQL server allows you to connect to it.
@@ -18279,7 +16848,7 @@
           This is an online, non-blocking backup that does not disturb
           the reads and writes on the tables. We assumed earlier that
           our tables are <literal>InnoDB</literal> tables, so
-          <literal>--single-transaction</literal> uses a consistent read
+          <option>--single-transaction</option> uses a consistent read
           and guarantees that data seen by <command>mysqldump</command>
           does not change. (Changes made by other clients to
           <literal>InnoDB</literal> tables are not seen by the
@@ -18316,12 +16885,12 @@
         <para>
           To make incremental backups, we need to save the incremental
           changes. The MySQL server should always be started with the
-          <literal>--log-bin</literal> option so that it stores these
+          <option>--log-bin</option> option so that it stores these
           changes in a file while it updates data. This option enables
           binary logging, so that the server writes each SQL statement
           that updates data into a file called a MySQL binary log. Let's
           look at the data directory of a MySQL server that was started
-          with the <literal>--log-bin</literal> option and that has been
+          with the <option>--log-bin</option> option and that has been
           running for some days. We find these MySQL binary log files:
         </para>
 
@@ -18485,7 +17054,7 @@
           location (RAID disks, SAN, ...) different from the place where
           it stores its data files, so that these logs were not in the
           destroyed disk. (That is, we can start the server with a
-          <literal>--log-bin</literal> option that specifies a location
+          <option>--log-bin</option> option that specifies a location
           on a different physical device than the one on which the data
           directory resides. That way, the logs are not lost even if the
           device containing the directory is.) If we had done this, we
@@ -18512,8 +17081,8 @@
           <listitem>
             <para>
               Always run the MySQL server with the
-              <literal>--log-bin</literal> option, or even
-              <literal>--log-bin=<replaceable>log_name</replaceable></literal>,
+              <option>--log-bin</option> option, or even
+              <option>--log-bin=<replaceable>log_name</replaceable></option>,
               where the log file name is located on some safe media
               different from the drive on which the data directory is
               located. If you have such safe media, this can also be
@@ -18677,7 +17246,7 @@
           <filename>/tmp</filename> directory which will show the SQL
           statements around the time the deleterious SQL statement was
           executed. You would then open this file with a text editor and
-          look for the statement that you don't want to repeat. Once the
+          look for the statement that you do not want to repeat. Once the
           position numbers in the binary log are determined for stopping
           and resuming the recovery, make note of them. Positions are
           labeled with <literal>log_pos</literal> followed by a number.
@@ -18836,7 +17405,7 @@
           database directory, you must specify the path to the database
           directory, because <command>myisamchk</command> has no idea
           where the database is located. In fact,
-          <command>myisamchk</command> doesn't actually care whether the
+          <command>myisamchk</command> does not actually care whether the
           files you are working on are located in a database directory.
           You can copy the files that correspond to a database table
           into some other location and perform recovery operations on
@@ -18966,7 +17535,7 @@
 
           <listitem>
             <para>
-              <literal>--help, -?</literal>
+              <option>--help, -?</option>
             </para>
 
             <para>
@@ -18989,7 +17558,7 @@
 
           <listitem>
             <para>
-              <literal>--silent, -s</literal>
+              <option>--silent, -s</option>
             </para>
 
             <para>
@@ -19001,7 +17570,7 @@
 
           <listitem>
             <para>
-              <literal>--verbose, -v</literal>
+              <option>--verbose, -v</option>
             </para>
 
             <para>
@@ -19015,7 +17584,7 @@
 
           <listitem>
             <para>
-              <literal>--version, -V</literal>
+              <option>--version, -V</option>
             </para>
 
             <para>
@@ -19025,7 +17594,7 @@
 
           <listitem>
             <para>
-              <literal>--wait, -w</literal>
+              <option>--wait, -w</option>
             </para>
 
             <para>
@@ -19033,7 +17602,7 @@
               locked, wait until the table is unlocked before
               continuing. Note that if you are running
               <command>mysqld</command> with the
-              <literal>--skip-external-locking</literal> option, the
+              <option>--skip-external-locking</option> option, the
               table can be locked only by another
               <command>myisamchk</command> command.
             </para>
@@ -19043,7 +17612,7 @@
 
         <para>
           You can also set the following variables by using
-          <literal>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
+          <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
           options:
         </para>
 
@@ -19147,7 +17716,7 @@
 
         <para>
           It is also possible to set variables by using
-          <literal>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
+          <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
           or <literal>-O
           <replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
           syntax. However, this syntax is deprecated as of MySQL 4.0.
@@ -19162,12 +17731,12 @@
         <para>
           <literal>sort_buffer_size</literal> is used when the keys are
           repaired by sorting keys, which is the normal case when you
-          use <literal>--recover</literal>.
+          use <option>--recover</option>.
         </para>
 
         <para>
           <literal>key_buffer_size</literal> is used when you are
-          checking the table with <literal>--extend-check</literal> or
+          checking the table with <option>--extend-check</option> or
           when the keys are repaired by inserting keys row by row into
           the table (like when doing normal inserts). Repairing through
           the key buffer is used in the following cases:
@@ -19177,7 +17746,7 @@
 
           <listitem>
             <para>
-              You use <literal>--safe-recover</literal>.
+              You use <option>--safe-recover</option>.
             </para>
           </listitem>
 
@@ -19191,7 +17760,7 @@
               operation needs to store the complete key values as it
               proceeds. If you have lots of temporary space and you can
               force <command>myisamchk</command> to repair by sorting,
-              you can use the <literal>--sort-recover</literal> option.
+              you can use the <option>--sort-recover</option> option.
             </para>
           </listitem>
 
@@ -19306,7 +17875,7 @@
 
           <listitem>
             <para>
-              <literal>--check, -c</literal>
+              <option>--check, -c</option>
             </para>
 
             <para>
@@ -19318,7 +17887,7 @@
 
           <listitem>
             <para>
-              <literal>--check-only-changed, -C</literal>
+              <option>--check-only-changed, -C</option>
             </para>
 
             <para>
@@ -19328,7 +17897,7 @@
 
           <listitem>
             <para>
-              <literal>--extend-check, -e</literal>
+              <option>--extend-check, -e</option>
             </para>
 
             <para>
@@ -19340,7 +17909,7 @@
             </para>
 
             <para>
-              If you are using <literal>--extend-check</literal> and
+              If you are using <option>--extend-check</option> and
               have plenty of memory, setting the
               <literal>key_buffer_size</literal> variable to a large
               value helps the repair operation run faster.
@@ -19349,7 +17918,7 @@
 
           <listitem>
             <para>
-              <literal>--fast, -F</literal>
+              <option>--fast, -F</option>
             </para>
 
             <para>
@@ -19359,21 +17928,21 @@
 
           <listitem>
             <para>
-              <literal>--force, -f</literal>
+              <option>--force, -f</option>
             </para>
 
             <para>
               Do a repair operation automatically if
               <command>myisamchk</command> finds any errors in the
               table. The repair type is the same as that specified with
-              the <literal>--repair</literal> or <literal>-r</literal>
+              the <option>--repair</option> or <option>-r</option>
               option.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>--information, -i</literal>
+              <option>--information, -i</option>
             </para>
 
             <para>
@@ -19384,12 +17953,12 @@
 
           <listitem>
             <para>
-              <literal>--medium-check, -m</literal>
+              <option>--medium-check, -m</option>
             </para>
 
             <para>
               Do a check that is faster than an
-              <literal>--extend-check</literal> operation. This finds
+              <option>--extend-check</option> operation. This finds
               only 99.99% of all errors, which should be good enough in
               most cases.
             </para>
@@ -19397,31 +17966,31 @@
 
           <listitem>
             <para>
-              <literal>--read-only, -T</literal>
+              <option>--read-only, -T</option>
             </para>
 
             <para>
-              Don't mark the table as checked. This is useful if you use
+              do not mark the table as checked. This is useful if you use
               <command>myisamchk</command> to check a table that is in
-              use by some other application that doesn't use locking,
+              use by some other application that does not use locking,
               such as <command>mysqld</command> when run with the
-              <literal>--skip-external-locking</literal> option.
+              <option>--skip-external-locking</option> option.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>--update-state, -U</literal>
+              <option>--update-state, -U</option>
             </para>
 
             <para>
               Store information in the <filename>.MYI</filename> file to
               indicate when the table was checked and whether the table
               crashed. This should be used to get full benefit of the
-              <literal>--check-only-changed</literal> option, but you
-              shouldn't use this option if the <command>mysqld</command>
+              <option>--check-only-changed</option> option, but you
+              should not use this option if the <command>mysqld</command>
               server is using the table and you are running it with the
-              <literal>--skip-external-locking</literal> option.
+              <option>--skip-external-locking</option> option.
             </para>
           </listitem>
 
@@ -19452,7 +18021,7 @@
 
           <listitem>
             <para>
-              <literal>--backup, -B</literal>
+              <option>--backup, -B</option>
             </para>
 
             <para>
@@ -19463,7 +18032,7 @@
 
           <listitem>
             <para>
-              <literal>--character-sets-dir=<replaceable>path</replaceable></literal>
+              <option>--character-sets-dir=<replaceable>path</replaceable></option>
             </para>
 
             <para>
@@ -19474,7 +18043,7 @@
 
           <listitem>
             <para>
-              <literal>--correct-checksum</literal>
+              <option>--correct-checksum</option>
             </para>
 
             <para>
@@ -19496,20 +18065,20 @@
 
           <listitem>
             <para>
-              <literal>--extend-check, -e</literal>
+              <option>--extend-check, -e</option>
             </para>
 
             <para>
               Do a repair that tries to recover every possible row from
               the data file. Normally this also finds a lot of garbage
-              rows. Don't use this option unless you are totally
+              rows. do not use this option unless you are totally
               desperate.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>--force, -f</literal>
+              <option>--force, -f</option>
             </para>
 
             <para>
@@ -19542,13 +18111,13 @@
 
           <listitem>
             <para>
-              <literal>--no-symlinks, -l</literal>
+              <option>--no-symlinks, -l</option>
             </para>
 
             <para>
               Do not follow symbolic links. Normally
               <command>myisamchk</command> repairs the table that a
-              symlink points to. This option doesn't exist as of MySQL
+              symlink points to. This option does not exist as of MySQL
               4.0, because versions from 4.0 on do not remove symlinks
               during repair operations.
             </para>
@@ -19556,7 +18125,7 @@
 
           <listitem>
             <para>
-              <literal>--parallel-recover, -p</literal>
+              <option>--parallel-recover, -p</option>
             </para>
 
             <para>
@@ -19570,7 +18139,7 @@
 
           <listitem>
             <para>
-              <literal>--quick, -q</literal>
+              <option>--quick, -q</option>
             </para>
 
             <para>
@@ -19583,17 +18152,17 @@
 
           <listitem>
             <para>
-              <literal>--recover, -r</literal>
+              <option>--recover, -r</option>
             </para>
 
             <para>
               Do a repair that can fix almost any problem except unique
-              keys that aren't unique (which is an extremely unlikely
+              keys that are not unique (which is an extremely unlikely
               error with
               <literal>ISAM</literal>/<literal>MyISAM</literal> tables).
               If you want to recover a table, this is the option to try
               first. You should try <literal>-o</literal> only if
-              <command>myisamchk</command> reports that the table can't
+              <command>myisamchk</command> reports that the table cannot
               be recovered by <literal>-r</literal>. (In the unlikely
               case that <literal>-r</literal> fails, the data file is
               still intact.)
@@ -19607,7 +18176,7 @@
 
           <listitem>
             <para>
-              <literal>--safe-recover, -o</literal>
+              <option>--safe-recover, -o</option>
             </para>
 
             <para>
@@ -19630,19 +18199,19 @@
 
           <listitem>
             <para>
-              <literal>--set-character-set=<replaceable>name</replaceable></literal>
+              <option>--set-character-set=<replaceable>name</replaceable></option>
             </para>
 
             <para>
               Change the character set used by the table indexes. This
-              option was replaced by <literal>--set-collation</literal>
+              option was replaced by <option>--set-collation</option>
               in MySQL 4.1.1/5.0.3.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>--set-collation=<replaceable>name</replaceable></literal>
+              <option>--set-collation=<replaceable>name</replaceable></option>
             </para>
 
             <para>
@@ -19655,7 +18224,7 @@
 
           <listitem>
             <para>
-              <literal>--sort-recover, -n</literal>
+              <option>--sort-recover, -n</option>
             </para>
 
             <para>
@@ -19687,7 +18256,7 @@
 
           <listitem>
             <para>
-              <literal>--unpack, -u</literal>
+              <option>--unpack, -u</option>
             </para>
 
             <para>
@@ -19713,7 +18282,7 @@
 
           <listitem>
             <para>
-              <literal>--analyze, -a</literal>
+              <option>--analyze, -a</option>
             </para>
 
             <para>
@@ -19730,7 +18299,7 @@
 
           <listitem>
             <para>
-              <literal>--description, -d</literal>
+              <option>--description, -d</option>
             </para>
 
             <para>
@@ -19758,7 +18327,7 @@
 
           <listitem>
             <para>
-              <literal>--sort-index, -S</literal>
+              <option>--sort-index, -S</option>
             </para>
 
             <para>
@@ -19843,7 +18412,7 @@
             <para>
               Double the size of the data file (the original one and a
               copy). This space is not needed if you do a repair with
-              <literal>--quick</literal>; in this case, only the index
+              <option>--quick</option>; in this case, only the index
               file is re-created. This space is needed on the same
               filesystem as the original data file! (The copy is created
               in the same directory as the original.)
@@ -19861,9 +18430,9 @@
 
           <listitem>
             <para>
-              When using <literal>--recover</literal> or
-              <literal>--sort-recover</literal> (but not when using
-              <literal>--safe-recover</literal>), you need space for a
+              When using <option>--recover</option> or
+              <option>--sort-recover</option> (but not when using
+              <option>--safe-recover</option>), you need space for a
               sort buffer. The amount of space required is:
             </para>
 
@@ -19878,7 +18447,7 @@
               <replaceable>tbl_name</replaceable></command>. This space
               is allocated in the temporary directory (specified by
               <literal>TMPDIR</literal> or
-              <literal>--tmpdir=<replaceable>path</replaceable></literal>).
+              <option>--tmpdir=<replaceable>path</replaceable></option>).
             </para>
           </listitem>
 
@@ -19886,8 +18455,8 @@
 
         <para>
           If you have a problem with disk space during repair, you can
-          try to use <literal>--safe-recover</literal> instead of
-          <literal>--recover</literal>.
+          try to use <option>--safe-recover</option> instead of
+          <option>--recover</option>.
         </para>
 
       </section>
@@ -19908,24 +18477,24 @@
 
         <para>
           If you run <command>mysqld</command> with
-          <literal>--skip-external-locking</literal> (which is the
-          default on some systems, such as Linux), you can't reliably
+          <option>--skip-external-locking</option> (which is the
+          default on some systems, such as Linux), you cannot reliably
           use <command>myisamchk</command> to check a table when
           <command>mysqld</command> is using the same table. If you can
           be sure that no one is accessing the tables through
           <command>mysqld</command> while you run
           <command>myisamchk</command>, you only have to do
           <command>mysqladmin flush-tables</command> before you start
-          checking the tables. If you can't guarantee this, then you
+          checking the tables. If you cannot guarantee this, then you
           must stop <command>mysqld</command> while you check the
           tables. If you run <command>myisamchk</command> while
           <command>mysqld</command> is updating the tables, you may get
-          a warning that a table is corrupt even when it isn't.
+          a warning that a table is corrupt even when it is not.
         </para>
 
         <para>
           If you are not using
-          <literal>--skip-external-locking</literal>, you can use
+          <option>--skip-external-locking</option>, you can use
           <command>myisamchk</command> to check tables at any time.
           While you do this, all clients that try to update the table
           wait until <command>myisamchk</command> is ready before
@@ -19937,7 +18506,7 @@
           tables, you <emphasis>must</emphasis> always ensure that the
           <command>mysqld</command> server is not using the table (this
           also applies if you are using
-          <literal>--skip-external-locking</literal>). If you don't take
+          <option>--skip-external-locking</option>). If you do not take
           down <command>mysqld</command>, you should at least do a
           <command>mysqladmin flush-tables</command> before you run
           <command>myisamchk</command>. Your tables <emphasis>may become
@@ -20001,7 +18570,7 @@
           <filename>.MYD</filename> data file row by row. It ends the
           repair stage by removing the old <filename>.MYD</filename>
           file and renaming the new file to the original file name. If
-          you use <literal>--quick</literal>,
+          you use <option>--quick</option>,
           <command>myisamchk</command> does not create a temporary
           <filename>.MYD</filename> file, but instead assumes that the
           <filename>.MYD</filename> file is correct and only generates a
@@ -20009,12 +18578,12 @@
           file. This is safe, because <command>myisamchk</command>
           automatically detects whether the <filename>.MYD</filename>
           file is corrupt and aborts the repair if it is. You can also
-          specify the <literal>--quick</literal> option twice to
+          specify the <option>--quick</option> option twice to
           <command>myisamchk</command>. In this case,
           <command>myisamchk</command> does not abort on some errors
           (such as duplicate-key errors) but instead tries to resolve
           them by modifying the <filename>.MYD</filename> file. Normally
-          the use of two <literal>--quick</literal> options is useful
+          the use of two <option>--quick</option> options is useful
           only if you have too little free disk space to perform a
           normal repair. In this case, you should at least make a backup
           before running <command>myisamchk</command>.
@@ -20055,13 +18624,13 @@
             </para>
 
             <para>
-              This finds 99.99% of all errors. What it can't find is
+              This finds 99.99% of all errors. What it cannot find is
               corruption that involves <emphasis>only</emphasis> the
               data file (which is very unusual). If you want to check a
               table, you should normally run
               <command>myisamchk</command> without options or with
               either the <literal>-s</literal> or
-              <literal>--silent</literal> option.
+              <option>--silent</option> option.
             </para>
           </listitem>
 
@@ -20094,7 +18663,7 @@
               This may take a long time for a large table that has many
               indexes. Normally, <command>myisamchk</command> stops
               after the first error it finds. If you want to obtain more
-              information, you can add the <literal>--verbose</literal>
+              information, you can add the <option>--verbose</option>
               (<literal>-v</literal>) option. This causes
               <command>myisamchk</command> to keep going, up through a
               maximum of 20 errors.
@@ -20174,7 +18743,7 @@
 
           <listitem>
             <para>
-              Can't find file
+              cannot find file
               <filename><replaceable>tbl_name</replaceable>.MYI</filename>
               (Errcode: <replaceable>###</replaceable>)
             </para>
@@ -20237,7 +18806,7 @@
 </programlisting>
 
         <para>
-          If you don't know the current table option values, use
+          If you do not know the current table option values, use
           <literal>SHOW CREATE TABLE tbl_name</literal>.
         </para>
 
@@ -20294,7 +18863,7 @@
 
         <para>
           If the <command>mysqld</command> server is down, you should
-          use the <literal>--update-state</literal> option to tell
+          use the <option>--update-state</option> option to tell
           <command>myisamchk</command> to mark the table as 'checked'.
         </para>
 
@@ -20360,7 +18929,7 @@
               --safe-recover
               <replaceable>tbl_name</replaceable></command>. Safe
               recovery mode uses an old recovery method that handles a
-              few cases that regular recovery mode doesn't (but is
+              few cases that regular recovery mode does not (but is
               slower).
             </para>
           </listitem>
@@ -20406,7 +18975,7 @@
 </programlisting>
 
             <para>
-              If your version of MySQL doesn't have <literal>TRUNCATE
+              If your version of MySQL does not have <literal>TRUNCATE
               TABLE</literal>, use <literal>DELETE FROM
               <replaceable>tbl_name</replaceable></literal> instead.
             </para>
@@ -20415,7 +18984,7 @@
           <listitem>
             <para>
               Copy the old data file back onto the newly created data
-              file. (Don't just move the old file back onto the new
+              file. (do not just move the old file back onto the new
               file; you want to retain a copy in case something goes
               wrong.)
             </para>
@@ -20425,7 +18994,7 @@
 
         <para>
           Go back to Stage 2. <command>myisamchk -r -q</command> should
-          work. (This shouldn't be an endless loop.)
+          work. (This should not be an endless loop.)
         </para>
 
         <para>
@@ -20442,7 +19011,7 @@
         <para>
           You should reach this stage only if the
           <filename>.frm</filename> description file has also crashed.
-          That should never happen, because the description file isn't
+          That should never happen, because the description file is not
           changed after the table is created:
         </para>
 
@@ -20459,7 +19028,7 @@
 
           <listitem>
             <para>
-              If you don't have a backup but know exactly how the table
+              If you do not have a backup but know exactly how the table
               was created, create a copy of the table in another
               database. Remove the new data file, then move the
               <filename>.frm</filename> description and
@@ -20519,7 +19088,7 @@
 
           <listitem>
             <para>
-              <literal>-S</literal>, <literal>--sort-index</literal>
+              <literal>-S</literal>, <option>--sort-index</option>
             </para>
           </listitem>
 
@@ -20527,13 +19096,13 @@
             <para>
               <literal>-R
               <replaceable>index_num</replaceable></literal>,
-              <literal>--sort-records=<replaceable>index_num</replaceable></literal>
+              <option>--sort-records=<replaceable>index_num</replaceable></option>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>-a</literal>, <literal>--analyze</literal>
+              <literal>-a</literal>, <option>--analyze</option>
             </para>
           </listitem>
 
@@ -20576,7 +19145,7 @@
         Another way to check tables is to use
         <command>myisamchk</command>. For maintenance purposes, you can
         use <command>myisamchk -s</command>. The <literal>-s</literal>
-        option (short for <literal>--silent</literal>) causes
+        option (short for <option>--silent</option>) causes
         <command>myisamchk</command> to run in silent mode, printing
         messages only when errors occur.
       </para>
@@ -20592,7 +19161,7 @@
         that could have been affected. (These are <quote>expected
         crashed tables.</quote>) To check <literal>MyISAM</literal>
         tables automatically, start the server with the
-        <literal>--myisam-recover</literal> option, available as of
+        <option>--myisam-recover</option> option, available as of
         MySQL 3.23.25. If your server is too old to support this option,
         you could add a test to <command>mysqld_safe</command> that runs
         <command>myisamchk</command> to check all tables that have been
@@ -20705,10 +19274,10 @@
             Runs <command>myisamchk</command> in <quote>describe
             mode</quote> to produce a description of your table. If you
             start the MySQL server using the
-            <literal>--skip-external-locking</literal> option,
+            <option>--skip-external-locking</option> option,
             <command>myisamchk</command> may report an error for a table
             that is updated while it runs. However, because
-            <command>myisamchk</command> doesn't change the table in
+            <command>myisamchk</command> does not change the table in
             describe mode, there is no risk of destroying data.
           </para>
         </listitem>
@@ -21425,7 +19994,7 @@
 
       <para>
         All MySQL binary distributions are compiled with
-        <literal>--with-extra-charsets=complex</literal>. This adds code
+        <option>--with-extra-charsets=complex</option>. This adds code
         to all standard programs that enables them to handle
         <literal>latin1</literal> and all multi-byte character sets
         within the binary. Other character sets are loaded from a
@@ -21441,9 +20010,9 @@
 
       <para>
         You can change the character set with the
-        <literal>--default-character-set</literal> option when you start
+        <option>--default-character-set</option> option when you start
         the server. The character sets available depend on the
-        <literal>--with-charset=<replaceable>charset</replaceable></literal>
+        <option>--with-charset=<replaceable>charset</replaceable></option>
         and <literal>--with-extra-charsets=
         <replaceable>list-of-charsets</replaceable> | complex | all |
         none</literal> options to <command>configure</command>, and the
@@ -21454,7 +20023,7 @@
 
       <para>
         As of MySQL 4.1.1, you can also change the character set
-        collation with the <literal>--default-collation</literal> option
+        collation with the <option>--default-collation</option> option
         when you start the server. The collation must be a legal
         collation for the default character set. (Use the <literal>SHOW
         COLLATION</literal> statement to determine which collations are
@@ -21497,7 +20066,7 @@
 
       <para>
         You can do this by specifying a
-        <literal>--character-sets-dir</literal> option to indicate the
+        <option>--character-sets-dir</option> option to indicate the
         path to the directory in which the dynamic MySQL character sets
         are stored. For example, you can put the following in an option
         file:
@@ -21529,7 +20098,7 @@
         <para>
           In MySQL 4.0, to get German sorting order, you should start
           <command>mysqld</command> with a
-          <literal>--default-character-set=latin1_de</literal> option.
+          <option>--default-character-set=latin1_de</option> option.
           This affects server behavior in several ways:
         </para>
 
@@ -21579,8 +20148,8 @@
           <literal>latin1_german2_ci</literal> collation. For example,
           to start the server with the
           <literal>latin1_german1_ci</literal> collation, use the
-          <literal>--character-set-server=latin1</literal> and
-          <literal>--collation-server=latin1_german1_ci</literal>
+          <option>--character-set-server=latin1</option> and
+          <option>--collation-server=latin1_german1_ci</option>
           options.
         </para>
 
@@ -21627,7 +20196,7 @@
 
       <para>
         To start <command>mysqld</command> with a particular language
-        for error messages, use the <literal>--language</literal> or
+        for error messages, use the <option>--language</option> or
         <literal>-L</literal> option. The option value can be a language
         name or the full path to the error message file. For example:
       </para>
@@ -21853,7 +20422,7 @@
 <programlisting>
 /*
  * This comment is parsed by configure to create ctype.c,
- * so don't change it unless you know what you are doing.
+ * so do not change it unless you know what you are doing.
  *
  * .configure. number_<replaceable>MYSET</replaceable>=<replaceable>MYNUMBER</replaceable>
  * .configure. strxfrm_multiply_<replaceable>MYSET</replaceable>=<replaceable>N</replaceable>
@@ -22107,14 +20676,14 @@
             sets are stored. (Default
             <filename>/usr/local/mysql/share/mysql/charsets</filename>).
             This can be fixed by using the
-            <literal>--character-sets-dir</literal> option when you run
+            <option>--character-sets-dir</option> option when you run
             the program in question.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            The character set is a multi-byte character set that can't
+            The character set is a multi-byte character set that cannot
             be loaded dynamically. In this case, you must recompile the
             program with support for the character set.
           </para>
@@ -22124,7 +20693,7 @@
 <!--  TODO: dynamic = not compiled in? -->
 
           <para>
-            The character set is a dynamic character set, but you don't
+            The character set is a dynamic character set, but you do not
             have a configure file for it. In this case, you should
             install the configure file for the character set from a new
             MySQL distribution.
@@ -22133,7 +20702,7 @@
 
         <listitem>
           <para>
-            If your <filename>Index</filename> file doesn't contain the
+            If your <filename>Index</filename> file does not contain the
             name for the character set, your program displays the
             following error message:
           </para>
@@ -22168,14 +20737,14 @@
       <para>
         Before MySQL 4.1.3, you can set the time zone for the server
         with the
-        <literal>--timezone=<replaceable>timezone_name</replaceable></literal>
+        <option>--timezone=<replaceable>timezone_name</replaceable></option>
         option to <command>mysqld_safe</command>. You can also set it by
         setting the <literal>TZ</literal> environment variable before
         you start <command>mysqld</command>.
       </para>
 
       <para>
-        The allowable values for <literal>--timezone</literal> or
+        The allowable values for <option>--timezone</option> or
         <literal>TZ</literal> are system-dependent. Consult your
         operating system documentation to see what values are
         acceptable.
@@ -22204,7 +20773,7 @@
             value is <literal>'SYSTEM'</literal>, which indicates that
             the server time zone is the same as the system time zone.
             The initial value can be specified explicitly with the
-            <literal>--default-time-zone=<replaceable>timezone</replaceable></literal>
+            <option>--default-time-zone=<replaceable>timezone</replaceable></option>
             option. If you have the <literal>SUPER</literal> privilege,
             you can set the global value at runtime with this statement:
           </para>
@@ -22320,7 +20889,7 @@
 </programlisting>
 
       <para>
-        If your system doesn't have a zoneinfo database (for example,
+        If your system does not have a zoneinfo database (for example,
         Windows or HP-UX), you can use the package of pre-built time
         zone tables that is available for download at
         <ulink url="http://dev.mysql.com/downloads/timezones.html"/>.
@@ -22334,7 +20903,7 @@
       </para>
 
       <para>
-        <emphasis role="bold">Warning!</emphasis> Please don't use the
+        <emphasis role="bold">Warning!</emphasis> Please do not use the
         downloadable package if your system has a zoneinfo database. Use
         the <command>mysql_tzinfo_to_sql</command> utility instead!
         Otherwise, you may cause a difference in datetime handling
@@ -22449,7 +21018,7 @@
       <para>
         Beginning with MySQL 4.0.10, you can specify where
         <command>mysqld</command> stores the error log file with the
-        <literal>--log-error[=<replaceable>file_name</replaceable>]</literal>
+        <option>--log-error[=<replaceable>file_name</replaceable>]</option>
         option. If no <replaceable>file_name</replaceable> value is
         given, <command>mysqld</command> uses the name
         <filename><replaceable>host_name</replaceable>.err</filename>
@@ -22466,20 +21035,20 @@
         <command>mysqld_safe</command> which redirected the error file
         to <literal><replaceable>host_name</replaceable>.err</literal>.
         You could change this filename by specifying a
-        <literal>--err-log=<replaceable>file_name</replaceable></literal>
+        <option>--err-log=<replaceable>file_name</replaceable></option>
         option to <command>mysqld_safe</command>.
       </para>
 
       <para>
-        If you don't specify <literal>--log-error</literal>, or (on
-        Windows) if you use the <literal>--console</literal> option,
+        If you do not specify <option>--log-error</option>, or (on
+        Windows) if you use the <option>--console</option> option,
         errors are written to stderr, the standard error output. Usually
         this is your terminal.
       </para>
 
       <para>
         On Windows, error output is always written to the
-        <literal>.err</literal> file if <literal>--console</literal> is
+        <literal>.err</literal> file if <option>--console</option> is
         not given.
       </para>
 
@@ -22501,7 +21070,7 @@
       <para>
         If you want to know what happens within
         <command>mysqld</command>, you should start it with the
-        <literal>--log[=<replaceable>file_name</replaceable>]</literal>
+        <option>--log[=<replaceable>file_name</replaceable>]</option>
         or <literal>-l [<replaceable>file_name</replaceable>]</literal>
         option. If no <replaceable>file_name</replaceable> value is
         given, the default name is
@@ -22518,13 +21087,13 @@
 
       <para>
         Older versions of the <command>mysql.server</command> script
-        (from MySQL 3.23.4 to 3.23.8) pass a <literal>--log</literal>
+        (from MySQL 3.23.4 to 3.23.8) pass a <option>--log</option>
         option to <command>safe_mysqld</command> to enable the general
         query log. If you need better performance when you start using
         MySQL in a production environment, you can remove the
-        <literal>--log</literal> option from
+        <option>--log</option> option from
         <command>mysql.server</command> or change it to
-        <literal>--log-bin</literal>. See <xref linkend="binary-log"/>.
+        <option>--log-bin</option>. See <xref linkend="binary-log"/>.
       </para>
 
       <para>
@@ -22582,13 +21151,13 @@
 
       <para>
         When started with the
-        <literal>--log-update[=<replaceable>file_name</replaceable>]</literal>
+        <option>--log-update[=<replaceable>file_name</replaceable>]</option>
         option, <command>mysqld</command> writes a log file containing
         all SQL statements that update data. If no
         <replaceable>file_name</replaceable> value is given, the default
         name is name of the host machine. If a filename is given, but it
-        doesn't contain a leading path, the file is written in the data
-        directory. If <filename>file_name</filename> doesn't have an
+        does not contain a leading path, the file is written in the data
+        directory. If <filename>file_name</filename> does not have an
         extension, <command>mysqld</command> creates log files with
         names of the form <replaceable>file_name.###</replaceable>,
         where <replaceable>###</replaceable> is a number that is
@@ -22668,8 +21237,8 @@
 
       <para>
         The binary log also contains information about how long each
-        statement took that updated the database. It doesn't contain
-        statements that don't modify any data. If you want to log all
+        statement took that updated the database. It does not contain
+        statements that do not modify any data. If you want to log all
         statements (for example, to identify a problem query) you should
         use the general query log. See <xref linkend="query-log"/>.
       </para>
@@ -22696,12 +21265,12 @@
 
       <para>
         When started with the
-        <literal>--log-bin[=<replaceable>file_name</replaceable>]</literal>
+        <option>--log-bin[=<replaceable>file_name</replaceable>]</option>
         option, <command>mysqld</command> writes a log file containing
         all SQL commands that update data. If no
         <replaceable>file_name</replaceable> value is given, the default
         name is the name of the host machine followed by
-        <literal>-bin</literal>. If file name is given, but it doesn't
+        <literal>-bin</literal>. If file name is given, but it does not
         contain a path, the file is written in the data directory. It is
         recommended to specify a filename, see
         <xref linkend="open-bugs"/> for the reason.
@@ -22709,7 +21278,7 @@
 
       <para>
         If you supply an extension in the log name (for example,
-        <literal>--log-bin=<replaceable>file_name.extension</replaceable></literal>),
+        <option>--log-bin=<replaceable>file_name.extension</replaceable></option>),
         the extension is silently removed and ignored.
       </para>
 
@@ -22731,7 +21300,7 @@
         default this has the same name as the binary log file, with the
         extension <literal>'.index'</literal>. You can change the name
         of the binary log index file with the
-        <literal>--log-bin-index[=<replaceable>file_name</replaceable>]</literal>
+        <option>--log-bin-index[=<replaceable>file_name</replaceable>]</option>
         option. You should not manually edit this file while
         <command>mysqld</command> is running; doing so would confuse
         <command>mysqld</command>.
@@ -22770,7 +21339,7 @@
 
         <listitem>
           <para>
-            <literal>--binlog-do-db=<replaceable>db_name</replaceable></literal>
+            <option>--binlog-do-db=<replaceable>db_name</replaceable></option>
           </para>
 
           <para>
@@ -22802,7 +21371,7 @@
 
         <listitem>
           <para>
-            <literal>--binlog-ignore-db=<replaceable>db_name</replaceable></literal>
+            <option>--binlog-ignore-db=<replaceable>db_name</replaceable></option>
           </para>
 
           <para>
@@ -22823,7 +21392,7 @@
           </para>
 
           <para>
-            Similar to the case for <literal>--binlog-do-db</literal>,
+            Similar to the case for <option>--binlog-do-db</option>,
             there is an exception to the <literal>CREATE/ALTER/DROP
             DATABASE</literal> statements, which use the database
             manipulated to decide if it should log the statement rather
@@ -23090,7 +21659,7 @@
         operations, at restart the transaction is rolled back by
         <literal>InnoDB</literal> but still exists in the binary log.
         This problem can be solved with the
-        <literal>--innodb-safe-binlog</literal> option (available
+        <option>--innodb-safe-binlog</option> option (available
         starting from MySQL 4.1.3), which adds consistency between the
         content of <literal>InnoDB</literal> tables and the binary log.
       </para>
@@ -23110,7 +21679,7 @@
       </para>
 
       <para>
-        Note that <literal>--innodb-safe-binlog</literal> can be used
+        Note that <option>--innodb-safe-binlog</option> can be used
         even if the MySQL server updates other storage engines than
         <literal>InnoDB</literal>. Only statements/transactions
         affecting <literal>InnoDB</literal> tables are subject to being
@@ -23120,7 +21689,7 @@
         lacks at least one successfully committed
         <literal>InnoDB</literal> transaction), which should not happen
         if <literal>sync_binlog=1</literal> and the disk/filesystem do
-        an actual sync when they are requested to (some don't), it
+        an actual sync when they are requested to (some do not), it
         prints an error message ("The binary log &lt;name&gt; is shorter
         than its expected size"). In this case, this binary log is not
         correct, replication should be restarted from a fresh master's
@@ -23153,7 +21722,7 @@
 
       <para>
         When started with the
-        <literal>--log-slow-queries[=<replaceable>file_name</replaceable>]</literal>
+        <option>--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
         option, <command>mysqld</command> writes a log file containing
         all SQL statements that took more than
         <literal>long_query_time</literal> seconds to execute. The time
@@ -23185,13 +21754,13 @@
 
       <para>
         Before MySQL 4.1, if you also use
-        <literal>--log-long-format</literal> when logging slow queries,
+        <option>--log-long-format</option> when logging slow queries,
         then queries that are not using indexes are logged as well.
-        <literal>--log-long-format</literal> is deprecated as of MySQL
-        version 4.1, when <literal>--log-short-format</literal> was
+        <option>--log-long-format</option> is deprecated as of MySQL
+        version 4.1, when <option>--log-short-format</option> was
         introduced. (Long log format is the default setting since
         version 4.1.) Also note that starting with MySQL 4.1, the
-        <literal>--log-queries-not-using-indexes</literal> option is
+        <option>--log-queries-not-using-indexes</option> option is
         available for the purpose of logging queries that do not use
         indexes to the slow query log. See
         <xref linkend="server-options"/>.
@@ -23239,7 +21808,7 @@
         The MySQL Server can create a number of different log files that
         make it easy to see what is going on. See
         <xref linkend="log-files"/>. However, you must clean up these
-        files regularly to ensure that the logs don't take up too much
+        files regularly to ensure that the logs do not take up too much
         disk space.
       </para>
 
@@ -23279,8 +21848,8 @@
 
         <listitem>
           <para>
-            If standard logging (<literal>--log</literal>) or slow query
-            logging (<literal>--log-slow-queries</literal>) is used,
+            If standard logging (<option>--log</option>) or slow query
+            logging (<option>--log-slow-queries</option>) is used,
             closes and reopens the log file
             (<filename>mysql.log</filename> and
             <filename>`hostname`-slow.log</filename> as default).
@@ -23289,8 +21858,8 @@
 
         <listitem>
           <para>
-            If update logging (<literal>--log-update</literal>) or
-            binary logging (<literal>--log-bin</literal>) is used,
+            If update logging (<option>--log-update</option>) or
+            binary logging (<option>--log-bin</option>) is used,
             closes the log and opens a new log file with a higher
             sequence number.
           </para>
@@ -23371,22 +21940,22 @@
 
       <listitem>
         <para>
-          <literal>--port=<replaceable>port_num</replaceable></literal>
+          <option>--port=<replaceable>port_num</replaceable></option>
         </para>
 
         <para>
-          <literal>--port</literal> controls the port number for TCP/IP
+          <option>--port</option> controls the port number for TCP/IP
           connections.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>--socket=<replaceable>path</replaceable></literal>
+          <option>--socket=<replaceable>path</replaceable></option>
         </para>
 
         <para>
-          <literal>--socket</literal> controls the Unix socket file path
+          <option>--socket</option> controls the Unix socket file path
           on Unix and the name of the named pipe on Windows. On Windows,
           it's necessary to specify distinct pipe names only for those
           servers that support named pipe connections.
@@ -23395,7 +21964,7 @@
 
       <listitem>
         <para>
-          <literal>--shared-memory-base-name=<replaceable>name</replaceable></literal>
+          <option>--shared-memory-base-name=<replaceable>name</replaceable></option>
         </para>
 
         <para>
@@ -23408,7 +21977,7 @@
 
       <listitem>
         <para>
-          <literal>--pid-file=<replaceable>path</replaceable></literal>
+          <option>--pid-file=<replaceable>path</replaceable></option>
         </para>
 
         <para>
@@ -23430,37 +21999,37 @@
 
       <listitem>
         <para>
-          <literal>--log=<replaceable>path</replaceable></literal>
+          <option>--log=<replaceable>path</replaceable></option>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>--log-bin=<replaceable>path</replaceable></literal>
+          <option>--log-bin=<replaceable>path</replaceable></option>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>--log-update=<replaceable>path</replaceable></literal>
+          <option>--log-update=<replaceable>path</replaceable></option>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>--log-error=<replaceable>path</replaceable></literal>
+          <option>--log-error=<replaceable>path</replaceable></option>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>--log-isam=<replaceable>path</replaceable></literal>
+          <option>--log-isam=<replaceable>path</replaceable></option>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>--bdb-logdir=<replaceable>path</replaceable></literal>
+          <option>--bdb-logdir=<replaceable>path</replaceable></option>
         </para>
       </listitem>
 
@@ -23481,13 +22050,13 @@
 
       <listitem>
         <para>
-          <literal>--tmpdir=<replaceable>path</replaceable></literal>
+          <option>--tmpdir=<replaceable>path</replaceable></option>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>--bdb-tmpdir=<replaceable>path</replaceable></literal>
+          <option>--bdb-tmpdir=<replaceable>path</replaceable></option>
         </para>
       </listitem>
 
@@ -23501,7 +22070,7 @@
 
     <para>
       Generally, each server should also use a different data directory,
-      which is specified using the <literal>--datadir=path</literal>
+      which is specified using the <option>--datadir=path</option>
       option.
     </para>
 
@@ -23509,7 +22078,7 @@
       <emphasis role="bold">Warning:</emphasis> Normally you should
       never have two servers that update data in the same databases!
       This may lead to unpleasant surprises if your operating system
-      doesn't support fault-free system locking! If (despite this
+      does not support fault-free system locking! If (despite this
       warning) you run multiple servers using the same data directory
       and they have logging enabled, you must use the appropriate
       options to specify log filenames that are unique to each server.
@@ -23558,20 +22127,20 @@
     <para>
       If you have multiple MySQL installations in different locations,
       normally you can specify the base installation directory for each
-      server with the <literal>--basedir=path</literal> option to cause
+      server with the <option>--basedir=path</option> option to cause
       each server to use a different data directory, log files, and PID
       file. (The defaults for all these values are determined relative
       to the base directory). In that case, the only other options you
-      need to specify are the <literal>--socket</literal> and
-      <literal>--port</literal> options. For example, suppose that you
+      need to specify are the <option>--socket</option> and
+      <option>--port</option> options. For example, suppose that you
       install different versions of MySQL using <filename>tar</filename>
       file binary distributions. These install in different locations,
       so you can start the server for each installation using the
       command <command>bin/mysqld_safe</command> under its corresponding
       base directory. <command>mysqld_safe</command> determines the
-      proper <literal>--basedir</literal> option to pass to
+      proper <option>--basedir</option> option to pass to
       <command>mysqld</command>, and you need specify only the
-      <literal>--socket</literal> and <literal>--port</literal> options
+      <option>--socket</option> and <option>--port</option> options
       to <command>mysqld_safe</command>. (For versions of MySQL older
       than 4.0, use <command>safe_mysqld</command> rather than
       <command>mysqld_safe</command>.)
@@ -23615,7 +22184,7 @@
           an option file, but it's necessary to make sure that each
           server gets its own set of options. To do this, create an
           option file for each server and tell the server the filename
-          with a <literal>--defaults-file</literal> option when you run
+          with a <option>--defaults-file</option> option when you run
           it.
         </para>
 
@@ -23743,8 +22312,8 @@
 
         <para>
           The following principles apply when installing a MySQL service
-          with the <literal>--install</literal> or
-          <literal>--install-manual</literal> option:
+          with the <option>--install</option> or
+          <option>--install-manual</option> option:
         </para>
 
         <itemizedlist>
@@ -23765,7 +22334,7 @@
 
             <para>
               If you specify a service name after the
-              <literal>--install</literal> option, the server ignores
+              <option>--install</option> option, the server ignores
               the <literal>[mysqld]</literal> option group and instead
               reads options from the group that has the same name as the
               service. The server reads options from the standard option
@@ -23775,7 +22344,7 @@
 
           <listitem>
             <para>
-              If you specify a <literal>--defaults-file</literal> option
+              If you specify a <option>--defaults-file</option> option
               after the service name, the server ignores the standard
               option files and reads options only from the
               <literal>[mysqld]</literal> group of the named file.
@@ -23878,7 +22447,7 @@
             <para>
               <emphasis role="bold">Approach 2:</emphasis> Specify
               options for each server in separate files and use
-              <literal>--defaults-file</literal> when you install the
+              <option>--defaults-file</option> when you install the
               services to tell each server what file to use. In this
               case, each file should list options using a
               <literal>[mysqld]</literal> group.
@@ -23924,7 +22493,7 @@
 </programlisting>
 
             <para>
-              To use a <literal>--defaults-file</literal> option when
+              To use a <option>--defaults-file</option> option when
               you install a MySQL server as a service, you must precede
               the option with the service name.
             </para>
@@ -23940,7 +22509,7 @@
         <para>
           To remove multiple services, use <command>mysqld
           --remove</command> for each one, specifying a service name
-          following the <literal>--remove</literal> option. If the
+          following the <option>--remove</option> option. If the
           service name is the default (<literal>MySQL</literal>), you
           can omit it.
         </para>
@@ -23981,7 +22550,7 @@
         Here, <replaceable>port_number</replaceable> and
         <replaceable>file_name</replaceable> must be different from the
         default TCP/IP port number and Unix socket file pathname, and
-        the <literal>--prefix</literal> value should specify an
+        the <option>--prefix</option> value should specify an
         installation directory different than the one under which the
         existing MySQL installation is located.
       </para>
@@ -24009,12 +22578,12 @@
         hostname, <command>mysqladmin</command> defaults to using a Unix
         socket file connection rather than TCP/IP. In MySQL 4.1, you can
         explicitly specify the connection protocol to use by using the
-        <literal>--protocol={TCP | SOCKET | PIPE | MEMORY}</literal>
+        <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
         option.
       </para>
 
       <para>
-        You don't have to compile a new MySQL server just to start with
+        You do not have to compile a new MySQL server just to start with
         a different Unix socket file and TCP/IP port number. It is also
         possible to specify those values at runtime. One way to do so is
         by using command-line options:
@@ -24026,9 +22595,9 @@
 
       <para>
         To start a second server, provide different
-        <literal>--socket</literal> and <literal>--port</literal> option
+        <option>--socket</option> and <option>--port</option> option
         values, and pass a
-        <literal>--datadir=<replaceable>path</replaceable></literal>
+        <option>--datadir=<replaceable>path</replaceable></option>
         option to <command>mysqld_safe</command> so that the server uses
         a different data directory.
       </para>
@@ -24122,7 +22691,7 @@
             <literal>--host=<replaceable>host_name</replaceable>
             --port=<replaceable>port_number</replaceable></literal> to
             connect via TCP/IP to a remote server, with
-            <literal>--host=127.0.0.1 --port=port_number</literal> to
+            <option>--host=127.0.0.1 --port=port_number</option> to
             connect via TCP/IP to a local server, or with
             <literal>--host=localhost
             --socket=<replaceable>file_name</replaceable></literal> to
@@ -24134,17 +22703,17 @@
         <listitem>
           <para>
             As of MySQL 4.1, start the client with
-            <literal>--protocol=tcp</literal> to connect via TCP/IP,
-            <literal>--protocol=socket</literal> to connect via a Unix
-            socket file, <literal>--protocol=pipe</literal> to connect
-            via a named pipe, or <literal>--protocol=memory</literal> to
+            <option>--protocol=tcp</option> to connect via TCP/IP,
+            <option>--protocol=socket</option> to connect via a Unix
+            socket file, <option>--protocol=pipe</option> to connect
+            via a named pipe, or <option>--protocol=memory</option> to
             connect via shared memory. For TCP/IP connections, you may
-            also need to specify <literal>--host</literal> and
-            <literal>--port</literal> options. For the other types of
+            also need to specify <option>--host</option> and
+            <option>--port</option> options. For the other types of
             connections, you may need to specify a
-            <literal>--socket</literal> option to specify a Unix socket
+            <option>--socket</option> option to specify a Unix socket
             file or named pipe name, or a
-            <literal>--shared-memory-base-name</literal> option to
+            <option>--shared-memory-base-name</option> option to
             specify the shared memory name. Shared memory connections
             are supported only on Windows.
           </para>
@@ -24264,7 +22833,7 @@
 
     <para>
       The query cache is extremely useful in an environment where you
-      have tables that don't change very often and for which the server
+      have tables that do not change very often and for which the server
       receives a lot of identical queries. This is a typical situation
       for many Web servers that generate a lot of dynamic pages based on
       database content.
@@ -24284,9 +22853,9 @@
     </para>
 
     <para>
-      <emphasis role="bold">Note</emphasis>: The query cache isn't used
+      <emphasis role="bold">Note</emphasis>: The query cache is not used
       for server-side prepared statements. If you're using server-side
-      prepared statements consider that these statement won't be
+      prepared statements consider that these statement will not be
       satisfied by the query cache. See
       <xref linkend="c-api-prepared-statements"/>.
     </para>
@@ -24327,7 +22896,7 @@
       <literal>query_cache_size</literal> system variable to 0. By
       disabling the query cache code, there is no noticeable overhead.
       Query cache capabilities can be excluded from the server entirely
-      by using the <literal>--without-query-cache</literal> option to
+      by using the <option>--without-query-cache</option> option to
       <command>configure</command> when compiling MySQL.
     </para>
 
Thread
bk commit - mysqldoc@docsrva tree (jon:1.3174)jon5 Aug