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

ChangeSet
  1.3194 05/08/07 20:06:59 jon@stripped +1 -0
  RefMan-4.1 Installation chapter edits. 
  (First part.)

  refman-4.1/installing.xml
    1.23 05/08/07 20:06:57 jon@stripped +558 -682
    RefMan-4.1 version edits. (First part.)

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

--- 1.22/refman-4.1/installing.xml	2005-08-06 08:55:11 +10:00
+++ 1.23/refman-4.1/installing.xml	2005-08-07 20:06:57 +10:00
@@ -485,17 +485,22 @@
 
       <title id='title-which-version'>&title-which-version;</title>
 
-<!--  TODO: We need to define what a "release" is, i.e., when we assign a new -->
-
-<!--  version number a produce distributions that users can grab and install. -->
-
-<!--  Also, define "release series", and "distribution" (an installable package).
-->
-
-<!--  TODO: This needs to describe the Standard/Max/Pro/Classic breakdown -->
-
-<!--  TODO: This needs to describe distribution formats as well -->
-
-<!--  (.tar.gz, RPM, PKG, .msi) -->
+<!--  
+      TODO: We need to define what a "release" is, i.e., when we assign 
+      a new version number a produce distributions that users can grab 
+      and install. Also, define "release series", and "distribution" (an 
+      installable package). 
+-->
+
+<!--  
+      TODO: This needs to describe the Standard/Max/Pro/Classic 
+      breakdown 
+-->
+
+<!--  
+      TODO: This needs to describe distribution formats as well 
+      (.tar.gz, RPM, PKG, .msi) 
+-->
 
       <para>
         When preparing to install MySQL, you should decide which version
@@ -578,7 +583,7 @@
         </itemizedlist>
 
         <para>
-          We don't believe in a complete freeze, as this also leaves out
+          We do not believe in a complete freeze, as this also leaves out
           bugfixes and things that <quote>must be done.</quote>
           <quote>Somewhat frozen</quote> means that we may add small
           things that <quote>almost surely do not affect anything that's
@@ -598,7 +603,7 @@
 
         <para>
           If you are running an old system and want to upgrade, but
-          don't want to take the chance of having a non-seamless
+          do not want to take the chance of having a non-seamless
           upgrade, you should upgrade to the latest version in the same
           release series you are using (where only the last part of the
           version number is newer than yours). We have tried to fix only
@@ -742,7 +747,7 @@
 
         <para>
           MySQL uses a naming scheme that is slightly different from
-          most other products. In general, it's relatively safe to use
+          most other products. In general, it is relatively safe to use
           any version that has been out for a couple of weeks without
           being replaced with a new version within the release series.
         </para>
@@ -912,40 +917,40 @@
 
               <listitem>
                 <para>
