List:Commits« Previous MessageNext Message »
From:paul Date:January 30 2006 8:36pm
Subject:svn commit - mysqldoc@docsrva: r1136 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-30 21:36:24 +0100 (Mon, 30 Jan 2006)
New Revision: 1136

Log:
 r2715@kite-hub:  paul | 2006-01-30 14:35:28 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/custom-engine.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-common/titles.en.ent


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

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-30 20:35:42 UTC (rev 1135)
+++ trunk/refman-4.1/installing.xml	2006-01-30 20:36:24 UTC (rev 1136)
@@ -3011,8 +3011,8 @@
         <para>
           The MySQL Installation Wizard is the standard installer for
           all MySQL server distributions, version 4.1.5 and higher.
-          Users of previous versions of MySQL need to manually shut down
-          and remove their existing MySQL installations before
+          Users of 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
           information on upgrading from a previous version.
@@ -3074,11 +3074,11 @@
 
         <para>
           The process for starting the wizard depends on the contents of
-          the install package you download. If there is a
-          <literal>setup.exe</literal> file present, double-click it to
-          start the install process. If there is a
-          <literal>.msi</literal> file present, double-click it to start
-          the install process.
+          the installation package you download. If there is a
+          <filename>setup.exe</filename> file present, double-click it
+          to start the installation process. If there is a
+          <filename>.msi</filename> file present, double-click it to
+          start the installation process.
         </para>
 
         <remark>
@@ -3092,43 +3092,46 @@
         <title>&title-mysql-install-wizard-install-type;</title>
 
         <para>
-          There are up three installation types available:
-          <literal>Typical</literal>, <literal>Complete</literal>, and
-          <literal>Custom</literal>.
+          There are three installation types available:
+          <emphasis role="bold">Typical</emphasis>,
+          <emphasis role="bold">Complete</emphasis>, and
+          <emphasis role="bold">Custom</emphasis>.
         </para>
 
         <para>
-          The <literal>Typical</literal> installation type installs the
-          MySQL server, the <command>mysql</command> command-line
-          client, and the command-line utilities. The command-line
-          clients and utilities include <command>mysqldump</command>,
-          <command>myisamchk</command>, and several other tools to help
-          you manage the MySQL server.
+          The <emphasis role="bold">Typical</emphasis> installation type
+          installs the MySQL server, the <command>mysql</command>
+          command-line client, and the command-line utilities. The
+          command-line clients and utilities include
+          <command>mysqldump</command>, <command>myisamchk</command>,
+          and several other tools to help you manage the MySQL server.
         </para>
 
         <para>
-          The <literal>Complete</literal> installation type installs all
-          components included in the installation package. The full
-          installation package includes components such as the embedded
-          server library, the benchmark suite, support scripts, and
-          documentation.
+          The <emphasis role="bold">Complete</emphasis> installation
+          type installs all components included in the installation
+          package. The full installation package includes components
+          such as the embedded server library, the benchmark suite,
+          support scripts, and documentation.
         </para>
 
         <para>
-          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
+          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.
         </para>
 
         <para>
-          If you choose the <literal>Typical</literal> or
-          <literal>Complete</literal> installation types and click the
-          Next button, you advance to the confirmation screen to confirm
-          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
+          If you choose the <emphasis role="bold">Typical</emphasis> or
+          <emphasis role="bold">Complete</emphasis> installation types
+          and click the <guibutton>Next</guibutton> button, you advance
+          to the confirmation screen to verify your choices and begin
+          the installation. If you choose the
+          <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"/>.
         </para>
 
@@ -3152,21 +3155,22 @@
         <para>
           A tree view on the left side of the custom install dialog
           lists all available components. Components that are not
-          installed have a red <guiicon>X</guiicon> icon, components
+          installed have a red <guiicon>X</guiicon> icon; components
           that are installed have a gray icon. To change whether a
-          component is installed, click on the component's icon and
-          choose an new option from the drop-down list that appears.
+          component is installed, click on that component's icon and
+          choose a new option from the drop-down list that appears.
         </para>
 
         <para>
           You can change the default installation path by clicking the
-          Change... button to the right of the displayed installation
-          path.
+          <guibutton>Change...</guibutton> button to the right of the
+          displayed installation path.
         </para>
 
         <para>
-          After choosing your install components and installation path,
-          click the Next button to advance to the confirmation dialog.
+          After choosing your installation components and installation
+          path, click the <guibutton>Next</guibutton> button to advance
+          to the confirmation dialog.
         </para>
 
         <remark>
@@ -3188,23 +3192,24 @@
 
         <para>
           To install MySQL if you are satisfied with your settings,
-          click the Install button. To change your settings, click the
-          Back button. To exit the MySQL Installation Wizard without
-          installing MySQL, click the Cancel button.
+          click the <guibutton>Install</guibutton> button. To change
+          your settings, click the <guibutton>Back</guibutton> button.
+          To exit the MySQL Installation Wizard without installing
+          MySQL, click the <guibutton>Cancel</guibutton> button.
         </para>
 
         <para>
-          After installation is complete, you are given the option of
+          After installation is complete, you have the option of
           registering with the MySQL web site. Registration gives you
           access to post in the MySQL forums at
           <ulink url="http://forums.mysql.com">forums.mysql.com</ulink>,
           along with the ability to report bugs at
           <ulink url="http://bugs.mysql.com">bugs.mysql.com</ulink> and
-          to subscribe to the newsletter. The final screen of the
+          to subscribe to our newsletter. The final screen of the
           installer provides a summary of the installation and gives you
           the option to launch the MySQL Configuration Wizard, which you
           can use to create a configuration file, install the MySQL
-          service, and configure security.
+          service, and configure security settings.
         </para>
 
         <remark>
@@ -3218,10 +3223,10 @@
         <title>&title-mysql-install-wizard-changes;</title>
 
         <para>
-          Once you click the Install button, the MySQL Installation
-          Wizard begins the installation process and makes certain
-          changes to your system which are described in the sections
-          that follow.
+          Once you click the <guibutton>Install</guibutton> button, the
+          MySQL Installation Wizard begins the installation process and
+          makes certain changes to your system which are described in
+          the sections that follow.
         </para>
 
         <para>
