List:Commits« Previous MessageNext Message »
From:paul Date:January 3 2006 3:33am
Subject:svn commit - mysqldoc@docsrva: r642 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-03 04:33:34 +0100 (Tue, 03 Jan 2006)
New Revision: 642

Log:
 r5766@frost:  paul | 2006-01-02 21:12:41 -0600
 Cleanup revisions.


Modified:
   trunk/
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/introduction.xml
   trunk/refman-4.1/preface.xml
   trunk/refman-4.1/using-mysql-programs.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.0/preface.xml
   trunk/refman-5.0/using-mysql-programs.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/introduction.xml
   trunk/refman-5.1/preface.xml
   trunk/refman-5.1/using-mysql-programs.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5758
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1848
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5766
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1848

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-4.1/installing.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <chapter id="installing">
 
@@ -34,7 +34,7 @@
         supported.</emphasis> Please note that not all supported systems
         are equally good for running MySQL on them. On some it is much
         more robust and efficient than others. See
-        <xref linkend="which-os"/> for details.
+        <xref linkend="which-os"/>, for details.
       </para>
     </listitem>
 
@@ -77,14 +77,14 @@
         <emphasis role="bold">Note</emphasis>: If you plan to upgrade an
         existing version of MySQL to a newer version rather than
         installing MySQL for the first time, see
-        <xref linkend="upgrade"/> for information about upgrade
+        <xref linkend="upgrade"/>, for information about upgrade
         procedures and about issues that you should consider before
         upgrading.
       </para>
 
       <para>
         If you encounter installation difficulties, see
-        <xref linkend="operating-system-specific-notes"/> for
+        <xref linkend="operating-system-specific-notes"/>, for
         information on solving problems for particular platforms.
       </para>
     </listitem>
@@ -794,7 +794,7 @@
               The <filename>mysql-test</filename> directory contains an
               extensive set of test cases. We run these tests for
               virtually every server binary. See
-              <xref linkend="mysql-test-suite"/> for more information
+              <xref linkend="mysql-test-suite"/>, for more information
               about this test suite.
             </para>
           </listitem>
@@ -2675,13 +2675,13 @@
       format of the respective platform. (This is also known as
       performing a <quote>binary install.</quote>) However, binary
       distributions of MySQL are available for many other platforms as
-      well. See <xref linkend="installing-binary"/> for generic
+      well. See <xref linkend="installing-binary"/>, for generic
       installation instructions for these packages that apply to all
       platforms.
     </para>
 
     <para>
-      See <xref linkend="general-installation-issues"/> for more
+      See <xref linkend="general-installation-issues"/>, for more
       information on what other binary distributions are available and
       how to obtain them.
     </para>
@@ -3012,7 +3012,7 @@
           Users of previous versions of MySQL need to manually shut down
           and remove their existing MySQL installations before
           installing MySQL with the MySQL Installation Wizard. See
-          <xref linkend="mysql-install-wizard-upgrading"/> for more
+          <xref linkend="mysql-install-wizard-upgrading"/>, for more
           information on upgrading from a previous version.
         </para>
 
@@ -3117,8 +3117,8 @@
           The <literal>Custom</literal> installation type gives you
           complete control over which packages you wish to install and
           the installation path that is used. See
-          <xref linkend="mysql-install-wizard-custom-install"/> for more
-          information on performing a custom install.
+          <xref linkend="mysql-install-wizard-custom-install"/>, for
+          more information on performing a custom install.
         </para>
 
         <para>
@@ -3128,7 +3128,7 @@
           your choices and begin the installation. If you choose the
           <literal>Custom</literal> installation type and click the Next
           button, you advance to the custom install dialog, described in
-          <xref linkend="mysql-install-wizard-custom-install"/>
+          <xref linkend="mysql-install-wizard-custom-install"/>.
         </para>
 
         <remark>
@@ -3573,8 +3573,8 @@
           To complete the <literal>Standard Configuration</literal>,
           please refer to the sections on <literal>Service
           Options</literal> and <literal>Security Options</literal>,
-          located at <xref linkend="mysql-config-wizard-service"/> and
-          <xref linkend="mysql-config-wizard-security"/> respectively.
+          located at <xref linkend="mysql-config-wizard-service"/>, and
+          <xref linkend="mysql-config-wizard-security"/>, respectively.
         </para>
 
         <remark>
@@ -3602,32 +3602,27 @@
 
           <listitem>
             <para>
-              <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.
+              <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>
-              <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.
+              <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>
               <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
@@ -3660,10 +3655,9 @@
 
           <listitem>
             <para>
-              <guimenuitem>Multifunctional Database</guimenuitem>
-
-              : This option enables both the <literal>InnoDB</literal>
-              and <literal>MyISAM</literal> storage engines, and divides
+              <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.
@@ -3672,23 +3666,19 @@
 
           <listitem>
             <para>
-              <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>.
+              <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>
-              <guimenuitem>Non-Transactional Database 
-              Only</guimenuitem>
-
+              <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.
@@ -3758,35 +3748,31 @@
 
           <listitem>
             <para>
-              <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
+              <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>
           </listitem>
 
           <listitem>
             <para>
-              <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.
+              <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>
-              <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.
+              <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>
 
@@ -3810,12 +3796,8 @@
 
         <para>
           TCP/IP networking is enabled by default. To disable TCP/IP
-          networking, uncheck the box next to the
-
-          <guimenuitem>Enable 
-          TCP/IP Networking</guimenuitem>
-
-          option.
+          networking, uncheck the box next to the <guimenuitem>Enable
+          TCP/IP Networking</guimenuitem> option.
         </para>
 
         <para>
@@ -3859,35 +3841,32 @@
 
           <listitem>
             <para>
-              <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.
+              <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>
-              <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.
+              <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>
               <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.
+              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.
             </para>
           </listitem>
 
@@ -3915,24 +3894,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
-
-          <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.
+          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
-
-          <guimenuitem>Launch the MySQL Server 
-          automatically</guimenuitem>
-
-          option.
+          <guimenuitem>Launch the MySQL Server
+          automatically</guimenuitem> option.
         </para>
 
         <remark>
@@ -3951,51 +3924,31 @@
           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.
+          <guimenuitem>Modify Security Settings</guimenuitem> option.
         </para>
 
         <para>
           To set the <literal>root</literal> password, type the desired
-          password into both the
-
-          <guimenuitem>New root 
-          password</guimenuitem>
-
-          and
-
-          <guimenuitem>Confirm</guimenuitem>
-
+          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.
+          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
-
-          <guimenuitem>Root may only
-          connect from localhost</guimenuitem>
-
-          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
-
-          <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.
+          <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.
         </para>
 
         <remark>
@@ -4209,7 +4162,7 @@
         <listitem>
           <para>
             If you are upgrading from a previous version please refer to
-            <xref linkend="windows-upgrading"/> before beginning the
+            <xref linkend="windows-upgrading"/>, before beginning the
             upgrade process.
           </para>
         </listitem>
@@ -4308,10 +4261,10 @@
 
       <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 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
+        file, and then in the <filename>my.cnf</filename> file. However,
+        to 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.
       </para>
@@ -4847,11 +4800,9 @@
         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
+        <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>
@@ -5025,13 +4976,10 @@
       </para>
 
       <para>
-        You can also specify options in
-
-        <guimenuitem>Start
-        parameters</guimenuitem>
-
-        in the Windows <command>Services</command> utility before you
-        start the MySQL service.
+        You can also specify options in <guimenuitem>Start
+        parameters</guimenuitem> in the Windows
+        <command>Services</command> utility before you start the MySQL
+        service.
       </para>
 
       <para>
@@ -5096,7 +5044,7 @@
       <para>
         For MySQL versions older than 3.23.49, one problem with
         automatic MySQL service shutdown is that Windows waited only for
-        a few seconds for the shutdown to complete, then killed the
+        a few seconds for the shutdown to complete, and then killed the
         database server process if the time limit was exceeded. This had
         the potential to cause problems. (For example, the
         <literal>InnoDB</literal> storage engine would have to perform
@@ -5130,7 +5078,7 @@
       </para>
 
       <para>
-        Please see <xref linkend="windows-troubleshooting"/> if you
+        Please see <xref linkend="windows-troubleshooting"/>, if you
         encounter difficulties during installation.
       </para>
 
@@ -5513,7 +5461,7 @@
 
         <listitem>
           <para>
-            Refer to <xref linkend="upgrade"/> for additional
+            Refer to <xref linkend="upgrade"/>, for additional
             information on upgrading MySQL that is not specific to
             Windows.
           </para>
@@ -6144,7 +6092,7 @@
       a previous installation and have made changes to its startup
       script, you may want to make a copy of the script so that you do
       not lose it when you install a newer RPM.) See
-      <xref linkend="automatic-start"/> for more information on how
+      <xref linkend="automatic-start"/>, for more information on how
       MySQL can be started automatically on system startup.
     </para>
 
@@ -6329,10 +6277,7 @@
       This manual section covers the installation of the official MySQL
       Mac OS X PKG only. Make sure to read Apple's help information
       about installing MySQL: Run the <command>Help View</command>
-      application, select
-
-      <guimenuitem>Mac OS X Server</guimenuitem>
-
+      application, select <guimenuitem>Mac OS X Server</guimenuitem>
       help, search for <quote>MySQL</quote>, and read the item entitled
       <quote>Installing MySQL</quote>.
     </para>
@@ -6794,7 +6739,7 @@
       that are provided for various platforms in the form of compressed
       <command>tar</command> files (files with a
       <literal>.tar.gz</literal> extension). See
-      <xref linkend="mysql-binaries"/> for a detailed list.
+      <xref linkend="mysql-binaries"/>, for a detailed list.
     </para>
 
     <para>
@@ -6815,8 +6760,8 @@
     <para>
       In addition to these generic packages, we also offer binaries in
       platform-specific package formats for selected platforms. See
-      <xref linkend="quick-standard-installation"/> for more information
-      on how to install these.
+      <xref linkend="quick-standard-installation"/>, for more
+      information on how to install these.
     </para>
 
     <para>
@@ -7510,7 +7455,7 @@
 
           <para>
             If the compile fails, see
-            <xref linkend="compilation-problems"/> for help.
+            <xref linkend="compilation-problems"/>, for help.
           </para>
         </listitem>
 
@@ -7545,7 +7490,7 @@
             <literal>#</literal> character before the option lines that
             start with <literal>innodb_...</literal>, and modify the
             option values to be what you want. See
-            <xref linkend="option-files"/> and
+            <xref linkend="option-files"/>, and
             <xref linkend="innodb-configuration"/>.
           </para>
         </listitem>
@@ -8144,7 +8089,7 @@
             --set-character-set=<replaceable>charset</replaceable></command>
             on every table. Your indexes may be sorted incorrectly
             otherwise. (This can happen if you install MySQL, create
-            some tables, then reconfigure MySQL to use a different
+            some tables, and then reconfigure MySQL to use a different
             character set and reinstall it.)
           </para>
 
@@ -8607,7 +8552,7 @@
             <literal>ChangeSet</literal> descriptions listed there. To
             examine a particular changeset, you would have to use the
             <command>sfioball</command> command to extract two
-            particular revisions of the source tree, then use an
+            particular revisions of the source tree, and then use an
             external <command>diff</command> command to compare them. If
             you see diffs or code that you have a question about, do not
             hesitate to send email to the MySQL
@@ -8667,7 +8612,7 @@
         All MySQL programs compile cleanly for us with no warnings on
         Solaris or Linux using <command>gcc</command>. On other systems,
         warnings may occur due to differences in system include files.
-        See <xref linkend="mit-pthreads"/> for warnings that may occur
+        See <xref linkend="mit-pthreads"/>, for warnings that may occur
         when using MIT-pthreads. For other problems, check the following
         list.
       </para>
@@ -8897,7 +8842,7 @@
           <para>
             Using <command>gcc</command> as the C++ compiler is also
             required if you want to compile MySQL with RAID