-                  <literal>--with-innodb</literal> (default for MySQL
+                  <option>--with-innodb</option> (default for MySQL
                   4.0 and up)
                 </para>
               </listitem>
 
               <listitem>
                 <para>
-                  <literal>--with-berkeley-db</literal> (not available
+                  <option>--with-berkeley-db</option> (not available
                   on all platforms)
                 </para>
               </listitem>
 
               <listitem>
                 <para>
-                  <literal>--with-raid</literal>
+                  <option>--with-raid</option>
                 </para>
               </listitem>
 
               <listitem>
                 <para>
-                  <literal>--with-libwrap</literal>
+                  <option>--with-libwrap</option>
                 </para>
               </listitem>
 
               <listitem>
                 <para>
-                  <literal>--with-named-z-libs</literal> (this is done
+                  <option>--with-named-z-libs</option> (this is done
                   for some of the binaries)
                 </para>
               </listitem>
 
               <listitem>
                 <para>
-                 
<literal>--with-debug[=<replaceable>full</replaceable>]</literal>
+                 
<option>--with-debug[=<replaceable>full</replaceable>]</option>
                 </para>
               </listitem>
 
@@ -1985,8 +1990,8 @@
 
         <para>
           If you want to compile a debug version of MySQL, you should
-          add <literal>--with-debug</literal> or
-          <literal>--with-debug=full</literal> to the preceding
+          add <option>--with-debug</option> or
+          <option>--with-debug=full</option> to the preceding
           <command>configure</command> commands and remove any
           <literal>-fomit-frame-pointer</literal> options.
         </para>
@@ -2177,10 +2182,6 @@
           <ulink url="http://www.openpgp.org/"/>.
         </para>
 
-<!--  Do not use @email with the key name, that comes out as &lt;...&gt; in
-->
-
-<!--  some output formats, which are not part of the key name. -->
-
         <para>
           To verify the signature for a specific package, you first need
           to obtain a copy of MySQL AB's public GPG build key. You can
@@ -2679,7 +2680,7 @@
 
 <!--  TODO: The prompt is inconsistent in the Windows sections. Sometimes -->
 
-<!--  begins with C:, sometimes it's shell&gt;. -->
+<!--  begins with C:, sometimes it is shell&gt;. -->
 
     <para>
       A native Windows version of MySQL has been available from MySQL AB
@@ -2753,7 +2754,10 @@
           immediately.
         </para>
       </listitem>
-
+<!--  
+      TODO: This is changing to VS.NET. Determine which versions the 
+      change will effect. [js]
+-->
       <listitem>
         <para>
           The source distribution contains all the code and support
@@ -2765,7 +2769,7 @@
     </itemizedlist>
 
     <para>
-      Generally speaking, you should use the binary distribution. It's
+      Generally speaking, you should use the binary distribution. It is
       simpler, and you need no additional tools to get MySQL up and
       running.
     </para>
@@ -2855,7 +2859,7 @@
         <listitem>
           <para>
             If you need tables with a size larger than 4GB, install
-            MySQL on an NTFS or newer filesystem. Don't forget to use
+            MySQL on an NTFS or newer filesystem. Do not forget to use
             <literal>MAX_ROWS</literal> and
             <literal>AVG_ROW_LENGTH</literal> when you create tables.
             See <xref linkend="create-table"/>.
@@ -2869,6 +2873,8 @@
     <section id="windows-choosing-package">
 
       <title
id='title-windows-choosing-package'>&title-windows-choosing-package;</title>
+      
+<!--  [MH] If the package names change update this! -->
 
       <para>
         Starting with MySQL version 4.1.5, there are three install
@@ -2882,7 +2888,7 @@
           <para>
             <emphasis role="bold">The Essentials Package</emphasis>:
             This package has a filename similar to
-            <filename>mysql-essential-4.1.9-win32.msi</filename> and
+            <filename>mysql-essential-4.1.13a-win32.msi</filename> and
             contains the minimum set of files needed to install MySQL on
             Windows, including the Configuration Wizard. This package
             does not include optional components such as the embedded
@@ -2894,7 +2900,7 @@
           <para>
             <emphasis role="bold">The Complete Package</emphasis>: This
             package has a filename similar to
-            <filename>mysql-4.1.9-win32.zip</filename> and contains all
+            <filename>mysql-4.1.13a-win32.zip</filename> and contains all
             files needed for a complete Windows installation, including
             the Configuration Wizard. This package includes optional
             components such as the embedded server and benchmark suite.
@@ -2905,7 +2911,7 @@
           <para>
             <emphasis role="bold">The Noinstall Archive</emphasis>: This
             package has a filename similar to
-            <filename>mysql-noinstall-4.1.9-win32.zip</filename> and
+            <filename>mysql-noinstall-4.1.13a-win32.zip</filename> and
             contains all the files found in the Complete install
             package, with the exception of the Configuration Wizard.
             This package does not include an automated installer, and
@@ -3028,94 +3034,6 @@
 
 <!--  END INTRODUCTION -->
 
-<!--  @node mysql-install-wizard-versions, mysql-install-wizard-starting,
mysql-install-wizard-introduction, Windows install wizard -->
-
-<!--  @subsubsection Choosing an Install Package -->
-
-<!--  -->
-
-<!--  There are three different packages available that you can use to -->
-
-<!--  install the MySQL server under Windows, each targeted at different -->
-
-<!--  user requirements: -->
-
-<!--  -->
-
-<!--  [MH] Looks like the GUI team changes these to Minimal and Full, -->
-
-<!--  and will eventually drop the Zip archives around the .MSI installers. -->
-
-<!--  Let's watch and change this when they do. -->
-
-<!--  -->
-
-<!--  @itemize @bullet -->
-
-<!--  -->
-
-<!--  @item -->
-
-<!--  @code{mysql-@var{version}-win-noinstall.zip}: -->
-
-<!--  This package is a simple Zip archive of all the files found in a -->
-
-<!--  full installation. It must be manually extracted and configured to -->
-
-<!--  be fully operational. If you are using this package, the rest of -->
-
-<!--  this document does not apply to you. -->
-
-<!--  -->
-
-<!--  @item -->
-
-<!--  @code{mysql-@var{version}-win.zip}: -->
-
-<!--  This package contains the MySQL Installation Wizard with all components of
-->
-
-<!--  MySQL and is intended for a full installation with all optional -->
-
-<!--  packages. This is recommended for users who need additional -->
-
-<!--  components such as the embedded server, benchmark suite, and -->
-
-<!--  additional support scripts. -->
-
-<!--  -->
-
-<!--  @item -->
-
-<!--  @code{mysql-@var{version}-essential-win.msi}: -->
-
-<!--  This package contains the MySQL Installation Wizard with the minimum -->
-
-<!--  components required to install a working MySQL server, without any -->
-
-<!--  optional packages. This is recommended for typical users who do not -->
-
-<!--  need any optional packages such as the embedded server or the -->
-
-<!--  benchmark suite. Omitted packages can be added later. -->
-
-<!--  -->
-
-<!--  @end itemize -->
-
-<!--  -->
-
-<!--  For most users, the -->
-
-<!--  @code{mysql-@var{version}-essential-win.msi} -->
-
-<!--  package is recommended because of its smaller size and decreased -->
-
-<!--  download time. -->
-
-<!--  -->
-
-<!--  END CHOOSE PACKAGES -->
-
       </section>
 
       <section id="mysql-install-wizard-starting">
@@ -3205,7 +3123,7 @@
         <para>
           All available components are listed in a tree view on the left
           side of the custom install dialog. Components that are not
-          installed have a red <literal>X</literal> icon, components
+          installed have a red <guiicon>X</guiicon> icon, components
           that are installed have a gray icon. To change whether a
           component is installed, click on the component's icon and
           choose an new option from the drop-down list that appears.
@@ -3359,7 +3277,7 @@
 
         </itemizedlist>
 
-<!--  [MH] Once again, if the package names change update this! -->
+<!--  [MH] If the package names change update this! -->
 
 <!--  END START MENU -->
 
@@ -3392,7 +3310,6 @@
 
 <programlisting>
 C:\Program Files\MySQL\MySQL Server 4.1
-C:\Program Files\MySQL\MySQL Server 5.0
 C:\Program Files\MySQL\MySQL Administrator 1.0
 C:\Program Files\MySQL\MySQL Query Browser 1.0
 </programlisting>
@@ -3478,7 +3395,7 @@
         <para>
           MySQL Configuration Wizard is to a large extent the result of
           feedback MySQL AB has received from many users over a period
-          of several years. However, if you find it's lacking some
+          of several years. However, if you find it is lacking some
           feature important to you, or if you discover a bug, please use
           our <ulink url="http://bugs.mysql.com">MySQL Bug
           System</ulink> to request features or report problems.
@@ -3627,29 +3544,29 @@
 
           <listitem>
             <para>
-              <literal>Developer Machine</literal>: Choose this option
-              for a typical desktop workstation where MySQL is intended
-              only for personal use. It is assumed that many other
-              desktop applications are running. The MySQL server is
-              configured to use minimal system resources.
+              <guimenuitem>Developer Machine</guimenuitem>: Choose this 
+              option for a typical desktop workstation where MySQL is 
+              intended only for personal use. It is assumed that many 
+              other desktop applications are running. The MySQL server 
+              is configured to use minimal system resources.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Server Machine</literal>: Choose this option for
-              a server machine where the MySQL server is running
-              alongside other server applications such as FTP, email,
-              and web servers. The MySQL server is configured to use a
-              medium portion of the system resources.
+              <guimenuitem>Server Machine</guimenuitem>: Choose this 
+              option for a server machine where the MySQL server is 
+              running alongside other server applications such as FTP, 
+              email, and web servers. The MySQL server is configured to 
+              use a medium portion of the system resources.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Dedicated MySQL Server Machine</literal>: Choose
-              this option for a server machine that is intended to run
-              only the MySQL server. It is assumed that no other
+              <guimenuitem>Dedicated MySQL Server Machine</guimenuitem>: 
+              Choose this option for a server machine that is intended 
+              to run only the MySQL server. It is assumed that no other
               applications are running. The MySQL server is configured
               to use all available system resources.
             </para>
@@ -3666,43 +3583,48 @@
         <title
id='title-mysql-config-wizard-database-usage'>&title-mysql-config-wizard-database-usage;</title>
 
         <para>
-          The <literal>Database Usage</literal> dialog allows you to
-          indicate the table handlers you expect to use when creating
+          The <guimenu>Database Usage</guimenu> dialog allows you to
+          indicate the storage engines you expect to use when creating
           MySQL tables. The option you choose determines whether the
-          InnoDB table handler is available and what percentage of the
-          server resources are available to InnoDB.
+          <literal>InnoDB</literal> storage is available and what 
+          percentage of the server resources are available to 
+          <literal>InnoDB</literal>.
         </para>
 
         <itemizedlist>
 
           <listitem>
             <para>
-              <literal>Multifunctional Database</literal>: This option
-              enables both the InnoDB and MyISAM table handlers and
-              divides resources evenly between the two. This option is
-              recommended for users that use both table handlers on a
-              regular basis.
+              <guimenuitem>Multifunctional Database</guimenuitem>: This 
+              option enables both the <literal>InnoDB</literal> and 
+              <literal>MyISAM</literal> storage engines, and divides 
+              resources evenly between the two. This option is 
+              recommended for users who employ both table handlers on 
+              a regular basis.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Transactional Database Only</literal>: This
-              option enables both the InnoDB and MyISAM table handlers
-              but dedicates most server resources toward the InnoDB
-              table handler. This option is recommended for users that
-              use InnoDB almost exclusively and make only minimal use of
-              MyISAM.
+              <guimenuitem>Transactional Database Only</guimenuitem>: 
+              This option enables both the <literal>InnoDB</literal> and 
+              <literal>MyISAM</literal> storage engines but dedicates 
+              most server resources to the <literal>InnoDB</literal>
+              storage engine. This option is recommended for users who
+              employ <literal>InnoDB</literal> almost exclusively and 
+              make only minimal use of <literal>MyISAM</literal>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Non-Transactional Database Only</literal>: This
-              option disables the InnoDB table handler completely and
-              dedicates all server resources to the MyISAM table
-              handler. This option is recommended for users who do not
-              use InnoDB.
+              <guimenuitem>Non-Transactional Database 
+              Only</guimenuitem>: This option disables the 
+              <literal>InnoDB</literal> storage engine completely, and
+              dedicates all server resources to the 
+              <literal>MyISAM</literal> storage engine. This option is 
+              recommended for those who do not wish to use 
+              <literal>InnoDB</literal>.
             </para>
           </listitem>
 
@@ -3717,27 +3639,28 @@
         <title
id='title-mysql-config-wizard-tablespace'>&title-mysql-config-wizard-tablespace;</title>
 
         <para>
-          Some users may want to locate the InnoDB tablespace files in a
-          different location than the MySQL server data directory.
-          Placing the tablespace files in a separate location can be
-          desirable if your system has a higher capacity or higher
-          performance storage device available, such as a RAID storage
-          system.
+          Some users may want to locate the <literal>InnoDB</literal> 
+          tablespace files in a location other than the MySQL server 
+          data directory. Placing the tablespace files in a separate 
+          location can be desirable if your system has available a 
+          storage device availablehas with higher capacity or higher 
+          performance, such as a RAID storage system.
         </para>
 
         <para>
-          To change the default location for the InnoDB tablespace
-          files, choose a new drive from the drop-down list of drive
-          letters and choose a new path from the drop-down list of
-          paths. To create a custom path, click the ... button.
+          To change the default location for the 
+          <literal>InnoDB</literal> tablespace files, choose a new drive 
+          from the drop-down list of drive letters and choose a new path 
+          from the drop-down list of paths. To create a custom path, 
+          click the <guibutton>...</guibutton> button.
         </para>
 
         <para>
           If you are modifying the configuration of an existing server,
-          you must click the Modify button before you change the path.
-          In this situation you have to manually move the existing
-          tablespace files to the new location before starting the
-          server.
+          you must click the <guibutton>Modify</guibutton> button before 
+          you change the path. In this situation you must move existing
+          tablespace files to the new location manually before starting 
+          the server.
         </para>
 
 <!--  END TABLESPACE DIALOG -->
@@ -3752,7 +3675,7 @@
           It is important to set a limit to the number of concurrent
           connections to the MySQL server that can be established to
           prevent the server from running out of resources. The
-          <literal>Concurrent Connections</literal> dialog allows you to
+          <guimenu>Concurrent Connections</guimenu> dialog allows you to
           choose the expected usage of your server, and sets the limit
           for concurrent connections accordingly. It is also possible to
           manually set the concurrent connection limit.
@@ -3762,9 +3685,9 @@
 
           <listitem>
             <para>
-              <literal>Decision Support (DSS)/OLAP</literal>: Choose
-              this option if your server does not require a large number
-              of concurrent connections. The maximum number of
+              <guimenuitem>Decision Support (DSS)/OLAP</guimenuitem>: 
+              Choose this option if the server does not require a large 
+              number of concurrent connections. The maximum number of
               connections is set at 100, with an average of 20
               concurrent connections assumed.
             </para>
@@ -3772,21 +3695,21 @@
 
           <listitem>
             <para>
-              <literal>Online Transaction Processing (OLTP)</literal>:
-              Choose this option if your server requires a large number
-              of concurrent connections. The maximum number of
-              connections is set at 500.
+              <guimenuitem>Online Transaction Processing 
+              (OLTP)</guimenuitem>: Choose this option if the server 
+              requires a large number of concurrent connections. The 
+              maximum number of connections is set at 500.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Manual Setting</literal>: Choose this option to
-              manually set the maximum number of concurrent connections
-              to the server. Choose the number of concurrent connections
-              from the drop-down box provided, or type the maximum
-              number of connections into the drop-down box if the number
-              you desire is not listed.
+              <guimenuitem>Manual Setting</guimenuitem>: Choose this 
+              option to set the maximum number of concurrent connections
+              to the server manually. Choose the number of concurrent 
+              connections from the drop-down box provided, or type the 
+              maximum number of connections into the drop-down box if 
+              the number you desire is not listed.
             </para>
           </listitem>
 
@@ -3801,15 +3724,15 @@
         <title
id='title-mysql-config-wizard-networking'>&title-mysql-config-wizard-networking;</title>
 
         <para>
-          Use the <literal>Networking Options</literal> dialog to enable
+          Use the <guimenu>Networking Options</guimenu> dialog to enable
           or disable TCP/IP networking and to configure the port number
           that is used to connect to the MySQL server.
         </para>
 
         <para>
           TCP/IP networking is enabled by default. To disable TCP/IP
-          networking, uncheck the box next to the <literal>Enable TCP/IP
-          Networking</literal> option.
+          networking, uncheck the box next to the <guimenuitem>Enable 
+          TCP/IP Networking</guimenuitem> option.
         </para>
 
         <para>
@@ -3832,7 +3755,7 @@
           The MySQL server supports multiple character sets and it is
           possible to set a default server character set that is applied
           to all tables, columns, and databases unless overridden. Use
-          the <literal>Character Set</literal> dialog to change the
+          the <guimenu>Character Set</guimenu> dialog to change the
           default character set of the MySQL server.
         </para>
 
@@ -3840,27 +3763,29 @@
 
           <listitem>
             <para>
-              <literal>Standard Character Set</literal>: Choose this
-              option if you want to use <literal>Latin1</literal> as the
-              default server character set. <literal>Latin1</literal> is
-              used for English and many Western European languages.
+              <guimenuitem>Standard Character Set</guimenuitem>: Choose 
+              this option if you want to use <literal>Latin1</literal> 
+              as the default server character set. 
+              <literal>Latin1</literal> is used for English and many 
+              Western European languages.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Best Support For Multilingualism</literal>:
-              Choose this option if you want to use
-              <literal>UTF8</literal> as the default server character
-              set. <literal>UTF8</literal> can store characters from
-              many different languages in a single character set.
+              <guimenuitem>Best Support For 
+              Multilingualism</guimenuitem>: Choose this option if you 
+              want to use <literal>UTF8</literal> as the default server 
+              character set. <literal>UTF8</literal> can store 
+              characters from many different languages in a single 
+              character set.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Manual Selected Default Character Set /
-              Collation</literal>: Choose this option if you want to
+              <guimenuitem>Manually Selected Default Character Set /
+              Collation</guimenuitem>: Choose this option if you want to
               pick the server's default character set manually. Choose
               the desired character set from the provided drop-down
               list.
@@ -3889,18 +3814,18 @@
           The MySQL Configuration Wizard installs the MySQL server as a
           service by default, using the service name
           <literal>MySQL</literal>. If you do not wish to install the
-          service, un-check the box next to the <literal>Install As
-          Windows Service</literal> option. You can change the service
-          name by picking a new service name from the drop-down box
-          provided or by typing a new service name into the drop-down
-          box.
+          service, un-check the box next to the <guimenuitem>Install As
+          Windows Service</guimenuitem> option. You can change the 
+          service name by picking a new service name from the drop-down 
+          box provided or by typing a new service name into the 
+          drop-down box.
         </para>
 
         <para>
           To install the MySQL server as a service but not have it
           started automatically at startup, un-check the box next to the
-          <literal>Launch the MySQL Server automatically</literal>
-          option.
+          <guimenuitem>Launch the MySQL Server 
+          automatically</guimenuitem> option.
         </para>
 
 <!--  END SERVICE OPTIONS -->
@@ -3912,34 +3837,33 @@
         <title
id='title-mysql-config-wizard-security'>&title-mysql-config-wizard-security;</title>
 
         <para>
-          It is strongly recommended that you set a
-          <literal>root</literal> password for your MySQL server, and
-          the MySQL Configuration Wizard requires you set a
-          <literal>root</literal> password by default. If you do not
-          wish to set a <literal>root</literal> password, un-check the
-          box next to the <literal>Modify Security Settings</literal>
-          option.
+          <emphasis>It is strongly recommended that you set a
+          <literal>root</literal> password for your MySQL 
+          server</emphasis>, and the MySQL Configuration Wizard requires 
+          by default that you do so. If you do not wish to set a 
+          <literal>root</literal> password, un-check thebox next to the 
+          <guimenuitem>Modify Security Settings</guimenuitem> option.
         </para>
 
         <para>
           To set the <literal>root</literal> password, type the desired
-          password into both the <literal>New root password</literal>
-          and <literal>Confirm</literal> boxes. If you are
-          re-configuring an existing server, you also need to enter the
-          existing <literal>root</literal> password into the
-          <literal>Current root password</literal> box.
+          password into both the <guimenuitem>New root 
+          password</guimenuitem> and <guimenuitem>Confirm</guimenuitem>

+          boxes. If you are re-configuring an existing server, you also 
+          need to enter the existing <literal>root</literal> password 
+          into the <guimenuitem>Current root password</guimenuitem> box.
         </para>
 
         <para>
           To prevent <literal>root</literal> logins from across the
-          network, check the box next to the <literal>Root may only
-          connect from localhost</literal> option. This increases the
-          security of your <literal>root</literal> account.
+          network, check the box next to the <guimenuitem>Root may only
+          connect from localhost</guimenuitem> option. This increases 
+          the security of your <literal>root</literal> account.
         </para>
 
         <para>
           To create an anonymous user account, check the box next to the
-          <literal>Create An Anonymous Account</literal> option.
+          <guimenuitem>Create An Anonymous Account</guimenuitem> option.
           Creating an anonymous account can decrease server security and
           cause login and permission difficulties and is not
           recommended.
@@ -3955,17 +3879,18 @@
 
         <para>
           The final dialog in the MySQL Configuration Wizard is the
-          <literal>Confirmation Dialog</literal>. To start the
-          configuration process, click the Execute button. To return to
-          a previous dialog, click the Back button. To exit the MySQL
-          Configuration Wizard without configuring the server, click the
-          Cancel button.
+          <guimenu>Confirmation Dialog</guimenu>. To start the
+          configuration process, click the 
+          <guibutton>Execute</guibutton> button. To return to a previous 
+          dialog, click the <guibutton>Back</guibutton> button. To exit 
+          the MySQL Configuration Wizard without configuring the server, 
+          click the <guibutton>Cancel</guibutton> button.
         </para>
 
         <para>
-          After you click the Execute button, the MySQL Configuration
-          Wizard performs a series of tasks with progress displayed
-          onscreen as the tasks are performed.
+          After you click the <guibutton>Execute</guibutton> button, the 
+          MySQL Configuration Wizard performs a series of tasks with the 
+          progress displayed onscreen as the tasks are performed.
         </para>
 
         <para>
@@ -3980,7 +3905,7 @@
           The MySQL Configuration Wizard then writes these options to a
           <filename>my.ini</filename> file. The final location of the
           <filename>my.ini</filename> file is displayed next to the
-          <literal>Write configuration file</literal> task.
+          <guilabel>Write configuration file</guilabel> task.
         </para>
 
         <para>
@@ -4031,16 +3956,15 @@
           To ensure that the MySQL server knows where to look for the
           <filename>my.ini</filename> file, an argument similar to this
           is passed to the MySQL server as part of the service
-          installation:
-          <literal>--defaults-file="<replaceable>C:\Program
-          Files\MySQL\MySQL Server 4.1</replaceable>\my.ini"</literal>,
+          installation: <option>--defaults-file="<replaceable>C:\Program
+          Files\MySQL\MySQL Server 4.1</replaceable>\my.ini"</option>,
           where <replaceable>C:\Program Files\MySQL\MySQL Server
           4.1</replaceable> is replaced with the installation path to
           the MySQL Server.
         </para>
 
         <para>
-          The <literal>--defaults-file</literal> instructs the MySQL
+          The <option>--defaults-file</option> instructs the MySQL
           server to read the specified file for configuration options.
         </para>
 
@@ -4167,7 +4091,7 @@
             server is installed at <filename>C:\mysql</filename>, and
             the new MySQL Installation Wizard installs MySQL to
             <filename>C:\Program Files\MySQL</filename>. If you do not
-            install MySQL at <filename>C:\mysql</filename>, you must
+            install MySQL in <filename>C:\mysql</filename>, you must
             specify the path to the install directory during startup or
             in an option file. See
             <xref linkend="windows-create-option-file"/>.
@@ -4206,9 +4130,9 @@
 
         <listitem>
           <para>
-            The installation or data directory locations are different
-            from the default locations (<filename>C:\mysql</filename>
-            and <filename>C:\mysql\data</filename>).
+            The installation or data directory locations differ from the 
+            default locations (<filename>C:\mysql</filename> and 
+            <filename>C:\mysql\data</filename>).
           </para>
         </listitem>
 
@@ -4222,8 +4146,8 @@
             <literal>InnoDB</literal> creates its data files and log
             files in the data directory by default. This means you need
             not configure <literal>InnoDB</literal> explicitly. You may
-            still do so if you wish, and an option file is useful in
-            this case, too.)
+            still do so if you wish, and an option file is also useful 
+            in this case.)
           </para>
         </listitem>
 
@@ -4235,7 +4159,7 @@
         directory, and the <filename>C:\my.cnf</filename> file. The
         Windows directory typically is named something like
         <filename>C:\WINDOWS</filename> or
-        <filename>C:\WinNT</filename>. You can determine its exact
+        <filename>C:\WINNT</filename>. You can determine its exact
         location from the value of the <literal>WINDIR</literal>
         environment variable using the following command:
       </para>
@@ -4247,8 +4171,8 @@
       <para>
         MySQL looks for options first in the <filename>my.ini</filename>
         file, then in the <filename>my.cnf</filename> file. However, to
-        avoid confusion, it's best if you use only one file. If your PC
-        uses a boot loader where the <literal>C:</literal> drive isn't
+        avoid confusion, it is best if you use only one file. If your PC
+        uses a boot loader where the <literal>C:</literal> drive is not
         the boot drive, your only option is to use the
         <filename>my.ini</filename> file. Whichever option file you use,
         it must be a plain text file.
@@ -4256,21 +4180,22 @@
 
       <para>
         You can also make use of the example option files included with
-        your MySQL distribution. Look in your install directory for
-        files such as my-small.cnf, my-medium.cnf, my-large.cnf, etc.,
-        which you can rename and copy to the appropriate location for
-        use as a base configuration file.
+        your MySQL distribution. Look in your installation directory for
+        files such as <filename>my-small.cnf</filename>, 
+        <filename>my-medium.cnf</filename>, 
+        <filename>my-large.cnf</filename>, and so on, which you can 
+        rename and copy to the appropriate location for use as a base 
+        configuration file.
       </para>
 
       <para>
         An option file can be created and modified with any text editor,
-        such as the <literal>Notepad</literal> program. For example, if
-        MySQL is installed at <filename>E:\mysql</filename> and the data
-        directory is located at <filename>E:\mydata\data</filename>, you
-        can create the option file and set up a
-        <literal>[mysqld]</literal> section to specify values for the
-        <literal>basedir</literal> and <literal>datadir</literal>
-        parameters:
+        such as the <command>Notepad</command> program. For example, if
+        MySQL is installed in <filename>E:\mysql</filename> and the data
+        directory is <filename>E:\mydata\data</filename>, you can create 
+        the option file and set up a <literal>[mysqld]</literal> section 
+        to specify values for the <literal>basedir</literal> and 
+        <literal>datadir</literal> parameters:
       </para>
 
 <programlisting>
@@ -4303,8 +4228,8 @@
         directory to the new location. For example, by default, the
         installer places MySQL in <filename>C:\mysql</filename> and the
         data directory in <filename>C:\mysql\data</filename>. If you
-        want to use a data directory of <filename>E:\mydata</filename>,
-        you must do two things:
+        want to use <filename>E:\mydata</filename> as the data 
+        directory, you must do two things:
       </para>
 
       <itemizedlist>
@@ -4319,7 +4244,7 @@
 
         <listitem>
           <para>
-            Use a <literal>--datadir</literal> option to specify the new
+            Use a <option>--datadir</option> option to specify the new
             data directory location each time you start the server.
           </para>
         </listitem>
@@ -4395,8 +4320,8 @@
         that results in the highest memory and CPU use due to the
         inclusion of full debugging support. The server named
         <command>mysqld-opt</command> is a better general-use server
-        choice to make instead if you don't need debugging support and
-        don't want the maximal feature set offered by the
+        choice to make instead if you do not need debugging support and
+        do not want the maximal feature set offered by the
         <literal>-max</literal> servers or named pipe support offered by
         the <literal>-nt</literal> servers.
       </para>
@@ -4482,6 +4407,11 @@
         <primary>named pipes</primary>
       </indexterm>
 
+<!--  
+      TODO: WHEN IS THIS TRUE? CAN WE BE MORE SPECIFIC ABOUT WHEN NAMED 
+      PIPES ARE SLOWER THAN TCP/IP? 
+-->
+
       <para>
         MySQL supports TCP/IP on all Windows platforms. The
         <command>mysqld-nt</command> and
<literal>mysql-max-nt</literal>
@@ -4489,14 +4419,10 @@
         However, the default is to use TCP/IP regardless of the
         platform. (Named pipes are slower than TCP/IP in many Windows
         configurations.)
-
-<!--  WHEN IS THIS TRUE? CAN WE BE MORE SPECIFIC ABOUT WHEN NAMED PIPES -->
       </para>
 
-<!--  ARE SLOWER THAN TCP/IP? -->
-
       <para>
-        Named pipe use is subject to these conditions:
+        Use of named pipes is subject to these conditions:
       </para>
 
       <itemizedlist>
@@ -4505,7 +4431,7 @@
           <para>
             Starting from MySQL 3.23.50, named pipes are enabled only if
             you start the server with the
-            <literal>--enable-named-pipe</literal> option. It is
+            <option>--enable-named-pipe</option> option. It is
             necessary to use this option explicitly because some users
             have experienced problems shutting down the MySQL server
             when named pipes were used.
@@ -4531,7 +4457,7 @@
 
         <listitem>
           <para>
-            These servers can not be run on Windows 95.
+            These servers cannot be run on Windows 95.
           </para>
         </listitem>
 
@@ -4561,8 +4487,8 @@
 
       <para>
         Note that if you are using an old Windows 95 release (for
-        example, OSR2), it's likely that you have an old Winsock
-        package; MySQL requires Winsock 2! You can get the newest
+        example, OSR2), it is likely that you have an old Winsock
+        package; MySQL requires Winsock 2. You can get the newest
         Winsock from <ulink url="http://www.microsoft.com/"/>. Windows
         98 has the new Winsock 2 library, so it is unnecessary to update
         the library.