@@ -3253,9 +3258,9 @@
           the installed location of the MySQL server, preventing a
           complete scan of the hard-disk to determine the installation
           path of the MySQL server. The registry keys are not required
-          to run the server and when using the
-          <literal>noinstall</literal> Zip archive the registry keys are
-          not created.
+          to run the server, and if you install MySQL using the
+          <literal>noinstall</literal> Zip archive, the registry keys
+          are not created.
         </para>
 
         <remark>
@@ -3268,45 +3273,47 @@
 
         <para>
           The MySQL Installation Wizard creates a new entry in the
-          Windows Start menu under a common MySQL menu heading named
-          after the major version of MySQL that you have installed. For
-          example, if you install MySQL 4.1, the MySQL Installation
-          Wizard creates a MySQL Server 4.1 section in the start menu.
+          Windows <guimenu>Start</guimenu> menu under a common MySQL
+          menu heading named after the major version of MySQL that you
+          have installed. For example, if you install MySQL 4.1, the
+          MySQL Installation Wizard creates a MySQL Server 4.1 section
+          in the start menu.
         </para>
 
         <para>
-          The following entries are created within the new Start menu
-          section:
+          The following entries are created within the new
+          <guimenu>Start</guimenu> menu section:
         </para>
 
         <itemizedlist>
 
           <listitem>
             <para>
-              <literal>MySQL Command Line Client</literal>: This is a
-              shortcut to the <command>mysql</command> command-line
+              <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.
+              <literal>root</literal> user password when you connect.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>MySQL Server Instance Config Wizard</literal>:
-              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 reconfigure an existing
+              server.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>MySQL Documentation</literal>: 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 from the
-              <literal>essential</literal> 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
+              from the Essentials installation package.
             </para>
           </listitem>
 
@@ -3326,14 +3333,14 @@
 
         <para>
           The MySQL Installation Wizard by default installs the MySQL
-          server to <literal>C:\<replaceable>Program
+          server to <filename>C:\<replaceable>Program
           Files</replaceable>\MySQL\MySQL Server
-          <replaceable>4.1</replaceable></literal>, where
+          <replaceable>4.1</replaceable></filename>, where
           <replaceable>Program Files</replaceable> is the default
           location for applications in your system, and
           <replaceable>4.1</replaceable> is the major version of your
-          MySQL server. This is the new recommended location for the
-          MySQL server, replacing the previous default location of
+          MySQL server. This is the new location for the MySQL server,
+          replacing the former default location of
           <filename>c:\mysql</filename>.
         </para>
 
@@ -3343,7 +3350,7 @@
           Files</replaceable>\MySQL</literal>, where
           <replaceable>Program Files</replaceable> is the default
           location for applications in your Windows installation. A
-          typical MySQL installation on a developer machine may look
+          typical MySQL installation on a developer machine might look
           like this:
         </para>
 
@@ -3382,7 +3389,7 @@
         </para>
 
         <para>
-          Automatic upgrades are only available when upgrading between
+          Automatic upgrades are available only when upgrading between
           installations that have the same major and minor version
           numbers. For example, you can upgrade automatically from MySQL
           4.1.5 to MySQL 4.1.6, but not from MySQL 4.1 to MySQL 5.0.
@@ -3460,14 +3467,17 @@
           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 MySQL Server Instance Config Wizard entry in the
-          MySQL section of the <literal>Start</literal> 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>
-          In addition, you can navigate to the <literal>bin</literal>
-          directory of your MySQL installation and launch the
-          <filename>MySQLInstanceConfig.exe</filename> file directly.
+          Alternatively, you can navigate to the
+          <filename>bin</filename> directory of your MySQL installation
+          and launch the <filename>MySQLInstanceConfig.exe</filename>
+          file directly.
         </para>
 
         <remark>
@@ -3483,38 +3493,38 @@
         <para>
           If the MySQL Configuration Wizard detects an existing
           <filename>my.ini</filename> file, you have the option of
-          either re-configuring your existing server, or removing the
+          either reconfiguring your existing server, or removing the
           server instance by deleting the <filename>my.ini</filename>
           file and stopping and removing the MySQL service.
         </para>
 
         <para>
           To reconfigure an existing server, choose the
-          <literal>Re-configure Instance</literal> option and click the
-          Next button. Your existing <filename>my.ini</filename> file is
-          renamed to <literal>my
-          <replaceable>timestamp</replaceable>.ini.bak</literal>, 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
-          <literal>Remove Instance</literal> option and click the Next
-          button.
+          <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 at which 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.
         </para>
 
         <para>
-          If you choose the <literal>Remove Instance</literal> option,
-          you advance to a confirmation window. Click the Execute button
-          and the MySQL Configuration Wizard stops and removes the MySQL
-          service and deletes the <filename>my.ini</filename> file. The
-          server installation and its <literal>data</literal> folder are
-          not removed.
+          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, 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 <literal>Re-configure Instance</literal>
-          option, you advance to the <literal>Configuration
-          Type</literal> 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 that you wish to configure.
         </para>
 
         <remark>
@@ -3529,29 +3539,30 @@
 
         <para>
           When you start the MySQL Configuration Wizard for a new MySQL
-          installation, or choose the <literal>Re-configure
-          Instance</literal> option for an existing installation, you
-          advance to the <literal>Configuration Type</literal> 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: <literal>Detailed
-          Configuration</literal> and <literal>Standard
-          Configuration</literal>. The <literal>Standard
-          Configuration</literal> option is intended for new users who
-          want to get started with MySQL quickly without having to make
-          a lot of decisions in regards to server configuration. The
-          <literal>Detailed Configuration</literal> option is intended
-          for advanced users who want more fine-grained control of
-          server configuration.
+          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 a lot of decisions about server
+          configuration. The <literal>Detailed Configuration</literal>
+          option is intended for advanced users who want more
+          fine-grained control of server configuration.
         </para>
 
         <para>
           If you are new to MySQL and need a server configured as a
-          single-user developer machine the <literal>Standard
-          Configuration</literal> should suit your needs. Choosing the
-          <literal>Standard Configuration</literal> option causes the
-          MySQL Configuration Wizard to automatically set all
+          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 automatically set all
           configuration options with the exception of the
           <literal>Service Options</literal> and <literal>Security
           Options</literal>.