-            functionality (see <xref linkend="create-table"/> for more
+            functionality (see <xref linkend="create-table"/>, for more
             info on RAID table type) and you are using GNU
             <command>gcc</command> version 3 and above. If you get
             errors like those following during the linking stage when
@@ -9115,7 +9060,7 @@
           <para>
             If you need to debug <command>mysqld</command> or a MySQL
             client, run <command>configure</command> with the
-            <option>--with-debug</option> option, then recompile and
+            <option>--with-debug</option> option, and then recompile and
             link your clients with the new client library. See
             <xref linkend="debugging-client"/>.
           </para>
@@ -9441,7 +9386,7 @@
             <listitem>
               <para>
                 BitKeeper 3.0 installed on that system. See
-                <xref linkend="installing-source-tree"/> for
+                <xref linkend="installing-source-tree"/>, for
                 instructions how to download and install BitKeeper.
               </para>
             </listitem>
@@ -9506,10 +9451,7 @@
           <listitem>
             <para>
               In the <guimenu>File</guimenu> menu, select
-
-              <guimenuitem>Open Workspace</guimenuitem>
-
-              .
+              <guimenuitem>Open Workspace</guimenuitem> .
             </para>
           </listitem>
 
@@ -9530,12 +9472,9 @@
 
           <listitem>
             <para>
-              Click over the screen selecting
-
-              <guimenuitem>mysqld - 
-              Win32 Debug</guimenuitem>
-
-              and click <guibutton>OK</guibutton>.
+              Click over the screen selecting <guimenuitem>mysqld -
+              Win32 Debug</guimenuitem> and click
+              <guibutton>OK</guibutton>.
             </para>
           </listitem>
 
@@ -9571,11 +9510,8 @@
               <filename>client_release</filename> and
               <filename>lib_release</filename> directories. Note that if
               you want to build both debug and release versions, you can
-              select the
-
-              <guimenuitem>Build All</guimenuitem>
-
-              option from the <guimenu>Build</guimenu> menu.
+              select the <guimenuitem>Build All</guimenuitem> option
+              from the <guimenu>Build</guimenu> menu.
             </para>
           </listitem>
 
@@ -9963,16 +9899,16 @@
       are specific to Windows systems and to Unix systems. Another
       section, <xref linkend="starting-server"/>, applies to all
       platforms; it describes what to do if you have trouble getting the
-      server to start. <xref linkend="default-privileges"/> also applies
-      to all platforms. You should follow its instructions to make sure
-      that you have properly protected your MySQL accounts by assigning
-      passwords to them.
+      server to start. <xref linkend="default-privileges"/>, also
+      applies to all platforms. You should follow its instructions to
+      make sure that you have properly protected your MySQL accounts by
+      assigning passwords to them.
     </para>
 
     <para>
       When you are ready to create additional user accounts, you can
       find information on the MySQL access control system and account
-      management in <xref linkend="privilege-system"/> and
+      management in <xref linkend="privilege-system"/>, and
       <xref linkend="user-account-management"/>.
     </para>
 
@@ -9998,10 +9934,10 @@
         Before setting up passwords, you might want to try running some
         client programs to make sure that you can connect to the server
         and that it is operating properly. Make sure that the server is
-        running (see <xref linkend="windows-server-first-start"/>), then
-        issue the following commands to verify that you can retrieve
-        information from the server. The output should be similar to
-        what is shown here:
+        running (see <xref linkend="windows-server-first-start"/>), and
+        then issue the following commands to verify that you can
+        retrieve information from the server. The output should be
+        similar to what is shown here:
       </para>
 
 <programlisting>
@@ -10903,7 +10839,7 @@
               package to enable the automatic startup of MySQL on system
               startup. The Startup Item starts the server by invoking
               <command>mysql.server</command>. See
-              <xref linkend="mac-os-x-installation"/> for details.
+              <xref linkend="mac-os-x-installation"/>, for details.
             </para>
           </listitem>
 
@@ -10965,7 +10901,7 @@
           the <command>mysql.server</command> script is installed in the
           <filename>/etc/init.d</filename> directory with the name
           <filename>mysql</filename>. You need not install it manually.
-          See <xref linkend="linux-rpm"/> for more information on the
+          See <xref linkend="linux-rpm"/>, for more information on the
           Linux RPM packages.
         </para>
 
@@ -11428,9 +11364,9 @@
           <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 <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>
+          with <option>--bdb-no-recover</option>. If that helps, you
+          should remove all <literal>BDB</literal> log files from the
+          data directory and try starting <command>mysqld</command>
           again without the <option>--bdb-no-recover</option> option.
         </para>
 
@@ -12011,7 +11947,7 @@
       <listitem>
         <para>
           If you are using replication, see
-          <xref linkend="replication-upgrade"/> for information on
+          <xref linkend="replication-upgrade"/>, for information on
           upgrading your replication setup.
         </para>
       </listitem>
@@ -12019,12 +11955,12 @@
       <listitem>
         <para>
           If you install a MySQL-Max distribution that includes a server
-          named <command>mysqld-max</command>, then upgrade later to a
-          non-Max version of MySQL, <command>mysqld_safe</command> still
-          attempts to run the old <command>mysqld-max</command> server.
-          If you perform such an upgrade, you should manually remove the
-          old <command>mysqld-max</command> server to ensure that
-          <command>mysqld_safe</command> runs the new
+          named <command>mysqld-max</command>, and then upgrade later to
+          a non-Max version of MySQL, <command>mysqld_safe</command>
+          still attempts to run the old <command>mysqld-max</command>
+          server. If you perform such an upgrade, you should manually
+          remove the old <command>mysqld-max</command> server to ensure
+          that <command>mysqld_safe</command> runs the new
           <command>mysqld</command> server.
         </para>
       </listitem>
@@ -12173,7 +12109,7 @@
         <listitem>
           <para>
             If you are using replication, see
-            <xref linkend="replication-upgrade"/> for information on
+            <xref linkend="replication-upgrade"/>, for information on
             upgrading your replication setup.
           </para>
         </listitem>
@@ -12330,9 +12266,9 @@
                 tables when you upgrade to MySQL 4.1.4 or later. The
                 storage format in those MySQL versions for
                 <literal>TIMESTAMP</literal> columns was incorrect. If
-                you upgrade from MySQL 4.0 to 4.1.4 or later, then no
-                rebuild of tables with <literal>TIMESTAMP</literal>
-                columns is needed.
+                you upgrade from MySQL 4.0 to 4.1.4 or later, no rebuild
+                of tables with <literal>TIMESTAMP</literal> columns is
+                needed.
               </para>
             </listitem>
 
@@ -12358,11 +12294,10 @@
                 <literal>BINARY</literal> (in the case of 4.1.0 and
                 4.1.1, with any character set and collation), and that
                 column may contain characters with a code &lt;
-                ASCII(32), then you should do <literal>ALTER
-                TABLE</literal> or <literal>OPTIMIZE TABLE</literal> on
-                it to regenerate the index, after upgrading to MySQL
-                4.1.3 or later. You can also rebuild the table from a
-                dump.
+                ASCII(32), you should do <literal>ALTER TABLE</literal>
+                or <literal>OPTIMIZE TABLE</literal> on it to regenerate
+                the index, after upgrading to MySQL 4.1.3 or later. You
+                can also rebuild the table from a dump.
               </para>
 
               <para>
@@ -12422,8 +12357,8 @@
                 <literal>MyISAM</literal> tables with live checksum
                 enabled (you used <literal>CHECKSUM=1</literal> in
                 <literal>CREATE TABLE</literal> or <literal>ALTER
-                TABLE</literal>), then these tables appear to be
-                corrupted following an upgrade. Use <literal>REPAIR
+                TABLE</literal>), these tables appear to be corrupted
+                following an upgrade. Use <literal>REPAIR
                 TABLE</literal> to recalculate the checksum for each
                 such table.
               </para>
@@ -12995,7 +12930,7 @@
       <para>
         Further background on password hashing with respect to client
         authentication and password-changing operations may be found in
-        <xref linkend="password-hashing"/> and
+        <xref linkend="password-hashing"/>, and
         <xref linkend="old-client"/>.
       </para>
 
@@ -13058,7 +12993,7 @@
         <listitem>
           <para>
             If you are using replication, see
-            <xref linkend="replication-upgrade"/> for information on
+            <xref linkend="replication-upgrade"/>, for information on
             upgrading your replication setup.
           </para>
         </listitem>
@@ -13752,10 +13687,10 @@
 </programlisting>
 
       <para>
-        You can also store the result in a file, then transfer the file
-        to the target machine and load the file into the database there.
-        For example, you can dump a database to a file on the source
-        machine like this:
+        You can also store the result in a file, and then transfer the
+        file to the target machine and load the file into the database
+        there. For example, you can dump a database to a file on the
+        source machine like this:
       </para>
 
 <programlisting>
@@ -13892,8 +13827,8 @@
       use <command>mysqldump</command> to dump your tables before
       downgrading. After downgrading, reload the dump file using
       <command>mysql</command> or <command>mysqlimport</command> to
-      re-create your tables. See <xref linkend="upgrading-to-arch"/> for
-      examples.
+      re-create your tables. See <xref linkend="upgrading-to-arch"/>,
+      for examples.
     </para>
 
     <para>
@@ -14044,7 +13979,7 @@
           serious stability problems using MySQL with kernel 2.2.14. If
           you are using this kernel, you should upgrade to 2.2.19 (or
           newer) or to a 2.4 or 2.6 kernel. If you have a multiple-CPU
-          machine, then you should seriously consider using 2.4 or 2.6
+          machine, you should seriously consider using 2.4 or 2.6
           because it gives you a significant speed boost. Your system
           should also be more stable.
         </para>
@@ -14664,7 +14599,7 @@
         <para>
           Just do what the error message says. Add an extra underscore
           to the <literal>_P</literal> macro name that has only one
-          underscore, then try again.
+          underscore, and then try again.
         </para>
 
         <para>
@@ -14685,10 +14620,10 @@
         <para>
           If <command>mysqld</command> always dumps core when it starts,
           the problem may be that you have an old
-          <filename>/lib/libc.a</filename>. Try renaming it, then remove
-          <filename>sql/mysqld</filename> and do a new <command>make
-          install</command> and try again. This problem has been
-          reported on some Slackware installations.
+          <filename>/lib/libc.a</filename>. Try renaming it, and then
+          remove <filename>sql/mysqld</filename> and do a new
+          <command>make install</command> and try again. This problem
+          has been reported on some Slackware installations.
         </para>
 
         <para>
@@ -15703,7 +15638,7 @@
           it cannot find <filename>/usr/include/pthreads</filename>,
           <command>configure</command> did not detect that you need
           MIT-pthreads. To fix this problem, remove
-          <filename>config.cache</filename>, then re-run
+          <filename>config.cache</filename>, and then re-run
           <command>configure</command> with the
           <option>--with-mit-threads</option> option.
         </para>
@@ -17083,7 +17018,7 @@
 
         <para>
           To install in the default <filename>/usr/include</filename>
-          directory, log in as <literal>root</literal>, then
+          directory, log in as <literal>root</literal>, and then
           <literal>cd</literal> to the <filename>thread/src</filename>
           directory and run <command>make install</command>.
         </para>
@@ -18163,8 +18098,8 @@
 
       <para>
         If Perl reports that it cannot find the
-        <filename>../mysql/mysql.so</filename> module, then the problem
-        is probably that Perl cannot locate the shared library
+        <filename>../mysql/mysql.so</filename> module, the problem is
+        probably that Perl cannot locate the shared library
         <filename>libmysqlclient.so</filename>.
       </para>
 

Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-4.1/introduction.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -2,12 +2,12 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities      SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <chapter id="introduction">
 
@@ -1955,7 +1955,7 @@
         <para>
           For MySQL versions older than 4.1, most subqueries can be
           rewritten using joins or other methods. See
-          <xref linkend="rewriting-subqueries"/> for examples that show
+          <xref linkend="rewriting-subqueries"/>, for examples that show
           how to do this.
         </para>
 

Modified: trunk/refman-4.1/preface.xml
===================================================================
--- trunk/refman-4.1/preface.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-4.1/preface.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <preface id="preface">
 

Modified: trunk/refman-4.1/using-mysql-programs.xml
===================================================================
--- trunk/refman-4.1/using-mysql-programs.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-4.1/using-mysql-programs.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <chapter id="using-mysql-programs">
 
@@ -71,7 +73,7 @@
 
       <listitem>
         <para>
-          The MYSQL server and server startup scripts:
+          The MySQL server and server startup scripts:
         </para>
 
         <itemizedlist>
@@ -221,7 +223,7 @@
       that RPM distributions are more specialized. There is one RPM for
       the server, another for the client programs, and so forth. If you
       appear to be missing one or more programs, see
-      <xref linkend="installing"/> for information on types of
+      <xref linkend="installing"/>, for information on types of
       distributions and what they contain. It may be that you need to
       install something else.
     </para>
@@ -349,7 +351,7 @@
           In environment variables. These are useful for options that
           you want to apply each time the program runs, although in
           practice option files are used more commonly for this purpose.
