List:Internals« Previous MessageNext Message »
From:paul Date:July 17 2005 3:16am
Subject:bk commit - mysqldoc@docsrva tree (paul:1.3046)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul 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.3046 05/07/16 20:16:44 paul@stripped +2 -0
  Change tags.

  refman/news.xml
    1.76 05/07/16 20:16:42 paul@stripped +343 -355
    Change tags.

  refman-4.1/news.xml
    1.54 05/07/16 20:16:42 paul@stripped +326 -338
    Sync.

# 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:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.53/refman-4.1/news.xml	2005-07-16 19:50:13 -05:00
+++ 1.54/refman-4.1/news.xml	2005-07-16 20:16:42 -05:00
@@ -7261,7 +7261,7 @@
 
     <listitem><para>
      Platform and architecture information in version information
-     produced for <literal>--version</literal> option on Windows was
+     produced for <option>--version</option> option on Windows was
      always <literal>Win95/Win98 (i32)</literal>. More accurately
      determine platform as <literal>Win32</literal> or
      <literal>Win64</literal> for 32-bit or 64-bit Windows, and
@@ -7376,12 +7376,12 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>InnoDB</literal>: Honor the
<literal>--tmpdir</literal>
+     <literal>InnoDB</literal>: Honor the
<option>--tmpdir</option>
      startup option when creating temporary files. Previously,
      <literal>InnoDB</literal> temporary files were always created in
      the temporary directory of the operating system. On Netware,
      <literal>InnoDB</literal> will continue to ignore