@@ -3591,9 +3602,9 @@
 
         <para>
           There are three different server types available to choose
-          from, and the server type you choose affects the decisions the
-          MySQL Configuration Wizard makes with regards to memory, disk,
-          and processor usage.
+          from. The server type that you choose affects the decisions
+          that the MySQL Configuration Wizard makes with regard to
+          memory, disk, and processor usage.
         </para>
 
         <itemizedlist>
@@ -3613,7 +3624,7 @@
               <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
+              email, and Web servers. The MySQL server is configured to
               use a medium portion of the system resources.
             </para>
           </listitem>
@@ -3642,11 +3653,11 @@
 
         <para>
           The <guimenu>Database Usage</guimenu> dialog allows you to
-          indicate the storage engines you expect to use when creating
-          MySQL tables. The option you choose determines whether the
-          <literal>InnoDB</literal> storage is available and what
-          percentage of the server resources are available to
-          <literal>InnoDB</literal>.
+          indicate the storage engines that you expect to use when
+          creating MySQL tables. The option you choose determines
+          whether the <literal>InnoDB</literal> storage engine is
+          available and what percentage of the server resources are
+          available to <literal>InnoDB</literal>.
         </para>
 
         <itemizedlist>
@@ -3734,9 +3745,9 @@
         <title>&title-mysql-config-wizard-connections;</title>
 
         <para>
-          It is important to set a limit to the number of concurrent
-          connections to the MySQL server that can be established to
-          prevent the server from running out of resources. The
+          To prevent the server from running out of resources, it is
+          important to set a limit to the number of concurrent
+          connections to the MySQL server that can be established. The
           <guimenu>Concurrent Connections</guimenu> dialog allows you to
           choose the expected usage of your server, and sets the limit
           for concurrent connections accordingly. It is also possible to
@@ -3809,12 +3820,12 @@
 
         <para>
           Set the <guimenu>Server SQL Mode</guimenu> to either enable or
-          disable strict mode. Enabling strict mode (default) will make
+          disable strict mode. Enabling strict mode (default) makes
           MySQL behave more like other database management systems.
-          <emphasis role="bold">If you run applications that rely on
-          MySQL's old <quote>forgiving</quote> behavior make sure to
-          either adapt those applications or to disable strict
-          mode.</emphasis> For more information about strict mode, see
+          <emphasis>If you run applications that rely on MySQL's old
+          <quote>forgiving</quote> behavior, make sure to either adapt
+          those applications or to disable strict mode.</emphasis> For
+          more information about strict mode, see
           <xref linkend="server-sql-mode"/>.
         </para>
 
@@ -3841,9 +3852,9 @@
           <listitem>
             <para>
               <guimenuitem>Standard Character Set</guimenuitem>: Choose
-              this option if you want to use <literal>Latin1</literal>
+              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
+              <literal>latin1</literal> is used for English and many
               Western European languages.
             </para>
           </listitem>
@@ -3853,9 +3864,8 @@
               <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.
+              character set. This is a Unicode character set that can
+              store characters from many different languages.
             </para>
           </listitem>
 
@@ -3883,10 +3893,10 @@
 
         <para>
           On Windows NT-based platforms, the MySQL server can be
-          installed as a service. When installed as a service, the MySQL
-          server can be started automatically during system startup, and
-          even restarted automatically by Windows in the event of a
-          service failure.
+          installed as a Windows service. When installed this way, the
+          MySQL server can be started automatically during system
+          startup, and even restarted automatically by Windows in the
+          event of a service failure.
         </para>
 
         <para>
@@ -3922,17 +3932,17 @@
           <literal>root</literal> password for your MySQL
           server</emphasis>, and the MySQL Configuration Wizard requires
           by default that you do so. If you do not wish to set a
-          <literal>root</literal> password, un-check thebox next to the
+          <literal>root</literal> password, uncheck the box next to the
           <guimenuitem>Modify Security Settings</guimenuitem> option.
         </para>
 
         <para>
-          To set the <literal>root</literal> password, type the desired
+          To set the <literal>root</literal> password, enter the desired
           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.
+          boxes. If you are reconfiguring an existing server, you need
+          to enter the existing <literal>root</literal> password into
+          the <guimenuitem>Current root password</guimenuitem> box.
         </para>
 
         <para>
@@ -3994,7 +4004,7 @@
         <para>
           If you chose to create a service for the MySQL server the
           MySQL Configuration Wizard creates and starts the service. If
-          you are re-configuring an existing service, the MySQL
+          you are reconfiguring an existing service, the MySQL
           Configuration Wizard restarts the service to apply your
           configuration changes.
         </para>
@@ -4042,15 +4052,16 @@
           <filename>my.ini</filename> file, an argument similar to this
           is passed to the MySQL server as part of the service
           installation: <option>--defaults-file="<replaceable>C:\Program
-          Files\MySQL\MySQL Server 4.1</replaceable>\my.ini"</option>,
-          where <replaceable>C:\Program Files\MySQL\MySQL Server
+          Files\MySQL\MySQL Server 4.1</replaceable>\my.ini"</option>.
+          Here, <replaceable>C:\Program Files\MySQL\MySQL Server
           4.1</replaceable> is replaced with the installation path to
           the MySQL Server.
         </para>
 
         <para>
-          The <option>--defaults-file</option> instructs the MySQL
-          server to read the specified file for configuration options.
+          The <option>--defaults-file</option> option instructs the
+          MySQL server to read the specified file for configuration
+          options when it starts.
         </para>
 
         <remark>
@@ -4073,12 +4084,14 @@
 
         <para>
           MySQL clients and utilities such as the
-          <command>mysql</command> command-line client and
-          <command>mysqldump</command> are not able to locate the
+          <command>mysql</command> and <command>mysqldump</command>
+          command-line clients are not able to locate the
           <filename>my.ini</filename> file located in the server
           installation directory. To configure the client and utility
           applications, create a new <filename>my.ini</filename> file in
-          the <filename>c:\Windows</filename> directory.
+          the <filename>C:\WINDOWS</filename> or
+          <filename>C:\WINNT</filename> directory (whichever is
+          applicable to your Windows version).
         </para>
 
       </section>
