List:Commits« Previous MessageNext Message »
From:paul Date:January 11 2006 8:55pm
Subject:svn commit - mysqldoc@docsrva: r769 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-11 21:55:15 +0100 (Wed, 11 Jan 2006)
New Revision: 769

Log:
 r6094@frost:  paul | 2006-01-11 14:54:37 -0600
 General/cleanup revisions.


Modified:
   trunk/
   trunk/refman-4.1/connector-mxj.xml
   trunk/refman-4.1/connector-net.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/functions.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/ndbcluster.xml
   trunk/refman-4.1/spatial-extensions.xml
   trunk/refman-5.0/connector-mxj.xml
   trunk/refman-5.0/connector-net.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/functions.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.0/ndbcluster.xml
   trunk/refman-5.0/spatial-extensions.xml
   trunk/refman-5.1/connector-mxj.xml
   trunk/refman-5.1/connector-net.xml
   trunk/refman-5.1/custom-engine.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/ndbcluster.xml
   trunk/refman-5.1/replication.xml
   trunk/refman-5.1/spatial-extensions.xml


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

Modified: trunk/refman-4.1/connector-mxj.xml
===================================================================
--- trunk/refman-4.1/connector-mxj.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-4.1/connector-mxj.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -63,7 +63,7 @@
     </para>
 
     <para>
-      This an beta release and feedback is welcome and encouraged.
+      This a beta release and feedback is welcome and encouraged.
     </para>
 
     <para>

Modified: trunk/refman-4.1/connector-net.xml
===================================================================
--- trunk/refman-4.1/connector-net.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-4.1/connector-net.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -3350,7 +3350,7 @@
 
         <para>
           Crystal Reports is a common tool used by Windows application
-          developers to perform reporting an document generation. In
+          developers to perform reporting and document generation. In
           this section we will show how to use Crystal Reports XI with
           MySQL and Connector/NET.
         </para>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-4.1/database-administration.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -13126,7 +13126,7 @@
 </programlisting>
 
           <para>
-            The result should include an row with the
+            The result should include a row with the
             <literal>Host</literal> and <literal>User</literal> columns
             matching your computer's hostname and your MySQL username.
           </para>

Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-4.1/functions.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -13736,7 +13736,7 @@
       </para>
 
       <para>
-        If you use an group function in a statement containing no
+        If you use a group function in a statement containing no
         <literal>GROUP BY</literal> clause, it is equivalent to grouping
         on all rows.
       </para>

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-4.1/installing.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -9016,7 +9016,7 @@
             The <filename>sql_yacc.cc</filename> file is generated from
             <filename>sql_yacc.yy</filename>. Normally the build process
             does not need to create <filename>sql_yacc.cc</filename>,
-            because MySQL comes with an pre-generated copy. However, if
+            because MySQL comes with a pre-generated copy. However, if
             you do need to re-create it, you might encounter this error:
           </para>
 
@@ -13580,12 +13580,12 @@
       <para>
         Some releases introduce changes to the structure of the grant
         tables (the tables in the <literal>mysql</literal> database) to
-        add new privileges or features. To make sure that your grant
-        tables are current when you update to a new version of MySQL,
-        you should run the <command>mysql_fix_privilege_tables</command>
-        script to update your grant tables as well. The procedure for
-        doing this is described at
-        <xref linkend="mysql-fix-privilege-tables"/>.
+        add new privileges or to support new features. To make sure that
+        your grant tables are current when you update to a new version
+        of MySQL, you should run the
+        <command>mysql_fix_privilege_tables</command> script to update
+        your grant tables as well. The procedure for doing this is
+        described at <xref linkend="mysql-fix-privilege-tables"/>.
       </para>
 
     </section>
@@ -13663,7 +13663,7 @@
 
       <para>
         If you want to copy a database from a remote machine over a slow
-        network, you can use:
+        network, you can use these commands:
       </para>
 
 <programlisting>
@@ -13672,25 +13672,24 @@
 </programlisting>
 
       <para>
-        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
+        You can also store the dump in a file, transfer the file to the
+        target machine, and then load the file into the database there.
+        For example, you can dump a database to a compressed file on the
         source machine like this:
       </para>
 
 <programlisting>
-shell&gt; <userinput>mysqldump --quick <replaceable>db_name</replaceable> | gzip &gt; <replaceable>db_name.contents</replaceable>.gz</userinput>
+shell&gt; <userinput>mysqldump --quick <replaceable>db_name</replaceable> | gzip &gt; <replaceable>db_name</replaceable>.gz</userinput>
 </programlisting>
 
       <para>
-        (The file created in this example is compressed.) Transfer the
-        file containing the database contents to the target machine and
-        run these commands there:
+        Transfer the file containing the database contents to the target
+        machine and run these commands there:
       </para>
 
 <programlisting>
 shell&gt; <userinput>mysqladmin create <replaceable>db_name</replaceable></userinput>
-shell&gt; <userinput>gunzip &lt; <replaceable>db_name.contents</replaceable>.gz | mysql <replaceable>db_name</replaceable></userinput>
+shell&gt; <userinput>gunzip &lt; <replaceable>db_name</replaceable>.gz | mysql <replaceable>db_name</replaceable></userinput>
 </programlisting>
 
       <indexterm>
@@ -13706,8 +13705,8 @@
         <command>mysqlimport</command> to transfer the database. For
         very large tables, this is much faster than simply using
         <command>mysqldump</command>. In the following commands,
-        <literal>DUMPDIR</literal> represents the full pathname of the
-        directory you use to store the output from
+        <replaceable>DUMPDIR</replaceable> represents the full pathname
+        of the directory you use to store the output from
         <command>mysqldump</command>.
       </para>
 
@@ -13734,8 +13733,8 @@
 </programlisting>
 
       <para>
-        Also, do not forget to copy the <literal>mysql</literal>
-        database because that is where the <literal>user</literal>,
+        Do not forget to copy the <literal>mysql</literal> database
+        because that is where the <literal>user</literal>,
         <literal>db</literal>, and <literal>host</literal> grant tables
         are stored. You might have to run commands as the MySQL
         <literal>root</literal> user on the new machine until you have
@@ -13762,9 +13761,9 @@
     </indexterm>
 
     <para>
-      This section describes what you should do if you are downgrading
-      to an older MySQL version in the unlikely case that the previous
-      version worked better than the new one.
+      This section describes what you should do to downgrade to an older
+      MySQL version in the unlikely case that the previous version
+      worked better than the new one.
     </para>
 
     <para>
@@ -13802,8 +13801,7 @@
     <para>
       You can always move the MySQL format files and data files between
       different versions on the same architecture as long as you stay