-          (<xref linkend="multiple-unix-servers"/> discusses one
+          (<xref linkend="multiple-unix-servers"/>, discusses one
           situation in which environment variables can be very helpful.
           It describes a handy technique that uses such variables to
           specify the TCP/IP port number and Unix socket file for both
@@ -473,7 +475,7 @@
         to the use of options that might be present in one version of
         MySQL but not another. Those capabilities are discussed in this
         section. Another change pertains to the way you use options to
-        set program variables. <xref linkend="program-variables"/>
+        set program variables. <xref linkend="program-variables"/>,
         discusses that topic further.
       </para>
 
@@ -556,11 +558,11 @@
         <option>--execute</option> option, which can be used to pass SQL
         statements to the server. The statements must be surrounded by
         (single or double) quotation marks. (However, if you wish to use
-        quoted values within the query, then you should use double
-        quotes for the query, and single quotes for any quoted values
-        within the query.) When this option is used, the statements are
-        executed, and then <command>mysql</command> exits to the command
-        shell immediately thereafter.
+        quoted values within the query, you should use double quotes for
+        the query, and single quotes for any quoted values within the
+        query.) When this option is used, the statements are executed,
+        and then <command>mysql</command> exits to the command shell
+        immediately thereafter.
       </para>
 
       <para>
@@ -620,7 +622,7 @@
         The <option>-e</option> option may also be used to pass commands
         in an analogous fashion to the <command>ndb_mgm</command>
         management client for MySQL Cluster. See
-        <xref linkend="multi-shutdown-restart"/> for an example.
+        <xref linkend="multi-shutdown-restart"/>, for an example.
       </para>
 
     </section>
@@ -787,7 +789,7 @@
         <replaceable>DATADIR</replaceable>. Otherwise, if
         <literal>MYSQL_HOME</literal> is not set and there is no
         <filename>my.cnf</filename> in
-        <replaceable>DATADIR</replaceable>, then
+        <replaceable>DATADIR</replaceable>,
         <literal>mysqld_safe</literal> sets
         <literal>MYSQL_HOME</literal> to
         <replaceable>BASEDIR</replaceable>.
@@ -919,7 +921,7 @@
             on the command line. Spaces are allowed around the first
             &lsquo;<literal>=</literal>&rsquo; character but not around
             the second. This syntax is deprecated as of MySQL 4.0. See
-            <xref linkend="program-variables"/> for more information on
+            <xref linkend="program-variables"/>, for more information on
             setting program variables.
           </para>
         </listitem>
@@ -1117,7 +1119,7 @@
         <filename>support-files</filename> directory under your MySQL
         installation directory. On Windows the sample option files may
         also be located in the MySQL installation directory (see earlier
-        in this section or <xref linkend="installing"/> if you do not
+        in this section or <xref linkend="installing"/>, if you do not
         know where this is). Currently there are sample option files for
         small, medium, large, and very large systems. To experiment with
         one of these files, copy it to <filename>C:\my.cnf</filename> on
@@ -1302,7 +1304,7 @@
       </para>
 
       <para>
-        <xref linkend="environment-variables"/> lists all environment
+        <xref linkend="environment-variables"/>, lists all environment
         variables that affect MySQL program operation.
       </para>
 

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-5.0/installing.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <chapter id="installing">
 
@@ -34,7 +34,7 @@
         supported.</emphasis> Please note that not all supported systems
         are equally suitable for running MySQL. On some pltforms it is
         much more robust and efficient than others. See
-        <xref linkend="which-os"/> for details.
+        <xref linkend="which-os"/>, for details.
       </para>
     </listitem>
 
@@ -77,14 +77,14 @@
         <emphasis role="bold">Note</emphasis>: If you plan to upgrade an
         existing version of MySQL to a newer version rather than
         installing MySQL for the first time, see
-        <xref linkend="upgrade"/> for information about upgrade
+        <xref linkend="upgrade"/>, for information about upgrade
         procedures and about issues that you should consider before
         upgrading.
       </para>
 
       <para>
         If you encounter installation difficulties, see
-        <xref linkend="operating-system-specific-notes"/> for
+        <xref linkend="operating-system-specific-notes"/>, for
         information on solving problems for particular platforms.
       </para>
     </listitem>
@@ -798,7 +798,7 @@
               The <filename>mysql-test</filename> directory contains an
               extensive set of test cases. We run these tests for
               virtually every server binary. See
-              <xref linkend="mysql-test-suite"/> for more information
+              <xref linkend="mysql-test-suite"/>, for more information
               about this test suite.
             </para>
           </listitem>
@@ -2674,13 +2674,13 @@
       format of the respective platform. (This is also known as
       performing a <quote>binary install</quote>.) However, binary
       distributions of MySQL are available for many other platforms as
-      well. See <xref linkend="installing-binary"/> for generic
+      well. See <xref linkend="installing-binary"/>, for generic
       installation instructions for these packages that apply to all
       platforms.
     </para>
 
     <para>
-      See <xref linkend="general-installation-issues"/> for more
+      See <xref linkend="general-installation-issues"/>, for more
       information on what other binary distributions are available and
       how to obtain them.
     </para>
@@ -2993,7 +2993,7 @@
           previous versions of MySQL need to shut down and remove their
           existing MySQL installations manually before installing MySQL
           with the MySQL Installation Wizard. See
-          <xref linkend="mysql-install-wizard-upgrading"/> for more
+          <xref linkend="mysql-install-wizard-upgrading"/>, for more
           information on upgrading from a previous version.
         </para>
 
@@ -3155,8 +3155,8 @@
           The <emphasis role="bold">Custom</emphasis> installation type
           gives you complete control over which packages you wish to
           install and the installation path that is used. See
-          <xref linkend="mysql-install-wizard-custom-install"/> for more
-          information on performing a custom install.
+          <xref linkend="mysql-install-wizard-custom-install"/>, for
+          more information on performing a custom install.
         </para>
 
         <para>
@@ -3168,7 +3168,7 @@
           <emphasis role="bold">Custom</emphasis> installation type and
           click the <guibutton>Next</guibutton> button, you advance to
           the custom installation dialog, described in
-          <xref linkend="mysql-install-wizard-custom-install"/>
+          <xref linkend="mysql-install-wizard-custom-install"/>.
         </para>
 
         <remark>
@@ -3331,9 +3331,8 @@
 
           <listitem>
             <para>
-              <guimenuitem>MySQL Command Line Client</guimenuitem>
-
-              : This is a shortcut to the <command>mysql</command>
+              <guimenuitem>MySQL Command Line Client</guimenuitem> :
+              This is a shortcut to the <command>mysql</command>
               command-line client and is configured to connect as the
               <literal>root</literal> user. The shortcut prompts for a
               <literal>root</literal> user password when connecting.
@@ -3342,22 +3341,21 @@
 
           <listitem>
             <para>
-              <guimenuitem>MySQL Server Instance Config Wizard</guimenuitem>
-
-              : This is a shortcut to the MySQL Configuration Wizard.
-              Use this shortcut to configure a newly installed server,
-              or to re-configure an existing server.
+              <guimenuitem>MySQL Server Instance Config
+              Wizard</guimenuitem> : This is a shortcut to the MySQL
+              Configuration Wizard. Use this shortcut to configure a
+              newly installed server, or to re-configure an existing
+              server.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <guimenuitem>MySQL Documentation</guimenuitem>
-
-              : This is a link to the MySQL server documentation that is
-              stored locally in the MySQL server installation directory.
-              This option is not available when the MySQL server is
-              installed using the Essentials installation package.
+              <guimenuitem>MySQL Documentation</guimenuitem> : This is a
+              link to the MySQL server documentation that is stored
+              locally in the MySQL server installation directory. This
+              option is not available when the MySQL server is installed
+              using the Essentials installation package.
             </para>
           </listitem>
 
@@ -3499,12 +3497,10 @@
           The MySQL Configuration Wizard is typically launched from the
           MySQL Installation Wizard, as the MySQL Installation Wizard
           exits. You can also launch the MySQL Configuration Wizard by
-          clicking the
-
-          <guimenuitem>MySQL Server Instance Config Wizard</guimenuitem>
-
-          entry in the <guisubmenu>MySQL</guisubmenu> section of the
-          Windows <guimenu>Start</guimenu> menu.
+          clicking the <guimenuitem>MySQL Server Instance Config
+          Wizard</guimenuitem> entry in the
+          <guisubmenu>MySQL</guisubmenu> section of the Windows
+          <guimenu>Start</guimenu> menu.
         </para>
 
         <para>
@@ -3533,42 +3529,31 @@
 
         <para>
           To reconfigure an existing server, choose the
-
-          <guimenuitem>Re-configure Instance</guimenuitem>
-
-          option and click the <guibutton>Next</guibutton> button. Your
-          existing <filename>my.ini</filename> file is renamed to
+          <guimenuitem>Re-configure Instance</guimenuitem> option and
+          click the <guibutton>Next</guibutton> button. Your existing
+          <filename>my.ini</filename> file is renamed to
           <filename>my<replaceable>timestamp</replaceable>.ini.bak</filename>,
           where <replaceable>timestamp</replaceable> is the date and
           time the existing <filename>my.ini</filename> file was
           created. To remove the existing server instance, choose the
-
-          <guimenuitem>Remove
-     Instance</guimenuitem>
-
-          option and click the <guibutton>Next</guibutton> button.
+          <guimenuitem>Remove Instance</guimenuitem> option and click
+          the <guibutton>Next</guibutton> button.
         </para>
 
         <para>
-          If you choose the
-
-          <guimenuitem>Remove Instance</guimenuitem>
-
+          If you choose the <guimenuitem>Remove Instance</guimenuitem>
           option, you advance to a confirmation window. Click the
           <guibutton>Execute</guibutton> button: the MySQL Configuration
-          Wizard stops and removes the MySQL service, then deletes the
-          <filename>my.ini</filename> file. The server installation and
-          its <filename>data</filename> folder are not removed.
+          Wizard stops and removes the MySQL service, and then deletes
+          the <filename>my.ini</filename> file. The server installation
+          and its <filename>data</filename> folder are not removed.
         </para>
 
         <para>
-          If you choose the
-
-          <guimenuitem>Re-configure Instance</guimenuitem>
-
-          option, you advance to the <guimenu>Configuration
-          Type</guimenu> dialog where you can choose the type of
-          installation you wish to configure.
+          If you choose the <guimenuitem>Re-configure
+          Instance</guimenuitem> option, you advance to the
+          <guimenu>Configuration Type</guimenu> dialog where you can
+          choose the type of installation you wish to configure.
         </para>
 
         <remark>
@@ -3583,94 +3568,51 @@
 
         <para>
           When you start the MySQL Configuration Wizard for a new MySQL
-          installation, or choose the
-
-          <guimenuitem>Re-configure 
-     Instance</guimenuitem>
-
-          option for an existing installation, you advance to the
-          <guimenu>Configuration Type</guimenu> dialog.
+          installation, or choose the <guimenuitem>Re-configure
+          Instance</guimenuitem> option for an existing installation,
+          you advance to the <guimenu>Configuration Type</guimenu>
+          dialog.
         </para>
 
         <para>
           There are two configuration types available:
-
-          <guimenuitem>Detailed Configuration</guimenuitem>
-
-          and
-
-          <guimenuitem>Standard Configuration</guimenuitem>
-
-          . The
-
-          <guimenuitem>Standard Configuration</guimenuitem>
-
-          option is intended for new users who want to get started with
-          MySQL quickly without having to make many decisions in regards
-          to server configuration. The
-
-          <guimenuitem>Detailed Configuration</guimenuitem>
-
-          option is intended for advanced users who want more
-          fine-grained control over server configuration.
+          <guimenuitem>Detailed Configuration</guimenuitem> and
+          <guimenuitem>Standard Configuration</guimenuitem> . The
+          <guimenuitem>Standard Configuration</guimenuitem> option is
+          intended for new users who want to get started with MySQL
+          quickly without having to make many decisions in regards to
+          server configuration. The <guimenuitem>Detailed
+          Configuration</guimenuitem> option is intended for advanced
+          users who want more fine-grained control over server
+          configuration.
         </para>
 
         <para>
           If you are new to MySQL and need a server configured as a
-          single-user developer machine the
-
-          <guimenuitem>Standard 
-        Configuration</guimenuitem>
-
-          should suit your needs. Choosing the
-
-          <guimenuitem>Standard Configuration</guimenuitem>
-
-          option causes the MySQL Configuration Wizard to set all
-          configuration options automatically with the exception of
-
-          <guimenuitem>Service 
-        Options</guimenuitem>
-
-          and
-
-          <guimenuitem>Security 
-        Options</guimenuitem>
-
-          .
+          single-user developer machine the <guimenuitem>Standard
+          Configuration</guimenuitem> should suit your needs. Choosing
+          the <guimenuitem>Standard Configuration</guimenuitem> option
+          causes the MySQL Configuration Wizard to set all configuration
+          options automatically with the exception of
+          <guimenuitem>Service Options</guimenuitem> and
+          <guimenuitem>Security Options</guimenuitem> .
         </para>
 
         <para>
-          The
-
-          <guimenuitem>Standard Configuration</guimenuitem>
-
-          sets options that may be incompatible with systems where there
-          are existing MySQL installations. If you have an existing
-          MySQL installation on your system in addition to the
-          installation you wish to configure, the
-
-          <guimenuitem>Detailed Configuration</guimenuitem>
-
-          option is recommended.
+          The <guimenuitem>Standard Configuration</guimenuitem> sets
+          options that may be incompatible with systems where there are
+          existing MySQL installations. If you have an existing MySQL
+          installation on your system in addition to the installation
+          you wish to configure, the <guimenuitem>Detailed
+          Configuration</guimenuitem> option is recommended.
         </para>
 
         <para>
-          To complete the
-
-          <guimenuitem>Standard Configuration</guimenuitem>
-
-          , please refer to the sections on
-
-          <guimenuitem>Service 
-        Options</guimenuitem>
-
-          and
-
-          <guimenuitem>Security 
-        Options</guimenuitem>
-
-          , at <xref linkend="mysql-config-wizard-service"/> and
+          To complete the <guimenuitem>Standard
+          Configuration</guimenuitem> , please refer to the sections on
+          <guimenuitem>Service Options</guimenuitem> and
+          <guimenuitem>Security Options</guimenuitem> , at
+          <xref linkend="mysql-config-wizard-service"/>, and
           <xref linkend="mysql-config-wizard-security"/>, respectively.
         </para>
 
@@ -3699,32 +3641,27 @@
 
           <listitem>
             <para>
-              <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.
+              <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>
-              <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 moderate 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 moderate portion of the system resources.
             </para>
           </listitem>
 
           <listitem>
             <para>
               <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
@@ -3757,10 +3694,9 @@
 
           <listitem>
             <para>
-              <guimenuitem>Multifunctional Database</guimenuitem>
-
-              : This option enables both the <literal>InnoDB</literal>
-              and <literal>MyISAM</literal> storage engines and divides
+              <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 that use both storage engines on a
               regular basis.
@@ -3769,22 +3705,19 @@
 
           <listitem>
             <para>
-              <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 that use <literal>InnoDB</literal>
-              almost exclusively and make only minimal use of
-              <literal>MyISAM</literal>.
+              <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 that
+              use <literal>InnoDB</literal> almost exclusively and make
+              only minimal use of <literal>MyISAM</literal>.
             </para>
           </listitem>
 
           <listitem>
             <para>
               <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.
@@ -3854,34 +3787,31 @@
 
           <listitem>
             <para>
-              <guimenuitem>Decision Support (DSS)/OLAP</guimenuitem>
-
-              : Choose this option if your server does not require a
-              large number of concurrent connections. The maximum number
-              of connections is set at 100, with an average of 20
+              <guimenuitem>Decision Support (DSS)/OLAP</guimenuitem> :
+              Choose this option if your 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>
           </listitem>
 
           <listitem>
             <para>
-              <guimenuitem>Online Transaction Processing (OLTP)</guimenuitem>
-
-              : 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 your server
+              requires a large number of concurrent connections. The
+              maximum number of connections is set at 500.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <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 enter 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 enter the
+              maximum number of connections into the drop-down box if
+              the number you desire is not listed.
             </para>
           </listitem>
 
@@ -3905,12 +3835,8 @@
 
         <para>
           TCP/IP networking is enabled by default. To disable TCP/IP
-          networking, uncheck the box next to the
-
-          <guimenuitem>Enable TCP/IP
-     Networking</guimenuitem>
-
-          option.
+          networking, uncheck the box next to the <guimenuitem>Enable
+          TCP/IP Networking</guimenuitem> option.
         </para>
 
         <para>
@@ -3954,34 +3880,32 @@
 
           <listitem>
             <para>
-              <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.
+              <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>
-              <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.
+              <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>
               <guimenuitem>Manual 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.
+              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.
             </para>
           </listitem>
 
@@ -4009,23 +3933,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, uncheck 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 entering a
-          new service name into the drop-down box.
+          service, uncheck 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 entering 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, uncheck the box next to the
-
-          <guimenuitem>Launch the MySQL Server Automatically</guimenuitem>
-
-          option.
+          <guimenuitem>Launch the MySQL Server
+          Automatically</guimenuitem> option.
         </para>
 
         <remark>
@@ -4044,52 +3963,32 @@
           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, uncheck the
-          box next to the
-
-          <guimenuitem>Modify Security 
-     Settings</guimenuitem>
-
-          option.
+          box next to the <guimenuitem>Modify Security
+          Settings</guimenuitem> option.
         </para>
 
         <para>
           To set the <literal>root</literal> password, enter the desired
-          password into both the
-
-          <guimenuitem>New root password</guimenuitem>
-
-          and
-
-          <guimenuitem>Confirm</guimenuitem>
-
+          password into both the <guimenuitem>New root
+          password</guimenuitem> and <guimenuitem>Confirm</guimenuitem>
           boxes. If you are reconfiguring an existing server, you also
           need to enter the existing <literal>root</literal> password
-          into the
-
-          <guimenuitem>Current root password</guimenuitem>
-
-          box.
+          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
-
-          <guimenuitem>Root may only connect from 
-     localhost</guimenuitem>
-
-          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
-
-          <guimenuitem>Create An Anonymous Account</guimenuitem>
-
-          option. Creating an anonymous account can decrease server
-          security and cause login and permission difficulties. For this
-          reason, it is not recommended.
+          <guimenuitem>Create An Anonymous Account</guimenuitem> option.
+          Creating an anonymous account can decrease server security and
+          cause login and permission difficulties. For this reason, it
+          is not recommended.
         </para>
 
         <remark>
@@ -4291,7 +4190,7 @@
         <listitem>
           <para>
             If you are upgrading from a previous version please refer to
-            <xref linkend="windows-upgrading"/> before beginning the
+            <xref linkend="windows-upgrading"/>, before beginning the
             upgrade process.
           </para>
         </listitem>
@@ -4387,10 +4286,10 @@
 
       <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 <filename>C:</filename> is not the boot
-        drive, your only option is to use the
+        file, and 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 <filename>C:</filename> 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.
       </para>
@@ -4844,15 +4743,11 @@
       <para>
         The <command>Services</command> utility (the Windows
         <command>Service Control Manager</command>) can be found in the
-        Windows Control Panel (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 the command line. This
-        prevents a number of errors.
+        Windows Control Panel (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 the
+        command line. This prevents a number of errors.
       </para>
 
       <para>
@@ -4867,10 +4762,10 @@
 
       <para>
         <emphasis role="bold">Note</emphasis>: If the MySQL
-        <literal>root</literal> user account has a password, then you
-        need to invoke this command as <command>C:\Program
-        Files\MySQL\MySQL Server &current-series;\bin\mysqladmin -u root
-        -p shutdown</command> and supply the password when prompted.
+        <literal>root</literal> user account has a password, you need to
+        invoke this command as <command>C:\Program Files\MySQL\MySQL
+        Server &current-series;\bin\mysqladmin -u root -p
+        shutdown</command> and supply the password when prompted.
       </para>
 
       <para>
@@ -4921,19 +4816,14 @@
             <guiicon>My 
               Computer</guiicon>
 
-            icon, and select
-
-            <guimenuitem>Properties</guimenuitem>
+            icon, and select <guimenuitem>Properties</guimenuitem>
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Next select, the
-
-            <guimenuitem>Advanced</guimenuitem>
-
-            tab from the <guimenu>System Properties</guimenu> menu that
+            Next select, the <guimenuitem>Advanced</guimenuitem> tab
+            from the <guimenu>System Properties</guimenu> menu that
             appears, and click the <guibutton>Environment
             Variables</guibutton> button.
           </para>
@@ -4942,12 +4832,9 @@
         <listitem>
           <para>
             Under <guilabel>System Variables</guilabel>, select
-
-            <guimenuitem>Path</guimenuitem>
-
-            , and then click the <guibutton>Edit</guibutton> button. The
-            <guimenu>Edit System Variable</guimenu> dialogue should
-            appear.
+            <guimenuitem>Path</guimenuitem> , and then click the
+            <guibutton>Edit</guibutton> button. The <guimenu>Edit System
+            Variable</guimenu> dialogue should appear.
           </para>
         </listitem>
 
@@ -5186,7 +5073,7 @@
       </para>
 
       <para>
-        Please see <xref linkend="windows-troubleshooting"/> if you
+        Please see <xref linkend="windows-troubleshooting"/>, if you
         encounter difficulties during installation.
       </para>
 
@@ -5518,7 +5405,7 @@
 
         <listitem>
           <para>
-            Refer to <xref linkend="upgrade"/> for additional
+            Refer to <xref linkend="upgrade"/>, for additional
             information on upgrading MySQL that is not specific to
             Windows.
           </para>
@@ -6175,7 +6062,7 @@
       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
-      <xref linkend="automatic-start"/> for more information on how
+      <xref linkend="automatic-start"/>, for more information on how
       MySQL can be started automatically on system startup.
     </para>
 
@@ -6838,7 +6725,7 @@
       that are provided for various platforms in the form of compressed
       <command>tar</command> files (files with a
       <literal>.tar.gz</literal> extension). See
-      <xref linkend="mysql-binaries"/> for a detailed list.
+      <xref linkend="mysql-binaries"/>, for a detailed list.
     </para>
 
     <para>
@@ -6859,8 +6746,8 @@
     <para>
       In addition to these generic packages, we also offer binaries in
       platform-specific package formats for selected platforms. See
-      <xref linkend="quick-standard-installation"/> for more information
-      on how to install these.
+      <xref linkend="quick-standard-installation"/>, for more
+      information on how to install these.
     </para>
 
     <para>
@@ -7532,7 +7419,7 @@
 
           <para>
             If the compile fails, see
-            <xref linkend="compilation-problems"/> for help.
+            <xref linkend="compilation-problems"/>, for help.
           </para>
         </listitem>
 
@@ -7567,7 +7454,7 @@
             <literal>#</literal> character before the option lines that
             start with <literal>innodb_...</literal>, and modify the
             option values to be what you want. See
-            <xref linkend="option-files"/> and
+            <xref linkend="option-files"/>, and
             <xref linkend="innodb-configuration"/>.
           </para>
         </listitem>
@@ -8159,8 +8046,8 @@
             --set-character-set=<replaceable>charset</replaceable></command>
             <emphasis>on every table</emphasis>. Your indexes may be
             sorted incorrectly otherwise. (This can happen if you
-            install MySQL, create some tables, then reconfigure MySQL to
-            use a different character set and reinstall it.)
+            install MySQL, create some tables, and then reconfigure
+            MySQL to use a different character set and reinstall it.)
           </para>
 
           <para>
@@ -8598,7 +8485,7 @@
             <literal>ChangeSet</literal> descriptions listed there. To
             examine a particular changeset, you would have to use the
             <command>sfioball</command> command to extract two
-            particular revisions of the source tree, then use an
+            particular revisions of the source tree, and then use an
             external <command>diff</command> command to compare them. If
             you see some funny diffs or code that you have a question
             about, do not hesitate to send email to the MySQL
@@ -8659,7 +8546,7 @@
         All MySQL programs compile cleanly for us with no warnings on
         Solaris or Linux using <command>gcc</command>. On other systems,
         warnings may occur due to differences in system include files.
-        See <xref linkend="mit-pthreads"/> for warnings that may occur
+        See <xref linkend="mit-pthreads"/>, for warnings that may occur
         when using MIT-pthreads. For other problems, check the following
         list.
       </para>
@@ -9068,7 +8955,7 @@
           <para>
             If you need to debug <command>mysqld</command> or a MySQL
             client, run <command>configure</command> with the
-            <option>--with-debug</option> option, then recompile and
+            <option>--with-debug</option> option, and then recompile and
             link your clients with the new client library. See
             <xref linkend="debugging-client"/>.
           </para>
@@ -9392,7 +9279,7 @@
             <listitem>
               <para>
                 BitKeeper 3.0 installed on that system. See
-                <xref linkend="installing-source-tree"/> for
+                <xref linkend="installing-source-tree"/>, for
                 instructions how to download and install BitKeeper.
               </para>
             </listitem>
@@ -9458,11 +9345,7 @@
           <listitem>
             <para>
               From the <guimenu>File menu</guimenu>, select
-
-              <guimenuitem>Open
-      Workspace</guimenuitem>
-
-              .
+              <guimenuitem>Open Workspace</guimenuitem> .
             </para>
           </listitem>
 
@@ -9482,12 +9365,9 @@
 
           <listitem>
             <para>
-              Click over the screen selecting
-
-              <guimenuitem>mysqld - Win32
-      Debug</guimenuitem>
-
-              and click <guibutton>OK</guibutton>.
+              Click over the screen selecting <guimenuitem>mysqld -
+              Win32 Debug</guimenuitem> and click
+              <guibutton>OK</guibutton>.
             </para>
           </listitem>
 
@@ -9518,11 +9398,8 @@
               <filename>client_release</filename> and
               <filename>lib_release</filename> directories. Note that if
               you want to build both debug and release versions, you can
-              select the
-
-              <guimenuitem>Build All</guimenuitem>
-
-              option from the <guimenu>Build</guimenu> menu.
+              select the <guimenuitem>Build All</guimenuitem> option
+              from the <guimenu>Build</guimenu> menu.
             </para>
           </listitem>
 
@@ -9911,16 +9788,16 @@
       are specific to Windows systems and to Unix systems. Another
       section, <xref linkend="starting-server"/>, applies to all
       platforms; it describes what to do if you have trouble getting the
-      server to start. <xref linkend="default-privileges"/> also applies
-      to all platforms. You should follow its instructions to make sure
-      that you have properly protected your MySQL accounts by assigning
-      passwords to them.
+      server to start. <xref linkend="default-privileges"/>, also
+      applies to all platforms. You should follow its instructions to
+      make sure that you have properly protected your MySQL accounts by
+      assigning passwords to them.
     </para>
 
     <para>
       When you are ready to create additional user accounts, you can
       find information on the MySQL access control system and account
-      management in <xref linkend="privilege-system"/> and
+      management in <xref linkend="privilege-system"/>, and
       <xref linkend="user-account-management"/>.
     </para>
 
@@ -9946,10 +9823,10 @@
         Before setting up passwords, you might want to try running some
         client programs to make sure that you can connect to the server
         and that it is operating properly. Make sure the server is
-        running (see <xref linkend="windows-server-first-start"/>), then
-        issue the following commands to verify that you can retrieve
-        information from the server. The output should be similar to
-        what is shown here:
+        running (see <xref linkend="windows-server-first-start"/>), and
+        then issue the following commands to verify that you can
+        retrieve information from the server. The output should be
+        similar to what is shown here:
       </para>
 
 <programlisting>
@@ -10165,7 +10042,7 @@
             <literal>host</literal>, <literal>tables_priv</literal>,
             <literal>columns_priv</literal>, and
             <literal>func</literal>, as well as others. See
-            <xref linkend="privilege-system"/> for a complete listing
+            <xref linkend="privilege-system"/>, for a complete listing
             and description of these.
           </para>
 
@@ -10641,11 +10518,10 @@
 
             <para>
               This indicates that the server is running, in which case
-              the grant tables have probably been created. If so, then
-              there is no need to run
-              <command>mysql_install_db</command> at all because it
-              needs to be run only once (when you install MySQL the
-              first time).
+              the grant tables have probably been created. If so, there
+              is no need to run <command>mysql_install_db</command> at
+              all because it needs to be run only once (when you install
+              MySQL the first time).
             </para>
           </listitem>
 
@@ -10846,7 +10722,7 @@
               package to enable the automatic startup of MySQL on system
               startup. The Startup Item starts the server by invoking
               <command>mysql.server</command>. See
-              <xref linkend="mac-os-x-installation"/> for details.
+              <xref linkend="mac-os-x-installation"/>, for details.
             </para>
           </listitem>
 
@@ -10908,7 +10784,7 @@
           the <command>mysql.server</command> script is installed in the
           <filename>/etc/init.d</filename> directory with the name
           <filename>mysql</filename>. You need not install it manually.
-          See <xref linkend="linux-rpm"/> for more information on the
+          See <xref linkend="linux-rpm"/>, for more information on the
           Linux RPM packages.
         </para>
 
@@ -11368,9 +11244,9 @@
           <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 <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>
+          with <option>--bdb-no-recover</option>. If that helps, you
+          should remove all <literal>BDB</literal> log files from the
+          data directory and try starting <command>mysqld</command>
           again without the <option>--bdb-no-recover</option> option.
         </para>
 
@@ -11919,10 +11795,10 @@
           about features that are new or different in MySQL
           &current-series; as opposed to those found in MySQL
           &previous-series;. If you wish to upgrade from a release
-          series previous to MySQL &previous-series;, then you should
-          upgrade to each next release series in turn until you have
-          reached MySQL &previous-series;, then proceed with the upgrade
-          to MySQL &current-series;. For information on upgrading from
+          series previous to MySQL &previous-series;, you should upgrade
+          to each next release series in turn until you have reached
+          MySQL &previous-series;, and then proceed with the upgrade to
+          MySQL &current-series;. For information on upgrading from
           MySQL &previous-series; or earlier releases, see the
           <citetitle>&title-refman-4-1;</citetitle>.
         </para>
@@ -11960,7 +11836,7 @@
       <listitem>
         <para>
           If you are using replication, see
-          <xref linkend="replication-upgrade"/> for information on
+          <xref linkend="replication-upgrade"/>, for information on
           upgrading your replication setup.
         </para>
       </listitem>
@@ -11968,12 +11844,12 @@
       <listitem>
         <para>
           If you install a MySQL-Max distribution that includes a server
-          named <command>mysqld-max</command>, then upgrade later to a
-          non-Max version of MySQL, <command>mysqld_safe</command> still
-          attempts to run the old <command>mysqld-max</command> server.
-          If you perform such an upgrade, you should remove the old
-          <command>mysqld-max</command> server manually to ensure that
-          <command>mysqld_safe</command> runs the new
+          named <command>mysqld-max</command>, and then upgrade later to
+          a non-Max version of MySQL, <command>mysqld_safe</command>
+          still attempts to run the old <command>mysqld-max</command>
+          server. If you perform such an upgrade, you should remove the
+          old <command>mysqld-max</command> server manually to ensure
+          that <command>mysqld_safe</command> runs the new
           <command>mysqld</command> server.
         </para>
       </listitem>
@@ -12138,7 +12014,7 @@
         <listitem>
           <para>
             If you are using replication, see
-            <xref linkend="replication-upgrade"/> for information on
+            <xref linkend="replication-upgrade"/>, for information on
             upgrading your replication setup.
           </para>
         </listitem>
@@ -12942,10 +12818,10 @@
 </programlisting>
 
       <para>
-        You can also store the result in a file, then transfer the file
-        to the target machine and load the file into the database there.
-        For example, you can dump a database to a file on the source
-        machine like this:
+        You can also store the result in a file, and then transfer the
+        file to the target machine and load the file into the database
+        there. For example, you can dump a database to a file on the
+        source machine like this:
       </para>
 
 <programlisting>
@@ -13082,8 +12958,8 @@
       use <command>mysqldump</command> to dump your tables before
       downgrading. After downgrading, reload the dump file using
       <command>mysql</command> or <literal>mysqlimport</literal> to
-      re-create your tables. See <xref linkend="upgrading-to-arch"/> for
-      examples.
+      re-create your tables. See <xref linkend="upgrading-to-arch"/>,
+      for examples.
     </para>
 
     <para>
@@ -13178,8 +13054,8 @@
       </orderedlist>
 
       <para>
-        If the preceding procedure fails, then you should be able to do
-        the following instead:
+        If the preceding procedure fails, you should be able to do the
+        following instead:
       </para>
 
       <orderedlist>
@@ -13266,7 +13142,7 @@
           encountered serious stability problems using MySQL with kernel
           2.2.14. If you are using this kernel, you should upgrade to
           2.2.19 (or newer) or to a 2.4 kernel. If you have a
-          multiple-CPU box, then you should seriously consider using 2.4
+          multiple-CPU box, you should seriously consider using 2.4
           because it gives you a significant speed boost. Your system
           should be more stable.
         </para>
@@ -13441,8 +13317,8 @@
           exceeding the 2GB limit, our binary is the best choice in most
           cases. After reading the following text, if you are in doubt
           about what to do, try our binary first to see whether it meets
-          your needs. If you discover that it is not good enough, then
-          you may want to try your own build. In that case, we would
+          your needs. If you discover that it is not good enough, you
+          may want to try your own build. In that case, we would
           appreciate a note about it so that we can build a better
           binary next time.
         </para>
@@ -13897,7 +13773,7 @@
         <para>
           Just do what the error message says. Add an extra underscore
           to the <literal>_P</literal> macro name that has only one
-          underscore, then try again.
+          underscore, and then try again.
         </para>
 
         <para>
@@ -13918,10 +13794,10 @@
         <para>
           If <command>mysqld</command> always dumps core when it starts,
           the problem may be that you have an old
-          <filename>/lib/libc.a</filename>. Try renaming it, then remove
-          <filename>sql/mysqld</filename> and do a new <command>make
-          install</command> and try again. This problem has been
-          reported on some Slackware installations.
+          <filename>/lib/libc.a</filename>. Try renaming it, and then
+          remove <filename>sql/mysqld</filename> and do a new
+          <command>make install</command> and try again. This problem
+          has been reported on some Slackware installations.
         </para>
 
         <para>
@@ -14942,7 +14818,7 @@
           it can't 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
+          <filename>config.cache</filename>, and then re-run
           <command>configure</command> with the
           <option>--with-mit-threads</option> option.
         </para>
@@ -16311,7 +16187,7 @@
 
         <para>
           To install in the default <filename>/usr/include</filename>
-          directory, log in as <literal>root</literal>, then
+          directory, log in as <literal>root</literal>, and then
           <literal>cd</literal> to the <filename>thread/src</filename>
           directory and run <command>make install</command>.
         </para>
@@ -17384,8 +17260,8 @@
 
       <para>
         If Perl reports that it can't find the
-        <filename>../mysql/mysql.so</filename> module, then the problem
-        is probably that Perl can't locate the shared library
+        <filename>../mysql/mysql.so</filename> module, the problem is
+        probably that Perl can't locate the shared library
         <filename>libmysqlclient.so</filename>.
       </para>
 

Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-5.0/introduction.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -2,12 +2,12 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities      SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <chapter id="introduction">
 
@@ -440,7 +440,7 @@
             <emphasis role="bold">Storage Engines</emphasis>: Storage
             engines added in MySQL 5.0 include
             <literal>ARCHIVE</literal> and <literal>FEDERATED</literal>.
-            See <xref linkend="archive-storage-engine"/> and
+            See <xref linkend="archive-storage-engine"/>, and
             <xref linkend="federated-storage-engine"/>.
           </para>
         </listitem>
@@ -467,8 +467,9 @@
         <listitem>
           <para>
             <emphasis role="bold">Triggers</emphasis>: MySQL 5.0 added
-            limited support for triggers. See <xref linkend="triggers"/>
-            and <xref linkend="ansi-diff-triggers"/>.
+            limited support for triggers. See
+            <xref linkend="triggers"/>, and
+            <xref linkend="ansi-diff-triggers"/>.
           </para>
         </listitem>
 
@@ -486,7 +487,7 @@
           <para>
             <emphasis role="bold">Views</emphasis>: MySQL 5.0 added
             support for named, updateable views. See
-            <xref linkend="views"/> and
+            <xref linkend="views"/>, and
             <xref linkend="ansi-diff-views"/>.
           </para>
         </listitem>
@@ -582,7 +583,7 @@
               <para>
                 These optimizations can be applied with any combination
                 of <literal>AND</literal> and <literal>OR</literal>
-                operators. See <xref linkend="nested-joins"/> and
+                operators. See <xref linkend="nested-joins"/>, and
                 <xref linkend="outer-join-simplification"/>.
               </para>
             </listitem>
@@ -684,7 +685,7 @@
                   </para>
 
                   <para>
-                    See <xref linkend="explain"/> for more information.
+                    See <xref linkend="explain"/>, for more information.
                   </para>
                 </listitem>
 
@@ -1577,7 +1578,7 @@
         <para>
           For MySQL versions older than 4.1, most subqueries can be
           rewritten using joins or other methods. See
-          <xref linkend="rewriting-subqueries"/> for examples that show
+          <xref linkend="rewriting-subqueries"/>, for examples that show
           how to do this.
         </para>
 

Modified: trunk/refman-5.0/preface.xml
===================================================================
--- trunk/refman-5.0/preface.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-5.0/preface.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <preface id="preface">
 

Modified: trunk/refman-5.0/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.0/using-mysql-programs.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-5.0/using-mysql-programs.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <chapter id="using-mysql-programs">
 
@@ -73,7 +73,7 @@
 
       <listitem>
         <para>
-          The MYSQL server and server startup scripts:
+          The MySQL server and server startup scripts:
         </para>
 
         <itemizedlist>
@@ -223,7 +223,7 @@
       that RPM distributions are more specialized. There is one RPM for
       the server, another for the client programs, and so forth. If you
       appear to be missing one or more programs, see
-      <xref linkend="installing"/> for information on types of
+      <xref linkend="installing"/>, for information on types of
       distributions and what they contain. It may be that you need to
       install something else.
     </para>
@@ -351,7 +351,7 @@
           In environment variables. These are useful for options that
           you want to apply each time the program runs, although in
           practice option files are used more commonly for this purpose.
-          (<xref linkend="multiple-unix-servers"/> discusses one
+          (<xref linkend="multiple-unix-servers"/>, discusses one
           situation in which environment variables can be very helpful.
           It describes a handy technique that uses such variables to
           specify the TCP/IP port number and Unix socket file for both
@@ -480,7 +480,7 @@
     the use of options that might be present in one version of MySQL but 
     not another. Those capabilities are discussed in this section. 
     Another change pertains to the way you use options to set program 
-    variables. <xref linkend="program-variables"/> discusses that topic 
+    variables. <xref linkend="program-variables"/>, discusses that topic 
     further.
    </para>
 -->
@@ -557,11 +557,11 @@
         <option>--execute</option> option, which can be used to pass SQL
         statements to the server. The statements must be surrounded by
         (single or double) quotation marks. (However, if you wish to use
-        quoted values within the query, then you should use double
-        quotes for the query, and single quotes for any quoted values
-        within the query.) When this option is used, the statements are
-        executed, and then <command>mysql</command> exits to the command
-        shell immediately thereafter.
+        quoted values within the query, you should use double quotes for
+        the query, and single quotes for any quoted values within the
+        query.) When this option is used, the statements are executed,
+        and then <command>mysql</command> exits to the command shell
+        immediately thereafter.
       </para>
 
       <para>
@@ -621,7 +621,7 @@
         The <option>-e</option> option may also be used to pass commands
         in an analogous fashion to the <command>ndb_mgm</command>
         management client for MySQL Cluster. See
-        <xref linkend="multi-shutdown-restart"/> for an example.
+        <xref linkend="multi-shutdown-restart"/>, for an example.
       </para>
 
     </section>
@@ -794,7 +794,7 @@
         <replaceable>DATADIR</replaceable>. Otherwise, if
         <literal>MYSQL_HOME</literal> is not set and there is no
         <filename>my.cnf</filename> in
-        <replaceable>DATADIR</replaceable>, then
+        <replaceable>DATADIR</replaceable>,
         <literal>mysqld_safe</literal> sets
         <literal>MYSQL_HOME</literal> to
         <replaceable>BASEDIR</replaceable>.
@@ -930,7 +930,7 @@
      on the command line. Spaces are allowed around the first
      &lsquo;<literal>=</literal>&rsquo; character but not around the second. This
      syntax is deprecated as of MySQL 4.0. See
-     <xref linkend="program-variables"/> for more information on setting
+     <xref linkend="program-variables"/>, for more information on setting
      program variables.
     </para></listitem>
 -->
@@ -1119,7 +1119,7 @@
         <filename>support-files</filename> directory under your MySQL
         installation directory. On Windows the sample option files may
         also be located in the MySQL installation directory (see earlier
-        in this section or <xref linkend="installing"/> if you do not
+        in this section or <xref linkend="installing"/>, if you do not
         know where this is). Currently there are sample option files for
         small, medium, large, and very large systems. To experiment with
         one of these files, copy it to <filename>C:\my.cnf</filename> on
@@ -1304,7 +1304,7 @@
       </para>
 
       <para>
-        <xref linkend="environment-variables"/> lists all environment
+        <xref linkend="environment-variables"/>, lists all environment
         variables that affect MySQL program operation.
       </para>
 

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-5.1/installing.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <chapter id="installing">
 
@@ -34,7 +34,7 @@
         supported.</emphasis> Please note that not all supported systems
         are equally suitable for running MySQL. On some pltforms it is
         much more robust and efficient than others. See
-        <xref linkend="which-os"/> for details.
+        <xref linkend="which-os"/>, for details.
       </para>
     </listitem>
 
@@ -77,14 +77,14 @@
         <emphasis role="bold">Note</emphasis>: If you plan to upgrade an
         existing version of MySQL to a newer version rather than
         installing MySQL for the first time, see
-        <xref linkend="upgrade"/> for information about upgrade
+        <xref linkend="upgrade"/>, for information about upgrade
         procedures and about issues that you should consider before
         upgrading.
       </para>
 
       <para>
         If you encounter installation difficulties, see
-        <xref linkend="operating-system-specific-notes"/> for
+        <xref linkend="operating-system-specific-notes"/>, for
         information on solving problems for particular platforms.
       </para>
     </listitem>
@@ -798,7 +798,7 @@
               The <filename>mysql-test</filename> directory contains an
               extensive set of test cases. We run these tests for
               virtually every server binary. See
-              <xref linkend="mysql-test-suite"/> for more information
+              <xref linkend="mysql-test-suite"/>, for more information
               about this test suite.
             </para>
           </listitem>
@@ -2674,13 +2674,13 @@
       format of the respective platform. (This is also known as
       performing a <quote>binary install</quote>.) However, binary
       distributions of MySQL are available for many other platforms as
-      well. See <xref linkend="installing-binary"/> for generic
+      well. See <xref linkend="installing-binary"/>, for generic
       installation instructions for these packages that apply to all
       platforms.
     </para>
 
     <para>
-      See <xref linkend="general-installation-issues"/> for more
+      See <xref linkend="general-installation-issues"/>, for more
       information on what other binary distributions are available and
       how to obtain them.
     </para>
@@ -2990,7 +2990,7 @@
           previous versions of MySQL need to shut down and remove their
           existing MySQL installations manually before installing MySQL
           with the MySQL Installation Wizard. See
-          <xref linkend="mysql-install-wizard-upgrading"/> for more
+          <xref linkend="mysql-install-wizard-upgrading"/>, for more
           information on upgrading from a previous version.
         </para>
 
@@ -3152,8 +3152,8 @@
           The <emphasis role="bold">Custom</emphasis> installation type
           gives you complete control over which packages you wish to
           install and the installation path that is used. See
-          <xref linkend="mysql-install-wizard-custom-install"/> for more
-          information on performing a custom install.
+          <xref linkend="mysql-install-wizard-custom-install"/>, for
+          more information on performing a custom install.
         </para>
 
         <para>
@@ -3165,7 +3165,7 @@
           <emphasis role="bold">Custom</emphasis> installation type and
           click the <guibutton>Next</guibutton> button, you advance to
           the custom installation dialog, described in
-          <xref linkend="mysql-install-wizard-custom-install"/>
+          <xref linkend="mysql-install-wizard-custom-install"/>.
         </para>
 
         <remark>
@@ -3328,9 +3328,8 @@
 
           <listitem>
             <para>
-              <guimenuitem>MySQL Command Line Client</guimenuitem>
-
-              : This is a shortcut to the <command>mysql</command>
+              <guimenuitem>MySQL Command Line Client</guimenuitem> :
+              This is a shortcut to the <command>mysql</command>
               command-line client and is configured to connect as the
               <literal>root</literal> user. The shortcut prompts for a
               <literal>root</literal> user password when connecting.
@@ -3339,22 +3338,21 @@
 
           <listitem>
             <para>
-              <guimenuitem>MySQL Server Instance Config Wizard</guimenuitem>
-
-              : This is a shortcut to the MySQL Configuration Wizard.
-              Use this shortcut to configure a newly installed server,
-              or to re-configure an existing server.
+              <guimenuitem>MySQL Server Instance Config
+              Wizard</guimenuitem> : This is a shortcut to the MySQL
+              Configuration Wizard. Use this shortcut to configure a
+              newly installed server, or to re-configure an existing
+              server.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <guimenuitem>MySQL Documentation</guimenuitem>
-
-              : This is a link to the MySQL server documentation that is
-              stored locally in the MySQL server installation directory.
-              This option is not available when the MySQL server is
-              installed using the Essentials installation package.
+              <guimenuitem>MySQL Documentation</guimenuitem> : This is a
+              link to the MySQL server documentation that is stored
+              locally in the MySQL server installation directory. This
+              option is not available when the MySQL server is installed
+              using the Essentials installation package.
             </para>
           </listitem>
 
@@ -3496,12 +3494,10 @@
           The MySQL Configuration Wizard is typically launched from the
           MySQL Installation Wizard, as the MySQL Installation Wizard
           exits. You can also launch the MySQL Configuration Wizard by
-          clicking the
-
-          <guimenuitem>MySQL Server Instance Config Wizard</guimenuitem>
-
-          entry in the <guisubmenu>MySQL</guisubmenu> section of the
-          Windows <guimenu>Start</guimenu> menu.
+          clicking the <guimenuitem>MySQL Server Instance Config
+          Wizard</guimenuitem> entry in the
+          <guisubmenu>MySQL</guisubmenu> section of the Windows
+          <guimenu>Start</guimenu> menu.
         </para>
 
         <para>
@@ -3530,42 +3526,31 @@
 
         <para>
           To reconfigure an existing server, choose the
-
-          <guimenuitem>Re-configure Instance</guimenuitem>
-
-          option and click the <guibutton>Next</guibutton> button. Your
-          existing <filename>my.ini</filename> file is renamed to
+          <guimenuitem>Re-configure Instance</guimenuitem> option and
+          click the <guibutton>Next</guibutton> button. Your existing
+          <filename>my.ini</filename> file is renamed to
           <filename>my<replaceable>timestamp</replaceable>.ini.bak</filename>,
           where <replaceable>timestamp</replaceable> is the date and
           time the existing <filename>my.ini</filename> file was
           created. To remove the existing server instance, choose the
-
-          <guimenuitem>Remove
-     Instance</guimenuitem>
-
-          option and click the <guibutton>Next</guibutton> button.
+          <guimenuitem>Remove Instance</guimenuitem> option and click
+          the <guibutton>Next</guibutton> button.
         </para>
 
         <para>
-          If you choose the
-
-          <guimenuitem>Remove Instance</guimenuitem>
-
+          If you choose the <guimenuitem>Remove Instance</guimenuitem>
           option, you advance to a confirmation window. Click the
           <guibutton>Execute</guibutton> button: the MySQL Configuration
-          Wizard stops and removes the MySQL service, then deletes the
-          <filename>my.ini</filename> file. The server installation and
-          its <filename>data</filename> folder are not removed.
+          Wizard stops and removes the MySQL service, and then deletes
+          the <filename>my.ini</filename> file. The server installation
+          and its <filename>data</filename> folder are not removed.
         </para>
 
         <para>
-          If you choose the
-
-          <guimenuitem>Re-configure Instance</guimenuitem>
-
-          option, you advance to the <guimenu>Configuration
-          Type</guimenu> dialog where you can choose the type of
-          installation you wish to configure.
+          If you choose the <guimenuitem>Re-configure
+          Instance</guimenuitem> option, you advance to the
+          <guimenu>Configuration Type</guimenu> dialog where you can
+          choose the type of installation you wish to configure.
         </para>
 
         <remark>
@@ -3580,94 +3565,51 @@
 
         <para>
           When you start the MySQL Configuration Wizard for a new MySQL
-          installation, or choose the
-
-          <guimenuitem>Re-configure 
-     Instance</guimenuitem>
-
-          option for an existing installation, you advance to the
-          <guimenu>Configuration Type</guimenu> dialog.
+          installation, or choose the <guimenuitem>Re-configure
+          Instance</guimenuitem> option for an existing installation,
+          you advance to the <guimenu>Configuration Type</guimenu>
+          dialog.
         </para>
 
         <para>
           There are two configuration types available:
-
-          <guimenuitem>Detailed Configuration</guimenuitem>
-
-          and
-
-          <guimenuitem>Standard Configuration</guimenuitem>
-
-          . The
-
-          <guimenuitem>Standard Configuration</guimenuitem>
-
-          option is intended for new users who want to get started with
-          MySQL quickly without having to make many decisions in regards
-          to server configuration. The
-
-          <guimenuitem>Detailed Configuration</guimenuitem>
-
-          option is intended for advanced users who want more
-          fine-grained control over server configuration.
+          <guimenuitem>Detailed Configuration</guimenuitem> and
+          <guimenuitem>Standard Configuration</guimenuitem> . The
+          <guimenuitem>Standard Configuration</guimenuitem> option is
+          intended for new users who want to get started with MySQL
+          quickly without having to make many decisions in regards to
+          server configuration. The <guimenuitem>Detailed
+          Configuration</guimenuitem> option is intended for advanced
+          users who want more fine-grained control over server
+          configuration.
         </para>
 
         <para>
           If you are new to MySQL and need a server configured as a
-          single-user developer machine the
-
-          <guimenuitem>Standard 
-        Configuration</guimenuitem>
-
-          should suit your needs. Choosing the
-
-          <guimenuitem>Standard Configuration</guimenuitem>
-
-          option causes the MySQL Configuration Wizard to set all
-          configuration options automatically with the exception of
-
-          <guimenuitem>Service 
-        Options</guimenuitem>
-
-          and
-
-          <guimenuitem>Security 
-        Options</guimenuitem>
-
-          .
+          single-user developer machine the <guimenuitem>Standard
+          Configuration</guimenuitem> should suit your needs. Choosing
+          the <guimenuitem>Standard Configuration</guimenuitem> option
+          causes the MySQL Configuration Wizard to set all configuration
+          options automatically with the exception of
+          <guimenuitem>Service Options</guimenuitem> and
+          <guimenuitem>Security Options</guimenuitem> .
         </para>
 
         <para>
-          The
-
-          <guimenuitem>Standard Configuration</guimenuitem>
-
-          sets options that may be incompatible with systems where there
-          are existing MySQL installations. If you have an existing
-          MySQL installation on your system in addition to the
-          installation you wish to configure, the
-
-          <guimenuitem>Detailed Configuration</guimenuitem>
-
-          option is recommended.
+          The <guimenuitem>Standard Configuration</guimenuitem> sets
+          options that may be incompatible with systems where there are
+          existing MySQL installations. If you have an existing MySQL
+          installation on your system in addition to the installation
+          you wish to configure, the <guimenuitem>Detailed
+          Configuration</guimenuitem> option is recommended.
         </para>
 
         <para>
-          To complete the
-
-          <guimenuitem>Standard Configuration</guimenuitem>
-
-          , please refer to the sections on
-
-          <guimenuitem>Service 
-        Options</guimenuitem>
-
-          and
-
-          <guimenuitem>Security 
-        Options</guimenuitem>
-
-          , at <xref linkend="mysql-config-wizard-service"/> and
+          To complete the <guimenuitem>Standard
+          Configuration</guimenuitem> , please refer to the sections on
+          <guimenuitem>Service Options</guimenuitem> and
+          <guimenuitem>Security Options</guimenuitem> , at
+          <xref linkend="mysql-config-wizard-service"/>, and
           <xref linkend="mysql-config-wizard-security"/>, respectively.
         </para>
 
@@ -3696,32 +3638,27 @@
 
           <listitem>
             <para>
-              <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.
+              <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>
-              <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 moderate 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 moderate portion of the system resources.
             </para>
           </listitem>
 
           <listitem>
             <para>
               <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
@@ -3754,10 +3691,9 @@
 
           <listitem>
             <para>
-              <guimenuitem>Multifunctional Database</guimenuitem>
-
-              : This option enables both the <literal>InnoDB</literal>
-              and <literal>MyISAM</literal> storage engines and divides
+              <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 that use both storage engines on a
               regular basis.
@@ -3766,22 +3702,19 @@
 
           <listitem>
             <para>
-              <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 that use <literal>InnoDB</literal>
-              almost exclusively and make only minimal use of
-              <literal>MyISAM</literal>.
+              <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 that
+              use <literal>InnoDB</literal> almost exclusively and make
+              only minimal use of <literal>MyISAM</literal>.
             </para>
           </listitem>
 
           <listitem>
             <para>
               <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.
@@ -3851,34 +3784,31 @@
 
           <listitem>
             <para>
-              <guimenuitem>Decision Support (DSS)/OLAP</guimenuitem>
-
-              : Choose this option if your server does not require a
-              large number of concurrent connections. The maximum number
-              of connections is set at 100, with an average of 20
+              <guimenuitem>Decision Support (DSS)/OLAP</guimenuitem> :
+              Choose this option if your 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>
           </listitem>
 
           <listitem>
             <para>
-              <guimenuitem>Online Transaction Processing (OLTP)</guimenuitem>
-
-              : 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 your server
+              requires a large number of concurrent connections. The
+              maximum number of connections is set at 500.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <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 enter 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 enter the
+              maximum number of connections into the drop-down box if
+              the number you desire is not listed.
             </para>
           </listitem>
 
@@ -3902,12 +3832,8 @@
 
         <para>
           TCP/IP networking is enabled by default. To disable TCP/IP
-          networking, uncheck the box next to the
-
-          <guimenuitem>Enable TCP/IP
-     Networking</guimenuitem>
-
-          option.
+          networking, uncheck the box next to the <guimenuitem>Enable
+          TCP/IP Networking</guimenuitem> option.
         </para>
 
         <para>
@@ -3951,34 +3877,32 @@
 
           <listitem>
             <para>
-              <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.
+              <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>
-              <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.
+              <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>
               <guimenuitem>Manual 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.
+              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.
             </para>
           </listitem>
 
@@ -4006,23 +3930,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, uncheck 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 entering a
-          new service name into the drop-down box.
+          service, uncheck 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 entering 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, uncheck the box next to the
-
-          <guimenuitem>Launch the MySQL Server Automatically</guimenuitem>
-
-          option.
+          <guimenuitem>Launch the MySQL Server
+          Automatically</guimenuitem> option.
         </para>
 
         <remark>
@@ -4041,52 +3960,32 @@
           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, uncheck the
-          box next to the
-
-          <guimenuitem>Modify Security 
-     Settings</guimenuitem>
-
-          option.
+          box next to the <guimenuitem>Modify Security
+          Settings</guimenuitem> option.
         </para>
 
         <para>
           To set the <literal>root</literal> password, enter the desired
-          password into both the
-
-          <guimenuitem>New root password</guimenuitem>
-
-          and
-
-          <guimenuitem>Confirm</guimenuitem>
-
+          password into both the <guimenuitem>New root
+          password</guimenuitem> and <guimenuitem>Confirm</guimenuitem>
           boxes. If you are reconfiguring an existing server, you also
           need to enter the existing <literal>root</literal> password
-          into the
-
-          <guimenuitem>Current root password</guimenuitem>
-
-          box.
+          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
-
-          <guimenuitem>Root may only connect from 
-     localhost</guimenuitem>
-
-          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
-
-          <guimenuitem>Create An Anonymous Account</guimenuitem>
-
-          option. Creating an anonymous account can decrease server
-          security and cause login and permission difficulties. For this
-          reason, it is not recommended.
+          <guimenuitem>Create An Anonymous Account</guimenuitem> option.
+          Creating an anonymous account can decrease server security and
+          cause login and permission difficulties. For this reason, it
+          is not recommended.
         </para>
 
         <remark>
@@ -4288,7 +4187,7 @@
         <listitem>
           <para>
             If you are upgrading from a previous version please refer to
-            <xref linkend="windows-upgrading"/> before beginning the
+            <xref linkend="windows-upgrading"/>, before beginning the
             upgrade process.
           </para>
         </listitem>
@@ -4384,10 +4283,10 @@
 
       <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 <filename>C:</filename> is not the boot
-        drive, your only option is to use the
+        file, and 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 <filename>C:</filename> 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.
       </para>
@@ -4841,15 +4740,11 @@
       <para>
         The <command>Services</command> utility (the Windows
         <command>Service Control Manager</command>) can be found in the
-        Windows Control Panel (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 the command line. This
-        prevents a number of errors.
+        Windows Control Panel (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 the
+        command line. This prevents a number of errors.
       </para>
 
       <para>
@@ -4864,10 +4759,10 @@
 
       <para>
         <emphasis role="bold">Note</emphasis>: If the MySQL
-        <literal>root</literal> user account has a password, then you
-        need to invoke this command as <command>C:\Program
-        Files\MySQL\MySQL Server &current-series;\bin\mysqladmin -u root
-        -p shutdown</command> and supply the password when prompted.
+        <literal>root</literal> user account has a password, you need to
+        invoke this command as <command>C:\Program Files\MySQL\MySQL
+        Server &current-series;\bin\mysqladmin -u root -p
+        shutdown</command> and supply the password when prompted.
       </para>
 
       <para>
@@ -4918,19 +4813,14 @@
             <guiicon>My 
               Computer</guiicon>
 
-            icon, and select
-
-            <guimenuitem>Properties</guimenuitem>
+            icon, and select <guimenuitem>Properties</guimenuitem>
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Next select, the
-
-            <guimenuitem>Advanced</guimenuitem>
-
-            tab from the <guimenu>System Properties</guimenu> menu that
+            Next select, the <guimenuitem>Advanced</guimenuitem> tab
+            from the <guimenu>System Properties</guimenu> menu that
             appears, and click the <guibutton>Environment
             Variables</guibutton> button.
           </para>
@@ -4939,12 +4829,9 @@
         <listitem>
           <para>
             Under <guilabel>System Variables</guilabel>, select
-
-            <guimenuitem>Path</guimenuitem>
-
-            , and then click the <guibutton>Edit</guibutton> button. The
-            <guimenu>Edit System Variable</guimenu> dialogue should
-            appear.
+            <guimenuitem>Path</guimenuitem> , and then click the
+            <guibutton>Edit</guibutton> button. The <guimenu>Edit System
+            Variable</guimenu> dialogue should appear.
           </para>
         </listitem>
 
@@ -5179,7 +5066,7 @@
       </para>
 
       <para>
-        Please see <xref linkend="windows-troubleshooting"/> if you
+        Please see <xref linkend="windows-troubleshooting"/>, if you
         encounter difficulties during installation.
       </para>
 
@@ -5511,7 +5398,7 @@
 
         <listitem>
           <para>
-            Refer to <xref linkend="upgrade"/> for additional
+            Refer to <xref linkend="upgrade"/>, for additional
             information on upgrading MySQL that is not specific to
             Windows.
           </para>
@@ -6168,7 +6055,7 @@
       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
-      <xref linkend="automatic-start"/> for more information on how
+      <xref linkend="automatic-start"/>, for more information on how
       MySQL can be started automatically on system startup.
     </para>
 
@@ -6831,7 +6718,7 @@
       that are provided for various platforms in the form of compressed
       <command>tar</command> files (files with a
       <literal>.tar.gz</literal> extension). See
-      <xref linkend="mysql-binaries"/> for a detailed list.
+      <xref linkend="mysql-binaries"/>, for a detailed list.
     </para>
 
     <para>
@@ -6852,8 +6739,8 @@
     <para>
       In addition to these generic packages, we also offer binaries in
       platform-specific package formats for selected platforms. See
-      <xref linkend="quick-standard-installation"/> for more information
-      on how to install these.
+      <xref linkend="quick-standard-installation"/>, for more
+      information on how to install these.
     </para>
 
     <para>
@@ -7525,7 +7412,7 @@
 
           <para>
             If the compile fails, see
-            <xref linkend="compilation-problems"/> for help.
+            <xref linkend="compilation-problems"/>, for help.
           </para>
         </listitem>
 
@@ -7560,7 +7447,7 @@
             <literal>#</literal> character before the option lines that
             start with <literal>innodb_...</literal>, and modify the
             option values to be what you want. See
-            <xref linkend="option-files"/> and
+            <xref linkend="option-files"/>, and
             <xref linkend="innodb-configuration"/>.
           </para>
         </listitem>
@@ -8152,8 +8039,8 @@
             --set-character-set=<replaceable>charset</replaceable></command>
             <emphasis>on every table</emphasis>. Your indexes may be
             sorted incorrectly otherwise. (This can happen if you
-            install MySQL, create some tables, then reconfigure MySQL to
-            use a different character set and reinstall it.)
+            install MySQL, create some tables, and then reconfigure
+            MySQL to use a different character set and reinstall it.)
           </para>
 
           <para>
@@ -8519,7 +8406,7 @@
             command lines if you to not require
             <literal>InnoDB</literal> or <literal>BDB</literal> support.
           </para>
-          
+
           <para>
             <emphasis role="bold">Note</emphasis>: Beginning with MySQL
             5.1, code specific to storage engines has been moved under a
@@ -8527,7 +8414,7 @@
             <literal>InnoDB</literal> code is now found in
             <filename>storage/innobase</filename> and
             <literal>NDBCluster</literal> code is in
-            <filename>storage/ndb</filename>. 
+            <filename>storage/ndb</filename>.
           </para>
 
           <para>
@@ -8600,7 +8487,7 @@
             <literal>ChangeSet</literal> descriptions listed there. To
             examine a particular changeset, you would have to use the
             <command>sfioball</command> command to extract two
-            particular revisions of the source tree, then use an
+            particular revisions of the source tree, and then use an
             external <command>diff</command> command to compare them. If
             you see some funny diffs or code that you have a question
             about, do not hesitate to send email to the MySQL
@@ -8661,7 +8548,7 @@
         All MySQL programs compile cleanly for us with no warnings on
         Solaris or Linux using <command>gcc</command>. On other systems,
         warnings may occur due to differences in system include files.
-        See <xref linkend="mit-pthreads"/> for warnings that may occur
+        See <xref linkend="mit-pthreads"/>, for warnings that may occur
         when using MIT-pthreads. For other problems, check the following
         list.
       </para>
@@ -9070,7 +8957,7 @@
           <para>
             If you need to debug <command>mysqld</command> or a MySQL
             client, run <command>configure</command> with the
-            <option>--with-debug</option> option, then recompile and
+            <option>--with-debug</option> option, and then recompile and
             link your clients with the new client library. See
             <xref linkend="debugging-client"/>.
           </para>
@@ -9394,7 +9281,7 @@
             <listitem>
               <para>
                 BitKeeper 3.0 installed on that system. See
-                <xref linkend="installing-source-tree"/> for
+                <xref linkend="installing-source-tree"/>, for
                 instructions how to download and install BitKeeper.
               </para>
             </listitem>
@@ -9460,11 +9347,7 @@
           <listitem>
             <para>
               From the <guimenu>File menu</guimenu>, select
-
-              <guimenuitem>Open
-      Workspace</guimenuitem>
-
-              .
+              <guimenuitem>Open Workspace</guimenuitem> .
             </para>
           </listitem>
 
@@ -9484,12 +9367,9 @@
 
           <listitem>
             <para>
-              Click over the screen selecting
-
-              <guimenuitem>mysqld - Win32
-      Debug</guimenuitem>
-
-              and click <guibutton>OK</guibutton>.
+              Click over the screen selecting <guimenuitem>mysqld -
+              Win32 Debug</guimenuitem> and click
+              <guibutton>OK</guibutton>.
             </para>
           </listitem>
 
@@ -9520,11 +9400,8 @@
               <filename>client_release</filename> and
               <filename>lib_release</filename> directories. Note that if
               you want to build both debug and release versions, you can
-              select the
-
-              <guimenuitem>Build All</guimenuitem>
-
-              option from the <guimenu>Build</guimenu> menu.
+              select the <guimenuitem>Build All</guimenuitem> option
+              from the <guimenu>Build</guimenu> menu.
             </para>
           </listitem>
 
@@ -9913,16 +9790,16 @@
       are specific to Windows systems and to Unix systems. Another
       section, <xref linkend="starting-server"/>, applies to all
       platforms; it describes what to do if you have trouble getting the
-      server to start. <xref linkend="default-privileges"/> also applies
-      to all platforms. You should follow its instructions to make sure
-      that you have properly protected your MySQL accounts by assigning
-      passwords to them.
+      server to start. <xref linkend="default-privileges"/>, also
+      applies to all platforms. You should follow its instructions to
+      make sure that you have properly protected your MySQL accounts by
+      assigning passwords to them.
     </para>
 
     <para>
       When you are ready to create additional user accounts, you can
       find information on the MySQL access control system and account
-      management in <xref linkend="privilege-system"/> and
+      management in <xref linkend="privilege-system"/>, and
       <xref linkend="user-account-management"/>.
     </para>
 
@@ -9948,10 +9825,10 @@
         Before setting up passwords, you might want to try running some
         client programs to make sure that you can connect to the server
         and that it is operating properly. Make sure the server is
-        running (see <xref linkend="windows-server-first-start"/>), then
-        issue the following commands to verify that you can retrieve
-        information from the server. The output should be similar to
-        what is shown here:
+        running (see <xref linkend="windows-server-first-start"/>), and
+        then issue the following commands to verify that you can
+        retrieve information from the server. The output should be
+        similar to what is shown here:
       </para>
 
 <programlisting>
@@ -10167,7 +10044,7 @@
             <literal>host</literal>, <literal>tables_priv</literal>,
             <literal>columns_priv</literal>, and
             <literal>func</literal>, as well as others. See
-            <xref linkend="privilege-system"/> for a complete listing
+            <xref linkend="privilege-system"/>, for a complete listing
             and description of these.
           </para>
 
@@ -10643,11 +10520,10 @@
 
             <para>
               This indicates that the server is running, in which case
-              the grant tables have probably been created. If so, then
-              there is no need to run
-              <command>mysql_install_db</command> at all because it
-              needs to be run only once (when you install MySQL the
-              first time).
+              the grant tables have probably been created. If so, there
+              is no need to run <command>mysql_install_db</command> at
+              all because it needs to be run only once (when you install
+              MySQL the first time).
             </para>
           </listitem>
 
@@ -10848,7 +10724,7 @@
               package to enable the automatic startup of MySQL on system
               startup. The Startup Item starts the server by invoking
               <command>mysql.server</command>. See
-              <xref linkend="mac-os-x-installation"/> for details.
+              <xref linkend="mac-os-x-installation"/>, for details.
             </para>
           </listitem>
 
@@ -10910,7 +10786,7 @@
           the <command>mysql.server</command> script is installed in the
           <filename>/etc/init.d</filename> directory with the name
           <filename>mysql</filename>. You need not install it manually.
-          See <xref linkend="linux-rpm"/> for more information on the
+          See <xref linkend="linux-rpm"/>, for more information on the
           Linux RPM packages.
         </para>
 
@@ -11370,9 +11246,9 @@
           <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 <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>
+          with <option>--bdb-no-recover</option>. If that helps, you
+          should remove all <literal>BDB</literal> log files from the
+          data directory and try starting <command>mysqld</command>
           again without the <option>--bdb-no-recover</option> option.
         </para>
 
@@ -11921,10 +11797,10 @@
           about features that are new or different in MySQL
           &current-series; as opposed to those found in MySQL
           &previous-series;. If you wish to upgrade from a release
-          series previous to MySQL &previous-series;, then you should
-          upgrade to each next release series in turn until you have
-          reached MySQL &previous-series;, then proceed with the upgrade
-          to MySQL &current-series;. For information on upgrading from
+          series previous to MySQL &previous-series;, you should upgrade
+          to each next release series in turn until you have reached
+          MySQL &previous-series;, and then proceed with the upgrade to
+          MySQL &current-series;. For information on upgrading from
           MySQL &previous-series;, see the
           <citetitle>&title-refman-previous;</citetitle>; for ealrier
           releases, see the <citetitle>&title-refman-4-1;</citetitle>.
@@ -11963,7 +11839,7 @@
       <listitem>
         <para>
           If you are using replication, see
-          <xref linkend="replication-upgrade"/> for information on
+          <xref linkend="replication-upgrade"/>, for information on
           upgrading your replication setup.
         </para>
       </listitem>
@@ -11971,12 +11847,12 @@
       <listitem>
         <para>
           If you install a MySQL-Max distribution that includes a server
-          named <command>mysqld-max</command>, then upgrade later to a
-          non-Max version of MySQL, <command>mysqld_safe</command> still
-          attempts to run the old <command>mysqld-max</command> server.
-          If you perform such an upgrade, you should remove the old
-          <command>mysqld-max</command> server manually to ensure that
-          <command>mysqld_safe</command> runs the new
+          named <command>mysqld-max</command>, and then upgrade later to
+          a non-Max version of MySQL, <command>mysqld_safe</command>
+          still attempts to run the old <command>mysqld-max</command>
+          server. If you perform such an upgrade, you should remove the
+          old <command>mysqld-max</command> server manually to ensure
+          that <command>mysqld_safe</command> runs the new
           <command>mysqld</command> server.
         </para>
       </listitem>
@@ -12110,7 +11986,7 @@
         <listitem>
           <para>
             If you are using replication, see
-            <xref linkend="replication-upgrade"/> for information on
+            <xref linkend="replication-upgrade"/>, for information on
             upgrading your replication setup.
           </para>
         </listitem>
@@ -12350,10 +12226,10 @@
 </programlisting>
 
       <para>
-        You can also store the result in a file, then transfer the file
-        to the target machine and load the file into the database there.
-        For example, you can dump a database to a file on the source
-        machine like this:
+        You can also store the result in a file, and then transfer the
+        file to the target machine and load the file into the database
+        there. For example, you can dump a database to a file on the
+        source machine like this:
       </para>
 
 <programlisting>
@@ -12490,8 +12366,8 @@
       use <command>mysqldump</command> to dump your tables before
       downgrading. After downgrading, reload the dump file using
       <command>mysql</command> or <literal>mysqlimport</literal> to
-      re-create your tables. See <xref linkend="upgrading-to-arch"/> for
-      examples.
+      re-create your tables. See <xref linkend="upgrading-to-arch"/>,
+      for examples.
     </para>
 
     <para>
@@ -12578,7 +12454,7 @@
           encountered serious stability problems using MySQL with kernel
           2.2.14. If you are using this kernel, you should upgrade to
           2.2.19 (or newer) or to a 2.4 kernel. If you have a
-          multiple-CPU box, then you should seriously consider using 2.4
+          multiple-CPU box, you should seriously consider using 2.4
           because it gives you a significant speed boost. Your system
           should be more stable.
         </para>
@@ -12753,8 +12629,8 @@
           exceeding the 2GB limit, our binary is the best choice in most
           cases. After reading the following text, if you are in doubt
           about what to do, try our binary first to see whether it meets
-          your needs. If you discover that it is not good enough, then
-          you may want to try your own build. In that case, we would
+          your needs. If you discover that it is not good enough, you
+          may want to try your own build. In that case, we would
           appreciate a note about it so that we can build a better
           binary next time.
         </para>
@@ -13209,7 +13085,7 @@
         <para>
           Just do what the error message says. Add an extra underscore
           to the <literal>_P</literal> macro name that has only one
-          underscore, then try again.
+          underscore, and then try again.
         </para>
 
         <para>
@@ -13230,10 +13106,10 @@
         <para>
           If <command>mysqld</command> always dumps core when it starts,
           the problem may be that you have an old
-          <filename>/lib/libc.a</filename>. Try renaming it, then remove
-          <filename>sql/mysqld</filename> and do a new <command>make
-          install</command> and try again. This problem has been
-          reported on some Slackware installations.
+          <filename>/lib/libc.a</filename>. Try renaming it, and then
+          remove <filename>sql/mysqld</filename> and do a new
+          <command>make install</command> and try again. This problem
+          has been reported on some Slackware installations.
         </para>
 
         <para>
@@ -14254,7 +14130,7 @@
           it can't 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
+          <filename>config.cache</filename>, and then re-run
           <command>configure</command> with the
           <option>--with-mit-threads</option> option.
         </para>
@@ -15623,7 +15499,7 @@
 
         <para>
           To install in the default <filename>/usr/include</filename>
-          directory, log in as <literal>root</literal>, then
+          directory, log in as <literal>root</literal>, and then
           <literal>cd</literal> to the <filename>thread/src</filename>
           directory and run <command>make install</command>.
         </para>
@@ -16696,8 +16572,8 @@
 
       <para>
         If Perl reports that it can't find the
-        <filename>../mysql/mysql.so</filename> module, then the problem
-        is probably that Perl can't locate the shared library
+        <filename>../mysql/mysql.so</filename> module, the problem is
+        probably that Perl can't locate the shared library
         <filename>libmysqlclient.so</filename>.
       </para>
 

Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-5.1/introduction.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -2,12 +2,12 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities      SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <chapter id="introduction">
 
@@ -397,7 +397,7 @@
             table is created. In effect, different portions of a table
             are stored as separate tables in different locations, but
             from the user point of view, the partitioned table is still
-            a single table. See <xref linkend="partitioning"/> for
+            a single table. See <xref linkend="partitioning"/>, for
             further information on this functionality. (Author: Mikael
             Ronström)
           </para>
@@ -449,9 +449,9 @@
                   <literal>SET <replaceable>instance_name</replaceable>.
                   <replaceable>option_name</replaceable>=<replaceable>option_value</replaceable></literal>
                   sets an option to the specified value and writes it to
-                  the config file See <xref linkend="instance-manager"/>
-                  for more details on these new commands. (Author: Petr
-                  Chardin)
+                  the config file See
+                  <xref linkend="instance-manager"/>, for more details
+                  on these new commands. (Author: Petr Chardin)
                 </para>
               </listitem>
 
@@ -1332,7 +1332,7 @@
         <para>
           For MySQL versions older than 4.1, most subqueries can be
           rewritten using joins or other methods. See
-          <xref linkend="rewriting-subqueries"/> for examples that show
+          <xref linkend="rewriting-subqueries"/>, for examples that show
           how to do this.
         </para>
 
@@ -2188,8 +2188,8 @@
         more traditional fashion that is like other DBMSs that reject
         improper input. The SQL mode can be set at runtime, which
         enables individual clients to select the behavior most
-        appropriate for their requirements. See 
-        <xref linkend="server-sql-mode"/>. 
+        appropriate for their requirements. See
+        <xref linkend="server-sql-mode"/>.
       </para>
 
       <para>
@@ -2246,8 +2246,8 @@
         </para>
 
         <para>
-          Through MySQL 5.1, only <literal>InnoDB</literal> tables support
-          foreign keys. See
+          Through MySQL 5.1, only <literal>InnoDB</literal> tables
+          support foreign keys. See
           <xref linkend="innodb-foreign-key-constraints"/>. Foreign key
           support in <literal>MyISAM</literal> tables is scheduled for
           implementation in MySQL 5.2. See <xref linkend="roadmap"/>.

Modified: trunk/refman-5.1/preface.xml
===================================================================
--- trunk/refman-5.1/preface.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-5.1/preface.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <preface id="preface">
 

Modified: trunk/refman-5.1/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.1/using-mysql-programs.xml	2006-01-02 20:09:31 UTC (rev 641)
+++ trunk/refman-5.1/using-mysql-programs.xml	2006-01-03 03:33:34 UTC (rev 642)
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-    <!ENTITY % fixedchars.entities    SYSTEM "../refman-common/fixedchars.ent">
-    %fixedchars.entities;
-    <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
-    %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
-    %versions.entities;
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % title.entities       SYSTEM "../refman-common/titles.en.ent">
+  %title.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
 ]>
 <chapter id="using-mysql-programs">
 
@@ -73,7 +73,7 @@
 
       <listitem>
         <para>
-          The MYSQL server and server startup scripts:
+          The MySQL server and server startup scripts:
         </para>
 
         <itemizedlist>
@@ -223,7 +223,7 @@
       that RPM distributions are more specialized. There is one RPM for
       the server, another for the client programs, and so forth. If you
       appear to be missing one or more programs, see
-      <xref linkend="installing"/> for information on types of
+      <xref linkend="installing"/>, for information on types of
       distributions and what they contain. It may be that you need to
       install something else.
     </para>
@@ -351,7 +351,7 @@
           In environment variables. These are useful for options that
           you want to apply each time the program runs, although in
           practice option files are used more commonly for this purpose.
-          (<xref linkend="multiple-unix-servers"/> discusses one
+          (<xref linkend="multiple-unix-servers"/>, discusses one
           situation in which environment variables can be very helpful.
           It describes a handy technique that uses such variables to
           specify the TCP/IP port number and Unix socket file for both
@@ -480,7 +480,7 @@
     the use of options that might be present in one version of MySQL but 
     not another. Those capabilities are discussed in this section. 
     Another change pertains to the way you use options to set program 
-    variables. <xref linkend="program-variables"/> discusses that topic 
+    variables. <xref linkend="program-variables"/>, discusses that topic 
     further.
    </para>
 -->
@@ -557,11 +557,11 @@
         <option>--execute</option> option, which can be used to pass SQL
         statements to the server. The statements must be surrounded by
         (single or double) quotation marks. (However, if you wish to use
-        quoted values within the query, then you should use double
-        quotes for the query, and single quotes for any quoted values
-        within the query.) When this option is used, the statements are
-        executed, and then <command>mysql</command> exits to the command
-        shell immediately thereafter.
+        quoted values within the query, you should use double quotes for
+        the query, and single quotes for any quoted values within the
+        query.) When this option is used, the statements are executed,
+        and then <command>mysql</command> exits to the command shell
+        immediately thereafter.
       </para>
 
       <para>
@@ -621,7 +621,7 @@
         The <option>-e</option> option may also be used to pass commands
         in an analogous fashion to the <command>ndb_mgm</command>
         management client for MySQL Cluster. See
-        <xref linkend="multi-shutdown-restart"/> for an example.
+        <xref linkend="multi-shutdown-restart"/>, for an example.
       </para>
 
     </section>
@@ -793,7 +793,7 @@
         <replaceable>DATADIR</replaceable>. Otherwise, if
         <literal>MYSQL_HOME</literal> is not set and there is no
         <filename>my.cnf</filename> in
-        <replaceable>DATADIR</replaceable>, then
+        <replaceable>DATADIR</replaceable>,
         <literal>mysqld_safe</literal> sets
         <literal>MYSQL_HOME</literal> to
         <replaceable>BASEDIR</replaceable>.
@@ -929,7 +929,7 @@
      on the command line. Spaces are allowed around the first
      &lsquo;<literal>=</literal>&rsquo; character but not around the second. This
      syntax is deprecated as of MySQL 4.0. See
-     <xref linkend="program-variables"/> for more information on setting
+     <xref linkend="program-variables"/>, for more information on setting
      program variables.
     </para></listitem>
 -->
@@ -1118,7 +1118,7 @@
         <filename>support-files</filename> directory under your MySQL
         installation directory. On Windows the sample option files may
         also be located in the MySQL installation directory (see earlier
-        in this section or <xref linkend="installing"/> if you do not
+        in this section or <xref linkend="installing"/>, if you do not
         know where this is). Currently there are sample option files for
         small, medium, large, and very large systems. To experiment with
         one of these files, copy it to <filename>C:\my.cnf</filename> on
@@ -1303,7 +1303,7 @@
       </para>
 
       <para>
-        <xref linkend="environment-variables"/> lists all environment
+        <xref linkend="environment-variables"/>, lists all environment
         variables that affect MySQL program operation.
       </para>
 

Thread
svn commit - mysqldoc@docsrva: r642 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul3 Jan