@@ -4177,9 +4190,9 @@
 
         <listitem>
           <para>
-            Choose an installation location. Traditionally the MySQL
-            server is installed at <filename>C:\mysql</filename>, and
-            the new MySQL Installation Wizard installs MySQL to
+            Choose an installation location. Traditionally, the MySQL
+            server has been installed at <filename>C:\mysql</filename>.
+            The MySQL Installation Wizard installs MySQL under
             <filename>C:\Program Files\MySQL</filename>. If you do not
             install MySQL in <filename>C:\mysql</filename>, you must
             specify the path to the install directory during startup or
@@ -4273,9 +4286,10 @@
         your MySQL distribution. Look in your installation directory for
         files such as <filename>my-small.cnf</filename>,
         <filename>my-medium.cnf</filename>,
-        <filename>my-large.cnf</filename>, and so on, which you can
-        rename and copy to the appropriate location for use as a base
-        configuration file.
+        <filename>my-large.cnf</filename>, and
+        <filename>my-huge.cnf</filename>, which you can rename and copy
+        to the appropriate location for use as a base configuration
+        file.
       </para>
 
       <para>
@@ -4316,7 +4330,7 @@
         would like to use a data directory in a different location, you
         should copy the entire contents of the <filename>data</filename>
         directory to the new location. For example, by default, the
-        installer places MySQL in <filename>C:\mysql</filename> and the
+        installer places MySQL in <filename>C:\mysql</filename>, and the
         data directory in <filename>C:\mysql\data</filename>. If you
         want to use <filename>E:\mydata</filename> as the data
         directory, you must do two things:
@@ -4555,8 +4569,8 @@
 
       <para>
         <emphasis role="bold">Note</emphasis>: Most of the examples in
-        reference manual use <command>mysqld</command> as the server
-        name. If you choose to use a different server, such as
+        this manual use <command>mysqld</command> as the server name. If
+        you choose to use a different server, such as
         <command>mysqld-nt</command>, make the appropriate substitutions
         in the commands that are shown in the examples.
       </para>

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-30 20:35:42 UTC (rev 1135)
+++ trunk/refman-5.0/installing.xml	2006-01-30 20:36:24 UTC (rev 1136)
@@ -3233,17 +3233,17 @@
         </para>
 
         <para>
-          After installation is complete, you are given the option of
+          After installation is complete, you have the option of
           registering with the MySQL web site. Registration gives you
           access to post in the MySQL forums at
           <ulink url="http://forums.mysql.com">forums.mysql.com</ulink>,
           along with the ability to report bugs at
           <ulink url="http://bugs.mysql.com">bugs.mysql.com</ulink> and
-          to subscribe to the newsletter. The final screen of the
+          to subscribe to our newsletter. The final screen of the
           installer provides a summary of the installation and gives you
           the option to launch the MySQL Configuration Wizard, which you
           can use to create a configuration file, install the MySQL
-          service, and configure security.
+          service, and configure security settings.
         </para>
 
         <remark>
@@ -3293,9 +3293,9 @@
           the installed location of the MySQL server, preventing a
           complete scan of the hard-disk to determine the installation
           path of the MySQL server. The registry keys are not required
-          to run the server and when using the
-          <literal>noinstall</literal> Zip archive the registry keys are
-          not created.
+          to run the server, and if you install MySQL using the
+          <literal>noinstall</literal> Zip archive, the registry keys
+          are not created.
         </para>
 
         <remark>
@@ -3329,7 +3329,7 @@
               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.
+              <literal>root</literal> user password when you connect.
             </para>
           </listitem>
 
@@ -3338,7 +3338,7 @@
               <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
+              newly installed server, or to reconfigure an existing
               server.
             </para>
           </listitem>
@@ -3375,9 +3375,9 @@
           <replaceable>Program Files</replaceable> is the default
           location for applications in your system, and
           <replaceable>&current-series;</replaceable> is the major
-          version of your MySQL server. This is the new recommended
-          location for the MySQL server, replacing the previous default
-          location <filename>c:\mysql</filename>.
+          version of your MySQL server. This is the recommended location
+          for the MySQL server, replacing the former default location
+          <filename>C:\mysql</filename>.
         </para>
 
         <para>
@@ -3386,7 +3386,7 @@
           Files</replaceable>\MySQL</filename>, where
           <replaceable>Program Files</replaceable> is the default
           location for applications in your Windows installation. A
-          typical MySQL installation on a developer machine may look
+          typical MySQL installation on a developer machine might look
           like this:
         </para>
 
@@ -3498,9 +3498,10 @@
         </para>
 
         <para>
-          In addition, you can navigate to the <filename>bin</filename>
-          directory of your MySQL installation and launch the
-          <filename>MySQLInstanceConfig.exe</filename> file directly.
+          Alternatively, you can navigate to the
+          <filename>bin</filename> directory of your MySQL installation
+          and launch the <filename>MySQLInstanceConfig.exe</filename>
+          file directly.
         </para>
 
         <remark>
@@ -3516,7 +3517,7 @@
         <para>
           If the MySQL Configuration Wizard detects an existing
           <filename>my.ini</filename> file, you have the option of
-          either re-configuring your existing server, or removing the
+          either reconfiguring your existing server, or removing the
           server instance by deleting the <filename>my.ini</filename>
           file and stopping and removing the MySQL service.
         </para>
@@ -3528,16 +3529,16 @@
           <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.
+          time at which 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.
         </para>
 
         <para>
           If you choose the <guimenuitem>Remove Instance</guimenuitem>
           option, you advance to a confirmation window. Click the
-          <guibutton>Execute</guibutton> button: the MySQL Configuration
+          <guibutton>Execute</guibutton> button. The MySQL Configuration
           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.
@@ -3547,7 +3548,7 @@
           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.
+          choose the type of installation that you wish to configure.
         </para>
 
         <remark>
@@ -3574,8 +3575,8 @@
           <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
+          quickly without having to make many decisions about server
+          configuration. The <guimenuitem>Detailed
           Configuration</guimenuitem> option is intended for advanced
           users who want more fine-grained control over server
           configuration.