-      within versions for the same release series of MySQL. The current
-      production release series is 4.1.
+      within versions for the same release series of MySQL.
     </para>
 
     <para>
@@ -13812,8 +13810,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. For examples, ee
+      <xref linkend="upgrading-to-arch"/>.
     </para>
 
     <para>
@@ -13826,15 +13824,13 @@
 
       <listitem>
         <para>
-          Stop the older MySQL server that you are trying to downgrade
-          to.
+          Stop the older MySQL server that you are downgrading to.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Restart the newer MySQL server you are trying to downgrade
-          from.
+          Restart the newer MySQL server you are downgrading from.
         </para>
       </listitem>
 
@@ -14838,7 +14834,7 @@
         </para>
 
         <para>
-          Known issues are:
+          Known issues:
         </para>
 
         <itemizedlist>
@@ -17010,8 +17006,8 @@
         </para>
 
         <para>
-          Remember that you must use GNU <command>make</command> when
-          making MySQL.
+          Remember that you must use GNU <command>make</command> to
+          build MySQL.
         </para>
 
         <para>
@@ -17154,8 +17150,8 @@
         </itemizedlist>
 
         <para>
-          Beginning with Legend/OpenServer 6.0.0 has native threads and
-          no 2GB file size limit.
+          Beginning with Legend/OpenServer 6.0.0, there are native
+          threads and no 2GB file size limit.
         </para>
 
       </section>
@@ -17165,7 +17161,7 @@
         <title>&title-sco-openserver;</title>
 
         <para>
-          Key improvements of OpenServer 6 include:
+          OpenServer 6 includes these key improvements:
         </para>
 
         <itemizedlist>
@@ -17203,7 +17199,7 @@
         </itemizedlist>
 
         <para>
-          OpenServer 6.0.0 has the following:
+          OpenServer 6.0.0 commands are organized as follows:
         </para>
 
         <itemizedlist>
@@ -17809,7 +17805,7 @@
     <para>
       Perl support for MySQL is provided by means of the
       <literal>DBI</literal>/<literal>DBD</literal> client interface.
-      The interface requires Perl 5.6.0 or later. It <emphasis>does not
+      The interface requires Perl 5.6.1 or later. It <emphasis>does not
       work</emphasis> if you have an older version of Perl.
     </para>
 
@@ -17820,8 +17816,8 @@
     </para>
 
     <para>
-      If you are using the MySQL 4.1 client library, you must use
-      <literal>DBD::mysql</literal> 2.9003 or newer.
+      If you are using the MySQL 4.1 or newer client library, you must
+      use <literal>DBD::mysql</literal> 2.9003 or newer.
     </para>
 
     <para>
@@ -17990,7 +17986,7 @@
         <literal>DBD</literal> module with ActiveState Perl:
       </para>
 
-      <itemizedlist>
+      <orderedlist>
 
         <listitem>
           <para>
@@ -18008,8 +18004,8 @@
 
         <listitem>
           <para>
-            If required, set the <literal>HTTP_proxy</literal> variable.
-            For example, you might try:
+            If necessary, set the <literal>HTTP_proxy</literal>
+            variable. For example, you might try a setting like this:
           </para>
 
 <programlisting>
@@ -18049,16 +18045,16 @@
 </programlisting>
         </listitem>
 
-      </itemizedlist>
+      </orderedlist>
 
       <para>
         This procedure should work with ActiveState Perl 5.6 and newer.
       </para>
 
       <para>
-        If you cannot get the procedure to work, you should instead
-        install the MyODBC driver and connect to the MySQL server
-        through ODBC:
+        If you cannot get the procedure to work, you should install the
+        MyODBC driver instead and connect to the MySQL server through
+        ODBC:
       </para>
 
 <programlisting>
@@ -18086,14 +18082,11 @@
       <para>
         If Perl reports that it cannot find the
         <filename>../mysql/mysql.so</filename> module, the problem is
-        probably that Perl cannot locate the shared library
-        <filename>libmysqlclient.so</filename>.
+        probably that Perl cannot locate the
+        <filename>libmysqlclient.so</filename> shared library. You
+        should be able to fix this by one of the following methods:
       </para>
 
-      <para>
-        You should be able to fix this by one of the following methods:
-      </para>
-
       <itemizedlist>
 
         <listitem>
@@ -18176,8 +18169,8 @@
       </para>
 
 <programlisting>
-/usr/bin/perl: cannot resolve symbol '__moddi3'
-/usr/bin/perl: cannot resolve symbol '__divdi3'
+/usr/bin/perl: can't resolve symbol '__moddi3'
+/usr/bin/perl: can't resolve symbol '__divdi3'
 </programlisting>
 
       <para>

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-4.1/ndbcluster.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -5416,7 +5416,7 @@
 
       <para>
         In a MySQL Cluster, a set of <command>ndbd</command> processes
-        co-operate in handling data. These processes can execute on the
+        cooperate in handling data. These processes can execute on the
         same computer (host) or on different computers. The
         correspondences between data nodes and Cluster hosts is
         completely configurable.

Modified: trunk/refman-4.1/spatial-extensions.xml
===================================================================
--- trunk/refman-4.1/spatial-extensions.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-4.1/spatial-extensions.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -919,7 +919,7 @@
         <listitem>
           <para>
             On a region map, <literal>Polygon</literal> objects could
-            represent forests, districts, an so on.
+            represent forests, districts, and so on.
           </para>
         </listitem>
 

Modified: trunk/refman-5.0/connector-mxj.xml
===================================================================
--- trunk/refman-5.0/connector-mxj.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.0/connector-mxj.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -63,7 +63,7 @@
     </para>
 
     <para>
-      This an beta release and feedback is welcome and encouraged.
+      This a beta release and feedback is welcome and encouraged.
     </para>
 
     <para>

Modified: trunk/refman-5.0/connector-net.xml
===================================================================
--- trunk/refman-5.0/connector-net.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.0/connector-net.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -3350,7 +3350,7 @@
 
         <para>
           Crystal Reports is a common tool used by Windows application
-          developers to perform reporting an document generation. In
+          developers to perform reporting and document generation. In
           this section we will show how to use Crystal Reports XI with
           MySQL and Connector/NET.
         </para>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.0/database-administration.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -2056,7 +2056,7 @@
 
         <title>&title-instance-manager-security;</title>
 
-         <para>
+        <para>
           Communication with the MySQL Instance Manager is handled using
           the MySQL client-server protocol. As such, you can connect to
           the IM using the standard <command>mysql</command> client
@@ -2066,29 +2066,30 @@
         </para>
 
         <refsection id="instance-manager-security-passwords">
-          <title>Instance Manager Users and Passwords</title>  
-        
-        <para>
-          The IM stores its user information in a password file. Default
-          placement for the password file is
-          <filename>/etc/mysqlmanager.passwd</filename>
-        </para>
 