@@ -4571,7 +4497,7 @@
       <para>
         On NT-based systems such as Windows NT, 2000, XP, or 2003,
         clients have two options. They can use TCP/IP, or they can use a
-        named pipe if the server supports named pipe connections. To get
+        named pipe if the server supports named pipe connections. For
         MySQL to work with TCP/IP on Windows NT 4, you must install
         service pack 3 (or newer).
       </para>
@@ -4579,9 +4505,9 @@
       <para>
         In MySQL versions 4.1 and higher, Windows servers also support
         shared-memory connections if started with the
-        <literal>--shared-memory</literal> option. Clients can connect
+        <option>--shared-memory</option> option. Clients can connect
         through shared memory by using the
-        <literal>--protocol=memory</literal> option.
+        <option>--protocol=memory</option> option.
       </para>
 
       <para>
@@ -4661,7 +4587,7 @@
       </para>
 
       <para>
-        If you omit the <literal>--console</literal> option, the server
+        If you omit the <option>--console</option> option, the server
         writes diagnostic output to the error log in the data directory
         (<filename>C:\mysql\data</filename> by default). The error log
         is the file with the <filename>.err</filename> extension.
@@ -4730,7 +4656,7 @@
       </para>
 
       <para>
-        If <command>mysqld</command> doesn't start, check the error log
+        If <command>mysqld</command> does not start, check the error log
         to see whether the server wrote any messages there to indicate
         the cause of the problem. The error log is located in the
         <filename>C:\mysql\data</filename> directory. It is the file
@@ -4742,17 +4668,17 @@
 
       <para>
         The last option is to start <command>mysqld</command> with
-        <literal>--standalone --debug</literal>. In this case,
+        <option>--standalone --debug</option>. In this case,
         <command>mysqld</command> writes a log file
         <filename>C:\mysqld.trace</filename> that should contain the
-        reason why <command>mysqld</command> doesn't start. See
+        reason why <command>mysqld</command> does not start. See
         <xref linkend="making-trace-files"/>.
       </para>
 
       <para>
         Use <command>mysqld --verbose --help</command> to display all
         the options that <command>mysqld</command> understands. (Prior
-        to MySQL 4.1, omit the <literal>--verbose</literal> option.)
+        to MySQL 4.1, omit the <option>--verbose</option> option.)
       </para>
 
     </section>
@@ -4768,16 +4694,16 @@
         server automatically when Windows starts and stops. A MySQL
         server installed as a service can also be controlled from the
         command line using <command>NET</command> commands, or with the
-        graphical <literal>Services</literal> utility.
+        graphical <command>Services</command> utility.
       </para>
 
       <para>
-        The <literal>Services</literal> utility (the Windows
-        <literal>Service Control Manager</literal>) can be found in the
-        Windows <literal>Control Panel</literal> (under
-        <literal>Administrative Tools</literal> on Windows 2000, XP, and
-        Server 2003). It is advisable to close the
-        <literal>Services</literal> utility while performing server
+        The <command>Services</command> utility (the Windows
+        <command>Service Control Manager</command>) can be found in the
+        Windows <guimenu>Control Panel</guimenu> (under
+        <guimenuitem>Administrative Tools</guimenuitem> on Windows 2000, 
+        XP, and Server 2003). It is advisable to close the
+        <command>Services</command> utility while performing server
         installation or removal operations from this command line. This
         prevents some odd errors.
       </para>
@@ -4820,14 +4746,6 @@
 C:\&gt; C:\mysql\bin\mysqld --install
 </programlisting>
 
-<!--  I commented this out because no instructions were given how to "fix" -->
-
-<!--  the path. - PD -->
-
-<!--  If that doesn't work, you can get @command{mysqld} to -->
-
-<!--  start properly by fixing the path in the registry! -->
-
       <para>
         The service-installation command does not start the server.
         Instructions for that are given later in this section.
@@ -4835,7 +4753,7 @@
 
       <para>
         Before MySQL 4.0.2, no command-line arguments can be given
-        following the <literal>--install</literal> option. MySQL 4.0.2
+        following the <option>--install</option> option. MySQL 4.0.2
         and up offers limited support for additional arguments:
       </para>
 
@@ -4844,7 +4762,7 @@
         <listitem>
           <para>
             You can specify a service name immediately following the
-            <literal>--install</literal> option. The default service
+            <option>--install</option> option. The default service
             name is <literal>MySQL</literal>.
           </para>
         </listitem>
@@ -4853,19 +4771,19 @@
           <para>
             As of MySQL 4.0.3, if a service name is given, it can be
             followed by a single option. By convention, this should be
-           
<literal>--defaults-file=<replaceable>file_name</replaceable></literal>
+           
<option>--defaults-file=<replaceable>file_name</replaceable></option>
             to specify the name of an option file from which the server
             should read options when it starts.
           </para>
 
           <para>
             It is possible to use a single option other than
-            <literal>--defaults-file</literal>, but this is discouraged.
-            <literal>--defaults-file</literal> is more flexible because
+            <option>--defaults-file</option>, but this is discouraged.
+            <option>--defaults-file</option> is more flexible because
             it enables you to specify multiple startup options for the
             server by placing them in the named option file. Also, in
             MySQL 5.0, use of an option different from
-            <literal>--defaults-file</literal> is not supported until
+            <option>--defaults-file</option> is not supported until
             5.0.3.
           </para>
         </listitem>
@@ -4873,13 +4791,13 @@
         <listitem>
           <para>
             As of MySQL 5.0.1, you can also specify a
-            <literal>--local-service</literal> option following the
+            <option>--local-service</option> option following the
             service name. This causes the server to run using the
             <literal>LocalService</literal> Windows account that has
             limited system privileges. This account is available only
             for Windows XP or newer. If both
-            <literal>--defaults-file</literal> and
-            <literal>--local-service</literal> are given following the
+            <option>--defaults-file</option> and
+            <option>--local-service</option> are given following the
             service name, they can be in any order.
           </para>
         </listitem>
@@ -4898,7 +4816,7 @@
           <para>
             If the service-installation command specifies no service
             name or the default service name (<literal>MySQL</literal>)
-            following the <literal>--install</literal> option, the
+            following the <option>--install</option> option, the
             server uses the a service name of <literal>MySQL</literal>
             and reads options from the <literal>[mysqld]</literal> group
             in the standard option files.
@@ -4909,7 +4827,7 @@
           <para>
             If the service-installation command specifies a service name
             other than <literal>MySQL</literal> following the
-            <literal>--install</literal> option, the server uses that
+            <option>--install</option> option, the server uses that
             service name. It reads options from the group that has the
             same name as the service, and reads options from the
             standard option files.
@@ -4929,7 +4847,7 @@
         <listitem>
           <para>
             If the service-installation command specifies a
-            <literal>--defaults-file</literal> option after the service
+            <option>--defaults-file</option> option after the service
             name, the server reads options only from the
             <literal>[mysqld]</literal> group of the named file and
             ignores the standard option files.
@@ -4948,20 +4866,20 @@
 
       <para>
         Here, the default service name (<literal>MySQL</literal>) is
-        given after the <literal>--install</literal> option. If no
-        <literal>--defaults-file</literal> option had been given, this
+        given after the <option>--install</option> option. If no
+        <option>--defaults-file</option> option had been given, this
         command would have the effect of causing the server to read the
         <literal>[mysqld]</literal> group from the standard option
-        files. However, because the <literal>--defaults-file</literal>
+        files. However, because the <option>--defaults-file</option>
         option is present, the server reads options from the
         <literal>[mysqld]</literal> option group, but only from the
         named file.
       </para>
 
       <para>
-        You can also specify options as <quote><literal>Start
-        parameters</literal></quote> in the Windows
-        <literal>Services</literal> utility before you start the MySQL
+        You can also specify options in <guimenuitem>Start
+        parameters</guimenuitem> in the Windows 
+        <command>Services</command> utility before you start the MySQL
         service.
       </para>
 
@@ -4986,7 +4904,7 @@
       <para>
         When run as a service, <command>mysqld</command> has no access
         to a console window, so no messages can be seen there. If
-        <command>mysqld</command> doesn't start, check the error log to
+        <command>mysqld</command> does not start, check the error log to
         see whether the server wrote any messages there to indicate the
         cause of the problem. The error log is located in the MySQL data
         directory (for example, <filename>C:\mysql\data</filename>). It
@@ -5004,10 +4922,10 @@
 
       <para>
         From MySQL 3.23.44 on, you have the choice of installing the
-        server as a <literal>Manual</literal> service if you don't wish
-        the service to be started automatically during the boot process.
-        To do this, use the <literal>--install-manual</literal> option
-        rather than the <literal>--install</literal> option:
+        server as a <guilabel>Manual</guilabel> service if you do not 
+        wish the service to be started automatically during the boot 
+        process. To do this, use the <option>--install-manual</option> 
+        option rather than the <option>--install</option> option:
       </para>
 
 <programlisting>
@@ -5016,7 +4934,7 @@
 
       <para>
         To remove a server that is installed as a service, first stop it
-        if it is running. Then use the <literal>--remove</literal>
+        if it is running. Then use the <option>--remove</option>
         option to remove it:
       </para>
 
@@ -5044,13 +4962,14 @@
         MySQL server works for Windows 2000 and XP. It does not work for
         Windows NT, where Windows waits only 20 seconds for a service to
         shut down, and after that kills the service process. You can
-        increase this default by opening the Registry Editor
-        <filename>\winnt\system32\regedt32.exe</filename> and editing
+        increase this default by opening the <command>Registry 
+        Editor</command> 
+        (<filename>\winnt\system32\regedt32.exe</filename>) and editing
         the value of <literal>WaitToKillServiceTimeout</literal> at
        
<literal>HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control</literal>
         in the Registry tree. Specify the new larger value in
-        milliseconds. For example, the value 120000 tells Windows NT to
-        wait up to 120 seconds.
+        milliseconds. For example, the value <literal>120000</literal> 
+        tells Windows NT to wait up to 120 seconds.
       </para>
 
       <para>
@@ -5095,18 +5014,18 @@
         connections from client programs on Windows 9x/Me, there is
         probably a problem with your DNS. In this case, start
         <command>mysqld</command> with the
-        <literal>--skip-name-resolve</literal> option and use only
+        <option>--skip-name-resolve</option> option and use only
         <literal>localhost</literal> and IP numbers in the
         <literal>Host</literal> column of the MySQL grant tables.
       </para>
 
       <para>
         You can force a MySQL client to use a named pipe connection
-        rather than TCP/IP by specifying the <literal>--pipe</literal>
+        rather than TCP/IP by specifying the <option>--pipe</option>
         option or by specifying <literal>.</literal> (period) as the
-        host name. Use the <literal>--socket</literal> option to specify
+        host name. Use the <option>--socket</option> option to specify
         the name of the pipe. As of MySQL 4.1, you can use the
-        <literal>--protocol=PIPE</literal> option instead.
+        <option>--protocol=PIPE</option> option instead.
       </para>
 
       <para>
@@ -5125,44 +5044,40 @@
             </row>
             <row>
               <entry><command>mysql</command></entry>
-              <entry>Compiled on native Windows, offering limited text editing
capabilities.</entry>
+              <entry>Compiled on native Windows, offering limited 
+                text editing capabilities.</entry>
             </row>
             <row>
               <entry><command>mysqlc</command></entry>