@@ -3583,7 +3584,7 @@
 
         <para>
           If you are new to MySQL and need a server configured as a
-          single-user developer machine the <guimenuitem>Standard
+          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
@@ -3626,9 +3627,9 @@
 
         <para>
           There are three different server types available to choose
-          from, and the server type you choose affects the decisions the
-          MySQL Configuration Wizard makes with regards to memory, disk,
-          and processor usage.
+          from. The server type that you choose affects the decisions
+          that the MySQL Configuration Wizard makes with regard to
+          memory, disk, and processor usage.
         </para>
 
         <itemizedlist>
@@ -3648,7 +3649,7 @@
               <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
+              email, and Web servers. The MySQL server is configured to
               use a moderate portion of the system resources.
             </para>
           </listitem>
@@ -3677,11 +3678,11 @@
 
         <para>
           The <guimenu>Database Usage</guimenu> dialog allows you to
-          indicate the table handlers you expect to use when creating
-          MySQL tables. The option you choose determines whether the
-          <literal>InnoDB</literal> storage engine is available and what
-          percentage of the server resources are available to
-          <literal>InnoDB</literal>.
+          indicate the storage engines that you expect to use when
+          creating MySQL tables. The option you choose determines
+          whether the <literal>InnoDB</literal> storage engine is
+          available and what percentage of the server resources are
+          available to <literal>InnoDB</literal>.
         </para>
 
         <itemizedlist>
@@ -3769,9 +3770,9 @@
         <title>&title-mysql-config-wizard-connections;</title>
 
         <para>
-          It is important to set a limit to the number of concurrent
-          connections to the MySQL server that can be established to
-          prevent the server from running out of resources. The
+          To prevent the server from running out of resources, it is
+          important to set a limit to the number of concurrent
+          connections to the MySQL server that can be established. The
           <guimenu>Concurrent Connections</guimenu> dialog allows you to
           choose the expected usage of your server, and sets the limit
           for concurrent connections accordingly. It is also possible to
@@ -3844,12 +3845,12 @@
 
         <para>
           Set the <guimenu>Server SQL Mode</guimenu> to either enable or
-          disable strict mode. Enabling strict mode (default) will make
+          disable strict mode. Enabling strict mode (default) makes
           MySQL behave more like other database management systems.
-          <emphasis role="bold">If you run applications that rely on
-          MySQL's old <quote>forgiving</quote> behavior make sure to
-          either adapt those applications or to disable strict
-          mode.</emphasis> For more information about strict mode, see
+          <emphasis>If you run applications that rely on MySQL's old
+          <quote>forgiving</quote> behavior, make sure to either adapt
+          those applications or to disable strict mode.</emphasis> For
+          more information about strict mode, see
           <xref linkend="server-sql-mode"/>.
         </para>
 
@@ -3876,9 +3877,9 @@
           <listitem>
             <para>
               <guimenuitem>Standard Character Set</guimenuitem>: Choose
-              this option if you want to use <literal>Latin1</literal>
+              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
+              <literal>latin1</literal> is used for English and many
               Western European languages.
             </para>
           </listitem>
@@ -3888,9 +3889,8 @@
               <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.
+              character set. This is a Unicode character set that can
+              store characters from many different languages.
             </para>
           </listitem>
 
@@ -3918,10 +3918,10 @@
 
         <para>
           On Windows NT-based platforms, the MySQL server can be
-          installed as a service. When installed as a service, the MySQL
-          server can be started automatically during system startup, and
-          even restarted automatically by Windows in the event of a
-          service failure.
+          installed as a Windows service. When installed this way, the
+          MySQL server can be started automatically during system
+          startup, and even restarted automatically by Windows in the
+          event of a service failure.
         </para>
 
         <para>
@@ -3953,22 +3953,21 @@
         <title>&title-mysql-config-wizard-security;</title>
 
         <para>
-          It is strongly recommended that you set a
-          <literal>root</literal> password for your MySQL server, and
-          the MySQL Configuration Wizard requires you set a
-          <literal>root</literal> password by default. If you do not
-          wish to set a <literal>root</literal> password, uncheck the
-          box next to the <guimenuitem>Modify Security
-          Settings</guimenuitem> option.
+          <emphasis>It is strongly recommended that you set a
+          <literal>root</literal> password for your MySQL
+          server</emphasis>, and the MySQL Configuration Wizard requires
+          by default that you do so. If you do not wish to set a
+          <literal>root</literal> password, uncheck the 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>
-          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.
+          boxes. If you are reconfiguring an existing server, you need
+          to enter the existing <literal>root</literal> password into
+          the <guimenuitem>Current root password</guimenuitem> box.
         </para>
 
         <para>
@@ -4000,7 +3999,7 @@
           The final dialog in the MySQL Configuration Wizard is the
           <guimenu>Confirmation Dialog</guimenu>. To start the
           configuration process, click the
-          <guibutton>Execute</guibutton>. To return to a previous
+          <guibutton>Execute</guibutton> button. To return to a previous
           dialog, click the <guibutton>Back</guibutton> button. To exit
           the MySQL Configuration Wizard without configuring the server,
           click the <guibutton>Cancel</guibutton> button.
@@ -4030,7 +4029,7 @@
         <para>
           If you chose to create a service for the MySQL server the
           MySQL Configuration Wizard creates and starts the service. If
-          you are re-configuring an existing service, the MySQL
+          you are reconfiguring an existing service, the MySQL
           Configuration Wizard restarts the service to apply your
           configuration changes.
         </para>
@@ -4072,15 +4071,16 @@
           is passed to the MySQL server as part of the service
           installation: <option>--defaults-file="<replaceable>C:\Program
           Files\MySQL\MySQL Server
-          &current-series;</replaceable>\my.ini"</option>, where
+          &current-series;</replaceable>\my.ini"</option>. Here,
           <replaceable>C:\Program Files\MySQL\MySQL Server
           &current-series;</replaceable> is replaced with the
           installation path to the MySQL Server.
         </para>
 
         <para>
-          The <option>--defaults-file</option> instructs the MySQL
-          server to read the specified file for configuration options.
+          The <option>--defaults-file</option> option instructs the
+          MySQL server to read the specified file for configuration
+          options when it starts.
         </para>
 
         <remark>