-        <para>
-          Password entries look like the following:
-        </para>
+          <title>Instance Manager Users and Passwords</title>
 
+          <para>
+            The IM stores its user information in a password file.
+            Default placement for the password file is
+            <filename>/etc/mysqlmanager.passwd</filename>
+          </para>
+
+          <para>
+            Password entries look like the following:
+          </para>
+
 <programlisting>
 petr:*35110DC9B4D8140F5DE667E28C72DD2597B5C848
 </programlisting>
 
-        <para>
-          To generate such an entry one should invoke IM with the
-          <command>--passwd</command> option. Then the output can be
-          redirected to the
-          <filename>/etc/mysqlmanager.passwd</filename> file to add a
-          new user. A sample command is given below.
-        </para>
+          <para>
+            To generate such an entry one should invoke IM with the
+            <command>--passwd</command> option. Then the output can be
+            redirected to the
+            <filename>/etc/mysqlmanager.passwd</filename> file to add a
+            new user. A sample command is given below.
+          </para>
 
 <programlisting>
 ./mysqlmanager --passwd &gt;&gt; /etc/mysqlmanager.passwd
@@ -2098,42 +2099,48 @@
 Re-type password: &lt;password&gt;
 </programlisting>
 
-        <para>
-          The following line is added to
-          <filename>/etc/mysqlmanager.passwd</filename>:
-        </para>
+          <para>
+            The following line is added to
+            <filename>/etc/mysqlmanager.passwd</filename>:
+          </para>
 
 <programlisting>
 mike:*00A51F3F48415C7D4E8908980D443C29C69B60C9
 </programlisting>
 
-        <para>
-          If there are no entries in the
-          <filename>/etc/mysqlmanager.passwd</filename> file one cannot
-          connect to the IM.
-        </para>
+          <para>
+            If there are no entries in the
+            <filename>/etc/mysqlmanager.passwd</filename> file one
+            cannot connect to the IM.
+          </para>
 
         </refsection>
-        
+
         <refsection id="instance-manager-security-monitoring">
+
           <title>MySQL Server Accounts for Status Monitoring</title>
-          
-          <para>In order to monitor server status, the MySQL Instance
+
+          <para>
+            In order to monitor server status, the MySQL Instance
             Manager will attempt to connect to the MySQL server instance
-          at regular intervals using the
-            <literal>MySQL_Instance_Manager@localhost</literal> user account
-            with a password of <literal>check_connection</literal>.</para>
-          
-          <para>You are <emphasis>not</emphasis> required to create a
+            at regular intervals using the
+            <literal>MySQL_Instance_Manager@localhost</literal> user
+            account with a password of
+            <literal>check_connection</literal>.
+          </para>
+
+          <para>
+            You are <emphasis>not</emphasis> required to create a
             <literal>MySQL_Instance_M@localhost</literal> user account
             in order for the MySQL Instance Manager to monitor server
             status, as a login failure is sufficient to identify that
-            the server is operational. However; because the account does not
-            exist the failed connection attempts will be recorded to
-            the <link linkend="query-log">General Query Log</link>.</para>
-        
+            the server is operational. However; because the account does
+            not exist the failed connection attempts will be recorded to
+            the <link linkend="query-log">General Query Log</link>.
+          </para>
+
         </refsection>
-        
+
       </refsection>
 
       <refsection id="instance-manager-command-line-options">
@@ -15253,7 +15260,7 @@
 </programlisting>
 
           <para>
-            The result should include an row with the
+            The result should include a row with the
             <literal>Host</literal> and <literal>User</literal> columns
             matching your computer's hostname and your MySQL username.
           </para>

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.0/functions.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -13793,7 +13793,7 @@
       </para>
 
       <para>
-        If you use an group function in a statement containing no
+        If you use a group function in a statement containing no
         <literal>GROUP BY</literal> clause, it is equivalent to grouping
         on all rows.
       </para>

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.0/installing.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -8910,7 +8910,7 @@
             The <filename>sql_yacc.cc</filename> file is generated from
             <filename>sql_yacc.yy</filename>. Normally the build process
             does not need to create <filename>sql_yacc.cc</filename>,
-            because MySQL comes with an pre-generated copy. However, if
+            because MySQL comes with a pre-generated copy. However, if
             you do need to re-create it, you might encounter this error:
           </para>
 
@@ -10521,115 +10521,115 @@
 
         </itemizedlist>
 
-          <para>
-            There are some alternatives to running the
-            <command>mysql_install_db</command> script as it is provided
-            in the MySQL distribution:
-          </para>
+        <para>
+          There are some alternatives to running the
+          <command>mysql_install_db</command> script as it is provided
+          in the MySQL distribution:
+        </para>
 
-          <indexterm>
-            <primary>grant tables</primary>
-            <secondary>re-creating</secondary>
-          </indexterm>
+        <indexterm>
+          <primary>grant tables</primary>
+          <secondary>re-creating</secondary>
+        </indexterm>
 
-          <indexterm>
-            <primary>re-creating</primary>
-            <secondary>grant tables</secondary>
-          </indexterm>
+        <indexterm>
+          <primary>re-creating</primary>
+          <secondary>grant tables</secondary>
+        </indexterm>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                If you want the initial privileges to be different from
-                the standard defaults, you can modify
-                <command>mysql_install_db</command> before you run it.
-                However, it is preferable to use
-                <literal>GRANT</literal> and <literal>REVOKE</literal>
-                to change the privileges <emphasis>after</emphasis> the
-                grant tables have been set up. In other words, you can
-                run <command>mysql_install_db</command>, and then use
-                <literal>mysql -u root mysql</literal> to connect to the
-                server as the MySQL <literal>root</literal> user so that
-                you can issue the necessary <literal>GRANT</literal> and
-                <literal>REVOKE</literal> statements.
-              </para>
+          <listitem>
+            <para>
+              If you want the initial privileges to be different from
+              the standard defaults, you can modify
+              <command>mysql_install_db</command> before you run it.
+              However, it is preferable to use <literal>GRANT</literal>
+              and <literal>REVOKE</literal> to change the privileges
+              <emphasis>after</emphasis> the grant tables have been set
+              up. In other words, you can run
+              <command>mysql_install_db</command>, and then use
+              <literal>mysql -u root mysql</literal> to connect to the
+              server as the MySQL <literal>root</literal> user so that
+              you can issue the necessary <literal>GRANT</literal> and
+              <literal>REVOKE</literal> statements.
+            </para>
 