-              <entry>Compiled with the Cygnus GNU compiler and libraries, which
offers
-                <literal>readline</literal> editing.
-                <command>mysqlc</command> was intended for use primarily
-                with Windows 9x/Me. It does not support the updated
-                authentication protocol used beginning with MySQL 4.1,
-                and is not supported in MySQL 4.1 and above. Beginning
-                with MySQL 4.1.8, it is no longer included in MySQL
-                Windows distributions.</entry>
+              <entry>Compiled with the Cygnus GNU compiler and 
+                libraries, which offers <literal>readline</literal> 
+                editing. <command>mysqlc</command> was intended for use 
+                primarily with Windows 9x/Me. It does not support the 
+                updated authentication protocol used beginning with 
+                MySQL 4.1, and is not supported in MySQL 4.1 and above. 
+                Beginning with MySQL 4.1.8, it is no longer included in 
+                MySQL Windows distributions.</entry>
             </row>
           </tbody>
         </tgroup>
       </informaltable>
 
-<!--  TODO: Remove or rewrite all references to mysqlc.exe after a -->
-
-<!--  suitable period of time has elapsed. Suggestion: Move this info to a -->
-
-<!--  separate 'legacy' page? -->
-
       <para>
         To use <command>mysqlc</command>, you must have a copy of the
         <filename>cygwinb19.dll</filename> library installed somewhere
         that <command>mysqlc</command> can find it. If your distribution
-        does not have the <literal>cygwinb19.dll</literal> library in
+        does not have the <filename>cygwinb19.dll</filename> library in
         the <filename>bin</filename> directory under the base directory
         of your MySQL installation, look for it in the
-        <literal>lib</literal> directory and copy it to your Windows
+        <filename>lib</filename> directory and copy it to your Windows
         system directory (<filename>\Windows\system</filename> or a
         similar place).
       </para>
 
-<!--  TODO: check whether it needs to be in the *system* directory, or if -->
-
-<!--  it can be in the Windows directory. -->
+<!--  
+      TODO: check if it needs to be in the *system* directory, or if 
+      it can be in the Windows directory. 
+-->
 
     </section>
 
@@ -5208,7 +5123,7 @@
         <listitem>
 <programlisting>
 System error 1067 has occurred.
-Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't exist
+Fatal error: Can't open privilege tables: Table 'mysql.host' does not exist
 </programlisting>
 
           <para>
@@ -5237,7 +5152,7 @@
             configuration (<literal>my.ini</literal>) file. The
             <literal>my.ini</literal> file needs to be located in your
             Windows directory, typically located at
-            <filename>C:\WinNT</filename> or
+            <filename>C:\WINNT</filename> or
             <filename>C:\WINDOWS</filename>. You can determine its exact
             location from the value of the <literal>WINDIR</literal>
             environment variable by issuing the following command from
@@ -5250,12 +5165,13 @@
 
           <para>
             An option file can be created and modified with any text
-            editor, such as the Notepad program. For example, if MySQL
-            is installed at <filename>E:\mysql</filename> and the data
-            directory is located at <filename>D:\MySQLdata</filename>,
-            you can create the option file and set up a
-            <literal>[mysqld]</literal> section to specify values for
-            the basedir and datadir parameters:
+            editor, such as the <command>Notepad</command> program. For 
+            example, if MySQL is installed in 
+            <filename>E:\mysql</filename> and the data directory is 
+            <filename>D:\MySQLdata</filename>, you can create the option 
+            file and set up a <literal>[mysqld]</literal> section to 
+            specify values for the <literal>basedir</literal> and 
+            <literal>datadir</literal> parameters:
           </para>
 
 <programlisting>
@@ -5487,9 +5403,9 @@
           <para>
             Windows 95 leaks about 200 bytes of main memory for each
             thread creation. Each connection in MySQL creates a new
-            thread, so you shouldn't run <command>mysqld</command> for
+            thread, so you should not run <command>mysqld</command> for
             an extended time on Windows 95 if your server handles many
-            connections! Other versions of Windows don't suffer from
+            connections! Other versions of Windows do not suffer from
             this bug.
           </para>
         </listitem>
@@ -5565,7 +5481,7 @@
 
               <listitem>
                 <para>
-                  If a connection hangs, it's impossible to break it
+                  If a connection hangs, it is impossible to break it
                   without killing MySQL.
                 </para>
               </listitem>
@@ -5579,7 +5495,7 @@
 
               <listitem>
                 <para>
-                  <command>mysqladmin shutdown</command> can't abort as
+                  <command>mysqladmin shutdown</command> cannot abort as
                   long as there are sleeping connections.
                 </para>
               </listitem>
@@ -5589,7 +5505,7 @@
 
           <para>
             We plan to fix this problem when our Windows developers have
-            figured out a nice workaround.
+            figured out a workaround.
           </para>
         </listitem>
 
@@ -5603,8 +5519,9 @@
             While you are executing an <literal>ALTER TABLE</literal>
             statement, the table is locked from being used by other
             threads. This has to do with the fact that on Windows, you
-            can't delete a file that is in use by another thread. In the
-            future, we may find some way to work around this problem.
+            cannot delete a file that is in use by another thread. In 
+            the future, we may find some way to work around this 
+            problem.
           </para>
         </listitem>
 
@@ -5619,7 +5536,7 @@
             <literal>MERGE</literal> table does not work on Windows
             because the <literal>MERGE</literal> handler does the table
             mapping hidden from the upper layer of MySQL. Because
-            Windows doesn't allow you to drop files that are open, you
+            Windows does not allow you to drop files that are open, you
             first must flush all <literal>MERGE</literal> tables (with
             <literal>FLUSH TABLES</literal>) or drop the
             <literal>MERGE</literal> table before dropping the table. We
@@ -5637,7 +5554,7 @@
             The <literal>DATA DIRECTORY</literal> and <literal>INDEX
             DIRECTORY</literal> options for <literal>CREATE
             TABLE</literal> are ignored on Windows, because Windows
-            doesn't support symbolic links. These options also are
+            does not support symbolic links. These options also are
             ignored on systems that have a non-functional
             <literal>realpath()</literal> call.
           </para>
@@ -5650,7 +5567,7 @@
           </para>
 
           <para>
-            You cannot drop a database that is in use by some thread.
+            You cannot drop a database that is in use by a thread.
           </para>
         </listitem>
 
@@ -5663,7 +5580,8 @@
           <para>
             You cannot kill MySQL from the Task Manager or with the
             shutdown utility in Windows 95. You must stop it with
-            <command>mysqladmin shutdown</command>.
+            <command>mysqladmin shutdown</command> or the <literal>NET 
+            STOP ...</literal> command.
           </para>
         </listitem>
 
@@ -5731,7 +5649,7 @@
           </para>
 
           <para>
-            This is mainly a problem when you try to apply a binary log
+            This is a problem mainly when you try to apply a binary log
             as follows:
           </para>
 
@@ -5759,79 +5677,36 @@
             The latter command also can be used to reliably read in any
             SQL file that may contain binary data.
           </para>