@@ -4103,14 +4103,14 @@
 
         <para>
           MySQL clients and utilities such as the
-          <command>mysql</command> command-line client and
-          <command>mysqldump</command> are not able to locate the
+          <command>mysql</command> and <command>mysqldump</command>
+          command-line clients are not able to locate the
           <filename>my.ini</filename> file located in the server
           installation directory. To configure the client and utility
           applications, create a new <filename>my.ini</filename> file in
           the <filename>C:\WINDOWS</filename> or
-          <filename>C:\WINNT</filename> directory as is applicable to
-          your Windows version.
+          <filename>C:\WINNT</filename> directory (whichever is
+          applicable to your Windows version).
         </para>
 
       </section>
@@ -4201,9 +4201,9 @@
 
         <listitem>
           <para>
-            Choose an installation location. Traditionally the MySQL
-            server is installed in <filename>C:\mysql</filename>, and
-            the MySQL Installation Wizard installs MySQL to
+            Choose an installation location. Traditionally, the MySQL
+            server is installed in <filename>C:\mysql</filename>. The
+            MySQL Installation Wizard installs MySQL under
             <filename>C:\Program Files\MySQL</filename>. If you do not
             install MySQL at <filename>C:\mysql</filename>, you must
             specify the path to the install directory during startup or
@@ -4215,7 +4215,7 @@
         <listitem>
           <para>
             Extract the install archive to the chosen installation
-            location using your preferred zip archive tool. Some tools
+            location using your preferred Zip archive tool. Some tools
             may extract the archive to a folder within your chosen
             installation location. If this occurs you can move the
             contents of the subfolder into the chosen installation
@@ -4293,7 +4293,8 @@
         You can also make use of the example option files included with
         your MySQL distribution. Look in your install directory for
         files such as <filename>my-small.cnf</filename>,
-        <filename>my-medium.cnf</filename>, <filename/>my-large.cnf, and
+        <filename>my-medium.cnf</filename>,
+        <filename>my-large.cnf</filename>, and
         <filename>my-huge.cnf</filename>, which you can rename and copy
         to the appropriate location for use as a base configuration
         file.
@@ -4338,7 +4339,7 @@
         should copy the entire contents of the <filename>data</filename>
         directory to the new location. For example, if MySQL is
         installed in <filename>C:\Program Files\MySQL\MySQL Server
-        &current-series;</filename> the data directory is by default in
+        &current-series;</filename>, the data directory is by default in
         <filename>C:\Program Files\MySQL\MySQL Server
         &current-series;\data</filename>. If you want to use
         <filename>E:\mydata</filename> as the data directory instead,
@@ -4372,8 +4373,8 @@
       <title>&title-windows-select-server;</title>
 
       <para>
-        The following table shows the available MySQL &current-series;
-        servers for Windows:
+        The following table shows the available servers for Windows in
+        MySQL &current-series;:
       </para>
 
       <informaltable>
@@ -4490,8 +4491,8 @@
 
       <para>
         <emphasis role="bold">Note</emphasis>: Most of the examples in
-        reference manual use <command>mysqld</command> as the server
-        name. If you choose to use a different server, such as
+        this manual use <command>mysqld</command> as the server name. If
+        you choose to use a different server, such as
         <command>mysqld-nt</command>, make the appropriate substitutions
         in the commands that are shown in the examples.
       </para>

Modified: trunk/refman-5.1/custom-engine.xml
===================================================================
--- trunk/refman-5.1/custom-engine.xml	2006-01-30 20:35:42 UTC (rev 1135)
+++ trunk/refman-5.1/custom-engine.xml	2006-01-30 20:36:24 UTC (rev 1136)
@@ -727,7 +727,7 @@
 
     <para>
       Storage engines are required to provide the MySQL server with a
-      list of extensions used by the storage engine with regards to a
+      list of extensions used by the storage engine with regard to a
       given table, its data and indexes.
     </para>
 

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-30 20:35:42 UTC (rev 1135)
+++ trunk/refman-5.1/installing.xml	2006-01-30 20:36:24 UTC (rev 1136)
@@ -3233,17 +3233,17 @@
         </para>
 
         <para>
-          After installation is complete, you are given the option of
+          After installation is complete, you have the option of
           registering with the MySQL web site. Registration gives you
           access to post in the MySQL forums at
           <ulink url="http://forums.mysql.com">forums.mysql.com</ulink>,
           along with the ability to report bugs at
           <ulink url="http://bugs.mysql.com">bugs.mysql.com</ulink> and
-          to subscribe to the newsletter. The final screen of the
+          to subscribe to our newsletter. The final screen of the
           installer provides a summary of the installation and gives you
           the option to launch the MySQL Configuration Wizard, which you
           can use to create a configuration file, install the MySQL
-          service, and configure security.
+          service, and configure security settings.
         </para>
 
         <remark>
@@ -3293,9 +3293,9 @@
           the installed location of the MySQL server, preventing a
           complete scan of the hard-disk to determine the installation
           path of the MySQL server. The registry keys are not required
-          to run the server and when using the
-          <literal>noinstall</literal> Zip archive the registry keys are
-          not created.
+          to run the server, and if you install MySQL using the
+          <literal>noinstall</literal> Zip archive, the registry keys
+          are not created.
         </para>
 
         <remark>
@@ -3329,7 +3329,7 @@
               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.
+              <literal>root</literal> user password when you connect.
             </para>
           </listitem>
 
@@ -3338,7 +3338,7 @@
               <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
+              newly installed server, or to reconfigure an existing
               server.
             </para>
           </listitem>
@@ -3375,9 +3375,9 @@
           <replaceable>Program Files</replaceable> is the default
           location for applications in your system, and
           <replaceable>&current-series;</replaceable> is the major
-          version of your MySQL server. This is the new recommended
-          location for the MySQL server, replacing the previous default
-          location <filename>c:\mysql</filename>.
+          version of your MySQL server. This is the recommended location
+          for the MySQL server, replacing the former default location
+          <filename>C:\mysql</filename>.
         </para>
 
         <para>