-              <para>
-                If you want to install MySQL on several machines with
-                the same privileges, you can put the
-                <literal>GRANT</literal> and <literal>REVOKE</literal>
-                statements in a file and execute the file as a script
-                using <literal>mysql</literal> after running
-                <command>mysql_install_db</command>. For example:
-              </para>
+            <para>
+              If you want to install MySQL on several machines with the
+              same privileges, you can put the <literal>GRANT</literal>
+              and <literal>REVOKE</literal> statements in a file and
+              execute the file as a script using
+              <literal>mysql</literal> after running
+              <command>mysql_install_db</command>. For example:
+            </para>
 
 <programlisting>
 shell&gt; <userinput>bin/mysql_install_db --user=mysql</userinput>
 shell&gt; <userinput>bin/mysql -u root &lt; your_script_file</userinput>
 </programlisting>
 
-              <para>
-                By doing this, you can avoid having to issue the
-                statements manually on each machine.
-              </para>
-            </listitem>
+            <para>
+              By doing this, you can avoid having to issue the
+              statements manually on each machine.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                It is possible to re-create the grant tables completely
-                after they have previously been created. You might want
-                to do this if you're just learning how to use
-                <literal>GRANT</literal> and <literal>REVOKE</literal>
-                and have made so many modifications after running
-                <command>mysql_install_db</command> that you want to
-                wipe out the tables and start over.
-              </para>
+          <listitem>
+            <para>
+              It is possible to re-create the grant tables completely
+              after they have previously been created. You might want to
+              do this if you're just learning how to use
+              <literal>GRANT</literal> and <literal>REVOKE</literal> and
+              have made so many modifications after running
+              <command>mysql_install_db</command> that you want to wipe
+              out the tables and start over.
+            </para>
 
-              <para>
-                To re-create the grant tables, remove all the
-                <filename>.frm</filename>, <filename>.MYI</filename>,
-                and <filename>.MYD</filename> files in the directory
-                containing the <literal>mysql</literal> database. (This
-                is the directory named <filename>mysql</filename> under
-                the data directory, which is listed as the
-                <literal>datadir</literal> value when you run
-                <command>mysqld --help</command>.) Then run the
-                <command>mysql_install_db</command> script again.
-              </para>
-            </listitem>
+            <para>
+              To re-create the grant tables, remove all the
+              <filename>.frm</filename>, <filename>.MYI</filename>, and
+              <filename>.MYD</filename> files in the directory
+              containing the <literal>mysql</literal> database. (This is
+              the directory named <filename>mysql</filename> under the
+              data directory, which is listed as the
+              <literal>datadir</literal> value when you run
+              <command>mysqld --help</command>.) Then run the
+              <command>mysql_install_db</command> script again.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                You can start <command>mysqld</command> manually using
-                the <option>--skip-grant-tables</option> option and add
-                the privilege information yourself using
-                <command>mysql</command>:
-              </para>
+          <listitem>
+            <para>
+              You can start <command>mysqld</command> manually using the
+              <option>--skip-grant-tables</option> option and add the
+              privilege information yourself using
+              <command>mysql</command>:
+            </para>
 
 <programlisting>
 shell&gt; <userinput>bin/mysqld_safe --user=mysql --skip-grant-tables &amp;</userinput>
 shell&gt; <userinput>bin/mysql mysql</userinput>
 </programlisting>
 
-              <para>
-                From <command>mysql</command>, manually execute the SQL
-                commands contained in
-                <command>mysql_install_db</command>. Make sure that you
-                run <command>mysqladmin flush-privileges</command> or
-                <command>mysqladmin reload</command> afterward to tell
-                the server to reload the grant tables.
-              </para>
+            <para>
+              From <command>mysql</command>, manually execute the SQL
+              commands contained in <command>mysql_install_db</command>.
+              Make sure that you run <command>mysqladmin
+              flush-privileges</command> or <command>mysqladmin
+              reload</command> afterward to tell the server to reload
+              the grant tables.
+            </para>
 
-              <para>
-                Note that by not using
-                <command>mysql_install_db</command>, you not only have
-                to populate the grant tables manually, you also have to
-                create them first.
-              </para>
-            </listitem>
+            <para>
+              Note that by not using
+              <command>mysql_install_db</command>, you not only have to
+              populate the grant tables manually, you also have to
+              create them first.
+            </para>
+          </listitem>
 
-          </itemizedlist>
+        </itemizedlist>
 
       </section>
 
@@ -12668,12 +12668,12 @@
       <para>
         Some releases introduce changes to the structure of the grant
         tables (the tables in the <literal>mysql</literal> database) to
-        add new privileges or features. To make sure that your grant
-        tables are current when you update to a new version of MySQL,
-        you should run the <command>mysql_fix_privilege_tables</command>
-        script to update your grant tables as well. The procedure for
-        doing this is described at
-        <xref linkend="mysql-fix-privilege-tables"/>.
+        add new privileges or to support new features. To make sure that
+        your grant tables are current when you update to a new version
+        of MySQL, you should run the
+        <command>mysql_fix_privilege_tables</command> script to update
+        your grant tables as well. The procedure for doing this is
+        described at <xref linkend="mysql-fix-privilege-tables"/>.
       </para>
 
       <para>
@@ -12793,7 +12793,7 @@
 
       <para>
         If you want to copy a database from a remote machine over a slow
-        network, you can use:
+        network, you can use these commands:
       </para>
 
 <programlisting>
@@ -12802,25 +12802,24 @@
 </programlisting>
 
       <para>
-        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
+        You can also store the dump in a file, transfer the file to the
+        target machine, and then load the file into the database there.
+        For example, you can dump a database to a compressed file on the
         source machine like this:
       </para>
 
 <programlisting>
-shell&gt; <userinput>mysqldump --quick <replaceable>db_name</replaceable> | gzip &gt; <replaceable>db_name.contents</replaceable>.gz</userinput>
+shell&gt; <userinput>mysqldump --quick <replaceable>db_name</replaceable> | gzip &gt; <replaceable>db_name</replaceable>.gz</userinput>
 </programlisting>
 
       <para>
-        (The file created in this example is compressed.) Transfer the
-        file containing the database contents to the target machine and
-        run these commands there:
+        Transfer the file containing the database contents to the target
+        machine and run these commands there:
       </para>
 
 <programlisting>
 shell&gt; <userinput>mysqladmin create <replaceable>db_name</replaceable></userinput>
-shell&gt; <userinput>gunzip &lt; <replaceable>db_name.contents</replaceable>.gz | mysql <replaceable>db_name</replaceable></userinput>
+shell&gt; <userinput>gunzip &lt; <replaceable>db_name</replaceable>.gz | mysql <replaceable>db_name</replaceable></userinput>
 </programlisting>
 
       <indexterm>
@@ -12836,8 +12835,8 @@
         <command>mysqlimport</command> to transfer the database. For
         large tables, this is much faster than simply using
         <command>mysqldump</command>. In the following commands,