-     <literal>--tmpdir</literal>. (Bug #5822)
+     <option>--tmpdir</option>. (Bug #5822)
     </para></listitem>
 
     <listitem><para>
@@ -7472,7 +7472,7 @@
    <itemizedlist>
 
     <listitem><para>
-     Added <literal>--hex-blob</literal> option to
+     Added <option>--hex-blob</option> option to
      <command>mysqldump</command> for dumping binary string columns
      using hexadecimal notation.
     </para></listitem>
@@ -7624,22 +7624,22 @@
    <itemizedlist>
 
     <listitem><para>
-     The <literal>--with-openssl</literal> option for
+     The <option>--with-openssl</option> option for
      <command>configure</command> now accepts a path prefix as an
-     argument. <literal>--with-openssl-includes</literal> and
-     <literal>--with-openssl-libs</literal> are still supported, but are
+     argument. <option>--with-openssl-includes</option> and
+     <option>--with-openssl-libs</option> are still supported, but are
      needed only to override the default values. (Bug #5494)
     </para></listitem>
 
     <listitem><para>
-     Added new <literal>--without-man</literal> option to
+     Added new <option>--without-man</option> option to
      <command>configure</command> to suppress building/installing the
      manual pages. (Bug #5379)
     </para></listitem>
 
     <listitem><para>
      InnoDB: New <command>mysqld</command> option
-     <literal>--innodb-table-locks</literal> and session variable
+     <option>--innodb-table-locks</option> and session variable
      <literal>innodb_table_locks</literal> (on by default). In
      applications using <literal>AUTOCOMMIT=1</literal> and MySQL's
      <literal>LOCK TABLES</literal> command, InnoDB's internal table
@@ -7722,9 +7722,9 @@
 
     <listitem><para>
      <command>mysqlimport</command> now reads input files locally from
-     the client host only if the <literal>--local</literal> option is
+     the client host only if the <option>--local</option> option is
      given. Previously, it assumed incorrectly in some cases that files
-     were local even without <literal>--local</literal>. (Bug #5829)
+     were local even without <option>--local</option>. (Bug #5829)
     </para></listitem>
 
     <listitem><para>
@@ -7774,10 +7774,10 @@
     <listitem><para>
      InnoDB: Fixed a bug introduced in 4.0.21. An assertion failed if
      one used <command>mysqldump</command> with the option
-     <literal>-l</literal> or <literal>--opt</literal>, or if one
used
+     <literal>-l</literal> or <option>--opt</option>, or if one
used
      <literal>LOCK TABLES ... LOCAL</literal>. (Workaround in 4.0.21:
-     use <literal>--quick</literal> and
-     <literal>--single-transaction</literal>. (Bug #5538)
+     use <option>--quick</option> and
+     <option>--single-transaction</option>. (Bug #5538)
     </para></listitem>
 
     <listitem><para>
@@ -7799,8 +7799,8 @@
 
     <listitem><para>
      Fixed bug which caused truncation of values read from or into
-     <literal>TIMESTAMP</literal> fields if
<literal>--new</literal>
-     mode was enabled. (Bug #4131)
+     <literal>TIMESTAMP</literal> fields if
<option>--new</option> mode
+     was enabled. (Bug #4131)
     </para></listitem>
 
     <listitem><para>
@@ -8221,8 +8221,8 @@
     </para></listitem>
 
     <listitem><para>
-     The <literal>--log-warnings</literal> server option now is enabled
-     by default. Disable with <literal>--skip-log-warnings</literal>.
+     The <option>--log-warnings</option> server option now is enabled by
+     default. Disable with <option>--skip-log-warnings</option>.
     </para></listitem>
 
     <listitem><para>
@@ -8351,7 +8351,7 @@
      case (for example, <quote>phantom</quote> rows or not all matching
      rows, even an empty result set). The easiest way to check whether
      you are affected is to start <command>mysqld</command> with
-     <literal>--skip-concurrent-insert</literal> switch and see if it
+     <option>--skip-concurrent-insert</option> switch and see if it
      helps.
     </para></listitem>
 
@@ -8469,8 +8469,8 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>--set-character-set</literal> and
-     <literal>--character-sets-dir</literal> options in
+     <option>--set-character-set</option> and
+     <option>--character-sets-dir</option> options in
      <command>myisamchk</command> now work.
     </para></listitem>
 
@@ -8675,15 +8675,15 @@
     </para></listitem>
 
     <listitem><para>
-     Removed old non-working <literal>--old-rpl-compat</literal> server
+     Removed old non-working <option>--old-rpl-compat</option> server
      option, which was a holdover from the very first 4.0.x versions.
      (Bug #2428)
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--sync-frm</literal>. It's on by default, to
+     Added option <option>--sync-frm</option>. It's on by default, to
      instruct MySQL to sync to disk each time <filename>.frm</filename>
-     file is created. Use <literal>--disable-sync-frm</literal> to
+     file is created. Use <option>--disable-sync-frm</option> to
      disable.
     </para></listitem>
 
@@ -8716,7 +8716,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug when <literal>--init-file</literal> crashes MySQL if it
+     Fixed bug when <option>--init-file</option> crashes MySQL if it
      contains a large <literal>SELECT</literal>. (Bug #2526)
     </para></listitem>
 
@@ -9025,7 +9025,7 @@
     <listitem><para>
      Sending <literal>SIGHUP</literal> to
<command>mysqld</command>
      crashed the server if it was running with
-     <literal>--log-bin</literal>. (Bug #2045)
+     <option>--log-bin</option>. (Bug #2045)
     </para></listitem>
 
     <listitem><para>
@@ -9196,7 +9196,7 @@
     <listitem><para>
      <command>mysqlbinlog</command> now asks for a password at the
      console when the <literal>-p</literal> or
-     <literal>--password</literal> option is used with no argument. This
+     <option>--password</option> option is used with no argument. This
      is consistent with the way that other clients such
      <command>mysqladmin</command> and
<command>mysqldump</command>
      behave. <emphasis role="bold">Note</emphasis>: A consequence of
@@ -9336,10 +9336,10 @@
     <listitem><para>
      <command>mysqlbinlog</command> now reads option files. To make this
      work, you must now specify
-     <literal>--read-from-remote-server</literal> when reading binary
-     logs from a MySQL server. (Note that using a remote server is
-     deprecated and may disappear in future
-     <command>mysqlbinlog</command> versions).
+     <option>--read-from-remote-server</option> when reading binary logs
+     from a MySQL server. (Note that using a remote server is deprecated
+     and may disappear in future <command>mysqlbinlog</command>
+     versions).
     </para></listitem>
 
     <listitem><para>
@@ -9351,7 +9351,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--libs_r</literal> and
<literal>--include</literal>
+     Added <option>--libs_r</option> and
<option>--include</option>
      options to <command>mysql_config</command>.
     </para></listitem>
 
@@ -9378,7 +9378,7 @@
      <filename>master.info</filename> and
      <filename>relay-log.info</filename> files, as well as any
      <filename>SQL_LOAD-*</filename> files located in the directory
-     specified by the <literal>--slave-load-tmpdir</literal> option. All
+     specified by the <option>--slave-load-tmpdir</option> option. All
      these files are needed when the slave resumes replication after you
      restore the slave's data.
     </para></listitem>
@@ -9464,17 +9464,16 @@
      MASTER</literal> dropped the corresponding database on the slave,
      thus erroneously dropping tables that had no counterpart on the
      master and tables that may have been excluded from replication
-     using <literal>--replicate-*-table</literal> rules. Now
-     <literal>LOAD DATA FROM MASTER</literal> no longer drops the
-     database. Instead, it drops only the tables that have a counterpart
-     on the master and that match the
-     <literal>--replicate-*-table</literal> rules.
-     <literal>--replicate-*-db</literal> rules can still be used to
+     using <option>--replicate-*-table</option> rules. Now
<literal>LOAD
+     DATA FROM MASTER</literal> no longer drops the database. Instead,
+     it drops only the tables that have a counterpart on the master and
+     that match the <option>--replicate-*-table</option> rules.
+     <option>--replicate-*-db</option> rules can still be used to
      include or exclude a database as a whole from <literal>LOAD DATA
      FROM MASTER</literal>. A database also is included or excluded as a
      whole if there are some rules like
-     <literal>--replicate-wild-do-table=db1.%</literal> or
-     <literal>--replicate-wild-ignore-table=db1.%</literal>, as is the
+     <option>--replicate-wild-do-table=db1.%</option> or
+     <option>--replicate-wild-ignore-table=db1.%</option>, as is the
      case for <literal>CREATE DATABASE</literal> and <literal>DROP
      DATABASE</literal> in replication. (Bug #1248)
     </para></listitem>
@@ -9482,7 +9481,7 @@
     <listitem><para>
      Fixed a bug where <command>mysqlbinlog</command> crashed with a
      segmentation fault when used with the <literal>-h</literal> or
-     <literal>--host</literal> option. (Bug #1258)
+     <option>--host</option> option. (Bug #1258)
     </para></listitem>
 
     <listitem><para>
@@ -9622,7 +9621,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--sql-mode=NO_DIR_IN_CREATE</literal> to make
+     Added option <option>--sql-mode=NO_DIR_IN_CREATE</option> to make
      it possible for slaves to ignore <literal>INDEX DIRECTORY</literal>
      and <literal>DATA DIRECTORY</literal> options given to
      <literal>CREATE TABLE</literal>. When this is mode is on,
@@ -9690,8 +9689,8 @@
      <literal>binlog-do-db</literal> and
      <literal>binlog-ignore-db</literal> options are tested against the
      database on the master (see <xref linkend="binary-log"/>), and a
-     paragraph about how <literal>--replicate-do-db</literal>,
-     <literal>--replicate-do-table</literal> and analogous options are
+     paragraph about how <option>--replicate-do-db</option>,
+     <option>--replicate-do-table</option> and analogous options are
      tested against the database and tables on the slave (see
      <xref linkend="replication-options"/>).
     </para></listitem>
@@ -9700,7 +9699,7 @@
      Now the slave does not replicate <literal>SET PASSWORD</literal> if
      it is configured to exclude the <literal>mysql</literal> database
      from replication (using for example
-     <literal>--replicate-wild-ignore-table=mysql.%</literal>). This was
+     <option>--replicate-wild-ignore-table=mysql.%</option>). This was
      the case for <literal>GRANT</literal> and
<literal>REVOKE</literal>
      since version 4.0.13 (although there was Bug #980 in 4.0.13 &amp;
      4.0.14, which has been fixed in 4.0.15).
@@ -9929,7 +9928,7 @@
     <listitem><para>
      Fixed segmentation fault resulting from <literal>LOAD DATA FROM
      MASTER</literal> when the master was running without the
-     <literal>--log-bin</literal> option. (Bug #934)
+     <option>--log-bin</option> option. (Bug #934)
     </para></listitem>
 
     <listitem><para>
@@ -9943,8 +9942,7 @@
      <literal>GRANT</literal> or <literal>REVOKE</literal>
queries even
      if it was configured to exclude the <literal>mysql</literal>
      database from replication (for example, using
-     <literal>--replicate-wild-ignore-table=mysql.%</literal>). (Bug
-     #980)
+     <option>--replicate-wild-ignore-table=mysql.%</option>). (Bug #980)
     </para></listitem>
 
     <listitem><para>
@@ -9979,7 +9977,7 @@
 
     <listitem><para>
      Fixed a segfault in <command>mysqlbinlog</command> when
-     <literal>--position=x</literal> was used with
<literal>x</literal>
+     <option>--position=x</option> was used with
<literal>x</literal>
      being between a <literal>Create_file</literal> event and its fellow
      <literal>Append_block</literal>,
<literal>Exec_load</literal> or
      <literal>Delete_file</literal> events. (Bug #1091)
@@ -9987,8 +9985,8 @@
 
     <listitem><para>
      <command>mysqlbinlog</command> printed superfluous warnings when
-     using <literal>--database</literal>, which caused syntax errors
-     when piped to <command>mysql</command>. (Bug #1092)
+     using <option>--database</option>, which caused syntax errors when
+     piped to <command>mysql</command>. (Bug #1092)
     </para></listitem>
 
     <listitem><para>
@@ -10103,7 +10101,7 @@
     </para></listitem>
 
     <listitem><para>
-     Removed <literal>--table</literal> option from
+     Removed <option>--table</option> option from
      <command>mysqlbinlog</command> to avoid repeating
      <command>mysqldump</command> functionality.
     </para></listitem>
@@ -10149,14 +10147,14 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--nice</literal> option to
+     Added <option>--nice</option> option to
      <command>mysqld_safe</command> to allow setting the niceness of the
      <command>mysqld</command> process. (Thanks to Christian Hammers for
      providing the initial patch.) (Bug #627)
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--read-only</literal> option to cause
+     Added <option>--read-only</option> option to cause
      <command>mysqld</command> to allow no updates except from slave
      threads or from users with the <literal>SUPER</literal> privilege.
      (Original patch from Markus Benning).
@@ -10174,7 +10172,7 @@
     <listitem><para>
      <command>mysqld</command> now only adds an interrupt handler for
      the <literal>SIGINT</literal> signal if you start it with the new
-     <literal>--gdb</literal> option. This is because some MySQL users
+     <option>--gdb</option> option. This is because some MySQL users
      encountered strange problems when they accidentally sent
      <literal>SIGINT</literal> to <command>mysqld</command>
threads.
     </para></listitem>
@@ -10440,7 +10438,7 @@
     </para></listitem>
 
     <listitem><para>
-     When using a slave compiled with <literal>--debug</literal>,
+     When using a slave compiled with <option>--debug</option>,
      <literal>CHANGE MASTER TO RELAY_LOG_POS</literal> could cause a
      debug assertion failure. (Bug #576)
     </para></listitem>
@@ -10449,7 +10447,7 @@
      When doing a <literal>LOCK TABLES WRITE</literal> on an
      <literal>InnoDB</literal> table, commit could not happen, if the
      query was not written to the binary log (for example, if
-     <literal>--log-bin</literal> was not used, or
+     <option>--log-bin</option> was not used, or
      <literal>binlog-ignore-db</literal> was used). (Bug #578)
     </para></listitem>
 
@@ -10486,12 +10484,12 @@
 
     <listitem><para>
      If a query was ignored on the slave (because of
-     <literal>--replicate-ignore-table</literal> and other similar
-     rules), the slave still checked if the query got the same error
-     code (0, no error) as on the master. So if the master had an error
-     on the query (for example, <quote>Duplicate entry</quote> in a
-     multiple-row insert), then the slave stopped and warned that the
-     error codes didn't match. (Bug #797)
+     <option>--replicate-ignore-table</option> and other similar rules),
+     the slave still checked if the query got the same error code (0, no
+     error) as on the master. So if the master had an error on the query
+     (for example, <quote>Duplicate entry</quote> in a multiple-row
+     insert), then the slave stopped and warned that the error codes
+     didn't match. (Bug #797)
     </para></listitem>
 
    </itemizedlist>
@@ -10515,7 +10513,7 @@
 
     <listitem><para>
      The Windows binary packages are now compiled with
-     <literal>--enable-local-infile</literal> to match the Unix build
+     <option>--enable-local-infile</option> to match the Unix build
      configuration.
     </para></listitem>
 
@@ -10567,7 +10565,7 @@
     </para></listitem>
 
     <listitem><para>
-     Option <literal>--new</literal> now changes binary items
+     Option <option>--new</option> now changes binary items
      (<literal>0xFFDF</literal>) to be treated as binary strings instead
      of numbers by default. This fixes some problems with character sets
      where it's convenient to input the string as a binary item. After
@@ -10608,13 +10606,13 @@
 
     <listitem><para>
      Added warnings to error log of why a secure connection failed (when
-     running with <literal>--log-warnings</literal>).
+     running with <option>--log-warnings</option>).
     </para></listitem>
 
     <listitem><para>
-     Deprecated options <literal>--skip-symlink</literal> and
-     <literal>--use-symbolic-links</literal> and replaced these with
-     <literal>--symbolic-links</literal>.
+     Deprecated options <option>--skip-symlink</option> and
+     <option>--use-symbolic-links</option> and replaced these with
+     <option>--symbolic-links</option>.
     </para></listitem>
 
     <listitem><para>
@@ -10655,20 +10653,19 @@
 
     <listitem><para>
      <command>mysqldump</command> no longer silently deletes the binary
-     logs when invoked with the <literal>--master-data</literal> or
-     <literal>--first-slave</literal> option; while this behavior was
+     logs when invoked with the <option>--master-data</option> or
+     <option>--first-slave</option> option; while this behavior was
      convenient for some users, others may suffer from it. Now you must
      explicitly ask for binary logs to be deleted by using the new
-     <literal>--delete-master-logs</literal> option.
+     <option>--delete-master-logs</option> option.
     </para></listitem>
 
     <listitem><para>
      If the slave is configured (using for example
-     <literal>--replicate-wild-ignore-table=mysql.%</literal>) to
-     exclude <literal>mysql.user</literal>,
-     <literal>mysql.host</literal>, <literal>mysql.db</literal>,
-     <literal>mysql.tables_priv</literal> and
-     <literal>mysql.columns_priv</literal> from replication, then
+     <option>--replicate-wild-ignore-table=mysql.%</option>) to exclude
+     <literal>mysql.user</literal>,
<literal>mysql.host</literal>,
+     <literal>mysql.db</literal>,
<literal>mysql.tables_priv</literal>
+     and <literal>mysql.columns_priv</literal> from replication, then
      <literal>GRANT</literal> and <literal>REVOKE</literal> are
not
      replicated.
     </para></listitem>
@@ -10774,7 +10771,7 @@
     <listitem><para>
      Fixed a crashing bug in <command>mysql</command> monitor program.
      It occurred if program was started with
-     <literal>--no-defaults</literal>, with a prompt that contained the
+     <option>--no-defaults</option>, with a prompt that contained the
      hostname and a connection to a non-existent database was requested.
     </para></listitem>
 
@@ -10868,7 +10865,7 @@
 
     <listitem><para>
      Added missing dashes to parameter
-     <literal>--open-files-limit</literal> in
+     <option>--open-files-limit</option> in
      <command>mysqld_safe</command>. (Bug #264)
     </para></listitem>
 
@@ -10964,7 +10961,7 @@
 
     <listitem><para>
      Fixed a bug in <command>mysqldump</command> when it was called with
-     <literal>--master-data</literal>: the <literal>CHANGE MASTER
+     <option>--master-data</option>: the <literal>CHANGE MASTER
      TO</literal> commands appended to the SQL dump had incorrect
      coordinates. (Bug #159)
     </para></listitem>
@@ -11010,8 +11007,8 @@
     </para></listitem>
 
     <listitem><para>
-     The <literal>--new</literal> option can be used to make a 4.0
-     server return <literal>TIMESTAMP</literal> as a string in
+     The <option>--new</option> option can be used to make a 4.0 server
+     return <literal>TIMESTAMP</literal> as a string in
      <literal>'YYYY-MM-DD HH:MM:SS'</literal> format, the way that 4.1
      servers do. This is also a <literal>new</literal> system variable
      that can be set for the same effect. See
@@ -11306,7 +11303,7 @@
     </para></listitem>
 
     <listitem><para>
-     When running with <literal>--lower-case-table-names</literal>
+     When running with <option>--lower-case-table-names</option>
      (default on Windows) and you had tables or databases with mixed
      case on disk, then executing <literal>SHOW TABLE STATUS</literal>
      followed with <literal>DROP DATABASE</literal> or <literal>DROP
@@ -11329,12 +11326,12 @@
 
     <listitem><para>
      Added option
-    
<literal>--log-error[=<replaceable>file_name</replaceable>]</literal>
+    
<option>--log-error[=<replaceable>file_name</replaceable>]</option>
      to <command>mysqld_safe</command> and
<command>mysqld</command>.
      This option forces all error messages to be put in a log file if
-     the option <literal>--console</literal> is not given. On Windows
-     <literal>--log-error</literal> is enabled as default, with a
-     default name of
+     the option <option>--console</option> is not given. On Windows
+     <option>--log-error</option> is enabled as default, with a default
+     name of
     
<filename><replaceable>host_name</replaceable>.err</filename> if
      the name is not specified.
     </para></listitem>
@@ -11354,7 +11351,7 @@
     </para></listitem>
 
     <listitem><para>
-     New <literal>--ft-stopword-file</literal> command-line option for
+     New <option>--ft-stopword-file</option> command-line option for
      <command>mysqld</command> to replace/disable the built-in stopword
      list that is used in full-text searches. See
      <xref linkend="server-system-variables"/>.
@@ -11367,7 +11364,7 @@
      128K for <literal>gethostbyaddr()</literal> to resolve a hostname.
      You can fix this for earlier MySQL versions by starting
      <command>mysqld</command> with
-     <literal>--thread-stack=192K</literal>.
+     <option>--thread-stack=192K</option>.
     </para></listitem>
 
     <listitem><para>
@@ -11663,7 +11660,7 @@
     <listitem><para>
      <command>mysqlbug</command> now also reports the compiler version
      used for building the binaries (if the compiler supports the option
-     <literal>--version</literal>).
+     <option>--version</option>).
     </para></listitem>
 
    </itemizedlist>
@@ -11824,8 +11821,8 @@
     </para></listitem>
 
     <listitem><para>
-     Make <literal>--lower-case-table-names</literal> default on Mac OS
-     X as the default filesystem (HFS+) is case insensitive. See
+     Make <option>--lower-case-table-names</option> default on Mac OS X
+     as the default filesystem (HFS+) is case insensitive. See
      <xref linkend="name-case-sensitivity"/>.
     </para></listitem>
 
@@ -11866,7 +11863,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug that prevented <literal>--chroot</literal> command-line
+     Fixed bug that prevented <option>--chroot</option> command-line
      option of <command>mysqld</command> from working.
     </para></listitem>
 
@@ -11891,7 +11888,7 @@
     </para></listitem>
 
     <listitem><para>
-    
<literal>--replicate-do=<replaceable>xxx</replaceable></literal>
+    
<option>--replicate-do=<replaceable>xxx</replaceable></option>
      didn't work for <literal>UPDATE</literal> commands. (Bug introduced
      in 4.0.0)
     </para></listitem>
@@ -11966,7 +11963,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--use-frm</literal> option to
+     Added <option>--use-frm</option> option to
      <command>mysqlcheck</command>. When used with <literal>REPAIR
      TABLE</literal>, it gets the table structure from the
      <filename>.frm</filename> file, so the table can be repaired even
@@ -12000,7 +11997,7 @@
     </para></listitem>
 
     <listitem><para>
-     When one uses the <literal>--open-files-limit=#</literal> option to
+     When one uses the <option>--open-files-limit=#</option> option to
      <command>mysqld_safe</command> it's now passed on to
      <command>mysqld</command>.
     </para></listitem>
@@ -12023,9 +12020,9 @@
 
     <listitem><para>
      Fixed an inadvertently changed option
-     (<literal>--ignore-space</literal>) back to the original
-     <literal>--ignore-spaces</literal> in
-     <literal>mysqlclient</literal>. (Both syntaxes work).
+     (<option>--ignore-space</option>) back to the original
+     <option>--ignore-spaces</option> in
<literal>mysqlclient</literal>.
+     (Both syntaxes work).
     </para></listitem>
 
     <listitem><para>
@@ -12145,7 +12142,7 @@
     </para></listitem>
 
     <listitem><para>
-     The filename argument for the <literal>--des-key-file</literal>
+     The filename argument for the <option>--des-key-file</option>
      argument to <command>mysqld</command> is interpreted relative to
      the data directory if given as a relative pathname.
     </para></listitem>
@@ -12271,7 +12268,7 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>--skip-ssl</literal> can now be used to disable SSL in the
+     <option>--skip-ssl</option> can now be used to disable SSL in the
      MySQL clients, even if one is using other SSL options in an option
      file or previously on the command line.
     </para></listitem>
@@ -12325,7 +12322,7 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>--log-binary=a.b.c</literal> now properly strips off
+     <option>--log-binary=a.b.c</option> now properly strips off
      <literal>.b.c</literal>.
     </para></listitem>
 
@@ -12357,8 +12354,7 @@
 
     <listitem><para>
      Fixed that <command>mysqld --help</command> reports correct values
-     for <literal>--datadir</literal> and
-     <literal>--bind-address</literal>.
+     for <option>--datadir</option> and
<option>--bind-address</option>.
     </para></listitem>
 
     <listitem><para>
@@ -12373,7 +12369,7 @@
 
     <listitem><para>
      Fixed a bug in <literal>my_getopt()</literal>;
-     <literal>--set-variable</literal> syntax didn't work for those
+     <option>--set-variable</option> syntax didn't work for those
      options that didn't have a valid variable in the
      <literal>my_option</literal> struct. This affected at least the
      <literal>default-table-type</literal> option.
@@ -12399,7 +12395,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug with the <literal>--slow-log</literal> when logging an
+     Fixed bug with the <option>--slow-log</option> when logging an
      administrator command (like <literal>FLUSH TABLES</literal>).
     </para></listitem>
 
@@ -12410,9 +12406,9 @@
 
     <listitem><para>
      Fixed a bug in <literal>my_getopt()</literal> in handling of
-     special prefixes (<literal>--skip-</literal>,
-     <literal>--enable-</literal>).
-     <literal>--skip-external-locking</literal> didn't work and the bug
+     special prefixes (<option>--skip-</option>,
+     <option>--enable-</option>).
+     <option>--skip-external-locking</option> didn't work and the bug
      may have affected other similar options.
     </para></listitem>
 
@@ -12471,10 +12467,10 @@
     <listitem><para>
      Fixed all boolean type variables/options to work with the old
      syntax, for example, all of these work:
-     <literal>--lower-case-table-names</literal>,
-     <literal>--lower-case-table-names=1</literal>, <literal>-O
-     lower-case-table-names=1</literal>,
-     <literal>--set-variable=lower-case-table-names=1</literal>
+     <option>--lower-case-table-names</option>,
+     <option>--lower-case-table-names=1</option>, <option>-O
+     lower-case-table-names=1</option>,
+     <option>--set-variable=lower-case-table-names=1</option>
     </para></listitem>
 
     <listitem><para>
@@ -12540,7 +12536,7 @@
 
     <listitem><para>
      <command>mysqld</command> now has the option
-     <literal>--temp-pool</literal> enabled by default as this gives
+     <option>--temp-pool</option> enabled by default as this gives
      better performance with some operating systems.
     </para></listitem>
 
@@ -12561,10 +12557,9 @@
     </para></listitem>
 
     <listitem><para>
-     If the <literal>--code-file</literal> option is specified, the
-     server calls <literal>setrlimit()</literal> to set the maximum
-     allowed core file size to unlimited, so core files can be
-     generated.
+     If the <option>--code-file</option> option is specified, the server
+     calls <literal>setrlimit()</literal> to set the maximum allowed
+     core file size to unlimited, so core files can be generated.
     </para></listitem>
 
     <listitem><para>
@@ -12572,10 +12567,10 @@
     </para></listitem>
 
     <listitem><para>
-     Added
<literal>--count=<replaceable>N</replaceable></literal>
+     Added <option>--count=<replaceable>N</replaceable></option>
      (<literal>-c</literal>) option to
<command>mysqladmin</command>, to
      make the program do only <replaceable>N</replaceable> iterations.
-     To be used with <literal>--sleep</literal>
(<literal>-i</literal>).
+     To be used with <option>--sleep</option>
(<option>-i</option>).
      Useful in scripts.
     </para></listitem>
 
@@ -12635,8 +12630,8 @@
      External system locking of
      <literal>MyISAM</literal>/<literal>ISAM</literal> files is
now
      turned off by default. One can turn this on with
-     <literal>--external-locking</literal>. (For most users this is
-     never needed).
+     <option>--external-locking</option>. (For most users this is never
+     needed).
     </para></listitem>
 
     <listitem><para>
@@ -12679,8 +12674,8 @@
     </para></listitem>
 
     <listitem><para>
-     Renamed <literal>--skip-locking</literal> to
-     <literal>--skip-external-locking</literal>.
+     Renamed <option>--skip-locking</option> to
+     <option>--skip-external-locking</option>.
     </para></listitem>
 
     <listitem><para>
@@ -12741,7 +12736,7 @@
     </para></listitem>
 
     <listitem><para>
-     Changed <literal>--chroot=path</literal> option to execute
+     Changed <option>--chroot=path</option> option to execute
      <literal>chroot()</literal> immediately after all options have been
      parsed.
     </para></listitem>
@@ -12793,7 +12788,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--single-transaction</literal> option to
+     Added <option>--single-transaction</option> option to
      <command>mysqldump</command>, allowing a consistent dump of
      <literal>InnoDB</literal> tables. See <xref linkend="mysqldump"/>.
     </para></listitem>
@@ -12924,7 +12919,7 @@
     </para></listitem>
 
     <listitem><para>
-     New configure option <literal>--without-query-cache</literal>.
+     New configure option <option>--without-query-cache</option>.
     </para></listitem>
 
     <listitem><para>
@@ -12991,7 +12986,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--ignore-lines=n</literal> option to
+     Added <option>--ignore-lines=n</option> option to
      <command>mysqlimport</command>. This has the same effect as the
      <literal>IGNORE n LINES</literal> clause for <literal>LOAD
      DATA</literal>.
@@ -13069,7 +13064,7 @@
     </para></listitem>
 
     <listitem><para>
-     Allow value of <literal>--user=#</literal> option for
+     Allow value of <option>--user=#</option> option for
      <command>mysqld</command> to be specified as a numeric user ID.
     </para></listitem>
 
@@ -13113,7 +13108,7 @@
 
     <listitem><para>
      Added <literal>NO_UNSIGNED_SUBTRACTION</literal> to the set of
-     flags that may be specified with the <literal>--sql-mode</literal>
+     flags that may be specified with the <option>--sql-mode</option>
      option for <command>mysqld</command>. It disables unsigned
      arithmetic rules when it comes to subtraction. (This makes MySQL
      4.0 behave more like 3.23 with <literal>UNSIGNED</literal>
@@ -13233,7 +13228,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--no-beep</literal> and
<literal>--prompt</literal>
+     Added <option>--no-beep</option> and
<option>--prompt</option>
      options to <command>mysql</command> command-line client.
     </para></listitem>
 
@@ -13304,7 +13299,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--des-key-file</literal> option to
+     Added <option>--des-key-file</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -13423,8 +13418,8 @@
    <itemizedlist>
 
     <listitem><para>
-     Added <literal>--xml</literal> option to
<command>mysql</command>
-     for producing XML output.
+     Added <option>--xml</option> option to
<command>mysql</command> for
+     producing XML output.
     </para></listitem>
 
     <listitem><para>
@@ -13649,8 +13644,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--master-data</literal> and
-     <literal>--no-autocommit</literal> options to
+     Added <option>--master-data</option> and
+     <option>--no-autocommit</option> options to
      <command>mysqldump</command>. (Thanks to Brian Aker for this.)
     </para></listitem>
 
@@ -13794,13 +13789,13 @@
 
     <listitem><para>
      If a query was ignored on the slave (because of
-     <literal>--replicate-ignore-table</literal> and other similar
-     rules), the slave still checked if the query got the same error
-     code (0, no error) as on the master. So if the master had an error
-     on the query (for example, <quote>Duplicate entry</quote> in a
-     multiple-row insert), then the slave stopped and warned that the
-     error codes didn't match. This is a backport of the fix for MySQL
-     4.0. (Bug #797)
+     <option>--replicate-ignore-table</option> and other similar rules),
+     the slave still checked if the query got the same error code (0, no
+     error) as on the master. So if the master had an error on the query
+     (for example, <quote>Duplicate entry</quote> in a multiple-row
+     insert), then the slave stopped and warned that the error codes
+     didn't match. This is a backport of the fix for MySQL 4.0. (Bug
+     #797)
     </para></listitem>
 
     <listitem><para>
@@ -14031,18 +14026,18 @@
 
     <listitem><para>
      <command>mysqldump</command> no longer silently deletes the binary
-     logs when invoked with the <literal>--master-data</literal> or
-     <literal>--first-slave</literal> option; while this behavior was
+     logs when invoked with the <option>--master-data</option> or
+     <option>--first-slave</option> option; while this behavior was
      convenient for some users, others may suffer from it. Now you must
      explicitly ask for binary logs to be deleted by using the new
-     <literal>--delete-master-logs</literal> option.
+     <option>--delete-master-logs</option> option.
     </para></listitem>
 
     <listitem><para>
      Fixed a bug in <command>mysqldump</command> when it was invoked
-     with the <literal>--master-data</literal> option: The
-     <literal>CHANGE MASTER TO</literal> statements that were appended
-     to the SQL dump had incorrect coordinates. (Bug #159)
+     with the <option>--master-data</option> option: The
<literal>CHANGE
+     MASTER TO</literal> statements that were appended to the SQL dump
+     had incorrect coordinates. (Bug #159)
     </para></listitem>
 
    </itemizedlist>
@@ -14089,7 +14084,7 @@
     <listitem><para>
      Security enhancement: <command>mysqld</command> and
      <command>safe_mysqld</command> now use only the first
-     <literal>--user</literal> option specified on the command line.
+     <option>--user</option> option specified on the command line.
      Normally this comes from <filename>/etc/my.cnf</filename>.
      (<ulink
url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0150">CAN-2003-0150</ulink>)
     </para></listitem>
@@ -14172,7 +14167,7 @@
     </para></listitem>
 
     <listitem><para>
-     When running with <literal>--lower-case-table-names=1</literal>
+     When running with <option>--lower-case-table-names=1</option>
      (default on Windows) and you had tables or databases with mixed
      case on disk, then executing <literal>SHOW TABLE STATUS</literal>
      followed with <literal>DROP DATABASE</literal> or <literal>DROP
@@ -14217,7 +14212,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug with the <literal>--slow-log</literal> when logging an
+     Fixed bug with the <option>--slow-log</option> when logging an
      administrator command (like <literal>FLUSH TABLES</literal>).
     </para></listitem>
 
@@ -14232,18 +14227,18 @@
     </para></listitem>
 
     <listitem><para>
-     Bugfix for <literal>--chroot</literal> (see
+     Bugfix for <option>--chroot</option> (see
      <xref linkend="news-3-23-54"/>) is reverted. Unfortunately, there
      is no way to make it to work, without introducing
      backward-incompatible changes in <filename>my.cnf</filename>. Those
-     who need <literal>--chroot</literal> functionality, should upgrade
-     to MySQL 4.0. (The fix in the 4.0 branch did not break
+     who need <option>--chroot</option> functionality, should upgrade to
+     MySQL 4.0. (The fix in the 4.0 branch did not break
      backward-compatibility).
     </para></listitem>
 
     <listitem><para>
-     Make <literal>--lower-case-table-names</literal> default on Mac OS
-     X as the default filesystem (HFS+) is case insensitive.
+     Make <option>--lower-case-table-names</option> default on Mac OS X
+     as the default filesystem (HFS+) is case insensitive.
     </para></listitem>
 
     <listitem><para>
@@ -14312,7 +14307,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug that prevented <literal>--chroot</literal> command-line
+     Fixed bug that prevented <option>--chroot</option> command-line
      option of <command>mysqld</command> from working.
     </para></listitem>
 
@@ -14366,8 +14361,8 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed that <literal>--core-file</literal> works on Linux (at least
-     on kernel 2.4.18).
+     Fixed that <option>--core-file</option> works on Linux (at least on
+     kernel 2.4.18).
     </para></listitem>
 
     <listitem><para>
@@ -14440,8 +14435,8 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed that <literal>--skip-show-database</literal> doesn't reset
-     the <literal>--port</literal> option.
+     Fixed that <option>--skip-show-database</option> doesn't reset the
+     <option>--port</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -14825,7 +14820,7 @@
      Because of problems on shutdown we have now disabled named pipes on
      Windows by default. One can enable named pipes by starting
      <command>mysqld</command> with
-     <literal>--enable-named-pipe</literal>.
+     <option>--enable-named-pipe</option>.
     </para></listitem>
 
     <listitem><para>
@@ -14834,7 +14829,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed core-dump bug when using <literal>--log-bin</literal> with
+     Fixed core-dump bug when using <option>--log-bin</option> with
      <literal>LOAD DATA INFILE</literal> without an active database.
     </para></listitem>
 
@@ -14870,8 +14865,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed binary builds to use
-     <literal>--enable-local-infile</literal>.
+     Fixed binary builds to use <option>--enable-local-infile</option>.
     </para></listitem>
 
     <listitem><para>
@@ -14943,8 +14937,8 @@
    <itemizedlist>
 
     <listitem><para>
-     Added <literal>--xml</literal> option to
-     <command>mysqldump</command> for producing XML output.
+     Added <option>--xml</option> option to
<command>mysqldump</command>
+     for producing XML output.
     </para></listitem>
 
     <listitem><para>
@@ -15185,7 +15179,7 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>--core-file</literal> now works on Solaris.
+     <option>--core-file</option> now works on Solaris.
     </para></listitem>
 
     <listitem><para>
@@ -15462,7 +15456,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug in <literal>--safe-user-create</literal>.
+     Fixed bug in <option>--safe-user-create</option>.
     </para></listitem>
 
    </itemizedlist>
@@ -15569,7 +15563,7 @@
     <listitem><para>
      Don't force everything to lowercase on Windows. (To fix problem
      with Windows and <literal>ALTER TABLE</literal>.) Now
-     <literal>--lower_case_table_names</literal> also works on Unix.
+     <option>--lower_case_table_names</option> also works on Unix.
     </para></listitem>
 
     <listitem><para>
@@ -15589,7 +15583,7 @@
 
     <listitem><para>
      Added
-    
<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>
      option to <command>mysqld</command>. See
      <xref linkend="server-options"/>.
     </para></listitem>
@@ -15649,7 +15643,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--safe-user-create</literal> option to
+     Added <option>--safe-user-create</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -15669,7 +15663,7 @@
    <itemizedlist>
 
     <listitem><para>
-     Fixed problem with <literal>--low-priority-updates</literal> and
+     Fixed problem with <option>--low-priority-updates</option> and
      <literal>INSERT</literal> statements.
     </para></listitem>
 
@@ -15722,12 +15716,12 @@
     </para></listitem>
 
     <listitem><para>
-     Option <literal>--force</literal> to
<command>myisamchk</command>
-     now also updates states.
+     Option <option>--force</option> to
<command>myisamchk</command> now
+     also updates states.
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--warnings</literal> to
+     Added option <option>--warnings</option> to
      <command>mysqld</command>. Now <command>mysqld</command>
prints the
      error <literal>Aborted connection</literal> only if this option is
      used.
@@ -15874,7 +15868,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-stack-trace</literal> option to
+     Added <option>--skip-stack-trace</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -15975,7 +15969,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--mysql-version</literal> option to
+     Added <option>--mysql-version</option> option to
      <command>safe_mysqld</command>
     </para></listitem>
 
@@ -16078,7 +16072,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-safemalloc</literal> option to
+     Added <option>--skip-safemalloc</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -16280,7 +16274,7 @@
 
     <listitem><para>
      Allow space around <literal>=</literal> in argument to
-     <literal>--set-variable</literal>.
+     <option>--set-variable</option>.
     </para></listitem>
 
     <listitem><para>
@@ -16342,11 +16336,10 @@
     </para></listitem>
 
     <listitem><para>
-     Allow <literal>--skip-gemini</literal>,
-     <literal>--skip-bdb</literal>, and
<literal>--skip-innodb</literal>
-     options to be specified when invoking <command>mysqld</command>,
-     even if these storage engines are not compiled in to
-     <command>mysqld</command>.
+     Allow <option>--skip-gemini</option>,
<option>--skip-bdb</option>,
+     and <option>--skip-innodb</option> options to be specified when
+     invoking <command>mysqld</command>, even if these storage engines
+     are not compiled in to <command>mysqld</command>.
     </para></listitem>
 
     <listitem><para>
@@ -16377,7 +16370,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--character-sets-dir</literal> option to
+     Added <option>--character-sets-dir</option> option to
      <command>myisampack</command>.
     </para></listitem>
 
@@ -16424,7 +16417,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--sort-recover</literal> option to
+     Added <option>--sort-recover</option> option to
      <command>myisamchk</command>.
     </para></listitem>
 
@@ -16518,7 +16511,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--temp-pool</literal> option to
+     Added <option>--temp-pool</option> option to
      <command>mysqld</command>. Using this option causes most temporary
      files created to use a small set of names, rather than a unique
      name for each new file. This is to work around a problem in the
@@ -16585,7 +16578,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--with-version-suffix</literal> option to
+     Added <option>--with-version-suffix</option> option to
      <command>configure</command>.
     </para></listitem>
 
@@ -16757,19 +16750,19 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--mysqld=#</literal> option to
+     Added <option>--mysqld=#</option> option to
      <command>safe_mysqld</command>.
     </para></listitem>
 
     <listitem><para>
-     Allow hex constants in the <literal>--fields-*-by</literal> and
-     <literal>--lines-terminated-by</literal> options to
+     Allow hex constants in the <option>--fields-*-by</option> and
+     <option>--lines-terminated-by</option> options to
      <command>mysqldump</command> and
<command>mysqlimport</command>. By
      Paul DuBois.
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--safe-show-database</literal> option to
+     Added <option>--safe-show-database</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -16782,13 +16775,13 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--open-files-limit</literal> option to
+     Added <option>--open-files-limit</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
     <listitem><para>
-     Changed <literal>--open-files</literal> option to
-     <literal>--open-files-limit</literal> in
+     Changed <option>--open-files</option> option to
+     <option>--open-files-limit</option> in
      <command>safe_mysqld</command>.
     </para></listitem>
 
@@ -16798,12 +16791,12 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed that <literal>--bdb-no-sync</literal> works.
+     Fixed that <option>--bdb-no-sync</option> works.
     </para></listitem>
 
     <listitem><para>
-     Changed <literal>--bdb-recover</literal> to
-     <literal>--bdb-no-recover</literal> as recover should be on by
+     Changed <option>--bdb-recover</option> to
+     <option>--bdb-no-recover</option> as recover should be on by
      default.
     </para></listitem>
 
@@ -16827,8 +16820,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug with <literal>--skip-networking</literal> on Debian
-     Linux.
+     Fixed bug with <option>--skip-networking</option> on Debian Linux.
     </para></listitem>
 
     <listitem><para>
@@ -16947,7 +16939,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--bdb-shared-data</literal> option to
+     Added <option>--bdb-shared-data</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -16984,8 +16976,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--abort-slave-event-count</literal> and
-     <literal>--disconnect-slave-event-count</literal> options to
+     Added <option>--abort-slave-event-count</option> and
+     <option>--disconnect-slave-event-count</option> options to
      <command>mysqld</command> for debugging and testing of replication.
     </para></listitem>
 
@@ -17045,10 +17037,9 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>--bootstrap</literal> is now run in a separate thread.
-     This fixes a problem that caused
-     <command>mysql_install_db</command> to core dump on some Linux
-     machines.
+     <option>--bootstrap</option> is now run in a separate thread. This
+     fixes a problem that caused <command>mysql_install_db</command> to
+     core dump on some Linux machines.
     </para></listitem>
 
     <listitem><para>
@@ -17073,7 +17064,7 @@
 
     <listitem><para>
      Reset status variable which could cause problem if one used
-     <literal>--slow-log</literal>.
+     <option>--slow-log</option>.
     </para></listitem>
 
     <listitem><para>
@@ -17098,9 +17089,9 @@
    <itemizedlist>
 
     <listitem><para>
-     Added new options <literal>--pager[=...]</literal>,
-     <literal>--no-pager</literal>, <literal>--tee=...</literal>
and
-     <literal>--no-tee</literal> to the <command>mysql</command>
client.
+     Added new options <option>--pager[=...]</option>,
+     <option>--no-pager</option>, <option>--tee=...</option> and
+     <option>--no-tee</option> to the <command>mysql</command>
client.
      The new corresponding interactive commands are
      <literal>pager</literal>, <literal>nopager</literal>,
      <literal>tee</literal> and <literal>notee</literal>. See
@@ -17140,7 +17131,7 @@
 
     <listitem><para>
      Added to the slow query log the time and the username for each
-     logged query. If you are using <literal>--log-long-format</literal>
+     logged query. If you are using <option>--log-long-format</option>
      then also queries that do not use an index are logged, even if the
      query takes less than <literal>long_query_time</literal> seconds.
     </para></listitem>
@@ -17179,8 +17170,8 @@
     </para></listitem>
 
     <listitem><para>
-     The <literal>--skip-networking</literal> option now works properly
-     on NT.
+     The <option>--skip-networking</option> option now works properly on
+     NT.
     </para></listitem>
 
     <listitem><para>
@@ -17200,10 +17191,10 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--replicate-ignore-table</literal>,
-     <literal>--replicate-do-table</literal>,
-     <literal>--replicate-wild-ignore-table</literal>, and
-     <literal>--replicate-wild-do-table</literal> options to
+     Added <option>--replicate-ignore-table</option>,
+     <option>--replicate-do-table</option>,
+     <option>--replicate-wild-ignore-table</option>, and
+     <option>--replicate-wild-do-table</option> options to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -17214,9 +17205,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--open-files</literal> and
-     <literal>--timezone</literal> options to
-     <command>safe_mysqld</command>.
+     Added <option>--open-files</option> and
<option>--timezone</option>
+     options to <command>safe_mysqld</command>.
     </para></listitem>
 
     <listitem><para>
@@ -17280,7 +17270,7 @@
 
     <listitem><para>
      <literal>SLAVE START</literal> did not work if you started with
-     <literal>--skip-slave-start</literal> and had not explicitly run
+     <option>--skip-slave-start</option> and had not explicitly run
      <literal>CHANGE MASTER TO</literal>.
     </para></listitem>
 
@@ -17300,9 +17290,9 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--safemalloc-mem-limit</literal> option to
+     Added <option>--safemalloc-mem-limit</option> option to
      <command>mysqld</command> to simulate memory shortage when compiled
-     with the <literal>--with-debug=full</literal> option.
+     with the <option>--with-debug=full</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -17415,7 +17405,7 @@
     </para></listitem>
 
     <listitem><para>
-     When using <literal>--log-slow-queries</literal>, don't count the
+     When using <option>--log-slow-queries</option>, don't count the
      time waiting for a lock.
     </para></listitem>
 
@@ -17426,7 +17416,7 @@
 
     <listitem><para>
      Automatic repair of <literal>MyISAM</literal> tables if you start
-     <command>mysqld</command> with
<literal>--myisam-recover</literal>.
+     <command>mysqld</command> with
<option>--myisam-recover</option>.
     </para></listitem>
 
     <listitem><para>
@@ -17460,12 +17450,12 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--replicate-rewrite-db</literal> option to
+     Added <option>--replicate-rewrite-db</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-slave-start</literal> option to
+     Added <option>--skip-slave-start</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -17491,7 +17481,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--default-extra-file=#</literal> option to all MySQL
+     Added <option>--default-extra-file=#</option> option to all MySQL
      clients.
     </para></listitem>
 
@@ -17583,7 +17573,7 @@
 
     <listitem><para>
      The <literal>MyISAM</literal> repair/reindex code didn't use the
-     <literal>--tmpdir</literal> option for its temporary files.
+     <option>--tmpdir</option> option for its temporary files.
     </para></listitem>
 
     <listitem><para>
@@ -17608,7 +17598,7 @@
     <listitem><para>
      Fixed a core dump bug when doing <literal>FLUSH MASTER</literal> if
      you didn't specify a filename argument to
-     <literal>--log-bin</literal>.
+     <option>--log-bin</option>.
     </para></listitem>
 
     <listitem><para>
@@ -17627,7 +17617,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--memlock</literal> option to
+     Added <option>--memlock</option> option to
      <command>mysqld</command> to lock <command>mysqld</command>
in
      memory on systems with the <literal>mlockall()</literal> call (as
      in Solaris).
@@ -17680,7 +17670,7 @@
     </para></listitem>
 
     <listitem><para>
-     Changed <literal>--log-isam</literal> to log
+     Changed <option>--log-isam</option> to log
      <literal>MyISAM</literal> tables instead of isam tables.
     </para></listitem>
 
@@ -17754,7 +17744,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--core-file</literal> option to
+     Added <option>--core-file</option> option to
      <command>mysqld</command> to get a core file on Linux if
      <command>mysqld</command> dies on the
<literal>SIGSEGV</literal>
      signal.
@@ -17762,9 +17752,9 @@
 
     <listitem><para>
      MySQL client <command>mysql</command> now starts with option
-     <literal>--no-named-commands</literal>
(<literal>-g</literal>) by
+     <option>--no-named-commands</option> (<literal>-g</literal>)
by
      default. This option can be disabled with
-     <literal>--enable-named-commands</literal>
(<literal>-G</literal>).
+     <option>--enable-named-commands</option>
(<literal>-G</literal>).
      This may cause incompatibility problems in some cases, for example,
      in SQL scripts that use named commands without a semicolon, etc.!
      Long format commands still work from the first line.
@@ -17808,8 +17798,8 @@
     </para></listitem>
 
     <listitem><para>
-     Changed behavior of <literal>--enable-thread-safe-client</literal>
-     so that both non-threaded (<literal>-lmysqlclient</literal>) and
+     Changed behavior of <option>--enable-thread-safe-client</option> so
+     that both non-threaded (<literal>-lmysqlclient</literal>) and
      threaded (<literal>-lmysqlclient_r</literal>) libraries are built.
      Users who linked against a threaded
      <literal>-lmysqlclient</literal> need to link against
@@ -17913,9 +17903,9 @@
 
     <listitem><para>
      Changed <command>myisamchk</command> so that
-     <literal>--fast</literal> and
-     <literal>--check-only-changed</literal> are also honored with
-     <literal>--sort-index</literal> and
<literal>--analyze</literal>.
+     <option>--fast</option> and
<option>--check-only-changed</option>
+     are also honored with <option>--sort-index</option> and
+     <option>--analyze</option>.
     </para></listitem>
 
     <listitem><para>
@@ -17966,7 +17956,7 @@
     </para></listitem>
 
     <listitem><para>
-     The log generated by <literal>--slow-query-log</literal> didn't
+     The log generated by <option>--slow-query-log</option> didn't
      contain the whole queries.
     </para></listitem>
 
@@ -18312,8 +18302,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added handling of <literal>--no-defaults</literal> and
-     <literal>--defaults-file</literal> to
+     Added handling of <option>--no-defaults</option> and
+     <option>--defaults-file</option> to
      <command>safe_mysqld.sh</command> and
      <command>mysql_install_db.sh</command>.
     </para></listitem>
@@ -18434,8 +18424,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--replicate-do-db</literal> and
-     <literal>--replicate-ignore-db</literal> options to
+     Added <option>--replicate-do-db</option> and
+     <option>--replicate-ignore-db</option> options to
      <command>mysqld</command>, to restrict which databases get
      replicated.
     </para></listitem>
@@ -18456,7 +18446,7 @@
 
     <listitem><para>
      To start <command>mysqld</command> as
<literal>root</literal>, you
-     must now use the <literal>--user=root</literal> option.
+     must now use the <option>--user=root</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -18614,11 +18604,11 @@
      table. This confused the <command>mysqld</command> daemon if it
      updated the same table at the same time. Now the status in the
      index file is only updated if one uses
-     <literal>--update-state</literal>. With older
+     <option>--update-state</option>. With older
      <command>myisamchk</command> versions you should use
-     <literal>--read-only</literal> when only checking tables, if there
-     is the slightest chance that the <command>mysqld</command> server
-     is working on the table at the same time!
+     <option>--read-only</option> when only checking tables, if there is
+     the slightest chance that the <command>mysqld</command> server is
+     working on the table at the same time!
     </para></listitem>
 
     <listitem><para>
@@ -18696,8 +18686,7 @@
      Fixed problem when doing locks on the same table more than 2 times
      in the same <literal>LOCK TABLE</literal> command; this fixed the
      problem one got when running the test-ATIS test with
-     <literal>--fast</literal> or
-     <literal>--check-only-changed</literal>.
+     <option>--fast</option> or
<option>--check-only-changed</option>.
     </para></listitem>
 
     <listitem><para>
@@ -18779,8 +18768,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--all-databases</literal> and
-     <literal>--databases</literal> options to
+     Added <option>--all-databases</option> and
+     <option>--databases</option> options to
      <command>mysqldump</command> to allow dumping of many databases at
      the same time.
     </para></listitem>
@@ -18845,8 +18834,8 @@
     <listitem><para>
      Added <literal>HIGH_PRIORITY</literal> option to
      <literal>INSERT</literal>. This overrides the effect of the
-     <literal>--low-priority-updates</literal> server option and does
-     not perform concurrent inserts.
+     <option>--low-priority-updates</option> server option and does not
+     perform concurrent inserts.
     </para></listitem>
 
     <listitem><para>
@@ -18893,8 +18882,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--i-am-a-dummy</literal> and
-     <literal>--safe-updates</literal> options to
+     Added <option>--i-am-a-dummy</option> and
+     <option>--safe-updates</option> options to
      <command>mysql</command>.
     </para></listitem>
 
@@ -18921,7 +18910,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-delay-key-write</literal> option to
+     Added <option>--skip-delay-key-write</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -18936,8 +18925,8 @@
 
     <listitem><para>
      Added back blocking of <literal>SIGPIPE</literal> when compiling
-     with <literal>--thread-safe-clients</literal> to make things safe
-     for old clients.
+     with <option>--thread-safe-clients</option> to make things safe for
+     old clients.
     </para></listitem>
 
    </itemizedlist>
@@ -19039,8 +19028,8 @@
 
     <listitem><para>
      Renamed <command>mysqld</command> startup option from
-     <literal>--delay-key-write</literal> to
-     <literal>--delay-key-write-for-all-tables</literal>.
+     <option>--delay-key-write</option> to
+     <option>--delay-key-write-for-all-tables</option>.
     </para></listitem>
 
     <listitem><para>
@@ -19055,7 +19044,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--log-slow-queries</literal> option to
+     Added <option>--log-slow-queries</option> option to
      <command>mysqld</command> to log all queries that take a long time
      to a separate log file with a time indicating how long the query
      took.
@@ -19115,8 +19104,8 @@
     </para></listitem>
 
     <listitem><para>
-     Option <literal>--delay-key-write</literal> didn't enable delayed
-     key writing.
+     Option <option>--delay-key-write</option> didn't enable delayed key
+     writing.
     </para></listitem>
 
     <listitem><para>
@@ -19257,7 +19246,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--verbose</literal> to
+     Added option <option>--verbose</option> to
      <command>mysqladmin</command>.
     </para></listitem>
 
@@ -19307,7 +19296,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--ansi</literal> option to
<command>mysqld</command>
+     Added <option>--ansi</option> option to
<command>mysqld</command>
      to make some functions standard SQL compatible.
     </para></listitem>
 
@@ -19317,7 +19306,7 @@
 
     <listitem><para>
      Added quoting of identifiers with <literal>`</literal>
-     (<literal>"</literal> in <literal>--ansi</literal> mode).
+     (<literal>"</literal> in <option>--ansi</option> mode).
     </para></listitem>
 
     <listitem><para>
@@ -19330,7 +19319,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--quote-names</literal> option to
+     Added <option>--quote-names</option> option to
      <command>mysqldump</command>.
     </para></listitem>
 
@@ -19494,7 +19483,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--relative</literal> option to
+     Added <option>--relative</option> option to
      <command>mysqladmin</command> to make
      <literal>extended-status</literal> more useful to monitor changes.
     </para></listitem>
@@ -19629,7 +19618,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added support of <literal>--[whitespace]</literal> comments.
+     Added support of <option>--[whitespace]</option> comments.
     </para></listitem>
 
     <listitem><para>
@@ -19799,7 +19788,7 @@
 
     <listitem><para>
      Added
-    
<literal>--init-file=<replaceable>file_name</replaceable></literal>
+    
<option>--init-file=<replaceable>file_name</replaceable></option>
      option to <command>mysqld</command>.
     </para></listitem>
 
@@ -19978,7 +19967,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-show-database</literal> option to
+     Added <option>--skip-show-database</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -20126,8 +20115,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--enable-large-files</literal> and
-     <literal>--disable-large-files</literal> options to
+     Added <option>--enable-large-files</option> and
+     <option>--disable-large-files</option> options to
      <command>configure</command>. See
<filename>configure.in</filename>
      for some systems where this is automatically turned off because of
      broken implementations.
@@ -20143,7 +20132,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--default-table-type</literal> option to
+     Added <option>--default-table-type</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -20562,7 +20551,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--defaults-file=file_name</literal> to option
+     Added option <option>--defaults-file=file_name</option> to option
      file handling to force use of only one specific option file.
     </para></listitem>
 
@@ -20769,9 +20758,8 @@
    <itemizedlist>
 
     <listitem><para>
-     Fixed a core dump problem when using
-     <literal>--log-update</literal> and connecting without a default
-     database.
+     Fixed a core dump problem when using <option>--log-update</option>
+     and connecting without a default database.
     </para></listitem>
 
     <listitem><para>
@@ -21161,7 +21149,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--bootstrap</literal> option to
+     Added <option>--bootstrap</option> option to
      <command>mysqld</command> and recoded
      <command>mysql_install_db</command> to use it. This makes it easier
      to install MySQL with RPMs.
@@ -21321,7 +21309,7 @@
 
     <listitem><para>
      You can now start <command>mysqld</command> on Windows with the
-     <literal>--flush</literal> option. This flushes all tables to disk
+     <option>--flush</option> option. This flushes all tables to disk
      after each update. This makes things much safer on the Windows
      platforms but also <emphasis role="bold">much</emphasis> slower.
     </para></listitem>
@@ -21479,13 +21467,13 @@
     </para></listitem>
 
     <listitem><para>
-     Added the <literal>--log-long-format</literal> option to
+     Added the <option>--log-long-format</option> option to
      <command>mysqld</command> to enable timestamps and INSERT_IDs in
      the update log.
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--where</literal> option to
+     Added <option>--where</option> option to
      <command>mysqldump</command> (patch by Jim Faucette).
     </para></listitem>
 
@@ -21646,7 +21634,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--low-priority-updates</literal> option to
+     Added <option>--low-priority-updates</option> option to
      <command>mysqld</command>, to give table-modifying operations
      (<literal>INSERT</literal>, <literal>REPLACE</literal>,
      <literal>UPDATE</literal>, <literal>DELETE</literal>) lower
@@ -21715,7 +21703,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--vertical</literal> option to
+     Added <option>--vertical</option> option to
      <command>mysql</command>, for printing results in vertical mode.
     </para></listitem>
 
@@ -21744,7 +21732,7 @@
    <itemizedlist>
 
     <listitem><para>
-     Added <literal>--tmpdir</literal> option to
+     Added <option>--tmpdir</option> option to
      <command>mysqld</command>, for specifying the location of the
      temporary file directory.
     </para></listitem>
@@ -21801,11 +21789,11 @@
      <command>mysqld</command> now automatically disables system locking
      on Linux and Windows, and for systems that use MIT-pthreads. You
      can force the use of locking with the
-     <literal>--enable-external-locking</literal> option.
+     <option>--enable-external-locking</option> option.
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--console</literal> option to
+     Added <option>--console</option> option to
      <command>mysqld</command>, to force a console window (for error
      messages) when using Windows.
     </para></listitem>
@@ -21850,7 +21838,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--compress</literal> option to all MySQL clients.
+     Added <option>--compress</option> option to all MySQL clients.
     </para></listitem>
 
     <listitem><para>
@@ -21891,7 +21879,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--chroot</literal> option to
+     Added <option>--chroot</option> option to
      <command>mysqld</command>, to start
<command>mysqld</command> in a
      chroot environment (by Nikki Chumakov
      <email>nikkic@stripped</email>).
@@ -21907,7 +21895,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--one-thread</literal> option to
+     Added <option>--one-thread</option> option to
      <command>mysqld</command>, for debugging with LinuxThreads (or
      <literal>glibc</literal>). (This replaces the
      <literal>-T32</literal> flag)
@@ -21970,7 +21958,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--timeout</literal> option to
+     Added <option>--timeout</option> option to
      <command>mysqladmin</command>, as a test of
      <literal>mysql_options()</literal>.
     </para></listitem>
@@ -22064,9 +22052,9 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--user</literal> option to
-     <command>mysqld</command>, to allow it to run as another Unix user
-     (if it is started as the Unix <literal>root</literal> user).
+     Added <option>--user</option> option to
<command>mysqld</command>,
+     to allow it to run as another Unix user (if it is started as the
+     Unix <literal>root</literal> user).
     </para></listitem>
 
     <listitem><para>
@@ -22151,7 +22139,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--set-variable</literal> option
+     Added <option>--set-variable</option> option
      <literal>wait_timeout</literal> to
<command>mysqld</command>.
     </para></listitem>
 
@@ -22173,8 +22161,8 @@
     <listitem><para>
      Added new <literal>DATE</literal> type that is stored in 3 bytes
      rather than 4 bytes. All new tables are created with the new date
-     type if you don't use the <literal>--old-protocol</literal> option
-     to <command>mysqld</command>.
+     type if you don't use the <option>--old-protocol</option> option to
+     <command>mysqld</command>.
     </para></listitem>
 
     <listitem><para>
@@ -22184,7 +22172,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--enable-assembler</literal> option to
+     Added <option>--enable-assembler</option> option to
      <command>configure</command>, for x86 machines (tested on Linux +
      <command>gcc</command>). This enables assembler functions for the
      most important string functions for more speed!
@@ -22258,14 +22246,14 @@
 
     <listitem><para>
      Fixed fatal bug in <literal>refresh()</literal> when running with
-     the <literal>--skip-external-locking</literal> option. There was a
+     the <option>--skip-external-locking</option> option. There was a
      <quote>very small</quote> time gap after a <command>mysqladmin
      refresh</command> when a table could be corrupted if one thread
      updated a table while another thread did <command>mysqladmin
      refresh</command> and another thread started a new update on the
      same table before the first thread had finished. A refresh (or
-     <literal>--flush-tables</literal>) now does not return until all
-     used tables are closed!
+     <option>--flush-tables</option>) now does not return until all used
+     tables are closed!
     </para></listitem>
 
     <listitem><para>
@@ -22540,7 +22528,7 @@
 
     <listitem><para>
      Ignore users with old (8-byte) password on startup if not using
-     <literal>--old-protocol</literal> option to
+     <option>--old-protocol</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -22729,7 +22717,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-thread-priority</literal> option to
+     Added <option>--skip-thread-priority</option> option to
      <command>mysqld</command>, for systems where
      <command>mysqld</command> thread scheduling doesn't work properly
      (BSDI 3.1).
@@ -23044,7 +23032,7 @@
 
     <listitem><para>
      Changed documentation string of
-     <literal>--with-unix-socket-path</literal> to avoid confusion.
+     <option>--with-unix-socket-path</option> to avoid confusion.
     </para></listitem>
 
     <listitem><para>
@@ -23397,7 +23385,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--table</literal> option to
<command>mysql</command>
+     Added <option>--table</option> option to
<command>mysql</command>
      to print in table format. Moved time and row information after
      query result. Added automatic reconnect of lost connections.
     </para></listitem>
@@ -23479,7 +23467,7 @@
 
     <listitem><para>
      <command>mysqld</command> now allows IP number and hostname for the
-     <literal>--bind-address</literal> option.
+     <option>--bind-address</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -23592,7 +23580,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--flush-logs</literal> option to
+     Added <option>--flush-logs</option> option to
      <command>mysqladmin</command>.
     </para></listitem>
 
@@ -23675,7 +23663,7 @@
 
     <listitem><para>
      Added
-    
<literal>--enable-unix-socket=<replaceable>pathname</replaceable></literal>
+    
<option>--enable-unix-socket=<replaceable>pathname</replaceable></option>
      option to <command>configure</command>.
     </para></listitem>
 
@@ -23764,7 +23752,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--pid-file=#</literal> option to
+     Added <option>--pid-file=#</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -23811,7 +23799,7 @@
      the error number of the error message. This makes error checking in
      the client much easier. This makes the new server incompatible with
      the 3.20.x server when running without
-     <literal>--old-protocol</literal>. The client code is
+     <option>--old-protocol</option>. The client code is
      backward-compatible. More information can be found in the
      <filename>README</filename> file!
     </para></listitem>
@@ -23930,7 +23918,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-networking</literal> option to
+     Added <option>--skip-networking</option> option to
      <command>mysqld</command>, to allow only socket connections. (This
      does not work with MIT-pthreads!)
     </para></listitem>
@@ -24028,7 +24016,7 @@
 
     <listitem><para>
      The range optimizer is coded, but only 85% tested. It can be
-     enabled with <literal>--new</literal>, but it crashes core a lot
+     enabled with <option>--new</option>, but it crashes core a lot
      yet...
     </para></listitem>
 
@@ -24172,7 +24160,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--log-update</literal> option to
+     Added <option>--log-update</option> option to
      <command>mysqld</command>, to get a log suitable for incremental
      updates.
     </para></listitem>
@@ -24314,7 +24302,7 @@
      directories from path) to <literal>isamlog</literal>. All files are
      written with a relative path from the database directory Now
      <command>mysqld</command> shouldn't crash on shutdown when using
-     the <literal>--log-isam</literal> option.
+     the <option>--log-isam</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -24337,9 +24325,9 @@
     </para></listitem>
 
     <listitem><para>
-     Now one usually only has to specify the
-     <literal>--basedir</literal> option to
<command>mysqld</command>.
-     All other paths are relative in a normal installation.
+     Now one usually only has to specify the <option>--basedir</option>
+     option to <command>mysqld</command>. All other paths are relative
+     in a normal installation.
     </para></listitem>
 
     <listitem><para>
@@ -24369,7 +24357,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--unbuffered</literal> option to
+     Added <option>--unbuffered</option> option to
      <command>mysql</command>, for new
<command>mysqlaccess</command>.
     </para></listitem>
 
@@ -24603,7 +24591,7 @@
    <itemizedlist>
 
     <listitem><para>
-     If one gives <literal>-p</literal> or
<literal>--password</literal>
+     If one gives <literal>-p</literal> or
<option>--password</option>
      option to <command>mysql</command> without an argument, the user is
      solicited for the password from the tty.
     </para></listitem>
@@ -24781,8 +24769,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--port</literal> and
<literal>--socket</literal>
-     options to all utility programs and <command>mysqld</command>.
+     Added <option>--port</option> and <option>--socket</option>
options
+     to all utility programs and <command>mysqld</command>.
     </para></listitem>
 
     <listitem><para>
@@ -24849,7 +24837,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--without-perl</literal> option to
+     Added <option>--without-perl</option> option to
      <command>configure</command>.
     </para></listitem>
 
@@ -25041,7 +25029,7 @@
      <literal>'\'</literal> while writing tab-separated output. This is
      to allow printing of binary data in a portable format. To get the
      old behavior, use <literal>-r</literal> (or
-     <literal>--raw</literal>).
+     <option>--raw</option>).
     </para></listitem>
 
     <listitem><para>
@@ -25490,7 +25478,7 @@
     
<filename>innodb_status.<replaceable>&lt;pid&gt;</replaceable></filename>
      file in the data directory. By default, the file is not created. To
      create it, start <command>mysqld</command> with the
-     <literal>--innodb_status_file=1</literal> option.
+     <option>--innodb_status_file=1</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -25664,7 +25652,7 @@
     
<filename>innodb_status.<replaceable>&lt;pid&gt;</replaceable></filename>
      file in the data directory. By default, the file is not created. To
      create it, start <command>mysqld</command> with the
-     <literal>--innodb_status_file=1</literal> option.
+     <option>--innodb_status_file=1</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -28472,7 +28460,7 @@
 
     <listitem><para>
      (Bug #10956) More than 7 node restarts with
-     <literal>--initial</literal> caused cluster to fail.
+     <option>--initial</option> caused cluster to fail.
     </para></listitem>
 
     <listitem><para>
@@ -28634,8 +28622,8 @@
      #8928) Databases with 1, 2, 4, 8, ...
      (2^<replaceable>n</replaceable> nodes) did not have the problem.
      After a rolling upgrade, restart each node manually by restarting
-     it with the <literal>--initial</literal> option. Otherwise, use
-     dump and restore after an upgrade.
+     it with the <option>--initial</option> option. Otherwise, use dump
+     and restore after an upgrade.
     </para></listitem>
 
    </itemizedlist>
@@ -29522,7 +29510,7 @@
 
     <listitem><para>
      In earlier versions, <command>mysqld</command> would crash if the
-     cluster wasn't started with the <literal>--ndbcluster</literal>
+     cluster wasn't started with the <option>--ndbcluster</option>
      option. Now <command>mysqld</command> handles cluster crashes and
      starts without crashing.
     </para></listitem>
@@ -29530,9 +29518,9 @@
     <listitem><para>
      The <literal>-i</literal> option for initial startup of
      <command>ndbd</command> has been removed. Initial startup still can
-     be specified by using the <literal>--initial</literal> option. The
+     be specified by using the <option>--initial</option> option. The
      reason for this is to ensure that it is clear what takes place when
-     using <literal>--initial</literal>: this option completely removes
+     using <option>--initial</option>: this option completely removes
      all data from the disk and should only be used at initial start, in
      certain software upgrade cases, and in some cases as a workaround
      when nodes cannot be restarted successfully.

--- 1.75/refman/news.xml	2005-07-16 19:49:19 -05:00
+++ 1.76/refman/news.xml	2005-07-16 20:16:42 -05:00
@@ -11966,7 +11966,7 @@
      <literal>xxx_add()</literal> functions.
<command>mysqld</command>
      by default no longer loads UDFs unless they have at least one
      auxiliary symbol defined in addition to the main symbol. The
-     <literal>--allow-suspicious-udfs</literal> option controls whether
+     <option>--allow-suspicious-udfs</option> option controls whether
      UDFs that have only an <literal>xxx</literal> symbol can be loaded.
      By default, the option is off. <literal>mysqld</literal> also
      checks UDF filenames when it reads them from the
@@ -12055,7 +12055,7 @@
 
     <listitem><para>
      Platform and architecture information in version information
-     produced for <literal>--version</literal> option on Windows was
+     produced for <option>--version</option> option on Windows was
      always <literal>Win95/Win98 (i32)</literal>. More accurately
      determine platform as <literal>Win32</literal> or
      <literal>Win64</literal> for 32-bit or 64-bit Windows, and
@@ -12073,8 +12073,8 @@
 
     <listitem><para>
      Fixed a failure of multiple-table updates to replicate properly on
-     slave servers when <literal>--replicate-*-table</literal> options
-     had been specified. (Bug #7011)
+     slave servers when <option>--replicate-*-table</option> options had
+     been specified. (Bug #7011)
     </para></listitem>
 
     <listitem><para>
@@ -12170,12 +12170,12 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>InnoDB</literal>: Honor the
<literal>--tmpdir</literal>
+     <literal>InnoDB</literal>: Honor the
<option>--tmpdir</option>
      startup option when creating temporary files. Previously,
      <literal>InnoDB</literal> temporary files were always created in
      the temporary directory of the operating system. On Netware,
      <literal>InnoDB</literal> will continue to ignore
-     <literal>--tmpdir</literal>. (Bug #5822)
+     <option>--tmpdir</option>. (Bug #5822)
     </para></listitem>
 
     <listitem><para>
@@ -12266,7 +12266,7 @@
    <itemizedlist>
 
     <listitem><para>
-     Added <literal>--hex-blob</literal> option to
+     Added <option>--hex-blob</option> option to
      <command>mysqldump</command> for dumping binary string columns
      using hexadecimal notation.
     </para></listitem>
@@ -12292,7 +12292,7 @@
      <literal>mysqlbinlog</literal> now prints an informative commented
      line (thread id, timestamp, server id, etc) before each
      <literal>LOAD DATA INFILE</literal>, like it does for other
-     queries; unless <literal>--short-form</literal> is used.
+     queries; unless <option>--short-form</option> is used.
     </para></listitem>
 
    </itemizedlist>
@@ -12418,22 +12418,22 @@
    <itemizedlist>
 
     <listitem><para>
-     The <literal>--with-openssl</literal> option for
+     The <option>--with-openssl</option> option for
      <command>configure</command> now accepts a path prefix as an
-     argument. <literal>--with-openssl-includes</literal> and
-     <literal>--with-openssl-libs</literal> are still supported, but are
+     argument. <option>--with-openssl-includes</option> and
+     <option>--with-openssl-libs</option> are still supported, but are
      needed only to override the default values. (Bug #5494)
     </para></listitem>
 
     <listitem><para>
-     Added new <literal>--without-man</literal> option to
+     Added new <option>--without-man</option> option to
      <command>configure</command> to suppress building/installing the
      manual pages. (Bug #5379)
     </para></listitem>
 
     <listitem><para>
      InnoDB: New <command>mysqld</command> option
-     <literal>--innodb-table-locks</literal> and session variable
+     <option>--innodb-table-locks</option> and session variable
      <literal>innodb_table_locks</literal> (on by default). In
      applications using <literal>AUTOCOMMIT=1</literal> and MySQL's
      <literal>LOCK TABLES</literal> command, InnoDB's internal table
@@ -12516,9 +12516,9 @@
 
     <listitem><para>
      <command>mysqlimport</command> now reads input files locally from
-     the client host only if the <literal>--local</literal> option is
+     the client host only if the <option>--local</option> option is
      given. Previously, it assumed incorrectly in some cases that files
-     were local even without <literal>--local</literal>. (Bug #5829)
+     were local even without <option>--local</option>. (Bug #5829)
     </para></listitem>
 
     <listitem><para>
@@ -12568,10 +12568,10 @@
     <listitem><para>
      InnoDB: Fixed a bug introduced in 4.0.21. An assertion failed if
      one used <command>mysqldump</command> with the option
-     <literal>-l</literal> or <literal>--opt</literal>, or if one
used
+     <literal>-l</literal> or <option>--opt</option>, or if one
used
      <literal>LOCK TABLES ... LOCAL</literal>. (Workaround in 4.0.21:
-     use <literal>--quick</literal> and
-     <literal>--single-transaction</literal>. (Bug #5538)
+     use <option>--quick</option> and
+     <option>--single-transaction</option>. (Bug #5538)
     </para></listitem>
 
     <listitem><para>
@@ -12593,8 +12593,8 @@
 
     <listitem><para>
      Fixed bug which caused truncation of values read from or into
-     <literal>TIMESTAMP</literal> fields if
<literal>--new</literal>
-     mode was enabled. (Bug #4131)
+     <literal>TIMESTAMP</literal> fields if
<option>--new</option> mode
+     was enabled. (Bug #4131)
     </para></listitem>
 
     <listitem><para>
@@ -12787,7 +12787,7 @@
      During the installation process of the server RPM on Linux,
      <command>mysqld</command> was run as the
<literal>root</literal>
      system user, and if you had
-    
<literal>--log-bin=&lt;somewhere_out_of_var_lib_mysql&gt;</literal>
+    
<option>--log-bin=<replaceable>somewhere_out_of_var_lib_mysql</replaceable></option>
      it created binary log files owned by <literal>root</literal> in
      this directory, which remained owned by <literal>root</literal>
      after the installation. This is now fixed by starting
@@ -12810,7 +12810,7 @@
      Fixed incorrect destruction of expression which led to crash of
      server on complex
<literal>AND</literal>/<literal>OR</literal>
      expressions if query was ignored (either by a replication server
-     because of <literal>--replicate-*-table</literal> rules, or by any
+     because of <option>--replicate-*-table</option> rules, or by any
      MySQL server because of a syntax error). (Bug #3969, Bug #4494)
     </para></listitem>
 
@@ -13015,8 +13015,8 @@
     </para></listitem>
 
     <listitem><para>
-     The <literal>--log-warnings</literal> server option now is enabled
-     by default. Disable with <literal>--skip-log-warnings</literal>.
+     The <option>--log-warnings</option> server option now is enabled by
+     default. Disable with <option>--skip-log-warnings</option>.
     </para></listitem>
 
     <listitem><para>
@@ -13094,7 +13094,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--replicate-same-server-id</literal>.
+     Added option <option>--replicate-same-server-id</option>.
     </para></listitem>
 
    </itemizedlist>
@@ -13145,7 +13145,7 @@
      case (for example, <quote>phantom</quote> rows or not all matching
      rows, even an empty result set). The easiest way to check whether
      you are affected is to start <command>mysqld</command> with
-     <literal>--skip-concurrent-insert</literal> switch and see if it
+     <option>--skip-concurrent-insert</option> switch and see if it
      helps.
     </para></listitem>
 
@@ -13263,8 +13263,8 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>--set-character-set</literal> and
-     <literal>--character-sets-dir</literal> options in
+     <option>--set-character-set</option> and
+     <option>--character-sets-dir</option> options in
      <command>myisamchk</command> now work.
     </para></listitem>
 
@@ -13347,13 +13347,13 @@
     <listitem><para>
      Fixed that a statement never triggers a superfluous error on the
      slave, if it must be excluded given the
-     <literal>--replicate-*</literal> options. The bug was that if the
+     <option>--replicate-*</option> options. The bug was that if the
      statement had been killed on the master, the slave would stop. (Bug
      #2983)
     </para></listitem>
 
     <listitem><para>
-     The <literal>--local-load</literal> option of
+     The <option>--local-load</option> option of
      <command>mysqlbinlog</command> now requires an argument.
     </para></listitem>
 
@@ -13399,13 +13399,13 @@
     <listitem><para>
      Multiple-table <literal>DELETE</literal> statements were always
      replicated by the slave if there were some
-     <literal>--replicate-*-ignore-table</literal> options and no
-     <literal>--replicate-*-do-table</literal> options. (Bug #3461)
+     <option>--replicate-*-ignore-table</option> options and no
+     <option>--replicate-*-do-table</option> options. (Bug #3461)
     </para></listitem>
 
     <listitem><para>
      Fixed a crash of the MySQL slave server when it was built with
-     <literal>--with-debug</literal> and replicating itself. (Bug #3568)
+     <option>--with-debug</option> and replicating itself. (Bug #3568)
     </para></listitem>
 
    </itemizedlist>
@@ -13469,15 +13469,15 @@
     </para></listitem>
 
     <listitem><para>
-     Removed old non-working <literal>--old-rpl-compat</literal> server
+     Removed old non-working <option>--old-rpl-compat</option> server
      option, which was a holdover from the very first 4.0.x versions.
      (Bug #2428)
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--sync-frm</literal>. It's on by default, to
+     Added option <option>--sync-frm</option>. It's on by default, to
      instruct MySQL to sync to disk each time <filename>.frm</filename>
-     file is created. Use <literal>--disable-sync-frm</literal> to
+     file is created. Use <option>--disable-sync-frm</option> to
      disable.
     </para></listitem>
 
@@ -13510,7 +13510,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug when <literal>--init-file</literal> crashes MySQL if it
+     Fixed bug when <option>--init-file</option> crashes MySQL if it
      contains a large <literal>SELECT</literal>. (Bug #2526)
     </para></listitem>
 
@@ -13709,7 +13709,7 @@
     <listitem><para>
      Multiple-table <literal>DELETE</literal> statements were never
      replicated by the slave if there were any
-     <literal>--replicate-*-table</literal> options. (Bug #2527)
+     <option>--replicate-*-table</option> options. (Bug #2527)
     </para></listitem>
 
     <listitem><para>
@@ -13819,7 +13819,7 @@
     <listitem><para>
      Sending <literal>SIGHUP</literal> to
<command>mysqld</command>
      crashed the server if it was running with
-     <literal>--log-bin</literal>. (Bug #2045)
+     <option>--log-bin</option>. (Bug #2045)
     </para></listitem>
 
     <listitem><para>
@@ -13990,7 +13990,7 @@
     <listitem><para>
      <command>mysqlbinlog</command> now asks for a password at the
      console when the <literal>-p</literal> or
-     <literal>--password</literal> option is used with no argument. This
+     <option>--password</option> option is used with no argument. This
      is consistent with the way that other clients such
      <command>mysqladmin</command> and
<command>mysqldump</command>
      behave. <emphasis role="bold">Note</emphasis>: A consequence of
@@ -14130,10 +14130,10 @@
     <listitem><para>
      <command>mysqlbinlog</command> now reads option files. To make this
      work, you must now specify
-     <literal>--read-from-remote-server</literal> when reading binary
-     logs from a MySQL server. (Note that using a remote server is
-     deprecated and may disappear in future
-     <command>mysqlbinlog</command> versions).
+     <option>--read-from-remote-server</option> when reading binary logs
+     from a MySQL server. (Note that using a remote server is deprecated
+     and may disappear in future <command>mysqlbinlog</command>
+     versions).
     </para></listitem>
 
     <listitem><para>
@@ -14145,7 +14145,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--libs_r</literal> and
<literal>--include</literal>
+     Added <option>--libs_r</option> and
<option>--include</option>
      options to <command>mysql_config</command>.
     </para></listitem>
 
@@ -14172,7 +14172,7 @@
      <filename>master.info</filename> and
      <filename>relay-log.info</filename> files, as well as any
      <filename>SQL_LOAD-*</filename> files located in the directory
-     specified by the <literal>--slave-load-tmpdir</literal> option. All
+     specified by the <option>--slave-load-tmpdir</option> option. All
      these files are needed when the slave resumes replication after you
      restore the slave's data.
     </para></listitem>
@@ -14258,17 +14258,16 @@
      MASTER</literal> dropped the corresponding database on the slave,
      thus erroneously dropping tables that had no counterpart on the
      master and tables that may have been excluded from replication
-     using <literal>--replicate-*-table</literal> rules. Now
-     <literal>LOAD DATA FROM MASTER</literal> no longer drops the
-     database. Instead, it drops only the tables that have a counterpart
-     on the master and that match the
-     <literal>--replicate-*-table</literal> rules.
-     <literal>--replicate-*-db</literal> rules can still be used to
+     using <option>--replicate-*-table</option> rules. Now
<literal>LOAD
+     DATA FROM MASTER</literal> no longer drops the database. Instead,
+     it drops only the tables that have a counterpart on the master and
+     that match the <option>--replicate-*-table</option> rules.
+     <option>--replicate-*-db</option> rules can still be used to
      include or exclude a database as a whole from <literal>LOAD DATA
      FROM MASTER</literal>. A database also is included or excluded as a
      whole if there are some rules like
-     <literal>--replicate-wild-do-table=db1.%</literal> or
-     <literal>--replicate-wild-ignore-table=db1.%</literal>, as is the
+     <option>--replicate-wild-do-table=db1.%</option> or
+     <option>--replicate-wild-ignore-table=db1.%</option>, as is the
      case for <literal>CREATE DATABASE</literal> and <literal>DROP
      DATABASE</literal> in replication. (Bug #1248)
     </para></listitem>
@@ -14276,7 +14275,7 @@
     <listitem><para>
      Fixed a bug where <command>mysqlbinlog</command> crashed with a
      segmentation fault when used with the <literal>-h</literal> or
-     <literal>--host</literal> option. (Bug #1258)
+     <option>--host</option> option. (Bug #1258)
     </para></listitem>
 
     <listitem><para>
@@ -14416,7 +14415,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--sql-mode=NO_DIR_IN_CREATE</literal> to make
+     Added option <option>--sql-mode=NO_DIR_IN_CREATE</option> to make
      it possible for slaves to ignore <literal>INDEX DIRECTORY</literal>
      and <literal>DATA DIRECTORY</literal> options given to
      <literal>CREATE TABLE</literal>. When this is mode is on,
@@ -14484,8 +14483,8 @@
      <literal>binlog-do-db</literal> and
      <literal>binlog-ignore-db</literal> options are tested against the
      database on the master (see <xref linkend="binary-log"/>), and a
-     paragraph about how <literal>--replicate-do-db</literal>,
-     <literal>--replicate-do-table</literal> and analogous options are
+     paragraph about how <option>--replicate-do-db</option>,
+     <option>--replicate-do-table</option> and analogous options are
      tested against the database and tables on the slave (see
      <xref linkend="replication-options"/>).
     </para></listitem>
@@ -14494,7 +14493,7 @@
      Now the slave does not replicate <literal>SET PASSWORD</literal> if
      it is configured to exclude the <literal>mysql</literal> database
      from replication (using for example
-     <literal>--replicate-wild-ignore-table=mysql.%</literal>). This was
+     <option>--replicate-wild-ignore-table=mysql.%</option>). This was
      the case for <literal>GRANT</literal> and
<literal>REVOKE</literal>
      since version 4.0.13 (although there was Bug #980 in 4.0.13 &amp;
      4.0.14, which has been fixed in 4.0.15).
@@ -14723,7 +14722,7 @@
     <listitem><para>
      Fixed segmentation fault resulting from <literal>LOAD DATA FROM
      MASTER</literal> when the master was running without the
-     <literal>--log-bin</literal> option. (Bug #934)
+     <option>--log-bin</option> option. (Bug #934)
     </para></listitem>
 
     <listitem><para>
@@ -14737,8 +14736,7 @@
      <literal>GRANT</literal> or <literal>REVOKE</literal>
queries even
      if it was configured to exclude the <literal>mysql</literal>
      database from replication (for example, using
-     <literal>--replicate-wild-ignore-table=mysql.%</literal>). (Bug
-     #980)
+     <option>--replicate-wild-ignore-table=mysql.%</option>). (Bug #980)
     </para></listitem>
 
     <listitem><para>
@@ -14773,7 +14771,7 @@
 
     <listitem><para>
      Fixed a segfault in <command>mysqlbinlog</command> when
-     <literal>--position=x</literal> was used with
<literal>x</literal>
+     <option>--position=x</option> was used with
<literal>x</literal>
      being between a <literal>Create_file</literal> event and its fellow
      <literal>Append_block</literal>,
<literal>Exec_load</literal> or
      <literal>Delete_file</literal> events. (Bug #1091)
@@ -14781,8 +14779,8 @@
 
     <listitem><para>
      <command>mysqlbinlog</command> printed superfluous warnings when
-     using <literal>--database</literal>, which caused syntax errors
-     when piped to <command>mysql</command>. (Bug #1092)
+     using <option>--database</option>, which caused syntax errors when
+     piped to <command>mysql</command>. (Bug #1092)
     </para></listitem>
 
     <listitem><para>
@@ -14897,7 +14895,7 @@
     </para></listitem>
 
     <listitem><para>
-     Removed <literal>--table</literal> option from
+     Removed <option>--table</option> option from
      <command>mysqlbinlog</command> to avoid repeating
      <command>mysqldump</command> functionality.
     </para></listitem>
@@ -14943,14 +14941,14 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--nice</literal> option to
+     Added <option>--nice</option> option to
      <command>mysqld_safe</command> to allow setting the niceness of the
      <command>mysqld</command> process. (Thanks to Christian Hammers for
      providing the initial patch.) (Bug #627)
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--read-only</literal> option to cause
+     Added <option>--read-only</option> option to cause
      <command>mysqld</command> to allow no updates except from slave
      threads or from users with the <literal>SUPER</literal> privilege.
      (Original patch from Markus Benning).
@@ -14968,7 +14966,7 @@
     <listitem><para>
      <command>mysqld</command> now only adds an interrupt handler for
      the <literal>SIGINT</literal> signal if you start it with the new
-     <literal>--gdb</literal> option. This is because some MySQL users
+     <option>--gdb</option> option. This is because some MySQL users
      encountered strange problems when they accidentally sent
      <literal>SIGINT</literal> to <command>mysqld</command>
threads.
     </para></listitem>
@@ -15234,7 +15232,7 @@
     </para></listitem>
 
     <listitem><para>
-     When using a slave compiled with <literal>--debug</literal>,
+     When using a slave compiled with <option>--debug</option>,
      <literal>CHANGE MASTER TO RELAY_LOG_POS</literal> could cause a
      debug assertion failure. (Bug #576)
     </para></listitem>
@@ -15243,7 +15241,7 @@
      When doing a <literal>LOCK TABLES WRITE</literal> on an
      <literal>InnoDB</literal> table, commit could not happen, if the
      query was not written to the binary log (for example, if
-     <literal>--log-bin</literal> was not used, or
+     <option>--log-bin</option> was not used, or
      <literal>binlog-ignore-db</literal> was used). (Bug #578)
     </para></listitem>
 
@@ -15280,12 +15278,12 @@
 
     <listitem><para>
      If a query was ignored on the slave (because of
-     <literal>--replicate-ignore-table</literal> and other similar
-     rules), the slave still checked if the query got the same error
-     code (0, no error) as on the master. So if the master had an error
-     on the query (for example, <quote>Duplicate entry</quote> in a
-     multiple-row insert), then the slave stopped and warned that the
-     error codes didn't match. (Bug #797)
+     <option>--replicate-ignore-table</option> and other similar rules),
+     the slave still checked if the query got the same error code (0, no
+     error) as on the master. So if the master had an error on the query
+     (for example, <quote>Duplicate entry</quote> in a multiple-row
+     insert), then the slave stopped and warned that the error codes
+     didn't match. (Bug #797)
     </para></listitem>
 
    </itemizedlist>
@@ -15309,7 +15307,7 @@
 
     <listitem><para>
      The Windows binary packages are now compiled with
-     <literal>--enable-local-infile</literal> to match the Unix build
+     <option>--enable-local-infile</option> to match the Unix build
      configuration.
     </para></listitem>
 
@@ -15361,7 +15359,7 @@
     </para></listitem>
 
     <listitem><para>
-     Option <literal>--new</literal> now changes binary items
+     Option <option>--new</option> now changes binary items
      (<literal>0xFFDF</literal>) to be treated as binary strings instead
      of numbers by default. This fixes some problems with character sets
      where it's convenient to input the string as a binary item. After
@@ -15402,13 +15400,13 @@
 
     <listitem><para>
      Added warnings to error log of why a secure connection failed (when
-     running with <literal>--log-warnings</literal>).
+     running with <option>--log-warnings</option>).
     </para></listitem>
 
     <listitem><para>
-     Deprecated options <literal>--skip-symlink</literal> and
-     <literal>--use-symbolic-links</literal> and replaced these with
-     <literal>--symbolic-links</literal>.
+     Deprecated options <option>--skip-symlink</option> and
+     <option>--use-symbolic-links</option> and replaced these with
+     <option>--symbolic-links</option>.
     </para></listitem>
 
     <listitem><para>
@@ -15449,20 +15447,19 @@
 
     <listitem><para>
      <command>mysqldump</command> no longer silently deletes the binary
-     logs when invoked with the <literal>--master-data</literal> or
-     <literal>--first-slave</literal> option; while this behavior was
+     logs when invoked with the <option>--master-data</option> or
+     <option>--first-slave</option> option; while this behavior was
      convenient for some users, others may suffer from it. Now you must
      explicitly ask for binary logs to be deleted by using the new
-     <literal>--delete-master-logs</literal> option.
+     <option>--delete-master-logs</option> option.
     </para></listitem>
 
     <listitem><para>
      If the slave is configured (using for example
-     <literal>--replicate-wild-ignore-table=mysql.%</literal>) to
-     exclude <literal>mysql.user</literal>,
-     <literal>mysql.host</literal>, <literal>mysql.db</literal>,
-     <literal>mysql.tables_priv</literal> and
-     <literal>mysql.columns_priv</literal> from replication, then
+     <option>--replicate-wild-ignore-table=mysql.%</option>) to exclude
+     <literal>mysql.user</literal>,
<literal>mysql.host</literal>,
+     <literal>mysql.db</literal>,
<literal>mysql.tables_priv</literal>
+     and <literal>mysql.columns_priv</literal> from replication, then
      <literal>GRANT</literal> and <literal>REVOKE</literal> are
not
      replicated.
     </para></listitem>
@@ -15568,7 +15565,7 @@
     <listitem><para>
      Fixed a crashing bug in <command>mysql</command> monitor program.
      It occurred if program was started with
-     <literal>--no-defaults</literal>, with a prompt that contained the
+     <option>--no-defaults</option>, with a prompt that contained the
      hostname and a connection to a non-existent database was requested.
     </para></listitem>
 
@@ -15662,7 +15659,7 @@
 
     <listitem><para>
      Added missing dashes to parameter
-     <literal>--open-files-limit</literal> in
+     <option>--open-files-limit</option> in
      <command>mysqld_safe</command>. (Bug #264)
     </para></listitem>
 
@@ -15758,7 +15755,7 @@
 
     <listitem><para>
      Fixed a bug in <command>mysqldump</command> when it was called with
-     <literal>--master-data</literal>: the <literal>CHANGE MASTER
+     <option>--master-data</option>: the <literal>CHANGE MASTER
      TO</literal> commands appended to the SQL dump had incorrect
      coordinates. (Bug #159)
     </para></listitem>
@@ -15804,8 +15801,8 @@
     </para></listitem>
 
     <listitem><para>
-     The <literal>--new</literal> option can be used to make a 4.0
-     server return <literal>TIMESTAMP</literal> as a string in
+     The <option>--new</option> option can be used to make a 4.0 server
+     return <literal>TIMESTAMP</literal> as a string in
      <literal>'YYYY-MM-DD HH:MM:SS'</literal> format, the way that 4.1
      servers do. This is also a <literal>new</literal> system variable
      that can be set for the same effect. See
@@ -16100,7 +16097,7 @@
     </para></listitem>
 
     <listitem><para>
-     When running with <literal>--lower-case-table-names</literal>
+     When running with <option>--lower-case-table-names</option>
      (default on Windows) and you had tables or databases with mixed
      case on disk, then executing <literal>SHOW TABLE STATUS</literal>
      followed with <literal>DROP DATABASE</literal> or <literal>DROP
@@ -16123,12 +16120,12 @@
 
     <listitem><para>
      Added option
-    
<literal>--log-error[=<replaceable>file_name</replaceable>]</literal>
+    
<option>--log-error[=<replaceable>file_name</replaceable>]</option>
      to <command>mysqld_safe</command> and
<command>mysqld</command>.
      This option forces all error messages to be put in a log file if
-     the option <literal>--console</literal> is not given. On Windows
-     <literal>--log-error</literal> is enabled as default, with a
-     default name of
+     the option <option>--console</option> is not given. On Windows
+     <option>--log-error</option> is enabled as default, with a default
+     name of
     
<filename><replaceable>host_name</replaceable>.err</filename> if
      the name is not specified.
     </para></listitem>
@@ -16148,7 +16145,7 @@
     </para></listitem>
 
     <listitem><para>
-     New <literal>--ft-stopword-file</literal> command-line option for
+     New <option>--ft-stopword-file</option> command-line option for
      <command>mysqld</command> to replace/disable the built-in stopword
      list that is used in full-text searches. See
      <xref linkend="server-system-variables"/>.
@@ -16161,7 +16158,7 @@
      128K for <literal>gethostbyaddr()</literal> to resolve a hostname.
      You can fix this for earlier MySQL versions by starting
      <command>mysqld</command> with
-     <literal>--thread-stack=192K</literal>.
+     <option>--thread-stack=192K</option>.
     </para></listitem>
 
     <listitem><para>
@@ -16457,7 +16454,7 @@
     <listitem><para>
      <command>mysqlbug</command> now also reports the compiler version
      used for building the binaries (if the compiler supports the option
-     <literal>--version</literal>).
+     <option>--version</option>).
     </para></listitem>
 
    </itemizedlist>
@@ -16618,8 +16615,8 @@
     </para></listitem>
 
     <listitem><para>
-     Make <literal>--lower-case-table-names</literal> default on Mac OS
-     X as the default filesystem (HFS+) is case insensitive. See
+     Make <option>--lower-case-table-names</option> default on Mac OS X
+     as the default filesystem (HFS+) is case insensitive. See
      <xref linkend="name-case-sensitivity"/>.
     </para></listitem>
 
@@ -16660,7 +16657,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug that prevented <literal>--chroot</literal> command-line
+     Fixed bug that prevented <option>--chroot</option> command-line
      option of <command>mysqld</command> from working.
     </para></listitem>
 
@@ -16685,7 +16682,7 @@
     </para></listitem>
 
     <listitem><para>
-    
<literal>--replicate-do=<replaceable>xxx</replaceable></literal>
+    
<option>--replicate-do=<replaceable>xxx</replaceable></option>
      didn't work for <literal>UPDATE</literal> commands. (Bug introduced
      in 4.0.0)
     </para></listitem>
@@ -16760,7 +16757,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--use-frm</literal> option to
+     Added <option>--use-frm</option> option to
      <command>mysqlcheck</command>. When used with <literal>REPAIR
      TABLE</literal>, it gets the table structure from the
      <filename>.frm</filename> file, so the table can be repaired even
@@ -16794,7 +16791,7 @@
     </para></listitem>
 
     <listitem><para>
-     When one uses the <literal>--open-files-limit=#</literal> option to
+     When one uses the <option>--open-files-limit=#</option> option to
      <command>mysqld_safe</command> it's now passed on to
      <command>mysqld</command>.
     </para></listitem>
@@ -16817,9 +16814,9 @@
 
     <listitem><para>
      Fixed an inadvertently changed option
-     (<literal>--ignore-space</literal>) back to the original
-     <literal>--ignore-spaces</literal> in
-     <literal>mysqlclient</literal>. (Both syntaxes work).
+     (<option>--ignore-space</option>) back to the original
+     <option>--ignore-spaces</option> in
<literal>mysqlclient</literal>.
+     (Both syntaxes work).
     </para></listitem>
 
     <listitem><para>
@@ -16939,7 +16936,7 @@
     </para></listitem>
 
     <listitem><para>
-     The filename argument for the <literal>--des-key-file</literal>
+     The filename argument for the <option>--des-key-file</option>
      argument to <command>mysqld</command> is interpreted relative to
      the data directory if given as a relative pathname.
     </para></listitem>
@@ -17065,7 +17062,7 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>--skip-ssl</literal> can now be used to disable SSL in the
+     <option>--skip-ssl</option> can now be used to disable SSL in the
      MySQL clients, even if one is using other SSL options in an option
      file or previously on the command line.
     </para></listitem>
@@ -17119,7 +17116,7 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>--log-binary=a.b.c</literal> now properly strips off
+     <option>--log-binary=a.b.c</option> now properly strips off
      <literal>.b.c</literal>.
     </para></listitem>
 
@@ -17151,8 +17148,7 @@
 
     <listitem><para>
      Fixed that <command>mysqld --help</command> reports correct values
-     for <literal>--datadir</literal> and
-     <literal>--bind-address</literal>.
+     for <option>--datadir</option> and
<option>--bind-address</option>.
     </para></listitem>
 
     <listitem><para>
@@ -17167,7 +17163,7 @@
 
     <listitem><para>
      Fixed a bug in <literal>my_getopt()</literal>;
-     <literal>--set-variable</literal> syntax didn't work for those
+     <option>--set-variable</option> syntax didn't work for those
      options that didn't have a valid variable in the
      <literal>my_option</literal> struct. This affected at least the
      <literal>default-table-type</literal> option.
@@ -17193,7 +17189,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug with the <literal>--slow-log</literal> when logging an
+     Fixed bug with the <option>--slow-log</option> when logging an
      administrator command (like <literal>FLUSH TABLES</literal>).
     </para></listitem>
 
@@ -17204,9 +17200,9 @@
 
     <listitem><para>
      Fixed a bug in <literal>my_getopt()</literal> in handling of
-     special prefixes (<literal>--skip-</literal>,
-     <literal>--enable-</literal>).
-     <literal>--skip-external-locking</literal> didn't work and the bug
+     special prefixes (<option>--skip-</option>,
+     <option>--enable-</option>).
+     <option>--skip-external-locking</option> didn't work and the bug
      may have affected other similar options.
     </para></listitem>
 
@@ -17265,10 +17261,10 @@
     <listitem><para>
      Fixed all boolean type variables/options to work with the old
      syntax, for example, all of these work:
-     <literal>--lower-case-table-names</literal>,
-     <literal>--lower-case-table-names=1</literal>, <literal>-O
-     lower-case-table-names=1</literal>,
-     <literal>--set-variable=lower-case-table-names=1</literal>
+     <option>--lower-case-table-names</option>,
+     <option>--lower-case-table-names=1</option>, <option>-O
+     lower-case-table-names=1</option>,
+     <option>--set-variable=lower-case-table-names=1</option>
     </para></listitem>
 
     <listitem><para>
@@ -17334,7 +17330,7 @@
 
     <listitem><para>
      <command>mysqld</command> now has the option
-     <literal>--temp-pool</literal> enabled by default as this gives
+     <option>--temp-pool</option> enabled by default as this gives
      better performance with some operating systems.
     </para></listitem>
 
@@ -17355,10 +17351,9 @@
     </para></listitem>
 
     <listitem><para>
-     If the <literal>--code-file</literal> option is specified, the
-     server calls <literal>setrlimit()</literal> to set the maximum
-     allowed core file size to unlimited, so core files can be
-     generated.
+     If the <option>--code-file</option> option is specified, the server
+     calls <literal>setrlimit()</literal> to set the maximum allowed
+     core file size to unlimited, so core files can be generated.
     </para></listitem>
 
     <listitem><para>
@@ -17366,10 +17361,10 @@
     </para></listitem>
 
     <listitem><para>
-     Added
<literal>--count=<replaceable>N</replaceable></literal>
+     Added <option>--count=<replaceable>N</replaceable></option>
      (<literal>-c</literal>) option to
<command>mysqladmin</command>, to
      make the program do only <replaceable>N</replaceable> iterations.
-     To be used with <literal>--sleep</literal>
(<literal>-i</literal>).
+     To be used with <option>--sleep</option>
(<option>-i</option>).
      Useful in scripts.
     </para></listitem>
 
@@ -17429,8 +17424,8 @@
      External system locking of
      <literal>MyISAM</literal>/<literal>ISAM</literal> files is
now
      turned off by default. One can turn this on with
-     <literal>--external-locking</literal>. (For most users this is
-     never needed).
+     <option>--external-locking</option>. (For most users this is never
+     needed).
     </para></listitem>
 
     <listitem><para>
@@ -17473,8 +17468,8 @@
     </para></listitem>
 
     <listitem><para>
-     Renamed <literal>--skip-locking</literal> to
-     <literal>--skip-external-locking</literal>.
+     Renamed <option>--skip-locking</option> to
+     <option>--skip-external-locking</option>.
     </para></listitem>
 
     <listitem><para>
@@ -17535,9 +17530,9 @@
     </para></listitem>
 
     <listitem><para>
-     Changed <literal>--chroot=path</literal> option to execute
-     <literal>chroot()</literal> immediately after all options have been
-     parsed.
+     Changed
<option>--chroot=<replaceable>path</replaceable></option>
+     option to execute <literal>chroot()</literal> immediately after all
+     options have been parsed.
     </para></listitem>
 
     <listitem><para>
@@ -17587,7 +17582,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--single-transaction</literal> option to
+     Added <option>--single-transaction</option> option to
      <command>mysqldump</command>, allowing a consistent dump of
      <literal>InnoDB</literal> tables. See <xref linkend="mysqldump"/>.
     </para></listitem>
@@ -17718,7 +17713,7 @@
     </para></listitem>
 
     <listitem><para>
-     New configure option <literal>--without-query-cache</literal>.
+     New configure option <option>--without-query-cache</option>.
     </para></listitem>
 
     <listitem><para>
@@ -17785,9 +17780,9 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--ignore-lines=n</literal> option to
-     <command>mysqlimport</command>. This has the same effect as the
-     <literal>IGNORE n LINES</literal> clause for <literal>LOAD
+     Added
<option>--ignore-lines=<replaceable>n</replaceable></option>
+     option to <command>mysqlimport</command>. This has the same effect
+     as the <literal>IGNORE n LINES</literal> clause for <literal>LOAD
      DATA</literal>.
     </para></listitem>
 
@@ -17863,7 +17858,7 @@
     </para></listitem>
 
     <listitem><para>
-     Allow value of <literal>--user=#</literal> option for
+     Allow value of <option>--user=#</option> option for
      <command>mysqld</command> to be specified as a numeric user ID.
     </para></listitem>
 
@@ -17907,7 +17902,7 @@
 
     <listitem><para>
      Added <literal>NO_UNSIGNED_SUBTRACTION</literal> to the set of
-     flags that may be specified with the <literal>--sql-mode</literal>
+     flags that may be specified with the <option>--sql-mode</option>
      option for <command>mysqld</command>. It disables unsigned
      arithmetic rules when it comes to subtraction. (This makes MySQL
      4.0 behave more like 3.23 with <literal>UNSIGNED</literal>
@@ -18027,7 +18022,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--no-beep</literal> and
<literal>--prompt</literal>
+     Added <option>--no-beep</option> and
<option>--prompt</option>
      options to <command>mysql</command> command-line client.
     </para></listitem>
 
@@ -18098,7 +18093,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--des-key-file</literal> option to
+     Added <option>--des-key-file</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -18217,8 +18212,8 @@
    <itemizedlist>
 
     <listitem><para>
-     Added <literal>--xml</literal> option to
<command>mysql</command>
-     for producing XML output.
+     Added <option>--xml</option> option to
<command>mysql</command> for
+     producing XML output.
     </para></listitem>
 
     <listitem><para>
@@ -18443,8 +18438,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--master-data</literal> and
-     <literal>--no-autocommit</literal> options to
+     Added <option>--master-data</option> and
+     <option>--no-autocommit</option> options to
      <command>mysqldump</command>. (Thanks to Brian Aker for this.)
     </para></listitem>
 
@@ -18551,7 +18546,7 @@
      Fixed incorrect destruction of expression which led to crash of
      server on complex
<literal>AND</literal>/<literal>OR</literal>
      expressions if query was ignored (either by a replication server
-     because of <literal>--replicate-*-table</literal> rules, or by any
+     because of <option>--replicate-*-table</option> rules, or by any
      MySQL server because of a syntax error). (Bug #3969, Bug #4494)
     </para></listitem>
 
@@ -18588,13 +18583,13 @@
 
     <listitem><para>
      If a query was ignored on the slave (because of
-     <literal>--replicate-ignore-table</literal> and other similar
-     rules), the slave still checked if the query got the same error
-     code (0, no error) as on the master. So if the master had an error
-     on the query (for example, <quote>Duplicate entry</quote> in a
-     multiple-row insert), then the slave stopped and warned that the
-     error codes didn't match. This is a backport of the fix for MySQL
-     4.0. (Bug #797)
+     <option>--replicate-ignore-table</option> and other similar rules),
+     the slave still checked if the query got the same error code (0, no
+     error) as on the master. So if the master had an error on the query
+     (for example, <quote>Duplicate entry</quote> in a multiple-row
+     insert), then the slave stopped and warned that the error codes
+     didn't match. This is a backport of the fix for MySQL 4.0. (Bug
+     #797)
     </para></listitem>
 
     <listitem><para>
@@ -18825,18 +18820,18 @@
 
     <listitem><para>
      <command>mysqldump</command> no longer silently deletes the binary
-     logs when invoked with the <literal>--master-data</literal> or
-     <literal>--first-slave</literal> option; while this behavior was
+     logs when invoked with the <option>--master-data</option> or
+     <option>--first-slave</option> option; while this behavior was
      convenient for some users, others may suffer from it. Now you must
      explicitly ask for binary logs to be deleted by using the new
-     <literal>--delete-master-logs</literal> option.
+     <option>--delete-master-logs</option> option.
     </para></listitem>
 
     <listitem><para>
      Fixed a bug in <command>mysqldump</command> when it was invoked
-     with the <literal>--master-data</literal> option: The
-     <literal>CHANGE MASTER TO</literal> statements that were appended
-     to the SQL dump had incorrect coordinates. (Bug #159)
+     with the <option>--master-data</option> option: The
<literal>CHANGE
+     MASTER TO</literal> statements that were appended to the SQL dump
+     had incorrect coordinates. (Bug #159)
     </para></listitem>
 
    </itemizedlist>
@@ -18883,7 +18878,7 @@
     <listitem><para>
      Security enhancement: <command>mysqld</command> and
      <command>safe_mysqld</command> now use only the first
-     <literal>--user</literal> option specified on the command line.
+     <option>--user</option> option specified on the command line.
      Normally this comes from <filename>/etc/my.cnf</filename>.
      (<ulink
url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0150">CAN-2003-0150</ulink>)
     </para></listitem>
@@ -18966,7 +18961,7 @@
     </para></listitem>
 
     <listitem><para>
-     When running with <literal>--lower-case-table-names=1</literal>
+     When running with <option>--lower-case-table-names=1</option>
      (default on Windows) and you had tables or databases with mixed
      case on disk, then executing <literal>SHOW TABLE STATUS</literal>
      followed with <literal>DROP DATABASE</literal> or <literal>DROP
@@ -19011,7 +19006,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug with the <literal>--slow-log</literal> when logging an
+     Fixed bug with the <option>--slow-log</option> when logging an
      administrator command (like <literal>FLUSH TABLES</literal>).
     </para></listitem>
 
@@ -19026,18 +19021,18 @@
     </para></listitem>
 
     <listitem><para>
-     Bugfix for <literal>--chroot</literal> (see
+     Bugfix for <option>--chroot</option> (see
      <xref linkend="news-3-23-54"/>) is reverted. Unfortunately, there
      is no way to make it to work, without introducing
      backward-incompatible changes in <filename>my.cnf</filename>. Those
-     who need <literal>--chroot</literal> functionality, should upgrade
-     to MySQL 4.0. (The fix in the 4.0 branch did not break
+     who need <option>--chroot</option> functionality, should upgrade to
+     MySQL 4.0. (The fix in the 4.0 branch did not break
      backward-compatibility).
     </para></listitem>
 
     <listitem><para>
-     Make <literal>--lower-case-table-names</literal> default on Mac OS
-     X as the default filesystem (HFS+) is case insensitive.
+     Make <option>--lower-case-table-names</option> default on Mac OS X
+     as the default filesystem (HFS+) is case insensitive.
     </para></listitem>
 
     <listitem><para>
@@ -19106,7 +19101,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug that prevented <literal>--chroot</literal> command-line
+     Fixed bug that prevented <option>--chroot</option> command-line
      option of <command>mysqld</command> from working.
     </para></listitem>
 
@@ -19160,8 +19155,8 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed that <literal>--core-file</literal> works on Linux (at least
-     on kernel 2.4.18).
+     Fixed that <option>--core-file</option> works on Linux (at least on
+     kernel 2.4.18).
     </para></listitem>
 
     <listitem><para>
@@ -19234,8 +19229,8 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed that <literal>--skip-show-database</literal> doesn't reset
-     the <literal>--port</literal> option.
+     Fixed that <option>--skip-show-database</option> doesn't reset the
+     <option>--port</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -19619,7 +19614,7 @@
      Because of problems on shutdown we have now disabled named pipes on
      Windows by default. One can enable named pipes by starting
      <command>mysqld</command> with
-     <literal>--enable-named-pipe</literal>.
+     <option>--enable-named-pipe</option>.
     </para></listitem>
 
     <listitem><para>
@@ -19628,7 +19623,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed core-dump bug when using <literal>--log-bin</literal> with
+     Fixed core-dump bug when using <option>--log-bin</option> with
      <literal>LOAD DATA INFILE</literal> without an active database.
     </para></listitem>
 
@@ -19664,8 +19659,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed binary builds to use
-     <literal>--enable-local-infile</literal>.
+     Fixed binary builds to use <option>--enable-local-infile</option>.
     </para></listitem>
 
     <listitem><para>
@@ -19737,8 +19731,8 @@
    <itemizedlist>
 
     <listitem><para>
-     Added <literal>--xml</literal> option to
-     <command>mysqldump</command> for producing XML output.
+     Added <option>--xml</option> option to
<command>mysqldump</command>
+     for producing XML output.
     </para></listitem>
 
     <listitem><para>
@@ -19979,7 +19973,7 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>--core-file</literal> now works on Solaris.
+     <option>--core-file</option> now works on Solaris.
     </para></listitem>
 
     <listitem><para>
@@ -20256,7 +20250,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug in <literal>--safe-user-create</literal>.
+     Fixed bug in <option>--safe-user-create</option>.
     </para></listitem>
 
    </itemizedlist>
@@ -20363,7 +20357,7 @@
     <listitem><para>
      Don't force everything to lowercase on Windows. (To fix problem
      with Windows and <literal>ALTER TABLE</literal>.) Now
-     <literal>--lower_case_table_names</literal> also works on Unix.
+     <option>--lower_case_table_names</option> also works on Unix.
     </para></listitem>
 
     <listitem><para>
@@ -20383,7 +20377,7 @@
 
     <listitem><para>
      Added
-    
<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>
      option to <command>mysqld</command>. See
      <xref linkend="server-options"/>.
     </para></listitem>
@@ -20443,7 +20437,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--safe-user-create</literal> option to
+     Added <option>--safe-user-create</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -20463,7 +20457,7 @@
    <itemizedlist>
 
     <listitem><para>
-     Fixed problem with <literal>--low-priority-updates</literal> and
+     Fixed problem with <option>--low-priority-updates</option> and
      <literal>INSERT</literal> statements.
     </para></listitem>
 
@@ -20516,12 +20510,12 @@
     </para></listitem>
 
     <listitem><para>
-     Option <literal>--force</literal> to
<command>myisamchk</command>
-     now also updates states.
+     Option <option>--force</option> to
<command>myisamchk</command> now
+     also updates states.
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--warnings</literal> to
+     Added option <option>--warnings</option> to
      <command>mysqld</command>. Now <command>mysqld</command>
prints the
      error <literal>Aborted connection</literal> only if this option is
      used.
@@ -20668,7 +20662,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-stack-trace</literal> option to
+     Added <option>--skip-stack-trace</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -20769,7 +20763,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--mysql-version</literal> option to
+     Added <option>--mysql-version</option> option to
      <command>safe_mysqld</command>
     </para></listitem>
 
@@ -20872,7 +20866,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-safemalloc</literal> option to
+     Added <option>--skip-safemalloc</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -21074,7 +21068,7 @@
 
     <listitem><para>
      Allow space around <literal>=</literal> in argument to
-     <literal>--set-variable</literal>.
+     <option>--set-variable</option>.
     </para></listitem>
 
     <listitem><para>
@@ -21136,11 +21130,10 @@
     </para></listitem>
 
     <listitem><para>
-     Allow <literal>--skip-gemini</literal>,
-     <literal>--skip-bdb</literal>, and
<literal>--skip-innodb</literal>
-     options to be specified when invoking <command>mysqld</command>,
-     even if these storage engines are not compiled in to
-     <command>mysqld</command>.
+     Allow <option>--skip-gemini</option>,
<option>--skip-bdb</option>,
+     and <option>--skip-innodb</option> options to be specified when
+     invoking <command>mysqld</command>, even if these storage engines
+     are not compiled in to <command>mysqld</command>.
     </para></listitem>
 
     <listitem><para>
@@ -21171,7 +21164,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--character-sets-dir</literal> option to
+     Added <option>--character-sets-dir</option> option to
      <command>myisampack</command>.
     </para></listitem>
 
@@ -21218,7 +21211,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--sort-recover</literal> option to
+     Added <option>--sort-recover</option> option to
      <command>myisamchk</command>.
     </para></listitem>
 
@@ -21312,7 +21305,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--temp-pool</literal> option to
+     Added <option>--temp-pool</option> option to
      <command>mysqld</command>. Using this option causes most temporary
      files created to use a small set of names, rather than a unique
      name for each new file. This is to work around a problem in the
@@ -21379,7 +21372,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--with-version-suffix</literal> option to
+     Added <option>--with-version-suffix</option> option to
      <command>configure</command>.
     </para></listitem>
 
@@ -21551,19 +21544,19 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--mysqld=#</literal> option to
+     Added <option>--mysqld=#</option> option to
      <command>safe_mysqld</command>.
     </para></listitem>
 
     <listitem><para>
-     Allow hex constants in the <literal>--fields-*-by</literal> and
-     <literal>--lines-terminated-by</literal> options to
+     Allow hex constants in the <option>--fields-*-by</option> and
+     <option>--lines-terminated-by</option> options to
      <command>mysqldump</command> and
<command>mysqlimport</command>. By
      Paul DuBois.
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--safe-show-database</literal> option to
+     Added <option>--safe-show-database</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -21576,13 +21569,13 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--open-files-limit</literal> option to
+     Added <option>--open-files-limit</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
     <listitem><para>
-     Changed <literal>--open-files</literal> option to
-     <literal>--open-files-limit</literal> in
+     Changed <option>--open-files</option> option to
+     <option>--open-files-limit</option> in
      <command>safe_mysqld</command>.
     </para></listitem>
 
@@ -21592,12 +21585,12 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed that <literal>--bdb-no-sync</literal> works.
+     Fixed that <option>--bdb-no-sync</option> works.
     </para></listitem>
 
     <listitem><para>
-     Changed <literal>--bdb-recover</literal> to
-     <literal>--bdb-no-recover</literal> as recover should be on by
+     Changed <option>--bdb-recover</option> to
+     <option>--bdb-no-recover</option> as recover should be on by
      default.
     </para></listitem>
 
@@ -21621,8 +21614,7 @@
     </para></listitem>
 
     <listitem><para>
-     Fixed bug with <literal>--skip-networking</literal> on Debian
-     Linux.
+     Fixed bug with <option>--skip-networking</option> on Debian Linux.
     </para></listitem>
 
     <listitem><para>
@@ -21741,7 +21733,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--bdb-shared-data</literal> option to
+     Added <option>--bdb-shared-data</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -21778,8 +21770,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--abort-slave-event-count</literal> and
-     <literal>--disconnect-slave-event-count</literal> options to
+     Added <option>--abort-slave-event-count</option> and
+     <option>--disconnect-slave-event-count</option> options to
      <command>mysqld</command> for debugging and testing of replication.
     </para></listitem>
 
@@ -21839,10 +21831,9 @@
     </para></listitem>
 
     <listitem><para>
-     <literal>--bootstrap</literal> is now run in a separate thread.
-     This fixes a problem that caused
-     <command>mysql_install_db</command> to core dump on some Linux
-     machines.
+     <option>--bootstrap</option> is now run in a separate thread. This
+     fixes a problem that caused <command>mysql_install_db</command> to
+     core dump on some Linux machines.
     </para></listitem>
 
     <listitem><para>
@@ -21867,7 +21858,7 @@
 
     <listitem><para>
      Reset status variable which could cause problem if one used
-     <literal>--slow-log</literal>.
+     <option>--slow-log</option>.
     </para></listitem>
 
     <listitem><para>
@@ -21892,9 +21883,9 @@
    <itemizedlist>
 
     <listitem><para>
-     Added new options <literal>--pager[=...]</literal>,
-     <literal>--no-pager</literal>, <literal>--tee=...</literal>
and
-     <literal>--no-tee</literal> to the <command>mysql</command>
client.
+     Added new options <option>--pager[=...]</option>,
+     <option>--no-pager</option>, <option>--tee=...</option> and
+     <option>--no-tee</option> to the <command>mysql</command>
client.
      The new corresponding interactive commands are
      <literal>pager</literal>, <literal>nopager</literal>,
      <literal>tee</literal> and <literal>notee</literal>. See
@@ -21934,7 +21925,7 @@
 
     <listitem><para>
      Added to the slow query log the time and the username for each
-     logged query. If you are using <literal>--log-long-format</literal>
+     logged query. If you are using <option>--log-long-format</option>
      then also queries that do not use an index are logged, even if the
      query takes less than <literal>long_query_time</literal> seconds.
     </para></listitem>
@@ -21973,8 +21964,8 @@
     </para></listitem>
 
     <listitem><para>
-     The <literal>--skip-networking</literal> option now works properly
-     on NT.
+     The <option>--skip-networking</option> option now works properly on
+     NT.
     </para></listitem>
 
     <listitem><para>
@@ -21994,10 +21985,10 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--replicate-ignore-table</literal>,
-     <literal>--replicate-do-table</literal>,
-     <literal>--replicate-wild-ignore-table</literal>, and
-     <literal>--replicate-wild-do-table</literal> options to
+     Added <option>--replicate-ignore-table</option>,
+     <option>--replicate-do-table</option>,
+     <option>--replicate-wild-ignore-table</option>, and
+     <option>--replicate-wild-do-table</option> options to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -22008,9 +21999,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--open-files</literal> and
-     <literal>--timezone</literal> options to
-     <command>safe_mysqld</command>.
+     Added <option>--open-files</option> and
<option>--timezone</option>
+     options to <command>safe_mysqld</command>.
     </para></listitem>
 
     <listitem><para>
@@ -22074,7 +22064,7 @@
 
     <listitem><para>
      <literal>SLAVE START</literal> did not work if you started with
-     <literal>--skip-slave-start</literal> and had not explicitly run
+     <option>--skip-slave-start</option> and had not explicitly run
      <literal>CHANGE MASTER TO</literal>.
     </para></listitem>
 
@@ -22094,9 +22084,9 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--safemalloc-mem-limit</literal> option to
+     Added <option>--safemalloc-mem-limit</option> option to
      <command>mysqld</command> to simulate memory shortage when compiled
-     with the <literal>--with-debug=full</literal> option.
+     with the <option>--with-debug=full</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -22209,7 +22199,7 @@
     </para></listitem>
 
     <listitem><para>
-     When using <literal>--log-slow-queries</literal>, don't count the
+     When using <option>--log-slow-queries</option>, don't count the
      time waiting for a lock.
     </para></listitem>
 
@@ -22220,7 +22210,7 @@
 
     <listitem><para>
      Automatic repair of <literal>MyISAM</literal> tables if you start
-     <command>mysqld</command> with
<literal>--myisam-recover</literal>.
+     <command>mysqld</command> with
<option>--myisam-recover</option>.
     </para></listitem>
 
     <listitem><para>
@@ -22254,12 +22244,12 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--replicate-rewrite-db</literal> option to
+     Added <option>--replicate-rewrite-db</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-slave-start</literal> option to
+     Added <option>--skip-slave-start</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -22285,7 +22275,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--default-extra-file=#</literal> option to all MySQL
+     Added <option>--default-extra-file=#</option> option to all MySQL
      clients.
     </para></listitem>
 
@@ -22377,7 +22367,7 @@
 
     <listitem><para>
      The <literal>MyISAM</literal> repair/reindex code didn't use the
-     <literal>--tmpdir</literal> option for its temporary files.
+     <option>--tmpdir</option> option for its temporary files.
     </para></listitem>
 
     <listitem><para>
@@ -22402,7 +22392,7 @@
     <listitem><para>
      Fixed a core dump bug when doing <literal>FLUSH MASTER</literal> if
      you didn't specify a filename argument to
-     <literal>--log-bin</literal>.
+     <option>--log-bin</option>.
     </para></listitem>
 
     <listitem><para>
@@ -22421,7 +22411,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--memlock</literal> option to
+     Added <option>--memlock</option> option to
      <command>mysqld</command> to lock <command>mysqld</command>
in
      memory on systems with the <literal>mlockall()</literal> call (as
      in Solaris).
@@ -22474,7 +22464,7 @@
     </para></listitem>
 
     <listitem><para>
-     Changed <literal>--log-isam</literal> to log
+     Changed <option>--log-isam</option> to log
      <literal>MyISAM</literal> tables instead of isam tables.
     </para></listitem>
 
@@ -22548,7 +22538,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--core-file</literal> option to
+     Added <option>--core-file</option> option to
      <command>mysqld</command> to get a core file on Linux if
      <command>mysqld</command> dies on the
<literal>SIGSEGV</literal>
      signal.
@@ -22556,9 +22546,9 @@
 
     <listitem><para>
      MySQL client <command>mysql</command> now starts with option
-     <literal>--no-named-commands</literal>
(<literal>-g</literal>) by
+     <option>--no-named-commands</option> (<literal>-g</literal>)
by
      default. This option can be disabled with
-     <literal>--enable-named-commands</literal>
(<literal>-G</literal>).
+     <option>--enable-named-commands</option>
(<literal>-G</literal>).
      This may cause incompatibility problems in some cases, for example,
      in SQL scripts that use named commands without a semicolon, etc.!
      Long format commands still work from the first line.
@@ -22602,8 +22592,8 @@
     </para></listitem>
 
     <listitem><para>
-     Changed behavior of <literal>--enable-thread-safe-client</literal>
-     so that both non-threaded (<literal>-lmysqlclient</literal>) and
+     Changed behavior of <option>--enable-thread-safe-client</option> so
+     that both non-threaded (<literal>-lmysqlclient</literal>) and
      threaded (<literal>-lmysqlclient_r</literal>) libraries are built.
      Users who linked against a threaded
      <literal>-lmysqlclient</literal> need to link against
@@ -22707,9 +22697,9 @@
 
     <listitem><para>
      Changed <command>myisamchk</command> so that
-     <literal>--fast</literal> and
-     <literal>--check-only-changed</literal> are also honored with
-     <literal>--sort-index</literal> and
<literal>--analyze</literal>.
+     <option>--fast</option> and
<option>--check-only-changed</option>
+     are also honored with <option>--sort-index</option> and
+     <option>--analyze</option>.
     </para></listitem>
 
     <listitem><para>
@@ -22760,7 +22750,7 @@
     </para></listitem>
 
     <listitem><para>
-     The log generated by <literal>--slow-query-log</literal> didn't
+     The log generated by <option>--slow-query-log</option> didn't
      contain the whole queries.
     </para></listitem>
 
@@ -23106,8 +23096,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added handling of <literal>--no-defaults</literal> and
-     <literal>--defaults-file</literal> to
+     Added handling of <option>--no-defaults</option> and
+     <option>--defaults-file</option> to
      <command>safe_mysqld.sh</command> and
      <command>mysql_install_db.sh</command>.
     </para></listitem>
@@ -23228,8 +23218,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--replicate-do-db</literal> and
-     <literal>--replicate-ignore-db</literal> options to
+     Added <option>--replicate-do-db</option> and
+     <option>--replicate-ignore-db</option> options to
      <command>mysqld</command>, to restrict which databases get
      replicated.
     </para></listitem>
@@ -23250,7 +23240,7 @@
 
     <listitem><para>
      To start <command>mysqld</command> as
<literal>root</literal>, you
-     must now use the <literal>--user=root</literal> option.
+     must now use the <option>--user=root</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -23408,11 +23398,11 @@
      table. This confused the <command>mysqld</command> daemon if it
      updated the same table at the same time. Now the status in the
      index file is only updated if one uses
-     <literal>--update-state</literal>. With older
+     <option>--update-state</option>. With older
      <command>myisamchk</command> versions you should use
-     <literal>--read-only</literal> when only checking tables, if there
-     is the slightest chance that the <command>mysqld</command> server
-     is working on the table at the same time!
+     <option>--read-only</option> when only checking tables, if there is
+     the slightest chance that the <command>mysqld</command> server is
+     working on the table at the same time!
     </para></listitem>
 
     <listitem><para>
@@ -23490,8 +23480,7 @@
      Fixed problem when doing locks on the same table more than 2 times
      in the same <literal>LOCK TABLE</literal> command; this fixed the
      problem one got when running the test-ATIS test with
-     <literal>--fast</literal> or
-     <literal>--check-only-changed</literal>.
+     <option>--fast</option> or
<option>--check-only-changed</option>.
     </para></listitem>
 
     <listitem><para>
@@ -23573,8 +23562,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--all-databases</literal> and
-     <literal>--databases</literal> options to
+     Added <option>--all-databases</option> and
+     <option>--databases</option> options to
      <command>mysqldump</command> to allow dumping of many databases at
      the same time.
     </para></listitem>
@@ -23639,8 +23628,8 @@
     <listitem><para>
      Added <literal>HIGH_PRIORITY</literal> option to
      <literal>INSERT</literal>. This overrides the effect of the
-     <literal>--low-priority-updates</literal> server option and does
-     not perform concurrent inserts.
+     <option>--low-priority-updates</option> server option and does not
+     perform concurrent inserts.
     </para></listitem>
 
     <listitem><para>
@@ -23687,8 +23676,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--i-am-a-dummy</literal> and
-     <literal>--safe-updates</literal> options to
+     Added <option>--i-am-a-dummy</option> and
+     <option>--safe-updates</option> options to
      <command>mysql</command>.
     </para></listitem>
 
@@ -23715,7 +23704,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-delay-key-write</literal> option to
+     Added <option>--skip-delay-key-write</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -23730,8 +23719,8 @@
 
     <listitem><para>
      Added back blocking of <literal>SIGPIPE</literal> when compiling
-     with <literal>--thread-safe-clients</literal> to make things safe
-     for old clients.
+     with <option>--thread-safe-clients</option> to make things safe for
+     old clients.
     </para></listitem>
 
    </itemizedlist>
@@ -23833,8 +23822,8 @@
 
     <listitem><para>
      Renamed <command>mysqld</command> startup option from
-     <literal>--delay-key-write</literal> to
-     <literal>--delay-key-write-for-all-tables</literal>.
+     <option>--delay-key-write</option> to
+     <option>--delay-key-write-for-all-tables</option>.
     </para></listitem>
 
     <listitem><para>
@@ -23849,7 +23838,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--log-slow-queries</literal> option to
+     Added <option>--log-slow-queries</option> option to
      <command>mysqld</command> to log all queries that take a long time
      to a separate log file with a time indicating how long the query
      took.
@@ -23909,8 +23898,8 @@
     </para></listitem>
 
     <listitem><para>
-     Option <literal>--delay-key-write</literal> didn't enable delayed
-     key writing.
+     Option <option>--delay-key-write</option> didn't enable delayed key
+     writing.
     </para></listitem>
 
     <listitem><para>
@@ -24051,7 +24040,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--verbose</literal> to
+     Added option <option>--verbose</option> to
      <command>mysqladmin</command>.
     </para></listitem>
 
@@ -24101,7 +24090,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--ansi</literal> option to
<command>mysqld</command>
+     Added <option>--ansi</option> option to
<command>mysqld</command>
      to make some functions standard SQL compatible.
     </para></listitem>
 
@@ -24111,7 +24100,7 @@
 
     <listitem><para>
      Added quoting of identifiers with <literal>`</literal>
-     (<literal>"</literal> in <literal>--ansi</literal> mode).
+     (<literal>"</literal> in <option>--ansi</option> mode).
     </para></listitem>
 
     <listitem><para>
@@ -24124,7 +24113,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--quote-names</literal> option to
+     Added <option>--quote-names</option> option to
      <command>mysqldump</command>.
     </para></listitem>
 
@@ -24288,7 +24277,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--relative</literal> option to
+     Added <option>--relative</option> option to
      <command>mysqladmin</command> to make
      <literal>extended-status</literal> more useful to monitor changes.
     </para></listitem>
@@ -24423,7 +24412,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added support of <literal>--[whitespace]</literal> comments.
+     Added support of <option>--[whitespace]</option> comments.
     </para></listitem>
 
     <listitem><para>
@@ -24593,7 +24582,7 @@
 
     <listitem><para>
      Added
-    
<literal>--init-file=<replaceable>file_name</replaceable></literal>
+    
<option>--init-file=<replaceable>file_name</replaceable></option>
      option to <command>mysqld</command>.
     </para></listitem>
 
@@ -24772,7 +24761,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-show-database</literal> option to
+     Added <option>--skip-show-database</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -24920,8 +24909,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--enable-large-files</literal> and
-     <literal>--disable-large-files</literal> options to
+     Added <option>--enable-large-files</option> and
+     <option>--disable-large-files</option> options to
      <command>configure</command>. See
<filename>configure.in</filename>
      for some systems where this is automatically turned off because of
      broken implementations.
@@ -24937,7 +24926,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--default-table-type</literal> option to
+     Added <option>--default-table-type</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -25356,7 +25345,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added option <literal>--defaults-file=file_name</literal> to option
+     Added option <option>--defaults-file=file_name</option> to option
      file handling to force use of only one specific option file.
     </para></listitem>
 
@@ -25563,9 +25552,8 @@
    <itemizedlist>
 
     <listitem><para>
-     Fixed a core dump problem when using
-     <literal>--log-update</literal> and connecting without a default
-     database.
+     Fixed a core dump problem when using <option>--log-update</option>
+     and connecting without a default database.
     </para></listitem>
 
     <listitem><para>
@@ -25955,7 +25943,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--bootstrap</literal> option to
+     Added <option>--bootstrap</option> option to
      <command>mysqld</command> and recoded
      <command>mysql_install_db</command> to use it. This makes it easier
      to install MySQL with RPMs.
@@ -26115,7 +26103,7 @@
 
     <listitem><para>
      You can now start <command>mysqld</command> on Windows with the
-     <literal>--flush</literal> option. This flushes all tables to disk
+     <option>--flush</option> option. This flushes all tables to disk
      after each update. This makes things much safer on the Windows
      platforms but also <emphasis role="bold">much</emphasis> slower.
     </para></listitem>
@@ -26273,13 +26261,13 @@
     </para></listitem>
 
     <listitem><para>
-     Added the <literal>--log-long-format</literal> option to
+     Added the <option>--log-long-format</option> option to
      <command>mysqld</command> to enable timestamps and INSERT_IDs in
      the update log.
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--where</literal> option to
+     Added <option>--where</option> option to
      <command>mysqldump</command> (patch by Jim Faucette).
     </para></listitem>
 
@@ -26440,7 +26428,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--low-priority-updates</literal> option to
+     Added <option>--low-priority-updates</option> option to
      <command>mysqld</command>, to give table-modifying operations
      (<literal>INSERT</literal>, <literal>REPLACE</literal>,
      <literal>UPDATE</literal>, <literal>DELETE</literal>) lower
@@ -26509,7 +26497,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--vertical</literal> option to
+     Added <option>--vertical</option> option to
      <command>mysql</command>, for printing results in vertical mode.
     </para></listitem>
 
@@ -26538,7 +26526,7 @@
    <itemizedlist>
 
     <listitem><para>
-     Added <literal>--tmpdir</literal> option to
+     Added <option>--tmpdir</option> option to
      <command>mysqld</command>, for specifying the location of the
      temporary file directory.
     </para></listitem>
@@ -26595,11 +26583,11 @@
      <command>mysqld</command> now automatically disables system locking
      on Linux and Windows, and for systems that use MIT-pthreads. You
      can force the use of locking with the
-     <literal>--enable-external-locking</literal> option.
+     <option>--enable-external-locking</option> option.
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--console</literal> option to
+     Added <option>--console</option> option to
      <command>mysqld</command>, to force a console window (for error
      messages) when using Windows.
     </para></listitem>
@@ -26644,7 +26632,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--compress</literal> option to all MySQL clients.
+     Added <option>--compress</option> option to all MySQL clients.
     </para></listitem>
 
     <listitem><para>
@@ -26685,7 +26673,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--chroot</literal> option to
+     Added <option>--chroot</option> option to
      <command>mysqld</command>, to start
<command>mysqld</command> in a
      chroot environment (by Nikki Chumakov
      <email>nikkic@stripped</email>).
@@ -26701,7 +26689,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--one-thread</literal> option to
+     Added <option>--one-thread</option> option to
      <command>mysqld</command>, for debugging with LinuxThreads (or
      <literal>glibc</literal>). (This replaces the
      <literal>-T32</literal> flag)
@@ -26764,7 +26752,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--timeout</literal> option to
+     Added <option>--timeout</option> option to
      <command>mysqladmin</command>, as a test of
      <literal>mysql_options()</literal>.
     </para></listitem>
@@ -26858,9 +26846,9 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--user</literal> option to
-     <command>mysqld</command>, to allow it to run as another Unix user
-     (if it is started as the Unix <literal>root</literal> user).
+     Added <option>--user</option> option to
<command>mysqld</command>,
+     to allow it to run as another Unix user (if it is started as the
+     Unix <literal>root</literal> user).
     </para></listitem>
 
     <listitem><para>
@@ -26945,7 +26933,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--set-variable</literal> option
+     Added <option>--set-variable</option> option
      <literal>wait_timeout</literal> to
<command>mysqld</command>.
     </para></listitem>
 
@@ -26967,8 +26955,8 @@
     <listitem><para>
      Added new <literal>DATE</literal> type that is stored in 3 bytes
      rather than 4 bytes. All new tables are created with the new date
-     type if you don't use the <literal>--old-protocol</literal> option
-     to <command>mysqld</command>.
+     type if you don't use the <option>--old-protocol</option> option to
+     <command>mysqld</command>.
     </para></listitem>
 
     <listitem><para>
@@ -26978,7 +26966,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--enable-assembler</literal> option to
+     Added <option>--enable-assembler</option> option to
      <command>configure</command>, for x86 machines (tested on Linux +
      <command>gcc</command>). This enables assembler functions for the
      most important string functions for more speed!
@@ -27052,14 +27040,14 @@
 
     <listitem><para>
      Fixed fatal bug in <literal>refresh()</literal> when running with
-     the <literal>--skip-external-locking</literal> option. There was a
+     the <option>--skip-external-locking</option> option. There was a
      <quote>very small</quote> time gap after a <command>mysqladmin
      refresh</command> when a table could be corrupted if one thread
      updated a table while another thread did <command>mysqladmin
      refresh</command> and another thread started a new update on the
      same table before the first thread had finished. A refresh (or
-     <literal>--flush-tables</literal>) now does not return until all
-     used tables are closed!
+     <option>--flush-tables</option>) now does not return until all used
+     tables are closed!
     </para></listitem>
 
     <listitem><para>
@@ -27334,7 +27322,7 @@
 
     <listitem><para>
      Ignore users with old (8-byte) password on startup if not using
-     <literal>--old-protocol</literal> option to
+     <option>--old-protocol</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -27523,7 +27511,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-thread-priority</literal> option to
+     Added <option>--skip-thread-priority</option> option to
      <command>mysqld</command>, for systems where
      <command>mysqld</command> thread scheduling doesn't work properly
      (BSDI 3.1).
@@ -27838,7 +27826,7 @@
 
     <listitem><para>
      Changed documentation string of
-     <literal>--with-unix-socket-path</literal> to avoid confusion.
+     <option>--with-unix-socket-path</option> to avoid confusion.
     </para></listitem>
 
     <listitem><para>
@@ -28191,7 +28179,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--table</literal> option to
<command>mysql</command>
+     Added <option>--table</option> option to
<command>mysql</command>
      to print in table format. Moved time and row information after
      query result. Added automatic reconnect of lost connections.
     </para></listitem>
@@ -28273,7 +28261,7 @@
 
     <listitem><para>
      <command>mysqld</command> now allows IP number and hostname for the
-     <literal>--bind-address</literal> option.
+     <option>--bind-address</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -28386,7 +28374,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--flush-logs</literal> option to
+     Added <option>--flush-logs</option> option to
      <command>mysqladmin</command>.
     </para></listitem>
 
@@ -28469,7 +28457,7 @@
 
     <listitem><para>
      Added
-    
<literal>--enable-unix-socket=<replaceable>pathname</replaceable></literal>
+    
<option>--enable-unix-socket=<replaceable>pathname</replaceable></option>
      option to <command>configure</command>.
     </para></listitem>
 
@@ -28558,7 +28546,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--pid-file=#</literal> option to
+     Added <option>--pid-file=#</option> option to
      <command>mysqld</command>.
     </para></listitem>
 
@@ -28605,7 +28593,7 @@
      the error number of the error message. This makes error checking in
      the client much easier. This makes the new server incompatible with
      the 3.20.x server when running without
-     <literal>--old-protocol</literal>. The client code is
+     <option>--old-protocol</option>. The client code is
      backward-compatible. More information can be found in the
      <filename>README</filename> file!
     </para></listitem>
@@ -28724,7 +28712,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--skip-networking</literal> option to
+     Added <option>--skip-networking</option> option to
      <command>mysqld</command>, to allow only socket connections. (This
      does not work with MIT-pthreads!)
     </para></listitem>
@@ -28822,7 +28810,7 @@
 
     <listitem><para>
      The range optimizer is coded, but only 85% tested. It can be
-     enabled with <literal>--new</literal>, but it crashes core a lot
+     enabled with <option>--new</option>, but it crashes core a lot
      yet...
     </para></listitem>
 
@@ -28966,7 +28954,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--log-update</literal> option to
+     Added <option>--log-update</option> option to
      <command>mysqld</command>, to get a log suitable for incremental
      updates.
     </para></listitem>
@@ -29108,7 +29096,7 @@
      directories from path) to <literal>isamlog</literal>. All files are
      written with a relative path from the database directory Now
      <command>mysqld</command> shouldn't crash on shutdown when using
-     the <literal>--log-isam</literal> option.
+     the <option>--log-isam</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -29131,9 +29119,9 @@
     </para></listitem>
 
     <listitem><para>
-     Now one usually only has to specify the
-     <literal>--basedir</literal> option to
<command>mysqld</command>.
-     All other paths are relative in a normal installation.
+     Now one usually only has to specify the <option>--basedir</option>
+     option to <command>mysqld</command>. All other paths are relative
+     in a normal installation.
     </para></listitem>
 
     <listitem><para>
@@ -29163,7 +29151,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--unbuffered</literal> option to
+     Added <option>--unbuffered</option> option to
      <command>mysql</command>, for new
<command>mysqlaccess</command>.
     </para></listitem>
 
@@ -29397,7 +29385,7 @@
    <itemizedlist>
 
     <listitem><para>
-     If one gives <literal>-p</literal> or
<literal>--password</literal>
+     If one gives <literal>-p</literal> or
<option>--password</option>
      option to <command>mysql</command> without an argument, the user is
      solicited for the password from the tty.
     </para></listitem>
@@ -29575,8 +29563,8 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--port</literal> and
<literal>--socket</literal>
-     options to all utility programs and <command>mysqld</command>.
+     Added <option>--port</option> and <option>--socket</option>
options
+     to all utility programs and <command>mysqld</command>.
     </para></listitem>
 
     <listitem><para>
@@ -29643,7 +29631,7 @@
     </para></listitem>
 
     <listitem><para>
-     Added <literal>--without-perl</literal> option to
+     Added <option>--without-perl</option> option to
      <command>configure</command>.
     </para></listitem>
 
@@ -29835,7 +29823,7 @@
      <literal>'\'</literal> while writing tab-separated output. This is
      to allow printing of binary data in a portable format. To get the
      old behavior, use <literal>-r</literal> (or
-     <literal>--raw</literal>).
+     <option>--raw</option>).
     </para></listitem>
 
     <listitem><para>
@@ -30284,7 +30272,7 @@
     
<filename>innodb_status.<replaceable>&lt;pid&gt;</replaceable></filename>
      file in the data directory. By default, the file is not created. To
      create it, start <command>mysqld</command> with the
-     <literal>--innodb_status_file=1</literal> option.
+     <option>--innodb_status_file=1</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -30458,7 +30446,7 @@
     
<filename>innodb_status.<replaceable>&lt;pid&gt;</replaceable></filename>
      file in the data directory. By default, the file is not created. To
      create it, start <command>mysqld</command> with the
-     <literal>--innodb_status_file=1</literal> option.
+     <option>--innodb_status_file=1</option> option.
     </para></listitem>
 
     <listitem><para>
@@ -33699,8 +33687,8 @@
      #8928) Databases with 1, 2, 4, 8, ...
      (2^<replaceable>n</replaceable> nodes) did not have the problem.
      After a rolling upgrade, restart each node manually by restarting
-     it with the <literal>--initial</literal> option. Otherwise, use
-     dump and restore after an upgrade.
+     it with the <option>--initial</option> option. Otherwise, use dump
+     and restore after an upgrade.
     </para></listitem>
 
    </itemizedlist>
@@ -34587,7 +34575,7 @@
 
     <listitem><para>
      In earlier versions, <command>mysqld</command> would crash if the
-     cluster wasn't started with the <literal>--ndbcluster</literal>
+     cluster wasn't started with the <option>--ndbcluster</option>
      option. Now <command>mysqld</command> handles cluster crashes and
      starts without crashing.
     </para></listitem>
@@ -34595,9 +34583,9 @@
     <listitem><para>
      The <literal>-i</literal> option for initial startup of
      <command>ndbd</command> has been removed. Initial startup still can
-     be specified by using the <literal>--initial</literal> option. The
+     be specified by using the <option>--initial</option> option. The
      reason for this is to ensure that it is clear what takes place when
-     using <literal>--initial</literal>: this option completely removes
+     using <option>--initial</option>: this option completely removes
      all data from the disk and should only be used at initial start, in
      certain software upgrade cases, and in some cases as a workaround
      when nodes cannot be restarted successfully.
Thread
bk commit - mysqldoc@docsrva tree (paul:1.3046)paul17 Jul