@@ -3386,7 +3386,7 @@
           Files</replaceable>\MySQL</filename>, where
           <replaceable>Program Files</replaceable> is the default
           location for applications in your Windows installation. A
-          typical MySQL installation on a developer machine may look
+          typical MySQL installation on a developer machine might look
           like this:
         </para>
 
@@ -3498,9 +3498,10 @@
         </para>
 
         <para>
-          In addition, you can navigate to the <filename>bin</filename>
-          directory of your MySQL installation and launch the
-          <filename>MySQLInstanceConfig.exe</filename> file directly.
+          Alternatively, you can navigate to the
+          <filename>bin</filename> directory of your MySQL installation
+          and launch the <filename>MySQLInstanceConfig.exe</filename>
+          file directly.
         </para>
 
         <remark>
@@ -3516,7 +3517,7 @@
         <para>
           If the MySQL Configuration Wizard detects an existing
           <filename>my.ini</filename> file, you have the option of
-          either re-configuring your existing server, or removing the
+          either reconfiguring your existing server, or removing the
           server instance by deleting the <filename>my.ini</filename>
           file and stopping and removing the MySQL service.
         </para>
@@ -3528,16 +3529,16 @@
           <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.
+          time at which 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.
         </para>
 
         <para>
           If you choose the <guimenuitem>Remove Instance</guimenuitem>
           option, you advance to a confirmation window. Click the
-          <guibutton>Execute</guibutton> button: the MySQL Configuration
+          <guibutton>Execute</guibutton> button. The MySQL Configuration
           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.
@@ -3547,7 +3548,7 @@
           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.
+          choose the type of installation that you wish to configure.
         </para>
 
         <remark>
@@ -3574,8 +3575,8 @@
           <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
+          quickly without having to make many decisions about server
+          configuration. The <guimenuitem>Detailed
           Configuration</guimenuitem> option is intended for advanced
           users who want more fine-grained control over server
           configuration.
@@ -3583,7 +3584,7 @@
 
         <para>
           If you are new to MySQL and need a server configured as a
-          single-user developer machine the <guimenuitem>Standard
+          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
@@ -3626,9 +3627,9 @@
 
         <para>
           There are three different server types available to choose
-          from, and the server type you choose affects the decisions the
-          MySQL Configuration Wizard makes with regards to memory, disk,
-          and processor usage.
+          from. The server type that you choose affects the decisions
+          that the MySQL Configuration Wizard makes with regard to
+          memory, disk, and processor usage.
         </para>
 
         <itemizedlist>
@@ -3648,7 +3649,7 @@
               <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
+              email, and Web servers. The MySQL server is configured to
               use a moderate portion of the system resources.
             </para>
           </listitem>
@@ -3677,11 +3678,11 @@
 
         <para>
           The <guimenu>Database Usage</guimenu> dialog allows you to
-          indicate the table handlers you expect to use when creating
-          MySQL tables. The option you choose determines whether the
-          <literal>InnoDB</literal> storage engine is available and what
-          percentage of the server resources are available to
-          <literal>InnoDB</literal>.
+          indicate the storage engines that you expect to use when
+          creating MySQL tables. The option you choose determines
+          whether the <literal>InnoDB</literal> storage engine is
+          available and what percentage of the server resources are
+          available to <literal>InnoDB</literal>.
         </para>
 
         <itemizedlist>
@@ -3769,9 +3770,9 @@
         <title>&title-mysql-config-wizard-connections;</title>
 
         <para>
-          It is important to set a limit to the number of concurrent
-          connections to the MySQL server that can be established to
-          prevent the server from running out of resources. The
+          To prevent the server from running out of resources, it is
+          important to set a limit to the number of concurrent
+          connections to the MySQL server that can be established. The
           <guimenu>Concurrent Connections</guimenu> dialog allows you to
           choose the expected usage of your server, and sets the limit
           for concurrent connections accordingly. It is also possible to
@@ -3844,12 +3845,12 @@
 
         <para>
           Set the <guimenu>Server SQL Mode</guimenu> to either enable or
-          disable strict mode. Enabling strict mode (default) will make
+          disable strict mode. Enabling strict mode (default) makes
           MySQL behave more like other database management systems.
-          <emphasis role="bold">If you run applications that rely on
-          MySQL's old <quote>forgiving</quote> behavior make sure to
-          either adapt those applications or to disable strict
-          mode.</emphasis> For more information about strict mode, see
+          <emphasis>If you run applications that rely on MySQL's old
+          <quote>forgiving</quote> behavior, make sure to either adapt
+          those applications or to disable strict mode.</emphasis> For
+          more information about strict mode, see
           <xref linkend="server-sql-mode"/>.
         </para>
 
@@ -3876,9 +3877,9 @@
           <listitem>
             <para>
               <guimenuitem>Standard Character Set</guimenuitem>: Choose
-              this option if you want to use <literal>Latin1</literal>
+              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
+              <literal>latin1</literal> is used for English and many
               Western European languages.
             </para>
           </listitem>
@@ -3888,9 +3889,8 @@
               <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.
+              character set. This is a Unicode character set that can
+              store characters from many different languages.
             </para>
           </listitem>
 
@@ -3918,10 +3918,10 @@
 
         <para>
           On Windows NT-based platforms, the MySQL server can be
-          installed as a service. When installed as a service, the MySQL
-          server can be started automatically during system startup, and
-          even restarted automatically by Windows in the event of a
-          service failure.
+          installed as a Windows service. When installed this way, the
+          MySQL server can be started automatically during system
+          startup, and even restarted automatically by Windows in the
+          event of a service failure.
         </para>
 
         <para>
@@ -3953,22 +3953,21 @@
         <title>&title-mysql-config-wizard-security;</title>
 
         <para>
-          It is strongly recommended that you set a
-          <literal>root</literal> password for your MySQL server, and
-          the MySQL Configuration Wizard requires you set a
-          <literal>root</literal> password by default. If you do not
-          wish to set a <literal>root</literal> password, uncheck the
-          box next to the <guimenuitem>Modify Security
-          Settings</guimenuitem> option.
+          <emphasis>It is strongly recommended that you set a
+          <literal>root</literal> password for your MySQL
+          server</emphasis>, and the MySQL Configuration Wizard requires
+          by default that you do so. If you do not wish to set a
+          <literal>root</literal> password, uncheck the 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>
-          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.
+          boxes. If you are reconfiguring an existing server, you need
+          to enter the existing <literal>root</literal> password into
+          the <guimenuitem>Current root password</guimenuitem> box.
         </para>
 
         <para>