-        <literal>DUMPDIR</literal> represents the full pathname of the
-        directory you use to store the output from
+        <replaceable>DUMPDIR</replaceable> represents the full pathname
+        of the directory you use to store the output from
         <command>mysqldump</command>.
       </para>
 
@@ -12847,28 +12846,29 @@
       </para>
 
 <programlisting>
-shell&gt; <userinput>mkdir DUMPDIR</userinput>
-shell&gt; <userinput>mysqldump --tab=DUMPDIR <replaceable>db_name</replaceable></userinput>
+shell&gt; <userinput>mkdir <replaceable>DUMPDIR</replaceable></userinput>
+shell&gt; <userinput>mysqldump --tab=<replaceable>DUMPDIR</replaceable> <replaceable>db_name</replaceable></userinput>
 </programlisting>
 
       <para>
-        Then transfer the files in the <literal>DUMPDIR</literal>
-        directory to some corresponding directory on the target machine
-        and load the files into MySQL there:
+        Then transfer the files in the
+        <replaceable>DUMPDIR</replaceable> directory to some
+        corresponding directory on the target machine and load the files
+        into MySQL there:
       </para>
 
 <programlisting>
 shell&gt; <userinput>mysqladmin create <replaceable>db_name</replaceable>           # create database</userinput>