-
-          <para>
-<!--  Mike Hillyer - This is getting a little old, commenting out. -->
-          </para>
-
-          <para>
-<!--  @item @code{Can't open named pipe} error -->
-          </para>
-
-          <para>
-<!--  If you use a MySQL 3.22 server on Windows NT with the newest MySQL client -->
-          </para>
-
-          <para>
-<!--  programs, you get the following error: -->
-          </para>
-
-          <para>
-<!--  @example -->
-          </para>
-
-          <para>
-<!--  error 2017: can't open named pipe to host: . pipe... -->
-          </para>
-
-          <para>
-<!--  @end example -->
-          </para>
-
-          <para>
-<!--  @tindex .my.cnf file -->
-          </para>
-
-          <para>
-<!--  This happens because the release version of MySQL uses named pipes on NT -->
-          </para>
-
-          <para>
-<!--  by default.  You can avoid this error by using the @code{-host=localhost} -->
-          </para>
-
-          <para>
-<!--  option to the new MySQL clients or by creating an option file -->
-          </para>
-
-          <para>
-<!--  @file{C:\my.cnf} that contains the following information: -->
-          </para>
-
-          <para>
-<!--  @example -->
-          </para>
-
-          <para>
-<!--  [client] -->
-          </para>
-
-          <para>
-<!--  host = localhost -->
-          </para>
-
-          <para>
-<!--  @end example -->
-          </para>
-
-          <para>
-<!--  Starting from 3.23.50, named pipes are enabled only if @command{mysqld-nt} or
-->
-          </para>
-
-          <para>
-<!--  @command{mysqld-max-nt} is started with @code{-enable-named-pipe}. -->
-          </para>
         </listitem>
+        
+<!--  
+      Mike Hillyer - This is getting a little old, commenting out. 
+      
+      @item @code{Can't open named pipe} error 
+      If you use a MySQL 3.22 server on Windows NT with the newest MySQL 
+      client programs, you get the following error: 
+      
+      @example 
+      error 2017: cannot open named pipe to host: . pipe... 
+      @end example 
+      
+      @tindex .my.cnf file 
+      
+      This happens because the release version of MySQL uses named pipes 
+      on NT by default.  You can avoid this error by using the 
+      @code{-host=localhost} option to the new MySQL clients or by 
+      creating an option file @file{C:\my.cnf} that contains the 
+      following information: 
+      
+      @example
+      [client]
+      host = localhost
+      @end example
+      
+      Starting from 3.23.50, named pipes are enabled only if 
+      @command{mysqld-nt} or @command{mysqld-max-nt} is started with 
+      @code{-enable-named-pipe}. 
+-->
 
         <listitem>
           <para>
@@ -5863,9 +5738,11 @@
 
       </itemizedlist>
 
-<!--  MH - Does this to-do list even still have relevance? I would think we would
-->
-
-<!--  now Task internal developers rather than ask the world for help. -->
+<!--  
+      MH - Does this to-do list even still have relevance? I would think 
+      we would now task internal developers rather than ask the world 
+      for help. 
+-->
 
       <para>
         Here are some open issues for anyone who might want to help us
@@ -5879,17 +5756,16 @@
 
       <itemizedlist>
 
-<!--  PD: Commented this one out as obsolete until I hear otherwise -->
-
-<!--  @item -->
-
-<!--  Make a single-user @code{MYSQL.DLL} server.  This should include everything in
-->
-
-<!--  a standard MySQL server, except thread creation.  This makes -->
-
-<!--  MySQL much easier to use in applications that don't need a true -->
-
-<!--  client/server and don't need to access the server from other hosts. -->
+<!--  
+      PD: Commented this one out as obsolete until I hear otherwise 
+      
+      @item 
+      Make a single-user @code{MYSQL.DLL} server. This should include 
+      everything in a standard MySQL server, except thread creation. 
+      This makes MySQL much easier to use in applications that do not 
+      need a true client/server and do not need to access the server 
+      from other hosts. 
+-->
 
         <listitem>
           <para>
@@ -6154,7 +6030,7 @@
       automatically at boot time. (This means that if you have performed
       a previous installation and have made changes to its startup
       script, you may want to make a copy of the script so that you
-      don't lose it when you install a newer RPM.) See
+      do not lose it when you install a newer RPM.) See
       <xref linkend="automatic-start"/> for more information on how
       MySQL can be started automatically on system startup.
     </para>
@@ -6203,7 +6079,7 @@
     </para>
 
   </section>
-
+  
   <section id="mac-os-x-installation">
 
     <title
id='title-mac-os-x-installation'>&title-mac-os-x-installation;</title>
@@ -6431,7 +6307,7 @@
     </para>
 
     <para>
-      If you don't use the Startup Item, enter the following command
+      If you do not use the Startup Item, enter the following command
       sequence:
     </para>
 
@@ -6680,7 +6556,7 @@
 
         <para>
           If you are running MySQL on NetWare 6.0, we strongly suggest
-          that you use the <literal>--skip-external-locking</literal>
+          that you use the <option>--skip-external-locking</option>
           option on the command line:
         </para>
 
@@ -6712,7 +6588,7 @@
 
         <para>
           If you want NetWare to close the screen automatically instead,
-          use the <literal>--autoclose</literal> option to
+          use the <option>--autoclose</option> option to
           <command>mysqld_safe</command>. For example:
         </para>
 
@@ -6840,7 +6716,7 @@
     <para>
       If you run into problems, <emphasis>please always use
       <command>mysqlbug</command></emphasis> when posting questions to
a
-      MySQL mailing list. Even if the problem isn't a bug,
+      MySQL mailing list. Even if the problem is not a bug,
       <command>mysqlbug</command> gathers system information that helps
       others solve your problem. By not using
       <command>mysqlbug</command>, you lessen the likelihood of getting
@@ -7048,11 +6924,11 @@
 
         <para>
           If you run the command as <literal>root</literal>, you should
-          use the <literal>--user</literal> option as shown. The value
+          use the <option>--user</option> option as shown. The value
           of the option should be the name of the login account that you
           created in the first step to use for running the server. If
           you run the command while logged in as that user, you can omit
-          the <literal>--user</literal> option.
+          the <option>--user</option> option.
         </para>
 
         <para>
@@ -7315,7 +7191,7 @@
     <para>
       If you run into problems, <emphasis>please always use
       <command>mysqlbug</command></emphasis> when posting questions to
a
-      MySQL mailing list. Even if the problem isn't a bug,
+      MySQL mailing list. Even if the problem is not a bug,
       <command>mysqlbug</command> gathers system information that helps
       others solve your problem. By not using
       <command>mysqlbug</command>, you lessen the likelihood of getting
@@ -7562,11 +7438,11 @@
 
           <para>
             If you run the command as <literal>root</literal>, you
-            should use the <literal>--user</literal> option as shown.
+            should use the <option>--user</option> option as shown.
             The value of the option should be the name of the login
             account that you created in the first step to use for
             running the server. If you run the command while logged in
-            as that user, you can omit the <literal>--user</literal>
+            as that user, you can omit the <option>--user</option>
             option.
           </para>
 
@@ -7739,7 +7615,7 @@
           <para>
             To compile just the MySQL client libraries and client
             programs and not the server, use the
-            <literal>--without-server</literal> option:
+            <option>--without-server</option> option:
           </para>
 
 <programlisting>
@@ -7749,12 +7625,12 @@
 <!--  FIX incorrect.. -->
 
           <para>
-            If you don't have a C++ compiler, <command>mysql</command>
+            If you do not have a C++ compiler, <command>mysql</command>
             cannot be compiled (it is the one client program that
             requires C++). In this case, you can remove the code in
             <command>configure</command> that tests for the C++ compiler
             and then run <command>./configure</command> with the
-            <literal>--without-server</literal> option. The compile step
+            <option>--without-server</option> option. The compile step
             should still try to build <command>mysql</command>, but you
             can ignore any warnings about <filename>mysql.cc</filename>.
             (If <command>make</command> stops, try <command>make
@@ -7767,13 +7643,13 @@
           <para>
             If you want to build the embedded MySQL library
             (<literal>libmysqld.a</literal>) you should use the
-            <literal>--with-embedded-server</literal> option.
+            <option>--with-embedded-server</option> option.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            If you don't want your log files and database directories
+            If you do not want your log files and database directories
             located under <filename>/usr/local/var</filename>, use a
             <command>configure</command> command something like one of
             these:
@@ -7893,7 +7769,7 @@
 
         <listitem>
           <para>
-            If you are using <command>gcc</command> and don't have
+            If you are using <command>gcc</command> and do not have
             <literal>libg++</literal> or
<literal>libstdc++</literal>
             installed, you can tell <command>configure</command> to use
             <command>gcc</command> as your C++ compiler:
@@ -8050,7 +7926,7 @@
             <filename>libmysqlclient.so.#</filename> (where
             '<literal>#</literal>' is a version number), you can work
             around this problem by giving the
-            <literal>--disable-shared</literal> option to
+            <option>--disable-shared</option> option to
             <command>configure</command>. In this case,
             <command>configure</command> does not build a shared
             <filename>libmysqlclient.so.#</filename> library.
@@ -8080,7 +7956,7 @@
           <para>
             By default, MySQL uses the <literal>latin1</literal>
             (cp1252) character set. To change the default set, use
-            the <literal>--with-charset</literal> option:
+            the <option>--with-charset</option> option:
 
 <programlisting>
 shell&gt; ./configure --with-charset=<replaceable>CHARSET</replaceable>
@@ -8106,7 +7982,7 @@
             As of MySQL 4.1.1, the default collation may also be
             specified. MySQL uses the
             <literal>latin1_swedish_ci</literal> collation. To change
-            this, use the <literal>--with-collation</literal> option:
+            this, use the <option>--with-collation</option> option:
           </para>
 
 <programlisting>
@@ -8115,8 +7991,8 @@
 
           <para>
             To change both the character set and the collation, use both
-            the <literal>--with-charset</literal> and
-            <literal>--with-collation</literal> options. The collation
+            the <option>--with-charset</option> and
+            <option>--with-collation</option> options. The collation
             must be a legal collation for the character set. (Use the
             <literal>SHOW COLLATION</literal> statement to determine
             which collations are available for each character set.)
@@ -8145,12 +8021,12 @@
 
           <para>
             With the <command>configure</command> option
-           
<literal>--with-extra-charsets=<replaceable>LIST</replaceable></literal>,
+           
<option>--with-extra-charsets=<replaceable>LIST</replaceable></option>,
             you can define which additional character sets should be
             compiled into the server. <replaceable>LIST</replaceable> is
             either a list of character set names separated by spaces,
             <literal>complex</literal> to include all character sets
-            that can't be dynamically loaded, or <literal>all</literal>
+            that cannot be dynamically loaded, or <literal>all</literal>
             to include all character sets into the binaries.
           </para>
         </listitem>
@@ -8158,7 +8034,7 @@
         <listitem>
           <para>
             To configure MySQL with debugging code, use the
-            <literal>--with-debug</literal> option:
+            <option>--with-debug</option> option:
 
 <programlisting>
 shell&gt; ./configure --with-debug
@@ -8174,7 +8050,7 @@
           <para>
             If your client programs are using threads, you also must
             compile a thread-safe version of the MySQL client library
-            with the <literal>--enable-thread-safe-client</literal>
+            with the <option>--enable-thread-safe-client</option>
             configure option. This creates a
             <literal>libmysqlclient_r</literal> library with which you
             should link your threaded applications. See
@@ -8185,7 +8061,7 @@
         <listitem>
           <para>
             It is now possible to build MySQL with big table support
-            using the <literal>--with-big-tables</literal> option,
+            using the <option>--with-big-tables</option> option,
             beginning with the following MySQL versions:
           </para>
 
@@ -8298,7 +8174,7 @@
               <para>
                 Make sure <literal>gcc</literal> has been installed
                 under Cygwin. You can test this by issuing
-                <literal>which gcc</literal>. If it's not installed, run
+                <literal>which gcc</literal>. If it is not installed, run
                 Cygwin's package manager, select <literal>gcc</literal>,
                 and install it.
               </para>
@@ -8379,7 +8255,7 @@
 </programlisting>
 
           <para>
-            Normally, you don't have to build the documentation
+            Normally, you do not have to build the documentation
             yourself, because we're providing it in various formats on
             <ulink url="http://dev.mysql.com/doc/"/>. The formats you
             can download there (HTML, PDF, etc.) are being built on a
@@ -8594,9 +8470,9 @@
             may overwrite your live release installation. If you have
             another installation of MySQL, we recommend that you run
             <command>./configure</command> with different values for the
-            <literal>--prefix</literal>,
-            <literal>--with-tcp-port</literal>, and
-            <literal>--unix-socket-path</literal> options than those
+            <option>--prefix</option>,
+            <option>--with-tcp-port</option>, and
+            <option>--unix-socket-path</option> options than those
             used for your production server.
           </para>
         </listitem>
@@ -8822,7 +8698,7 @@
             amount of memory to compile <filename>sql_yacc.cc</filename>
             with inline functions. Try running
             <command>configure</command> with the
-            <literal>--with-low-memory</literal> option:
+            <option>--with-low-memory</option> option:
           </para>
 
 <programlisting>
@@ -8834,11 +8710,11 @@
             added to the compile line if you are using
             <command>gcc</command> and <literal>-O0</literal> if
you are
             using something else. You should try the
-            <literal>--with-low-memory</literal> option even if you have
-            so much memory and swap space that you think you can't
+            <option>--with-low-memory</option> option even if you have
+            so much memory and swap space that you think you cannot
             possibly have run out. This problem has been observed to
             occur even on systems with generous hardware configurations
-            and the <literal>--with-low-memory</literal> option usually
+            and the <option>--with-low-memory</option> option usually
             fixes it.
           </para>
         </listitem>
@@ -8927,7 +8803,7 @@
           </indexterm>
 
           <indexterm type="concept">
-            <primary><literal>--with-raid</literal> link
errors</primary>
+            <primary><option>--with-raid</option> link
errors</primary>
           </indexterm>
 
           <para>
@@ -8938,7 +8814,7 @@
             <command>gcc</command> version 3 and above. If you get
             errors like those following during the linking stage when
             you configure MySQL to compile with the option
-            <literal>--with-raid</literal>, try to use
+            <option>--with-raid</option>, try to use
             <command>gcc</command> as your C++ compiler by defining the
             <literal>CXX</literal> environment variable:
           </para>
@@ -9136,7 +9012,7 @@
           <para>
             The <filename>sql_yacc.cc</filename> file is generated from
             <filename>sql_yacc.yy</filename>. Normally the build process
-            doesn't need to create <filename>sql_yacc.cc</filename>,
+            does not need to create <filename>sql_yacc.cc</filename>,
             because MySQL comes with an pre-generated copy. However, if
             you do need to re-create it, you might encounter this error:
           </para>
@@ -9166,7 +9042,7 @@
           <para>
             If you need to debug <command>mysqld</command> or a MySQL
             client, run <command>configure</command> with the
-            <literal>--with-debug</literal> option, then recompile and
+            <option>--with-debug</option> option, then recompile and
             link your clients with the new client library. See
             <xref linkend="debugging-client"/>.
           </para>
@@ -9281,7 +9157,7 @@
           <para>
             On most systems, you can force MIT-pthreads to be used by
             running <command>configure</command> with the
-            <literal>--with-mit-threads</literal> option:
+            <option>--with-mit-threads</option> option:
           </para>
 
 <programlisting>
@@ -9300,12 +9176,12 @@
             The checks that determine whether to use MIT-pthreads occur
             only during the part of the configuration process that deals
             with the server code. If you have configured the
-            distribution using <literal>--without-server</literal> to
+            distribution using <option>--without-server</option> to
             build only the client code, clients do not know whether
             MIT-pthreads is being used and use Unix socket connections
             by default. Because Unix socket files do not work under
             MIT-pthreads on some platforms, this means you need to use
-            <literal>-h</literal> or <literal>--host</literal>
when you
+            <literal>-h</literal> or <option>--host</option> when
you
             run client programs.
           </para>
         </listitem>
@@ -9315,7 +9191,7 @@
             When MySQL is compiled using MIT-pthreads, system locking is
             disabled by default for performance reasons. You can tell
             the server to use system locking with the
-            <literal>--external-locking</literal> option. This is needed
+            <option>--external-locking</option> option. This is needed
             only if you want to be able to run two MySQL servers against
             the same data files, which is not recommended.
           </para>
@@ -9346,7 +9222,7 @@
         <listitem>
           <para>
             With MIT-pthreads, the <literal>sleep()</literal> system
-            call isn't interruptible with <literal>SIGINT</literal>
+            call is not interruptible with <literal>SIGINT</literal>
             (break). This is only noticeable when you run
             <command>mysqladmin --sleep</command>. You must wait for the
             <literal>sleep()</literal> call to terminate before the
@@ -9386,7 +9262,7 @@
         <listitem>
           <para>
             We haven't gotten <literal>readline</literal> to work with
-            MIT-pthreads. (This isn't needed, but may be interesting for
+            MIT-pthreads. (This is not needed, but may be interesting for
             someone.)
           </para>
         </listitem>
@@ -9624,8 +9500,8 @@
               and its data directory as the base directory and data
               directory, you need to tell the server their pathnames.
               You can either do this on the command line with the
-              <literal>--basedir</literal> and
-              <literal>--datadir</literal> options, or place appropriate
+              <option>--basedir</option> and
+              <option>--datadir</option> options, or place appropriate
               options in an option file (the <filename>my.ini</filename>
               file in your Windows directory or
               <filename>C:\my.cnf</filename>). If you have an existing
@@ -9818,7 +9694,7 @@
 
               <listitem>
                 <para>
-                  <literal>--help</literal>
+                  <option>--help</option>
                 </para>
 
                 <para>
@@ -9828,7 +9704,7 @@
 
               <listitem>
                 <para>
-                  <literal>--debug</literal>
+                  <option>--debug</option>
                 </para>
 
                 <para>
@@ -9839,7 +9715,7 @@
 
               <listitem>
                 <para>
-                  <literal>--tmp</literal>
+                  <option>--tmp</option>
                 </para>
 
                 <para>
@@ -9849,7 +9725,7 @@
 
               <listitem>
                 <para>
-                  <literal>--suffix</literal>
+                  <option>--suffix</option>
                 </para>
 
                 <para>
@@ -9859,7 +9735,7 @@
 
               <listitem>
                 <para>
-                  <literal>--dirname</literal>
+                  <option>--dirname</option>
                 </para>
 
                 <para>
@@ -9869,7 +9745,7 @@
 
               <listitem>
                 <para>
-                  <literal>--silent</literal>
+                  <option>--silent</option>
                 </para>
 
                 <para>
@@ -9879,7 +9755,7 @@
 
               <listitem>
                 <para>
-                  <literal>--tar</literal>
+                  <option>--tar</option>
                 </para>
 
                 <para>
@@ -10190,7 +10066,7 @@
             program to set up the initial MySQL grant tables containing
             the privileges that determine how users are allowed to
             connect to the server. You'll need to do this if you used a
-            distribution type that doesn't run the program for you.
+            distribution type that does not run the program for you.
           </para>
 
           <para>
@@ -10236,11 +10112,11 @@
             and files are owned by the <literal>mysql</literal> login
             account so that the server has read and write access to them
             when you run it later. To ensure this, the
-            <literal>--user</literal> option should be used as shown if
+            <option>--user</option> option should be used as shown if
             you run <command>mysql_install_db</command> as
             <literal>root</literal>. Otherwise, you should execute the
             script while logged in as <literal>mysql</literal>, in which
-            case you can omit the <literal>--user</literal> option from
+            case you can omit the <option>--user</option> option from
             the command.
           </para>
 
@@ -10254,7 +10130,7 @@
           </para>
 
           <para>
-            If you don't want to have the <literal>test</literal>
+            If you do not want to have the <literal>test</literal>
             database, you can remove it with <command>mysqladmin -u root
             drop test</command> after starting the server.
           </para>
@@ -10356,7 +10232,7 @@
             <listitem>
               <para>
                 You can start <command>mysqld</command> manually using
-                the <literal>--skip-grant-tables</literal> option and
+                the <option>--skip-grant-tables</option> option and
                 add the privilege information yourself using
                 <command>mysql</command>:
               </para>
@@ -10404,11 +10280,11 @@
           <para>
             It is important that the MySQL server be run using an
             unprivileged (non-<literal>root</literal>) login account. To
-            ensure this, the <literal>--user</literal> option should be
+            ensure this, the <option>--user</option> option should be
             used as shown if you run <literal>mysql_safe</literal> as
             <literal>root</literal>. Otherwise, you should execute the
             script while logged in as <literal>mysql</literal>, in which
-            case you can omit the <literal>--user</literal> option from
+            case you can omit the <option>--user</option> option from
             the command.
           </para>
 
@@ -10480,7 +10356,7 @@
           <para>
             To see what else you can do with
             <command>mysqladmin</command>, invoke it with the
-            <literal>--help</literal> option.
+            <option>--help</option> option.
           </para>
         </listitem>
 
@@ -10609,7 +10485,7 @@
 </programlisting>
 
           <para>
-            If you don't have the <filename>sql-bench</filename>
+            If you do not have the <filename>sql-bench</filename>
             directory, you probably installed MySQL using RPM files
             other than the source RPM. (The source RPM includes the
             <filename>sql-bench</filename> benchmark directory.) In this
@@ -10679,7 +10555,7 @@
 
         <para>
           If you want to re-create your privilege tables, first stop the
-          <command>mysqld</command> server if it's running. Then rename
+          <command>mysqld</command> server if it is running. Then rename
           the <filename>mysql</filename> directory under the data
           directory to save it, and then run
           <command>mysql_install_db</command>. For example:
@@ -10700,7 +10576,7 @@
           <listitem>
             <para>
               <emphasis role="bold"><command>mysql_install_db</command>
-              doesn't install the grant tables</emphasis>
+              does not install the grant tables</emphasis>
             </para>
 
             <para>
@@ -10721,7 +10597,7 @@
               carefully. The log should be located in the directory
               <filename>XXXXXX</filename> named by the error message,
               and should indicate why <command>mysqld</command> didn't
-              start. If you don't understand what happened, include the
+              start. If you do not understand what happened, include the
               log when you post a bug report. See
               <xref linkend="bug-reports"/>.
             </para>
@@ -10736,7 +10612,7 @@
             <para>
               This indicates that the server is running, in which case
               the grant tables have probably been created. If so, you
-              don't have to run <command>mysql_install_db</command> at
+              do not have to run <command>mysql_install_db</command> at
               all because it need be run only once (when you install
               MySQL the first time).
             </para>
@@ -10745,7 +10621,7 @@
           <listitem>
             <para>
               <emphasis role="bold">Installing a second
-              <command>mysqld</command> server doesn't work when one
+              <command>mysqld</command> server does not work when one
               server is running</emphasis>
             </para>
 
@@ -10794,12 +10670,12 @@
 
           <listitem>
             <para>
-              <emphasis role="bold">You don't have write access to
+              <emphasis role="bold">You do not have write access to
               <filename>/tmp</filename></emphasis>
             </para>
 
             <para>
-              If you don't have write access to create temporary files
+              If you do not have write access to create temporary files
               or a Unix socket file in the default location (the
               <filename>/tmp</filename> directory), an error occurs when
               you run <command>mysql_install_db</command> or the
@@ -11246,7 +11122,7 @@
 
           <listitem>
             <para>
-              Check the error log to see why the server doesn't start.
+              Check the error log to see why the server does not start.
             </para>
           </listitem>
 
@@ -11309,13 +11185,13 @@
           somewhere else on your system, the server does not work
           properly. You can find out what the default path settings are
           by invoking <command>mysqld</command> with the
-          <literal>--verbose</literal> and
<literal>--help</literal>
+          <option>--verbose</option> and <option>--help</option>
           options. (Prior to MySQL 4.1, omit the
-          <literal>--verbose</literal> option.)
+          <option>--verbose</option> option.)
         </para>
 
         <para>
-          If the defaults don't match the MySQL installation layout on
+          If the defaults do not match the MySQL installation layout on
           your system, you can override them by specifying options on
           the command line to <command>mysqld</command> or
           <command>mysqld_safe</command>. You can also list the options
@@ -11324,17 +11200,17 @@
 
         <para>
           To specify the location of the data directory explicitly, use
-          the <literal>--datadir</literal> option. However, normally you
+          the <option>--datadir</option> option. However, normally you
           can tell <command>mysqld</command> the location of the base
           directory under which MySQL is installed and it looks for the
           data directory there. You can do this with the
-          <literal>--basedir</literal> option.
+          <option>--basedir</option> option.
         </para>
 
         <para>
           To check the effect of specifying path options, invoke
           <command>mysqld</command> with those options followed by the
-          <literal>--verbose</literal> and
<literal>--help</literal>
+          <option>--verbose</option> and <option>--help</option>
           options. For example, if you change location into the
           directory where <command>mysqld</command> is installed, and
           then run the following command, it shows the effect of
@@ -11348,16 +11224,16 @@
 
         <para>
           You can specify other options such as
-          <literal>--datadir</literal> as well, but note that
-          <literal>--verbose</literal> and
<literal>--help</literal>
+          <option>--datadir</option> as well, but note that
+          <option>--verbose</option> and <option>--help</option>
           must be the last options. (Prior to MySQL 4.1, omit the
-          <literal>--verbose</literal> option.)
+          <option>--verbose</option> option.)
         </para>
 
         <para>
           Once you determine the path settings you want, start the
-          server without <literal>--verbose</literal> and
-          <literal>--help</literal>.
+          server without <option>--verbose</option> and
+          <option>--help</option>.
         </para>
 
         <para>
@@ -11455,7 +11331,7 @@
 
         <para>
           This means that you didn't start <command>mysqld</command>
-          with the <literal>--bdb-no-recover</literal> option and
+          with the <option>--bdb-no-recover</option> option and
           Berkeley DB found something wrong with its own log files when
           it tried to recover your databases. To be able to continue,
           you should move away the old Berkeley DB log files from the
@@ -11472,10 +11348,10 @@
           <command>mysqld</command> dumps core at startup, this could be
           due to problems with the <literal>BDB</literal> recovery log.
           In this case, you can try starting <command>mysqld</command>
-          with <literal>--bdb-no-recover</literal>. If that helps, then
+          with <option>--bdb-no-recover</option>. If that helps, then
           you should remove all <literal>BDB</literal> log files from
           the data directory and try starting <command>mysqld</command>
-          again without the <literal>--bdb-no-recover</literal> option.
+          again without the <option>--bdb-no-recover</option> option.
         </para>
 
         <para>
@@ -11503,13 +11379,13 @@
           If no other server is running, try to execute the command
           <literal>telnet your-host-name tcp-ip-port-number</literal>.
           (The default MySQL port number is 3306.) Then press Enter a
-          couple of times. If you don't get an error message like
+          couple of times. If you do not get an error message like
           <literal>telnet: Unable to connect to remote host: Connection
           refused</literal>, some other program is using the TCP/IP port
           that <command>mysqld</command> is trying to use. You'll need
           to track down what program this is and disable it, or else
           tell <command>mysqld</command> to listen to a different port
-          with the <literal>--port</literal> option. In this case,
+          with the <option>--port</option> option. In this case,
           you'll also need to specify the port number for client
           programs when connecting to the server via TCP/IP.
         </para>
@@ -11521,7 +11397,7 @@
         </para>
 
         <para>
-          If the server starts but you can't connect to it, you should
+          If the server starts but you cannot connect to it, you should
           make sure that you have an entry in
           <filename>/etc/hosts</filename> that looks like this:
         </para>
@@ -11531,15 +11407,15 @@
 </programlisting>
 
         <para>
-          This problem occurs only on systems that don't have a working
+          This problem occurs only on systems that do not have a working
           thread library and for which MySQL must be configured to use
           MIT-pthreads.
         </para>
 
         <para>
-          If you can't get <command>mysqld</command> to start, you can
+          If you cannot get <command>mysqld</command> to start, you can
           try to make a trace file to find the problem by using the
-          <literal>--debug</literal> option. See
+          <option>--debug</option> option. See
           <xref linkend="making-trace-files"/>.
         </para>
 
@@ -11743,7 +11619,7 @@
 
       <para>
         You might want to defer setting the passwords until later, so
-        that you don't need to specify them while you perform additional
+        that you do not need to specify them while you perform additional
         setup or testing. However, be sure to set them before using your
         installation for any real production work.
       </para>
@@ -11782,7 +11658,7 @@
         <literal>Host</literal> column of the
         non-<literal>localhost</literal> record for
         <literal>root</literal> in the <literal>user</literal>
table. If
-        you don't know what hostname this is, issue the following
+        you do not know what hostname this is, issue the following
         statement before using <literal>SET PASSWORD</literal>:
       </para>
 
@@ -12117,10 +11993,10 @@
 
     <para>
       If problems occur, such as that the new <command>mysqld</command>
-      server doesn't want to start or that you can't connect without a
-      password, verify that you don't have some old
+      server does not want to start or that you cannot connect without a
+      password, verify that you do not have some old
       <filename>my.cnf</filename> file from your previous installation.
-      You can check this with the <literal>--print-defaults</literal>
+      You can check this with the <option>--print-defaults</option>
       option (for example, <command>mysqld --print-defaults</command>).
       If this displays anything other than the program name, you have an
       active <filename>my.cnf</filename> file that affects server or
@@ -12210,7 +12086,7 @@
             more secure handling of passwords. The procedure uses
             <command>mysql_fix_privilege_tables</command> and is
             described in <xref linkend="upgrading-grant-tables"/>. If
-            you don't do this, MySQL does not use the new more secure
+            you do not do this, MySQL does not use the new more secure
             protocol to authenticate. Implications of the
             password-handling change for applications are given later in
             this section.
@@ -12256,7 +12132,7 @@
           </para>
 
           <para>
-            If you don't upgrade, some methods (such as
+            If you do not upgrade, some methods (such as
             <literal>DBI-&gt;do()</literal>) do not notice error
             conditions correctly.
           </para>
@@ -12264,8 +12140,8 @@
 
         <listitem>
           <para>
-            The <literal>--defaults-file=option-file-name</literal>
-            option gives an error if the option file doesn't exist.
+            The <option>--defaults-file=option-file-name</option>
+            option gives an error if the option file does not exist.
           </para>
         </listitem>
 
@@ -12296,7 +12172,7 @@
       <para>
         Some of the 4.1 behaviors can be tested in 4.0 before performing
         a full upgrade to 4.1. We have added to later MySQL 4.0 releases
-        (from 4.0.12 on) a <literal>--new</literal> startup option for
+        (from 4.0.12 on) a <option>--new</option> startup option for
         <command>mysqld</command>. See <xref
linkend="server-options"/>.
       </para>
 
@@ -12311,7 +12187,7 @@
       <para>
         If you believe that some of the 4.1 changes affect you, we
         recommend that before upgrading to 4.1, you download the latest
-        MySQL 4.0 version and run it with the <literal>--new</literal>
+        MySQL 4.0 version and run it with the <option>--new</option>
         option by adding the following to your config file:
       </para>
 
@@ -12324,10 +12200,10 @@
         That way you can test the new behaviors in 4.0 to make sure that
         your applications work with them. This helps you have a smooth,
         painless transition when you perform a full upgrade to 4.1
-        later. Putting the <literal>--new</literal> option in the
+        later. Putting the <option>--new</option> option in the
         <literal>[mysqld-4.0]</literal> option group ensures that you
-        don't accidentally later run the 4.1 version with the
-        <literal>--new</literal> option.
+        do not accidentally later run the 4.1 version with the
+        <option>--new</option> option.
       </para>
 
       <para>
@@ -12612,10 +12488,10 @@
           <para>
             Windows servers support connections from local clients using
             shared memory if run with the
-            <literal>--shared-memory</literal> option. If you are
+            <option>--shared-memory</option> option. If you are
             running multiple servers this way on the same Windows
             machine, you should use a different
-            <literal>--shared-memory-base-name</literal> option for each
+            <option>--shared-memory-base-name</option> option for each
             server.
           </para>
         </listitem>
@@ -12639,7 +12515,7 @@
             user-defined functions unless they have at least one
             auxiliary symbol defined in addition to the main function
             symbol. This behavior can be overridden with the
-            <literal>--allow-suspicious-udfs</literal> option. See
+            <option>--allow-suspicious-udfs</option> option. See
             <xref linkend="udf-security"/>.
           </para>
         </listitem>
@@ -12655,10 +12531,10 @@
         <listitem>
           <para>
             <command>mysqldump</command> has the
-            <literal>--opt</literal> and
-            <literal>--quote-names</literal> options enabled by default.
-            You can turn them off with <literal>--skip-opt</literal> and
-            <literal>--skip-quote-names</literal>.
+            <option>--opt</option> and
+            <option>--quote-names</option> options enabled by default.
+            You can turn them off with <option>--skip-opt</option> and
+            <option>--skip-quote-names</option>.
           </para>
         </listitem>
 
@@ -12693,13 +12569,13 @@
             <literal>TIMESTAMP</literal> is returned as a string in
             <literal>'YYYY-MM-DD HH:MM:SS'</literal> format. See
             <xref linkend="timestamp-4-1"/>. From 4.0.12 on, the
-            <literal>--new</literal> option can be used to make a 4.0
+            <option>--new</option> option can be used to make a 4.0
             server behave as 4.1 in this respect. The effect of this
             option is described in <xref linkend="timestamp-pre-4-1"/>.
           </para>
 
           <para>
-            When running the server with <literal>--new</literal>, if
+            When running the server with <option>--new</option>, if
             you want to have a <literal>TIMESTAMP</literal> column
             returned as a number (as MySQL 4.0 does by default), you
             should add <literal>+0</literal> when you retrieve it:
@@ -12730,7 +12606,7 @@
             <emphasis role="bold">Incompatible change:</emphasis> Binary
             values such as <literal>0xFFDF</literal> are assumed to be
             strings instead of numbers. This fixes some problems with
-            character sets where it's convenient to input a string as a
+            character sets where it is convenient to input a string as a
             binary value. With this change, you should use
             <literal>CAST()</literal> if you want to compare binary
             values numerically as integers:
@@ -12743,7 +12619,7 @@
 </programlisting>
 
           <para>
-            If you don't use <literal>CAST()</literal>, a lexical string
+            If you do not use <literal>CAST()</literal>, a lexical string
             comparison is done:
           </para>
 
@@ -12755,7 +12631,7 @@
           <para>
             Using binary items in a numeric context or comparing them
             using the <literal>=</literal> operator should work as
-            before. (The <literal>--new</literal> option can be used
+            before. (The <option>--new</option> option can be used
             from 4.0.13 on to make a 4.0 server behave as 4.1 in this
             respect.)
           </para>
@@ -12863,9 +12739,9 @@
             for the <literal>sql_mode</literal> variable. You should use
             <literal>SET TRANSACTION ISOLATION LEVEL
             SERIALIZABLE</literal> instead.
<literal>SERIALIZE</literal>
-            is no longer valid for the <literal>--sql-mode</literal>
+            is no longer valid for the <option>--sql-mode</option>
             option for <command>mysqld</command>, either. Use
-            <literal>--transaction-isolation=SERIALIZABLE</literal>
+            <option>--transaction-isolation=SERIALIZABLE</option>
             instead.
           </para>
         </listitem>
@@ -12959,11 +12835,11 @@
             widen the <literal>Password</literal> column in the
             <literal>user</literal> table so that it can hold long
             password hashes. But run the server with the
-            <literal>--old-passwords</literal> option to provide
+            <option>--old-passwords</option> option to provide
             backward compatibility that allows pre-4.1 clients to
             continue to connect to their short-hash accounts.
             Eventually, when all your clients are upgraded to 4.1, you
-            can stop using the <literal>--old-passwords</literal> server
+            can stop using the <option>--old-passwords</option> server
             option. You can also change the passwords for your MySQL
             accounts to use the new more secure format. A pure-4.1
             installation is the most secure.
@@ -13096,7 +12972,7 @@
 
         <listitem>
           <para>
-            Ensure that you don't have any MySQL clients that use shared
+            Ensure that you do not have any MySQL clients that use shared
             libraries (like the Perl <literal>DBD::mysql</literal>
             module). If you do, you should recompile them, because the
             data structures used in
@@ -13109,7 +12985,7 @@
       </itemizedlist>
 
       <para>
-        MySQL 4.0 works even if you don't perform the preceding actions,
+        MySQL 4.0 works even if you do not perform the preceding actions,
         but you cannot use the new security privileges in MySQL 4.0 and
         you may run into problems when upgrading later to MySQL 4.1 or
         newer. The <literal>ISAM</literal> file format still works in
@@ -13151,7 +13027,7 @@
             user-defined functions unless they have at least one
             auxiliary symbol defined in addition to the main function
             symbol. This behavior can be overridden with the
-            <literal>--allow-suspicious-udfs</literal> option. See
+            <option>--allow-suspicious-udfs</option> option. See
             <xref linkend="udf-security"/>.
           </para>
         </listitem>
@@ -13188,7 +13064,7 @@
 
           <para>
             From version 4.0.2 on, the option
-            <literal>--safe-show-database</literal> is deprecated (and
+            <option>--safe-show-database</option> is deprecated (and
             no longer does anything). See
             <xref linkend="privileges-options"/>.
           </para>
@@ -13220,10 +13096,10 @@
             you do not use <literal>InnoDB</literal> and want to save
             memory when running a server that has
             <literal>InnoDB</literal> support enabled, use the
-            <literal>--skip-innodb</literal> server startup option. To
+            <option>--skip-innodb</option> server startup option. To
             compile MySQL without <literal>InnoDB</literal> support, run
             <command>configure</command> with the
-            <literal>--without-innodb</literal> option.
+            <option>--without-innodb</option> option.
           </para>
         </listitem>
 
@@ -13239,7 +13115,7 @@
         <listitem>
           <para>
             <command>mysqld</command> has the option
-            <literal>--temp-pool</literal> enabled by default because
+            <option>--temp-pool</option> enabled by default because
             this gives better performance with some operating systems
             (most notably Linux).
           </para>
@@ -13248,10 +13124,10 @@
         <listitem>
           <para>
             The <command>mysqld</command> startup options
-            <literal>--skip-locking</literal> and
-            <literal>--enable-locking</literal> were renamed to
-            <literal>--skip-external-locking</literal> and
-            <literal>--external-locking</literal>.
+            <option>--skip-locking</option> and
+            <option>--enable-locking</option> were renamed to
+            <option>--skip-external-locking</option> and
+            <option>--external-locking</option>.
           </para>
         </listitem>
 
@@ -13260,7 +13136,7 @@
             External system locking of
             <literal>MyISAM</literal>/<literal>ISAM</literal>
files is
             turned off by default. You can turn this on with
-            <literal>--external-locking</literal>. (However, this is
+            <option>--external-locking</option>. (However, this is
             never needed for most users.)
           </para>
         </listitem>
@@ -13305,8 +13181,8 @@
                   <entry><literal>log-warnings</literal></entry>
                 </row>
                 <row>
-                  <entry><literal>--err-log</literal></entry>
-                  <entry><literal>--log-error</literal> (for
<command>mysqld_safe</command>)</entry>
+                  <entry><option>--err-log</option></entry>
+                  <entry><option>--log-error</option> (for
<command>mysqld_safe</command>)</entry>
                 </row>
               </tbody>
             </tgroup>
@@ -13450,7 +13326,7 @@
             value from an unsigned entity and want a negative answer or
             subtracting an unsigned value from an integer column. You
             can disable this behavior by using the
-            <literal>--sql-mode=NO_UNSIGNED_SUBTRACTION</literal> option
+            <option>--sql-mode=NO_UNSIGNED_SUBTRACTION</option> option
             when starting <command>mysqld</command>. See
             <xref linkend="server-sql-mode"/>.
           </para>
@@ -13477,11 +13353,11 @@
         <listitem>
           <para>
             You should use <literal>TRUNCATE TABLE</literal> when you
-            want to delete all rows from a table and you don't need to
+            want to delete all rows from a table and you do not need to
             obtain a count of the number of rows that were deleted.
             (<literal>DELETE FROM
             <replaceable>tbl_name</replaceable></literal> returns a row
-            count in 4.0 and doesn't reset the
+            count in 4.0 and does not reset the
             <literal>AUTO_INCREMENT</literal> counter, and
             <literal>TRUNCATE TABLE</literal> is faster.)
           </para>
@@ -13654,8 +13530,8 @@
             <literal>ISAM</literal> type. By default, all new tables are
             created with type <literal>MyISAM</literal> unless you start
             <command>mysqld</command> with the
-            <literal>--default-table-type=isam</literal> option. You
-            don't have to convert your old <literal>ISAM</literal>
+            <option>--default-table-type=isam</option> option. You
+            do not have to convert your old <literal>ISAM</literal>
             tables to use them with MySQL 3.23. You can convert an
             <literal>ISAM</literal> table to
<literal>MyISAM</literal>
             format with <literal>ALTER TABLE
@@ -13693,9 +13569,9 @@
         <listitem>
           <para>
             The MySQL client <command>mysql</command> is by default
-            started with the <literal>--no-named-commands (-g)</literal>
+            started with the <option>--no-named-commands (-g)</option>
             option. This option can be disabled with
-            <literal>--enable-named-commands (-G)</literal>. This may
+            <option>--enable-named-commands (-G)</option>. This may
             cause incompatibility problems in some cases---for example,
             in SQL scripts that use named commands without a semicolon.
             Long format commands still work from the first line.
@@ -13706,7 +13582,7 @@
           <para>
             If you want your <command>mysqldump</command> files to be
             compatible between MySQL 3.22 and 3.23, you should not use
-            the <literal>--opt</literal> or
<literal>--all</literal>
+            the <option>--opt</option> or <option>--all</option>
             option to <command>mysqldump</command>.
           </para>
         </listitem>
@@ -13874,7 +13750,7 @@
         <listitem>
           <para>
             <literal>LPAD()</literal> and
<literal>RPAD()</literal>
-            shorten the result string if it's longer than the length
+            shorten the result string if it is longer than the length
             argument.
           </para>
         </listitem>
@@ -13899,7 +13775,7 @@
         <listitem>
           <para>
             <literal>mysql_num_fields()</literal> cannot be used on a
-            <literal>MYSQL*</literal> object (it's a function that takes
+            <literal>MYSQL*</literal> object (it is a function that takes
             a <literal>MYSQL_RES*</literal> value as an argument). With
             a <literal>MYSQL*</literal> object, you should use
             <literal>mysql_field_count()</literal> instead.
@@ -13928,7 +13804,7 @@
         Nothing that affects compatibility has changed between versions
         3.21 and 3.22. The only pitfall is that new tables that are
         created with <literal>DATE</literal> type columns use the new
-        way to store the date. You can't access these new columns from
+        way to store the date. You cannot access these new columns from
         an old version of <command>mysqld</command>.
       </para>
 
@@ -13999,7 +13875,7 @@
 
       <para>
         You can start the <command>mysqld</command> Version 3.21 server
-        with the <literal>--old-protocol</literal> option to use it with
+        with the <option>--old-protocol</option> option to use it with
         clients from a Version 3.20 distribution. In this case, the
         server uses the old pre-3.21 <literal>password()</literal>
         checking rather than the new method. Also, the new client
@@ -14010,7 +13886,7 @@
 
       <para>
         If you are <emphasis>not</emphasis> using the
-        <literal>--old-protocol</literal> option to
+        <option>--old-protocol</option> option to
         <command>mysqld</command>, you need to make the following
         changes:
       </para>
@@ -14043,7 +13919,7 @@
 
         <listitem>
           <para>
-            The table format hasn't changed, so you don't have to
+            The table format hasn't changed, so you do not have to
             convert any tables.
           </para>
         </listitem>
@@ -14071,7 +13947,7 @@
       </para>
 
       <para>
-        If you are not using the <literal>--old-protocol</literal>
+        If you are not using the <option>--old-protocol</option>
         option to <command>mysqld</command>, old clients are unable to
         connect and should issue the following error message:
       </para>
@@ -14189,7 +14065,7 @@
       </para>
 
       <para>
-        On Windows systems, there isn't an easy way to update the grant
+        On Windows systems, there is not an easy way to update the grant
         tables until MySQL 4.0.15. From version 4.0.15 on, MySQL
         distributions include a
         <filename>mysql_fix_privilege_tables.sql</filename> SQL script
@@ -14425,7 +14301,7 @@
 </programlisting>
 
       <para>
-        Also, don't forget to copy the <literal>mysql</literal> database
+        Also, do not forget to copy the <literal>mysql</literal> database
         because that is where the <literal>user</literal>,
         <literal>db</literal>, and <literal>host</literal> grant
tables
         are stored. You might have to run commands as the MySQL
@@ -14463,7 +14339,7 @@
       example, from 4.0.20 to 4.0.19) the general rule is that you just
       have to install the new binaries on top of the old ones. There is
       no need to do anything with the databases. As always, however,
-      it's always a good idea to make a backup.
+      it is always a good idea to make a backup.
     </para>
 
     <para>
@@ -14476,7 +14352,7 @@
       <listitem>
         <para>
           Read the upgrading section for the release series from which
-          you are downgrading to be sure that it doesn't have any
+          you are downgrading to be sure that it does not have any
           features you really need. <xref linkend="upgrade"/>.
         </para>
       </listitem>
@@ -14509,7 +14385,7 @@
 
     <para>
       The normal symptom of a downward-incompatible table format change
-      when you downgrade is that you can't open tables. In that case,
+      when you downgrade is that you cannot open tables. In that case,
       use the following procedure:
     </para>
 
@@ -14626,7 +14502,7 @@
 
         <listitem>
           <para>
-            Start MySQL 4.1 with the <literal>--skip-grant</literal>
+            Start MySQL 4.1 with the <option>--skip-grant</option>
             option.
           </para>
         </listitem>
@@ -14746,7 +14622,7 @@
           should be more stable.
         </para>
 
-<!--  TODO: this isn't really an "issue"; put in a FAQ somewhere: -->
+<!--  TODO: this is not really an "issue"; put in a FAQ somewhere: -->
 
 <!--  "Why do I always see at least three mysqld processes on Linux?" -->
 
@@ -14788,7 +14664,7 @@
           <literal>-static</literal> is slightly larger than a
           dynamically linked program, but also slightly faster (3-5%).
           However, one problem with a statically linked program is that
-          you can't use user-defined functions (UDFs). If you are going
+          you cannot use user-defined functions (UDFs). If you are going
           to write or use UDFs (this is something for C or C++
           programmers only), you must compile MySQL yourself using
           dynamic linking.
@@ -14826,10 +14702,10 @@
               <command>mysql_install_db --force</command>, which does
               not execute the <command>resolveip</command> test in
               <command>mysql_install_db</command>. The downside is that
-              you can't use hostnames in the grant tables: Except for
+              you cannot use hostnames in the grant tables: Except for
               <literal>localhost</literal>, you must use IP numbers
               instead. If you are using an old version of MySQL that
-              doesn't support <literal>--force</literal>, you must
+              does not support <option>--force</option>, you must
               manually remove the <literal>resolveip</literal> test in
               <literal>mysql_install</literal> using an editor.
             </para>
@@ -14839,7 +14715,7 @@
             <para>
               You also may see the following error when you try to run
               <command>mysqld</command> with the
-              <literal>--user</literal> option:
+              <option>--user</option> option:
             </para>
 
 <programlisting>
@@ -14849,7 +14725,7 @@
             <para>
               To work around this, start <command>mysqld</command> by
               using the <literal>su</literal> command rather than by
-              specifying the <literal>--user</literal> option. This
+              specifying the <option>--user</option> option. This
               causes the system itself to change the user ID of the
               <command>mysqld</command> process so that
               <command>mysqld</command> need not do so.
@@ -14924,7 +14800,7 @@
 
         <para>
           MySQL uses LinuxThreads on Linux. If you are using an old
-          Linux version that doesn't have <literal>glibc2</literal>, you
+          Linux version that does not have <literal>glibc2</literal>, you
           must install LinuxThreads before trying to compile MySQL. You
           can get LinuxThreads at
           <ulink url="http://dev.mysql.com/downloads/os-linux.html"/>.
@@ -15125,7 +15001,7 @@
         </para>
 
         <para>
-          If MySQL can't open enough files or connections, it may be
+          If MySQL cannot open enough files or connections, it may be
           that you haven't configured Linux to handle enough files.
         </para>
 
@@ -15300,12 +15176,12 @@
           To get a core dump on Linux if <command>mysqld</command> dies
           with a <literal>SIGSEGV</literal> signal, you can start
           <command>mysqld</command> with the
-          <literal>--core-file</literal> option. Note that you also
+          <option>--core-file</option> option. Note that you also
           probably need to raise the core file size by adding
           <command>ulimit -c 1000000</command> to
           <command>mysqld_safe</command> or starting
           <command>mysqld_safe</command> with
-          <literal>--core-file-size=1000000</literal>. See
+          <option>--core-file-size=1000000</option>. See
           <xref linkend="mysqld-safe"/>.
         </para>
 
@@ -15317,7 +15193,7 @@
 
         <para>
           MySQL requires <literal>libc</literal> Version 5.4.12 or
-          newer. It's known to work with <literal>libc</literal> 5.4.46.
+          newer. It is known to work with <literal>libc</literal> 5.4.46.
           <literal>glibc</literal> Version 2.0.6 and later should also
           work. There have been some problems with the
           <literal>glibc</literal> RPMs from Red Hat, so if you have
@@ -15333,7 +15209,7 @@
           new <literal>glibc</literal> library requires a stack size
           greater than 128KB for this call. To fix the problem, start
           <command>mysqld</command> with the
-          <literal>--thread-stack=192K</literal> option. (Use
+          <option>--thread-stack=192K</option> option. (Use
           <literal>-O thread_stack=192K</literal> before MySQL 4.) This
           stack size is the default on MySQL 4.0.10 and above, so you
           should not see the problem.
@@ -15343,7 +15219,7 @@
           If you are using <command>gcc</command> 3.0 and above to
           compile MySQL, you must install the
           <literal>libstdc++v3</literal> library before compiling MySQL;
-          if you don't do this, you get an error about a missing
+          if you do not do this, you get an error about a missing
           <literal>__cxa_pure_virtual</literal> symbol during linking.
         </para>
 
@@ -15539,7 +15415,7 @@
               when using <command>gcc</command>, the resulting image
               dumps core at startup time. In other words, <emphasis>do
               not</emphasis> use
-              <literal>--with-mysqld-ldflags=-all-static</literal> with
+              <option>--with-mysqld-ldflags=-all-static</option> with
               <command>gcc</command>.
             </para>
           </listitem>
@@ -15652,7 +15528,7 @@
 
             <para>
               This is probably a signal handling problem in the thread
-              library where the signal doesn't break a pending read and
+              library where the signal does not break a pending read and
               we hope that a future update to the thread libraries will
               fix this.
             </para>
@@ -15741,7 +15617,7 @@
       <para>
         On Solaris, you may run into trouble even before you get the
         MySQL distribution unpacked! Solaris <command>tar</command>
-        can't handle long filenames, so you may see an error like this
+        cannot handle long filenames, so you may see an error like this
         when you unpack MySQL:
       </para>
 
@@ -15771,7 +15647,7 @@
       </para>
 
 <programlisting>
-checking for restartable system calls... configure: error can not
+checking for restartable system calls... configure: error cannot
 run test programs while cross compiling
 </programlisting>
 
@@ -15791,7 +15667,7 @@
         <command>gcc</command> 2.95.2 or 3.2. You can find this at
         <ulink url="http://gcc.gnu.org/"/>. Note that
         <command>egcs</command> 1.1.1 and <command>gcc</command>
2.8.1
-        don't work reliably on SPARC!
+        do not work reliably on SPARC!
       </para>
 
       <para>
@@ -15839,7 +15715,7 @@
         To create a 64-bit Solaris binary using <command>gcc</command>,
         add <literal>-m64</literal> to <literal>CFLAGS</literal>
and
         <literal>CXXFLAGS</literal> and remove
-        <literal>--enable-assembler</literal> from the
+        <option>--enable-assembler</option> from the
         <command>configure</command> line. This works only with MySQL
         4.0 and up; MySQL 3.23 does not include the required
         modifications to support this.
@@ -15893,7 +15769,7 @@
 
       <para>
         If you turn on <literal>__STDC__</literal> with the
-        <literal>-Xc</literal> option, the Sun compiler can't compile
+        <literal>-Xc</literal> option, the Sun compiler cannot compile
         with the Solaris <filename>pthread.h</filename> header file.
         This is a Sun bug (broken compiler or broken include file).
       </para>
@@ -15953,9 +15829,9 @@
       </para>
 
       <para>
-        Solaris doesn't provide static versions of all system libraries
+        Solaris does not provide static versions of all system libraries
         (<literal>libpthreads</literal> and
<literal>libdl</literal>),
-        so you can't compile MySQL with <literal>--static</literal>. If
+        so you cannot compile MySQL with <option>--static</option>. If
         you try to do so, you get one of the following errors:
       </para>
 
@@ -16018,7 +15894,7 @@
 
       <para>
         If you have problems with <command>configure</command> trying to
-        link with <literal>-lz</literal> when you don't have
+        link with <literal>-lz</literal> when you do not have
         <literal>zlib</literal> installed, you have two options:
       </para>
 
@@ -16035,7 +15911,7 @@
         <listitem>
           <para>
             Run <command>configure</command> with the
-            <literal>--with-named-z-libs=no</literal> option when
+            <option>--with-named-z-libs=no</option> option when
             building MySQL.
           </para>
         </listitem>
@@ -16067,15 +15943,15 @@
 
       <para>
         You might try starting the server with the
-        <literal>--back_log=50</literal> option as a workaround for
+        <option>--back_log=50</option> option as a workaround for
         this. (Use <literal>-O back_log=50</literal> before MySQL 4.)
       </para>
 
       <para>
-        Solaris doesn't support core files for
-        <literal>setuid()</literal> applications, so you can't get a
+        Solaris does not support core files for
+        <literal>setuid()</literal> applications, so you cannot get a
         core file from <command>mysqld</command> if you are using the
-        <literal>--user</literal> option.
+        <option>--user</option> option.
       </para>
 
       <section id="solaris-2-7">
@@ -16134,7 +16010,7 @@
 
         <para>
           If you get the following errors when you run
-          <command>make</command>, it's because
+          <command>make</command>, it is because
           <command>configure</command> didn't detect the
           <filename>curses.h</filename> file (probably because of the
           error in <filename>/usr/include/widec.h</filename>):
@@ -16178,7 +16054,7 @@
         </itemizedlist>
 
         <para>
-          If your linker can't find <literal>-lz</literal> when linking
+          If your linker cannot find <literal>-lz</literal> when linking
           client programs, the problem is probably that your
           <filename>libz.so</filename> file is installed in
           <filename>/usr/local/lib</filename>. You can fix this problem
@@ -16212,7 +16088,7 @@
           <listitem>
             <para>
               Run <command>configure</command> with the
-              <literal>--with-named-z-libs=no</literal> option when
+              <option>--with-named-z-libs=no</option> option when
               building MySQL.
             </para>
           </listitem>
@@ -16251,7 +16127,7 @@
         </para>
 
         <para>
-          If this doesn't help, you should compile a debug version and
+          If this does not help, you should compile a debug version and
           run it with a trace file or under <command>gdb</command>. See
           <xref linkend="using-gdb-on-mysqld"/>.
         </para>
@@ -16341,7 +16217,7 @@
           circumstances, the <command>mysqld</command> process suddenly
           causes 100% CPU load and is unresponsive. If you encounter
           this problem, try to start MySQL using the
-          <literal>--skip-name-resolve</literal> option.
+          <option>--skip-name-resolve</option> option.
         </para>
 
         <para>
@@ -16373,7 +16249,7 @@
 
             <para>
               This is probably a signal handling problem in the thread
-              library where the signal doesn't break a pending read.
+              library where the signal does not break a pending read.
               This is supposed to be fixed in FreeBSD 5.0
             </para>
           </listitem>
@@ -16412,12 +16288,12 @@
 
         <para>
           If you get an error from <command>make install</command> that
-          it can't find <filename>/usr/include/pthreads</filename>,
+          it cannot find <filename>/usr/include/pthreads</filename>,
           <command>configure</command> didn't detect that you need
           MIT-pthreads. To fix this problem, remove
           <filename>config.cache</filename>, then re-run
           <command>configure</command> with the
-          <literal>--with-mit-threads</literal> option.
+          <option>--with-mit-threads</option> option.
         </para>
 
 <!--  TODO: This is not really FreeBSD-specific. Move to general -->
@@ -16440,7 +16316,7 @@
         <para>
           FreeBSD is known to have a very low default file handle limit.
           See <xref linkend="not-enough-file-handles"/>. Start the
-          server by using the <literal>--open-files-limit</literal>
+          server by using the <option>--open-files-limit</option>
           option for <command>mysqld_safe</command>, or raise the limits
           for the <command>mysqld</command> user in
           <filename>/etc/login.conf</filename> and rebuild it with
@@ -16501,7 +16377,7 @@
         <para>
           Our users have reported that OpenBSD 2.8 has a threading bug
           that causes problems with MySQL. The OpenBSD Developers have
-          fixed the problem, but as of January 25, 2001, it's only
+          fixed the problem, but as of January 25, 2001, it is only
           available in the <quote>-current</quote> branch. The symptoms
           of this threading bug are slow response, high load, high CPU
           usage, and crashes.
@@ -16543,7 +16419,7 @@
 
         <para>
           Try using <command>ulimit -v 80000</command> and run
-          <command>make</command> again. If this doesn't work and you
+          <command>make</command> again. If this does not work and you
           are using <command>bash</command>, try switching to
           <command>csh</command> or <command>sh</command>; some
BSDI
           users have reported problems with <command>bash</command> and
@@ -16552,7 +16428,7 @@
 
         <para>
           If you are using <command>gcc</command>, you may also use have
-          to use the <literal>--with-low-memory</literal> flag for
+          to use the <option>--with-low-memory</option> flag for
           <command>configure</command> to be able to compile
           <filename>sql_yacc.cc</filename>.
         </para>
@@ -16605,7 +16481,7 @@
 
         <para>
           If you have problems with performance under heavy load, try
-          using the <literal>--skip-thread-priority</literal> option to
+          using the <option>--skip-thread-priority</option> option to
           <command>mysqld</command>. This runs all threads with the same
           priority. On BSDI Version 3.1, this gives better performance,
           at least until BSDI fixes its thread scheduler.
@@ -16615,7 +16491,7 @@
           If you get the error <literal>virtual memory
           exhausted</literal> while compiling, you should try using
           <command>ulimit -v 80000</command> and running
-          <command>make</command> again. If this doesn't work and you
+          <command>make</command> again. If this does not work and you
           are using <command>bash</command>, try switching to
           <command>csh</command> or <command>sh</command>; some
BSDI
           users have reported problems with <command>bash</command> and
@@ -16636,16 +16512,16 @@
 
         <para>
           On some BSDI Version 4.x systems, you may get problems with
-          shared libraries. The symptom is that you can't execute any
+          shared libraries. The symptom is that you cannot execute any
           client programs, for example, <command>mysqladmin</command>.
           In this case, you need to reconfigure not to use shared
-          libraries with the <literal>--disable-shared</literal> option
+          libraries with the <option>--disable-shared</option> option
           to configure.
         </para>
 
         <para>
           Some customers have had problems on BSDI 4.0.1 that the
-          <command>mysqld</command> binary after a while can't open
+          <command>mysqld</command> binary after a while cannot open
           tables. This is because some library/system-related bug causes
           <command>mysqld</command> to change current directory without
           having asked for that to happen.
@@ -16660,7 +16536,7 @@
         </para>
 
         <para>
-          Note that this means that you can't symbolically link a
+          Note that this means that you cannot symbolically link a
           database directories to another database directory or symbolic
           link a table to another database on BSDI. (Making a symbolic
           link to another disk is okay).
@@ -16692,7 +16568,7 @@
         </para>
 
         <para>
-          We recommend using <command>gcc</command> 2.95 on HP-UX. Don't
+          We recommend using <command>gcc</command> 2.95 on HP-UX. Do not
           use high optimization flags (such as <literal>-O6</literal>)
           because they may not be safe on HP-UX.
         </para>
@@ -16774,7 +16650,7 @@
 </programlisting>
 
         <para>
-          The problem is that HP-UX doesn't define
+          The problem is that HP-UX does not define
           <literal>pthreads_atfork()</literal> consistently. It has
           conflicting prototypes in
           <filename>/usr/include/sys/unistd.h</filename>:184 and
@@ -16837,7 +16713,7 @@
 
         <para>
           If you get the following error from
-          <command>configure</command>, verify that you don't have the
+          <command>configure</command>, verify that you do not have the
           path to the K&amp;R compiler before the path to the HP-UX C
           and C++ compiler:
         </para>
@@ -16938,9 +16814,9 @@
           The <literal>-Wa,-many</literal> option is necessary for the
           compile to be successful. IBM is aware of this problem but is
           in no hurry to fix it because of the workaround that is
-          available. We don't know if the
+          available. We do not know if the
           <literal>-fno-exceptions</literal> is required with
-          <command>gcc</command> 2.95, but because MySQL doesn't use
+          <command>gcc</command> 2.95, but because MySQL does not use
           exceptions and the option generates faster code, we recommend
           that you should always use it with <command>egcs</command> /
           <command>gcc</command>.
@@ -16958,7 +16834,7 @@
         </para>
 
         <para>
-          If you don't know what your CPU is, execute a <literal>uname
+          If you do not know what your CPU is, execute a <literal>uname
           -m</literal> command. It produces a string that looks like
           <literal>000514676700</literal>, with a format of
           <literal>xxyyyyyymmss</literal> where
<literal>xx</literal>
@@ -16994,8 +16870,8 @@
 </programlisting>
 
         <para>
-          This doesn't affect the performance of MySQL, but has the side
-          effect that you can't kill clients that are
+          This does not affect the performance of MySQL, but has the side
+          effect that you cannot kill clients that are
           <quote>sleeping</quote> on a connection with
           <command>mysqladmin kill</command> or <command>mysqladmin
           shutdown</command>. Instead, the client dies when it issues
@@ -17045,7 +16921,7 @@
 
         <para>
           If you need to allocate a lot of memory to the
-          <command>mysqld</command> process, it's not enough to just use
+          <command>mysqld</command> process, it is not enough to just use
           <command>ulimit -d unlimited</command>. You may also have to
           modify <command>mysqld_safe</command> to add a line something
           like this:
@@ -17320,8 +17196,8 @@
 </programlisting>
 
         <para>
-          This doesn't affect the performance of MySQL, but has the side
-          effect that you can't kill clients that are
+          This does not affect the performance of MySQL, but has the side
+          effect that you cannot kill clients that are
           <quote>sleeping</quote> on a connection with
           <command>mysqladmin kill</command> or <command>mysqladmin
           shutdown</command>. Instead, the client dies when it issues
@@ -17344,7 +17220,7 @@
           directory and do a cut-and-paste of the last
           <command>gcc</command> line, but change
<literal>-O3</literal>
           to <literal>-O0</literal> (or add
<literal>-O0</literal>
-          immediately after <command>gcc</command> if you don't have any
+          immediately after <command>gcc</command> if you do not have any
           <literal>-O</literal> option on your compile line). After this
           is done, you can just change back to the top-level directory
           and run <command>make</command> again.
@@ -17382,7 +17258,7 @@
           lines from <filename>config.h</filename> that define
           <literal>HAVE_ALLOC</literal> and
           <literal>HAVE_ALLOCA_H</literal>. If <command>mysqladmin
-          create</command> doesn't work, remove the line from
+          create</command> does not work, remove the line from
           <filename>config.h</filename> that defines
           <literal>HAVE_READDIR_R</literal>. You may have to remove the
           <literal>HAVE_TERM_H</literal> line as well.
@@ -17804,7 +17680,7 @@
         </para>
 
         <para>
-          <emphasis role="bold">Note</emphasis>: If you don't start
+          <emphasis role="bold">Note</emphasis>: If you do not start
           <command>mysqld_safe</command> as
<literal>root</literal>, you
           should get only the default 110 open files per process.
           <command>mysqld</command> writes a note about this in the log
@@ -17925,7 +17801,7 @@
             </para>
 
             <para>
-              It's probably a good idea to install these patches before
+              It is probably a good idea to install these patches before
               trying to compile/use MySQL.
             </para>
           </listitem>
@@ -17980,7 +17856,7 @@
           <command>configure</command> command needs to build both a
           static and a dynamic library in
          
<filename><replaceable>src_directory</replaceable>/bdb/build_unix/</filename>,
-          but it doesn't with MySQL's own BDB version. The workaround is
+          but it does not with MySQL's own BDB version. The workaround is
           as follows.
 
           <orderedlist>
@@ -18301,7 +18177,7 @@
           <command>configure</command> command needs to build both a
           static and a dynamic library in
          
<filename><replaceable>src_directory</replaceable>/bdb/build_unix/</filename>,
-          but it doesn't with MySQL's own BDB version. The workaround is
+          but it does not with MySQL's own BDB version. The workaround is
           as follows.
 
           <orderedlist>
@@ -18493,7 +18369,7 @@
 </programlisting>
 
       <para>
-        If you don't do this, you may encounter the following error:
+        If you do not do this, you may encounter the following error:
       </para>
 
 <programlisting>
@@ -18659,7 +18535,7 @@
         using the default username and password. (The default username
         is your login name on Unix, and <literal>ODBC</literal> on
         Windows. The default password is <quote>no password.</quote>) If
-        you can't connect to the server with those values (for example,
+        you cannot connect to the server with those values (for example,
         if your account has a password), the tests fail. You can use
         <literal>force install DBD::mysql</literal> to ignore the failed
         tests.
@@ -18737,7 +18613,7 @@
       </para>
 
       <para>
-        If you don't have access rights to install Perl modules in the
+        If you do not have access rights to install Perl modules in the
         system directory or if you want to install local Perl modules,
         the following reference may be useful:
         <ulink
url="http://servers.digitaldaze.com/extensions/perl/modules.html#modules"/>
@@ -18840,7 +18716,7 @@
       </para>
 
       <para>
-        If you can't get the procedure to work, you should instead
+        If you cannot get the procedure to work, you should instead
         install the MyODBC driver and connect to the MySQL server
         through ODBC:
       </para>
@@ -18868,9 +18744,9 @@
       </indexterm>
 
       <para>
-        If Perl reports that it can't find the
+        If Perl reports that it cannot find the
         <filename>../mysql/mysql.so</filename> module, then the problem
-        is probably that Perl can't locate the shared library
+        is probably that Perl cannot locate the shared library
         <filename>libmysqlclient.so</filename>.
       </para>
 
@@ -18960,8 +18836,8 @@
       </para>
 
 <programlisting>
-/usr/bin/perl: can't resolve symbol '__moddi3'
-/usr/bin/perl: can't resolve symbol '__divdi3'
+/usr/bin/perl: cannot resolve symbol '__moddi3'
+/usr/bin/perl: cannot resolve symbol '__divdi3'
 </programlisting>
 
       <para>
@@ -18975,7 +18851,7 @@
       </para>
 
       <para>
-        Another cause of this problem may be that Perl and MySQL aren't
+        Another cause of this problem may be that Perl and MySQL are not
         both compiled with <command>gcc</command>. In this case, you can
         solve the mismatch by compiling both with
         <command>gcc</command>.
@@ -19053,7 +18929,7 @@
       </para>
 
       <para>
-        If you want to use the Perl module on a system that doesn't
+        If you want to use the Perl module on a system that does not
         support dynamic linking (such as SCO), you can generate a static
         version of Perl that includes <literal>DBI</literal> and
         <literal>DBD::mysql</literal>. The way this works is that you
Thread
bk commit - mysqldoc@docsrva tree (jon:1.3194)jon7 Aug