@@ -4000,7 +3999,7 @@
           The final dialog in the MySQL Configuration Wizard is the
           <guimenu>Confirmation Dialog</guimenu>. To start the
           configuration process, click the
-          <guibutton>Execute</guibutton>. To return to a previous
+          <guibutton>Execute</guibutton> button. To return to a previous
           dialog, click the <guibutton>Back</guibutton> button. To exit
           the MySQL Configuration Wizard without configuring the server,
           click the <guibutton>Cancel</guibutton> button.
@@ -4030,7 +4029,7 @@
         <para>
           If you chose to create a service for the MySQL server the
           MySQL Configuration Wizard creates and starts the service. If
-          you are re-configuring an existing service, the MySQL
+          you are reconfiguring an existing service, the MySQL
           Configuration Wizard restarts the service to apply your
           configuration changes.
         </para>
@@ -4072,15 +4071,16 @@
           is passed to the MySQL server as part of the service
           installation: <option>--defaults-file="<replaceable>C:\Program
           Files\MySQL\MySQL Server
-          &current-series;</replaceable>\my.ini"</option>, where
+          &current-series;</replaceable>\my.ini"</option>. Here,
           <replaceable>C:\Program Files\MySQL\MySQL Server
           &current-series;</replaceable> is replaced with the
           installation path to the MySQL Server.
         </para>
 
         <para>
-          The <option>--defaults-file</option> instructs the MySQL
-          server to read the specified file for configuration options.
+          The <option>--defaults-file</option> option instructs the
+          MySQL server to read the specified file for configuration
+          options when it starts.
         </para>
 
         <remark>
@@ -4103,14 +4103,14 @@
 
         <para>
           MySQL clients and utilities such as the
-          <command>mysql</command> command-line client and
-          <command>mysqldump</command> are not able to locate the
+          <command>mysql</command> and <command>mysqldump</command>
+          command-line clients are not able to locate the
           <filename>my.ini</filename> file located in the server
           installation directory. To configure the client and utility
           applications, create a new <filename>my.ini</filename> file in
           the <filename>C:\WINDOWS</filename> or
-          <filename>C:\WINNT</filename> directory as is applicable to
-          your Windows version.
+          <filename>C:\WINNT</filename> directory (whichever is
+          applicable to your Windows version).
         </para>
 
       </section>
@@ -4201,9 +4201,9 @@
 
         <listitem>
           <para>
-            Choose an installation location. Traditionally the MySQL
-            server is installed in <filename>C:\mysql</filename>, and
-            the MySQL Installation Wizard installs MySQL to
+            Choose an installation location. Traditionally, the MySQL
+            server is installed in <filename>C:\mysql</filename>. The
+            MySQL Installation Wizard installs MySQL under
             <filename>C:\Program Files\MySQL</filename>. If you do not
             install MySQL at <filename>C:\mysql</filename>, you must
             specify the path to the install directory during startup or
@@ -4215,7 +4215,7 @@
         <listitem>
           <para>
             Extract the install archive to the chosen installation
-            location using your preferred zip archive tool. Some tools
+            location using your preferred Zip archive tool. Some tools
             may extract the archive to a folder within your chosen
             installation location. If this occurs you can move the
             contents of the subfolder into the chosen installation
@@ -4293,7 +4293,8 @@
         You can also make use of the example option files included with
         your MySQL distribution. Look in your install directory for
         files such as <filename>my-small.cnf</filename>,
-        <filename>my-medium.cnf</filename>, <filename/>my-large.cnf, and
+        <filename>my-medium.cnf</filename>,
+        <filename>my-large.cnf</filename>, and
         <filename>my-huge.cnf</filename>, which you can rename and copy
         to the appropriate location for use as a base configuration
         file.
@@ -4338,7 +4339,7 @@
         should copy the entire contents of the <filename>data</filename>
         directory to the new location. For example, if MySQL is
         installed in <filename>C:\Program Files\MySQL\MySQL Server
-        &current-series;</filename> the data directory is by default in
+        &current-series;</filename>, the data directory is by default in
         <filename>C:\Program Files\MySQL\MySQL Server
         &current-series;\data</filename>. If you want to use
         <filename>E:\mydata</filename> as the data directory instead,
@@ -4372,8 +4373,8 @@
       <title>&title-windows-select-server;</title>
 
       <para>
-        The following table shows the available MySQL &current-series;
-        servers for Windows:
+        The following table shows the available servers for Windows in
+        MySQL &current-series;:
       </para>
 
       <informaltable>
@@ -4490,8 +4491,8 @@
 
       <para>
         <emphasis role="bold">Note</emphasis>: Most of the examples in
-        reference manual use <command>mysqld</command> as the server
-        name. If you choose to use a different server, such as
+        this manual use <command>mysqld</command> as the server name. If
+        you choose to use a different server, such as
         <command>mysqld-nt</command>, make the appropriate substitutions
         in the commands that are shown in the examples.
       </para>

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-30 20:35:42 UTC (rev 1135)
+++ trunk/refman-common/titles.en.ent	2006-01-30 20:36:24 UTC (rev 1136)
@@ -905,7 +905,7 @@
 <!ENTITY title-mysql-install-wizard-install-type "Choosing an Install Type">
 <!ENTITY title-mysql-install-wizard-introduction "Introduction to the Installation Wizard">
 <!ENTITY title-mysql-install-wizard-starting "Downloading and Starting the MySQL Installation Wizard">
-<!ENTITY title-mysql-install-wizard-upgrading "Upgrading MySQL">
+<!ENTITY title-mysql-install-wizard-upgrading "Upgrading MySQL with the Installation Wizard">
 <!ENTITY title-mysql-internals "MySQL Internals">
 <!ENTITY title-mysql-kill "<literal>mysql_kill()</literal>">
 <!ENTITY title-mysql-library-end "<literal>mysql_library_end()</literal>">

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