-shell&gt; <userinput>cat DUMPDIR/*.sql | mysql <replaceable>db_name</replaceable>   # create tables in database</userinput>
-shell&gt; <userinput>mysqlimport <replaceable>db_name</replaceable> DUMPDIR/*.txt   # load data into tables</userinput>
+shell&gt; <userinput>cat <replaceable>DUMPDIR</replaceable>/*.sql | mysql <replaceable>db_name</replaceable>   # create tables in database</userinput>
+shell&gt; <userinput>mysqlimport <replaceable>db_name</replaceable> <replaceable>DUMPDIR</replaceable>/*.txt   # load data into tables</userinput>
 </programlisting>
 
       <para>
-        Also, do not forget to copy the <literal>mysql</literal>
-        database because that is where the grant tables are stored. You
-        might have to run commands as the MySQL <literal>root</literal>
-        user on the new machine until you have the
-        <literal>mysql</literal> database in place.
+        Do not forget to copy the <literal>mysql</literal> database
+        because that is where the grant tables are stored. You might
+        have to run commands as the MySQL <literal>root</literal> user
+        on the new machine until you have the <literal>mysql</literal>
+        database in place.
       </para>
 
       <para>
@@ -12891,9 +12891,9 @@
     </indexterm>
 
     <para>
-      This section describes what you should do if you are downgrading
-      to an older MySQL version in the unlikely case that the previous
-      version worked better than the new one.
+      This section describes what you should do to downgrade to an older
+      MySQL version in the unlikely case that the previous version
+      worked better than the new one.
     </para>
 
     <para>
@@ -12907,7 +12907,7 @@
 
     <para>
       The following items form a checklist of things you should do
-      whenever you perform an downgrade:
+      whenever you perform a downgrade:
     </para>
 
     <itemizedlist>
@@ -12930,10 +12930,9 @@
     </itemizedlist>
 
     <para>
-      You can in most cases move the MySQL format files and data files
+      In most cases, you can move the MySQL format files and data files
       between different versions on the same architecture as long as you
-      stay within versions for the same release series of MySQL. The
-      current production release series is &current-series;.
+      stay within versions for the same release series of MySQL.
     </para>
 
     <para>
@@ -12942,8 +12941,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. For examples, see
+      <xref linkend="upgrading-to-arch"/>.
     </para>
 
     <para>
@@ -12956,15 +12955,13 @@
 
       <listitem>
         <para>
-          Stop the older MySQL server that you are trying to downgrade
-          to.
+          Stop the older MySQL server that you are downgrading to.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Restart the newer MySQL server you are trying to downgrade
-          from.
+          Restart the newer MySQL server you are downgrading from.
         </para>
       </listitem>
 
@@ -14019,7 +14016,7 @@
         </para>
 
         <para>
-          Known issues are:
+          Known issues:
         </para>
 
         <itemizedlist>
@@ -16178,8 +16175,8 @@
         </para>
 
         <para>
-          Remember that you must use GNU <command>make</command> when
-          making MySQL.
+          Remember that you must use GNU <command>make</command> to
+          build MySQL.
         </para>
 
         <para>
@@ -16322,8 +16319,8 @@
         </itemizedlist>
 
         <para>
-          Beginning with Legend/OpenServer 6.0.0 has native threads and
-          no 2GB file size limit.
+          Beginning with Legend/OpenServer 6.0.0, there are native
+          threads and no 2GB file size limit.
         </para>
 
       </section>
@@ -16333,7 +16330,7 @@
         <title>&title-sco-openserver;</title>
 
         <para>
-          Key improvements of OpenServer 6 include:
+          OpenServer 6 includes these key improvements:
         </para>
 
         <itemizedlist>
@@ -16371,7 +16368,7 @@
         </itemizedlist>
 
         <para>
-          OpenServer 6.0.0 has the following:
+          OpenServer 6.0.0 commands are organized as follows:
         </para>
 
         <itemizedlist>
@@ -16965,7 +16962,7 @@
     <para>
       Perl support for MySQL is provided by means of the
       <literal>DBI</literal>/<literal>DBD</literal> client interface.
-      The interface requires Perl 5.6.0 or later. It <emphasis>does not
+      The interface requires Perl 5.6.1 or later. It <emphasis>does not
       work</emphasis> if you have an older version of Perl.
     </para>
 
@@ -16976,8 +16973,8 @@
     </para>
 
     <para>
-      If you are using the MySQL 4.1 client library, you must use
-      <literal>DBD::mysql</literal> 2.9003 or newer.
+      If you are using the MySQL 4.1 or newer client library, you must
+      use <literal>DBD::mysql</literal> 2.9003 or newer.
     </para>
 
     <para>
@@ -17034,7 +17031,7 @@
         using the default username and password. (The default username
         is your login name on Unix, and <literal>ODBC</literal> on
         Windows. The default password is <quote>no password.</quote>) If
-        you can't connect to the server with those values (for example,
+        you cannot connect to the server with those values (for example,
         if your account has a password), the tests fail. You can use
         <literal>force install DBD::mysql</literal> to ignore the failed
         tests.
@@ -17150,7 +17147,7 @@
         <literal>DBD</literal> module with ActiveState Perl:
       </para>
 
-      <itemizedlist>
+      <orderedlist>
 
         <listitem>
           <para>
@@ -17168,8 +17165,8 @@
 
         <listitem>
           <para>
-            If required, set the <literal>HTTP_proxy</literal> variable.
-            For example, you might try:
+            If necessary, set the <literal>HTTP_proxy</literal>
+            variable. For example, you might try a setting like this:
           </para>
 
 <programlisting>
@@ -17209,16 +17206,16 @@
 </programlisting>
         </listitem>
 
-      </itemizedlist>
+      </orderedlist>
 
       <para>
         This procedure should work with ActiveState Perl 5.6 or newer.
       </para>
 
       <para>
-        If you can't get the procedure to work, you should instead
-        install the MyODBC driver and connect to the MySQL server
-        through ODBC:
+        If you cannot get the procedure to work, you should install the
+        MyODBC driver instead and connect to the MySQL server through
+        ODBC:
       </para>
 
 <programlisting>
@@ -17244,16 +17241,14 @@
       </indexterm>
 
       <para>
-        If Perl reports that it can't find the
+        If Perl reports that it cannot find the
         <filename>../mysql/mysql.so</filename> module, the problem is
-        probably that Perl can't locate the shared library
-        <filename>libmysqlclient.so</filename>.
+        probably that Perl cannot locate the
+        <filename>libmysqlclient.so</filename> shared library. You
+        should be able to fix this problem by one of the following
+        methods:
       </para>
 
-      <para>
-        You should be able to fix this by one of the following methods:
-      </para>
-
       <itemizedlist>
 
         <listitem>

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.0/ndbcluster.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -5428,7 +5428,7 @@
 
       <para>
         In a MySQL Cluster, a set of <command>ndbd</command> processes
-        co-operate in handling data. These processes can execute on the
+        cooperate in handling data. These processes can execute on the
         same computer (host) or on different computers. The
         correspondences between data nodes and Cluster hosts is
         completely configurable.

Modified: trunk/refman-5.0/spatial-extensions.xml
===================================================================
--- trunk/refman-5.0/spatial-extensions.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.0/spatial-extensions.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -934,7 +934,7 @@
         <listitem>
           <para>
             On a region map, <literal>Polygon</literal> objects could
-            represent forests, districts, an so on.
+            represent forests, districts, and so on.
           </para>
         </listitem>
 

Modified: trunk/refman-5.1/connector-mxj.xml
===================================================================
--- trunk/refman-5.1/connector-mxj.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.1/connector-mxj.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -63,7 +63,7 @@
     </para>
 
     <para>
-      This an beta release and feedback is welcome and encouraged.
+      This a beta release and feedback is welcome and encouraged.
     </para>
 
     <para>

Modified: trunk/refman-5.1/connector-net.xml
===================================================================
--- trunk/refman-5.1/connector-net.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.1/connector-net.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -3350,7 +3350,7 @@
 
         <para>
           Crystal Reports is a common tool used by Windows application
-          developers to perform reporting an document generation. In
+          developers to perform reporting and document generation. In
           this section we will show how to use Crystal Reports XI with
           MySQL and Connector/NET.
         </para>

Modified: trunk/refman-5.1/custom-engine.xml
===================================================================
--- trunk/refman-5.1/custom-engine.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.1/custom-engine.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -81,7 +81,7 @@
     </para>
 
     <para>
-      Each storage engine is an class with each instance of the class
+      Each storage engine is a class with each instance of the class
       communicating with the MySQL server through a special
       <literal>handler</literal> interface.
     </para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.1/database-administration.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -2047,7 +2047,7 @@
 
         <title>&title-instance-manager-security;</title>
 
-         <para>
+        <para>
           Communication with the MySQL Instance Manager is handled using
           the MySQL client-server protocol. As such, you can connect to
           the IM using the standard <command>mysql</command> client
@@ -2057,29 +2057,30 @@
         </para>
 
         <refsection id="instance-manager-security-passwords">
-          <title>Instance Manager Users and Passwords</title>  
-        
-        <para>
-          The IM stores its user information in a password file. Default
-          placement for the password file is
-          <filename>/etc/mysqlmanager.passwd</filename>
-        </para>
 
-        <para>
-          Password entries look like the following:
-        </para>
+          <title>Instance Manager Users and Passwords</title>
 
+          <para>
+            The IM stores its user information in a password file.
+            Default placement for the password file is
+            <filename>/etc/mysqlmanager.passwd</filename>
+          </para>
+
+          <para>
+            Password entries look like the following:
+          </para>
+
 <programlisting>
 petr:*35110DC9B4D8140F5DE667E28C72DD2597B5C848
 </programlisting>
 
-        <para>
-          To generate such an entry one should invoke IM with the
-          <command>--passwd</command> option. Then the output can be
-          redirected to the
-          <filename>/etc/mysqlmanager.passwd</filename> file to add a
-          new user. A sample command is given below.
-        </para>
+          <para>
+            To generate such an entry one should invoke IM with the
+            <command>--passwd</command> option. Then the output can be
+            redirected to the
+            <filename>/etc/mysqlmanager.passwd</filename> file to add a
+            new user. A sample command is given below.
+          </para>
 
 <programlisting>
 ./mysqlmanager --passwd &gt;&gt; /etc/mysqlmanager.passwd
@@ -2089,42 +2090,48 @@
 Re-type password: &lt;password&gt;
 </programlisting>
 
-        <para>
-          The following line is added to
-          <filename>/etc/mysqlmanager.passwd</filename>:
-        </para>
+          <para>
+            The following line is added to
+            <filename>/etc/mysqlmanager.passwd</filename>:
+          </para>
 
 <programlisting>
 mike:*00A51F3F48415C7D4E8908980D443C29C69B60C9
 </programlisting>
 
-        <para>
-          If there are no entries in the
-          <filename>/etc/mysqlmanager.passwd</filename> file one cannot
-          connect to the IM.
-        </para>
+          <para>
+            If there are no entries in the
+            <filename>/etc/mysqlmanager.passwd</filename> file one
+            cannot connect to the IM.
+          </para>
 
         </refsection>
-        
+
         <refsection id="instance-manager-security-monitoring">
+
           <title>MySQL Server Accounts for Status Monitoring</title>
-          
-          <para>In order to monitor server status, the MySQL Instance
+
+          <para>
+            In order to monitor server status, the MySQL Instance
             Manager will attempt to connect to the MySQL server instance
-          at regular intervals using the
-            <literal>MySQL_Instance_Manager@localhost</literal> user account
-            with a password of <literal>check_connection</literal>.</para>
-          
-          <para>You are <emphasis>not</emphasis> required to create a
+            at regular intervals using the
+            <literal>MySQL_Instance_Manager@localhost</literal> user
+            account with a password of
+            <literal>check_connection</literal>.
+          </para>
+
+          <para>
+            You are <emphasis>not</emphasis> required to create a
             <literal>MySQL_Instance_M@localhost</literal> user account
             in order for the MySQL Instance Manager to monitor server
             status, as a login failure is sufficient to identify that
-            the server is operational. However; because the account does not
-            exist the failed connection attempts will be recorded to
-            the <link linkend="query-log">General Query Log</link>.</para>
-        
+            the server is operational. However; because the account does
+            not exist the failed connection attempts will be recorded to
+            the <link linkend="query-log">General Query Log</link>.
+          </para>
+
         </refsection>
-        
+
       </refsection>
 
       <refsection id="instance-manager-command-line-options">
@@ -15207,7 +15214,7 @@
 </programlisting>
 
           <para>
-            The result should include an row with the
+            The result should include a row with the
             <literal>Host</literal> and <literal>User</literal> columns
             matching your computer's hostname and your MySQL username.
           </para>

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.1/functions.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -13682,7 +13682,7 @@
       </para>
 
       <para>
-        If you use an group function in a statement containing no
+        If you use a group function in a statement containing no
         <literal>GROUP BY</literal> clause, it is equivalent to grouping
         on all rows.
       </para>

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.1/installing.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -8912,7 +8912,7 @@
             The <filename>sql_yacc.cc</filename> file is generated from
             <filename>sql_yacc.yy</filename>. Normally the build process
             does not need to create <filename>sql_yacc.cc</filename>,
-            because MySQL comes with an pre-generated copy. However, if
+            because MySQL comes with a pre-generated copy. However, if
             you do need to re-create it, you might encounter this error:
           </para>
 
@@ -12115,12 +12115,12 @@
       <para>
         Some releases introduce changes to the structure of the grant
         tables (the tables in the <literal>mysql</literal> database) to
-        add new privileges or features. To make sure that your grant
-        tables are current when you update to a new version of MySQL,
-        you should run the <command>mysql_fix_privilege_tables</command>
-        script to update your grant tables as well. The procedure for
-        doing this is described at
-        <xref linkend="mysql-fix-privilege-tables"/>.
+        add new privileges or to support new features. To make sure that
+        your grant tables are current when you update to a new version
+        of MySQL, you should run the
+        <command>mysql_fix_privilege_tables</command> script to update
+        your grant tables as well. The procedure for doing this is
+        described at <xref linkend="mysql-fix-privilege-tables"/>.
       </para>
 
       <para>
@@ -12201,7 +12201,7 @@
 
       <para>
         If you want to copy a database from a remote machine over a slow
-        network, you can use:
+        network, you can use these commands:
       </para>
 
 <programlisting>
@@ -12210,25 +12210,24 @@
 </programlisting>
 
       <para>
-        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
+        You can also store the dump in a file, transfer the file to the
+        target machine, and then load the file into the database there.
+        For example, you can dump a database to a compressed file on the
         source machine like this:
       </para>
 
 <programlisting>
-shell&gt; <userinput>mysqldump --quick <replaceable>db_name</replaceable> | gzip &gt; <replaceable>db_name.contents</replaceable>.gz</userinput>
+shell&gt; <userinput>mysqldump --quick <replaceable>db_name</replaceable> | gzip &gt; <replaceable>db_name</replaceable>.gz</userinput>
 </programlisting>
 
       <para>
-        (The file created in this example is compressed.) Transfer the
-        file containing the database contents to the target machine and
-        run these commands there:
+        Transfer the file containing the database contents to the target
+        machine and run these commands there:
       </para>
 
 <programlisting>
 shell&gt; <userinput>mysqladmin create <replaceable>db_name</replaceable></userinput>
-shell&gt; <userinput>gunzip &lt; <replaceable>db_name.contents</replaceable>.gz | mysql <replaceable>db_name</replaceable></userinput>
+shell&gt; <userinput>gunzip &lt; <replaceable>db_name</replaceable>.gz | mysql <replaceable>db_name</replaceable></userinput>
 </programlisting>
 
       <indexterm>
@@ -12244,8 +12243,8 @@
         <command>mysqlimport</command> to transfer the database. For
         large tables, this is much faster than simply using
         <command>mysqldump</command>. In the following commands,
-        <literal>DUMPDIR</literal> represents the full pathname of the
-        directory you use to store the output from
+        <replaceable>DUMPDIR</replaceable> represents the full pathname
+        of the directory you use to store the output from
         <command>mysqldump</command>.
       </para>
 
@@ -12255,28 +12254,29 @@
       </para>
 
 <programlisting>
-shell&gt; <userinput>mkdir DUMPDIR</userinput>
-shell&gt; <userinput>mysqldump --tab=DUMPDIR <replaceable>db_name</replaceable></userinput>
+shell&gt; <userinput>mkdir <replaceable>DUMPDIR</replaceable></userinput>
+shell&gt; <userinput>mysqldump --tab=<replaceable>DUMPDIR</replaceable> <replaceable>db_name</replaceable></userinput>
 </programlisting>
 
       <para>
-        Then transfer the files in the <literal>DUMPDIR</literal>
-        directory to some corresponding directory on the target machine
-        and load the files into MySQL there:
+        Then transfer the files in the
+        <replaceable>DUMPDIR</replaceable> directory to some
+        corresponding directory on the target machine and load the files
+        into MySQL there:
       </para>
 
 <programlisting>
 shell&gt; <userinput>mysqladmin create <replaceable>db_name</replaceable>           # create database</userinput>
-shell&gt; <userinput>cat DUMPDIR/*.sql | mysql <replaceable>db_name</replaceable>   # create tables in database</userinput>
-shell&gt; <userinput>mysqlimport <replaceable>db_name</replaceable> DUMPDIR/*.txt   # load data into tables</userinput>
+shell&gt; <userinput>cat <replaceable>DUMPDIR</replaceable>/*.sql | mysql <replaceable>db_name</replaceable>   # create tables in database</userinput>
+shell&gt; <userinput>mysqlimport <replaceable>db_name</replaceable> <replaceable>DUMPDIR</replaceable>/*.txt   # load data into tables</userinput>
 </programlisting>
 
       <para>
-        Also, do not forget to copy the <literal>mysql</literal>
-        database because that is where the grant tables are stored. You
-        might have to run commands as the MySQL <literal>root</literal>
-        user on the new machine until you have the
-        <literal>mysql</literal> database in place.
+        Do not forget to copy the <literal>mysql</literal> database
+        because that is where the grant tables are stored. You might
+        have to run commands as the MySQL <literal>root</literal> user
+        on the new machine until you have the <literal>mysql</literal>
+        database in place.
       </para>
 
       <para>
@@ -12299,9 +12299,9 @@
     </indexterm>
 
     <para>
-      This section describes what you should do if you are downgrading
-      to an older MySQL version in the unlikely case that the previous
-      version worked better than the new one.
+      This section describes what you should do to downgrade to an older
+      MySQL version in the unlikely case that the previous version
+      worked better than the new one.
     </para>
 
     <para>
@@ -12315,7 +12315,7 @@
 
     <para>
       The following items form a checklist of things you should do
-      whenever you perform an downgrade:
+      whenever you perform a downgrade:
     </para>
 
     <itemizedlist>
@@ -12338,10 +12338,9 @@
     </itemizedlist>
 
     <para>
-      You can in most cases move the MySQL format files and data files
+      In most cases, you can move the MySQL format files and data files
       between different versions on the same architecture as long as you
-      stay within versions for the same release series of MySQL. The
-      current production release series is &current-series;.
+      stay within versions for the same release series of MySQL.
     </para>
 
     <para>
@@ -12350,8 +12349,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. For examples, see
+      <xref linkend="upgrading-to-arch"/>.
     </para>
 
     <para>
@@ -12364,15 +12363,13 @@
 
       <listitem>
         <para>
-          Stop the older MySQL server that you are trying to downgrade
-          to.
+          Stop the older MySQL server that you are downgrading to.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Restart the newer MySQL server you are trying to downgrade
-          from.
+          Restart the newer MySQL server you are downgrading from.
         </para>
       </listitem>
 
@@ -13331,7 +13328,7 @@
         </para>
 
         <para>
-          Known issues are:
+          Known issues:
         </para>
 
         <itemizedlist>
@@ -15490,8 +15487,8 @@
         </para>
 
         <para>
-          Remember that you must use GNU <command>make</command> when
-          making MySQL.
+          Remember that you must use GNU <command>make</command> to
+          build MySQL.
         </para>
 
         <para>
@@ -15634,8 +15631,8 @@
         </itemizedlist>
 
         <para>
-          Beginning with Legend/OpenServer 6.0.0 has native threads and
-          no 2GB file size limit.
+          Beginning with Legend/OpenServer 6.0.0, there are native
+          threads and no 2GB file size limit.
         </para>
 
       </section>
@@ -15645,7 +15642,7 @@
         <title>&title-sco-openserver;</title>
 
         <para>
-          Key improvements of OpenServer 6 include:
+          OpenServer 6 includes these key improvements:
         </para>
 
         <itemizedlist>
@@ -15683,7 +15680,7 @@
         </itemizedlist>
 
         <para>
-          OpenServer 6.0.0 has the following:
+          OpenServer 6.0.0 commands are organized as follows:
         </para>
 
         <itemizedlist>
@@ -16277,7 +16274,7 @@
     <para>
       Perl support for MySQL is provided by means of the
       <literal>DBI</literal>/<literal>DBD</literal> client interface.
-      The interface requires Perl 5.6.0 or later. It <emphasis>does not
+      The interface requires Perl 5.6.1 or later. It <emphasis>does not
       work</emphasis> if you have an older version of Perl.
     </para>
 
@@ -16288,8 +16285,8 @@
     </para>
 
     <para>
-      If you are using the MySQL 4.1 client library, you must use
-      <literal>DBD::mysql</literal> 2.9003 or newer.
+      If you are using the MySQL 4.1 or newer client library, you must
+      use <literal>DBD::mysql</literal> 2.9003 or newer.
     </para>
 
     <para>
@@ -16346,7 +16343,7 @@
         using the default username and password. (The default username
         is your login name on Unix, and <literal>ODBC</literal> on
         Windows. The default password is <quote>no password.</quote>) If
-        you can't connect to the server with those values (for example,
+        you cannot connect to the server with those values (for example,
         if your account has a password), the tests fail. You can use
         <literal>force install DBD::mysql</literal> to ignore the failed
         tests.
@@ -16462,7 +16459,7 @@
         <literal>DBD</literal> module with ActiveState Perl:
       </para>
 
-      <itemizedlist>
+      <orderedlist>
 
         <listitem>
           <para>
@@ -16480,8 +16477,8 @@
 
         <listitem>
           <para>
-            If required, set the <literal>HTTP_proxy</literal> variable.
-            For example, you might try:
+            If necessary, set the <literal>HTTP_proxy</literal>
+            variable. For example, you might try a setting like this:
           </para>
 
 <programlisting>
@@ -16521,16 +16518,16 @@
 </programlisting>
         </listitem>
 
-      </itemizedlist>
+      </orderedlist>
 
       <para>
         This procedure should work with ActiveState Perl 5.6 or newer.
       </para>
 
       <para>
-        If you can't get the procedure to work, you should instead
-        install the MyODBC driver and connect to the MySQL server
-        through ODBC:
+        If you cannot get the procedure to work, you should install the
+        MyODBC driver instead and connect to the MySQL server through
+        ODBC:
       </para>
 
 <programlisting>
@@ -16556,16 +16553,14 @@
       </indexterm>
 
       <para>
-        If Perl reports that it can't find the
+        If Perl reports that it cannot find the
         <filename>../mysql/mysql.so</filename> module, the problem is
-        probably that Perl can't locate the shared library
-        <filename>libmysqlclient.so</filename>.
+        probably that Perl cannot locate the
+        <filename>libmysqlclient.so</filename> shared library. You
+        should be able to fix this problem by one of the following
+        methods:
       </para>
 
-      <para>
-        You should be able to fix this by one of the following methods:
-      </para>
-
       <itemizedlist>
 
         <listitem>

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -5426,7 +5426,7 @@
 
       <para>
         In a MySQL Cluster, a set of <command>ndbd</command> processes
-        co-operate in handling data. These processes can execute on the
+        cooperate in handling data. These processes can execute on the
         same computer (host) or on different computers. The
         correspondences between data nodes and Cluster hosts is
         completely configurable.

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.1/replication.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -4353,7 +4353,7 @@
         <para>
           All other functions are replicated correctly (including
           <literal>RAND()</literal>, <literal>NOW()</literal>,
-          <literal>LOAD DATA INFILE</literal>, an so forth).
+          <literal>LOAD DATA INFILE</literal>, and so forth).
         </para>
       </listitem>
 

Modified: trunk/refman-5.1/spatial-extensions.xml
===================================================================
--- trunk/refman-5.1/spatial-extensions.xml	2006-01-11 20:54:58 UTC (rev 768)
+++ trunk/refman-5.1/spatial-extensions.xml	2006-01-11 20:55:15 UTC (rev 769)
@@ -934,7 +934,7 @@
         <listitem>
           <para>
             On a region map, <literal>Polygon</literal> objects could
-            represent forests, districts, an so on.
+            represent forests, districts, and so on.
           </para>
         </listitem>
 

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