List:Commits« Previous MessageNext Message »
From:paul Date:January 11 2006 6:36pm
Subject:svn commit - mysqldoc@docsrva: r763 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-11 19:35:54 +0100 (Wed, 11 Jan 2006)
New Revision: 763

Log:
 r6085@frost:  paul | 2006-01-11 12:25:29 -0600
 Cleanup revisions.


Modified:
   trunk/
   trunk/refman-4.1/apis.xml
   trunk/refman-4.1/charset.xml
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-4.1/connector-j.xml
   trunk/refman-4.1/connector-mxj.xml
   trunk/refman-4.1/connector-net.xml
   trunk/refman-4.1/data-types.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/functions.xml
   trunk/refman-4.1/innodb.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/ndbcluster.xml
   trunk/refman-4.1/optimization.xml
   trunk/refman-4.1/replication.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-4.1/storage-engines.xml
   trunk/refman-5.0/apis.xml
   trunk/refman-5.0/charset.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.0/connector-j.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/innodb.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.0/ndbcluster.xml
   trunk/refman-5.0/optimization.xml
   trunk/refman-5.0/problems.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.0/storage-engines.xml
   trunk/refman-5.1/apis.xml
   trunk/refman-5.1/charset.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-5.1/connector-j.xml
   trunk/refman-5.1/connector-mxj.xml
   trunk/refman-5.1/connector-net.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/extending-mysql.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-5.1/innodb.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/ndbcluster.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.1/partitioning.xml
   trunk/refman-5.1/problems.xml
   trunk/refman-5.1/replication.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-5.1/storage-engines.xml
   trunk/refman-common/manual-conventions.en.xml
   trunk/refman-common/news-innodb.xml
   trunk/refman-common/titles.en.ent


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

Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/apis.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -177,8 +177,9 @@
         the MySQL server library into a compiled version of a program,
         use the GNU C compiler (<literal>gcc</literal>). The compiler
         will need to know where to find various files and need
-        instructions on how to compile the program. Below is an example
-        of how a program could be compiled from the command-line:
+        instructions on how to compile the program. The following
+        example shows how a program could be compiled from the command
+        line:
       </para>
 
 <programlisting>

Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/charset.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -1365,8 +1365,8 @@
       <para>
         Standard SQL resolves such questions using what used to be
         called <quote>coercibility</quote> rules. Basically, this means:
-        Since both <literal>x</literal> and <literal>'Y'</literal> have
-        collations, whose collation takes precedence? This can be
+        Both <literal>x</literal> and <literal>'Y'</literal> have
+        collations, so which collation takes precedence? This can be
         difficult to resolve, but the following rules take care of most
         situations:
       </para>
@@ -2138,7 +2138,7 @@
 
     <para>
       <firstterm>Metadata</firstterm> is <quote>the data about the
-      data</quote>. Anything that <emphasis>describes</emphasis> the
+      data.</quote> Anything that <emphasis>describes</emphasis> the
       database &mdash; as opposed to being the
       <emphasis>contents</emphasis> of the database &mdash; is metadata.
       Thus column names, database names, usernames, version names, and
@@ -2258,9 +2258,9 @@
     <para>
       Although automatic conversion is not in the SQL standard, the SQL
       standard document does say that every character set is (in terms
-      of supported characters) a <quote>subset</quote> of Unicode. Since
-      it is a well-known principle that <quote>what applies to a
-      superset can apply to a subset</quote>, we believe that a
+      of supported characters) a <quote>subset</quote> of Unicode.
+      Because it is a well-known principle that <quote>what applies to a
+      superset can apply to a subset,</quote> we believe that a
       collation for Unicode can apply for comparisons with non-Unicode
       strings.
     </para>
@@ -3397,7 +3397,7 @@
             <foreignphrase>Deutsches Institut für
             Normung</foreignphrase> (the German equivalent of ANSI).
             DIN-1 is called the <quote>dictionary collation</quote> and
-            DIN-2 is called the <quote>phone book collation</quote>.
+            DIN-2 is called the <quote>phone book collation.</quote>
           </para>
 
           <itemizedlist>
@@ -3492,7 +3492,7 @@
         same as the official <literal>ISO 8859-1</literal> or IANA
         (Internet Assigned Numbers Authority) <literal>latin1</literal>,
         but IANA <literal>latin1</literal> treats the code points
-        between 0x80 and 0x9f as <quote>undefined</quote>, while
+        between 0x80 and 0x9f as <quote>undefined,</quote> while
         <literal>cp1252</literal>, and therefore MySQL's
         <literal>latin1</literal>, assign characters for those
         positions. For example, 0x80 is the Euro sign. For the

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -5269,7 +5269,7 @@
         <para>
           If you are doing a backup on the server, and your tables all
           are <literal>MyISAM</literal> tables, you could consider using
-          the <command>mysqlhotcopy</command> instead since faster
+          the <command>mysqlhotcopy</command> instead because faster
           backups and faster restores can be accomplished with the
           latter. See <xref linkend="mysqlhotcopy"/>.
         </para>
@@ -6271,7 +6271,7 @@
 
         <para>
           For point-in-time recovery (also known as
-          <quote>roll-forward</quote>, when you need to restore an old
+          <quote>roll-forward,</quote> when you need to restore an old
           backup and replay the changes which happened since that
           backup), it is often useful to rotate the binary log (see
           <xref linkend="binary-log"/>) or at least know the binary log

Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/connector-j.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -992,7 +992,7 @@
 
         <para>
           Starting with Connector/J 3.1.9, we don't ship the .class
-          files <quote>unbundled</quote>, they are only available in the
+          files <quote>unbundled,</quote> they are only available in the
           JAR archives that ship with the driver.
         </para>
 
@@ -1290,7 +1290,7 @@
 
             <para>
               Starting with Connector/J 3.1.9, we don't ship the .class
-              files <quote>unbundled</quote>, they are only available in
+              files <quote>unbundled,</quote> they are only available in
               the JAR archives that ship with the driver.
             </para>
 
@@ -2677,7 +2677,7 @@
             <listitem>
               <para>
                 If a parameter changes from <quote>large</quote> to
-                non-<quote>large</quote>, the driver must reset the
+                non-<quote>large,</quote> the driver must reset the
                 server-side state of the prepared statement to allow the
                 parameter that is being changed to take the place of the
                 prior <quote>large</quote> value. This removes all of
@@ -4082,7 +4082,7 @@
         that comes with Connector/J to the <filename>lib</filename>
         directory for your server configuration (which is usually called
         "<filename>default</filename>"). Then, in the same configuration
-        directory, in the subdirectory named <quote>deploy</quote>,
+        directory, in the subdirectory named <quote>deploy,</quote>
         create a datasource configuration file that ends with "-ds.xml",
         which tells JBoss to deploy this file as a JDBC Datasource. The
         file should have the following contents:

Modified: trunk/refman-4.1/connector-mxj.xml
===================================================================
--- trunk/refman-4.1/connector-mxj.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/connector-mxj.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -128,11 +128,12 @@
 
     <para>
       The first thing to do is make sure that the components will work
-      on the platform. Since the ''MysqldResource'' class is really a
-      wrapper for a native version of MySQL, not all platforms are
-      supported. At the time of this writing, Linux on the i386
-      architecture has been tested and seems to work quite well, as does
-      OS X v10.3. There has been limited testing on Windows and Solaris.
+      on the platform. The <classname>MysqldResource</classname> class
+      is really a wrapper for a native version of MySQL, so not all
+      platforms are supported. At the time of this writing, Linux on the
+      i386 architecture has been tested and seems to work quite well, as
+      does OS X v10.3. There has been limited testing on Windows and
+      Solaris.
     </para>
 
     <para>
@@ -227,11 +228,11 @@
         <para>
           The tests attempt to launch MySQL on the port 3336. If you
           have a MySQL running, it may conflict, but this isn't very
-          likely since thedefault port for MySQL is 3306. However, You
-          may set the "c-mxj_test_port" Java property to a port of your
-          choosing. Alternatively, you may wish to start by shutting
-          down any instances of MySQL you have running on the target
-          machine.
+          likely because the default port for MySQL is 3306. However,
+          You may set the "c-mxj_test_port" Java property to a port of
+          your choosing. Alternatively, you may wish to start by
+          shutting down any instances of MySQL you have running on the
+          target machine.
         </para>
 
         <para>

Modified: trunk/refman-4.1/connector-net.xml
===================================================================
--- trunk/refman-4.1/connector-net.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/connector-net.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -653,7 +653,7 @@
               information from the stored procedure specified in the
               MySqlCommand and populates the Parameters collection of
               the specified MySqlCommand object. This method is not
-              currently supported since stored procedures are not
+              currently supported because stored procedures are not
               available in MySql.
             </para>
           </listitem>

Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/data-types.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -2237,7 +2237,7 @@
 
     <para>
       MySQL also allows you to store <literal>'0000-00-00'</literal> as
-      a <quote>dummy date</quote>. This is in some cases more
+      a <quote>dummy date.</quote> This is in some cases more
       convenient, and uses less data and index space, than storing
       <literal>NULL</literal> values.
     </para>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/database-administration.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -5001,7 +5001,7 @@
             <para>
               The number of days for automatic binary log removal. The
               default is 0, which means <quote>no automatic
-              removal</quote>. Possible removals happen at startup and
+              removal.</quote> Possible removals happen at startup and
               at binary log rotation. This variable was added in MySQL
               4.1.0.
             </para>
@@ -6218,7 +6218,7 @@
             <para>
               The maximum number of simultaneous connections allowed to
               any given MySQL account. A value of <literal>0</literal>
-              means <quote>no limit</quote>. This variable was added in
+              means <quote>no limit.</quote> This variable was added in
               MySQL 3.23.34.
             </para>
 
@@ -9667,7 +9667,7 @@
             escaped character sequences in Web forms, URLs, or whatever
             application you have built. Be sure that your application
             remains secure if a user enters something like
-            <quote><literal>; DROP DATABASE mysql;</literal></quote>.
+            <quote><literal>; DROP DATABASE mysql;</literal>.</quote>
             This is an extreme example, but large security leaks and
             data loss might occur as a result of hackers using similar
             techniques, if you do not prepare for them.

Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/functions.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -8735,7 +8735,7 @@
           date actually occurs in the 52nd week of 1999. We decided to
           return <literal>0</literal> instead because we want the
           function to return <quote>the week number in the given
-          year</quote>. This makes use of the <literal>WEEK()</literal>
+          year.</quote> This makes use of the <literal>WEEK()</literal>
           function reliable when combined with other functions that
           extract a date part from a date.
         </para>
@@ -11632,7 +11632,7 @@
           <para>
             These functions allow encryption and decryption of data
             using the official AES (Advanced Encryption Standard)
-            algorithm, previously known as <quote>Rijndael</quote>.
+            algorithm, previously known as <quote>Rijndael.</quote>
             Encoding with a 128-bit key length is used, but you can
             extend it up to 256 bits by modifying the source. We chose
             128 bits because it is much faster and it is secure enough
@@ -14640,7 +14640,7 @@
         can use columns or calculations in the <literal>SELECT</literal>
         list that do not appear in the <literal>GROUP BY</literal>
         clause. This stands for <quote>any possible value for this
-        group</quote>. You can use this to get better performance by
+        group.</quote> You can use this to get better performance by
         avoiding sorting and grouping on unnecessary items. For example,
         you do not need to group on <literal>customer.name</literal> in
         the following query:

Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/innodb.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -1106,7 +1106,7 @@
           The size of the buffer pool (in MB), if it is placed in the
           AWE memory. This is relevant only in 32-bit Windows. If your
           32-bit Windows operating system supports more than 4GB memory,
-          using so-called <quote>Address Windowing Extensions</quote>,
+          using so-called <quote>Address Windowing Extensions,</quote>
           you can allocate the <literal>InnoDB</literal> buffer pool
           into the AWE physical memory using this variable. The maximum
           possible value for this variable is 63000. If it is greater
@@ -3058,8 +3058,8 @@
       <command>mysqldump</command>. The reason for this is that a binary
       file might be corrupted without you noticing it. Dumped tables are
       stored into text files that are human-readable, so spotting table
-      corruption becomes easier. Also, since the format is simpler, the
-      chance for serious data corruption is smaller.
+      corruption becomes easier. Also, because the format is simpler,
+      the chance for serious data corruption is smaller.
       <command>mysqldump</command> also has a
       <option>--single-transaction</option> option that you can use to
       make a consistent snapshot without locking out other clients.
@@ -3828,7 +3828,7 @@
             non-locking fashion, but a possible earlier version of a
             record might be used. Thus, using this isolation level, such
             reads are not consistent. This is also called a <quote>dirty
-            read</quote>. Otherwise, this isolation level works like
+            read.</quote> Otherwise, this isolation level works like
             <literal>READ COMMITTED</literal>.
           </para>
         </listitem>
@@ -4010,7 +4010,7 @@
         a unique identifier to each child added to table
         <literal>child</literal>. Obviously, using a consistent read or
         a shared mode read to read the present value of the counter is
-        not a good idea, since two users of the database may then see
+        not a good idea because two users of the database may then see
         the same value for the counter, and a duplicate-key error occurs
         if two users attempt to add children with the same identifier to
         the table.
@@ -4091,7 +4091,7 @@
         <literal>R</literal> in an index, another user cannot insert a
         new index record immediately before <literal>R</literal> in the
         index order. This locking of gaps is done to prevent the
-        so-called <quote>phantom problem</quote>. Suppose that you want
+        so-called <quote>phantom problem.</quote> Suppose that you want
         to read and lock all children from the <literal>child</literal>
         table having an identifier value greater than 100, with the
         intention of updating some column in the selected rows later:
@@ -4383,7 +4383,7 @@
             <literal>InnoDB</literal> knows about row-level locks.
             Otherwise, InnoDB's automatic deadlock detection cannot
             detect deadlocks where such table locks are involved. Also,
-            since the higher MySQL layer does not know about row-level
+            because the higher MySQL layer does not know about row-level
             locks, it is possible to get a table lock on a table where
             another user currently has row-level locks. However, this
             does not endanger transaction integrity, as discussed in
@@ -4709,8 +4709,8 @@
           Wrap several modifications into one transaction.
           <literal>InnoDB</literal> must flush the log to disk at each
           transaction commit if that transaction made modifications to
-          the database. Since the rotation speed of a disk is typically
-          at most 167 revolutions/second, that constrains the number of
+          the database. The rotation speed of a disk is typically at
+          most 167 revolutions/second, which constrains the number of
           commits to the same 167<superscript>th</superscript> of a
           second if the disk does not <quote>fool</quote> the operating
           system.

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/installing.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -8308,7 +8308,7 @@
 
           <para>
             Normally, you do not have to build the documentation
-            yourself, because we provide it in various formats on
+            yourself because we provide it in various formats on
             <ulink url="&base-url-docs;"/>. The formats you can download
             there (HTML, PDF, and so forth) are built on a daily basis,
             so you gain little by creating them yourself from the

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/ndbcluster.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -136,7 +136,7 @@
       The data stored in the data nodes for MySQL Cluster can be
       mirrored; the cluster can handle failures of individual data nodes
       with no other impact than that a small number of transactions are
-      aborted due to losing the transaction state. Since transactional
+      aborted due to losing the transaction state. Because transactional
       applications are expected to handle transaction failure, this
       should not be a source of problems.
     </para>
@@ -365,7 +365,7 @@
       basics for how to plan, install, configure, and run a MySQL
       Cluster. Unlike the example in
       <xref linkend="mysql-cluster-configuration"/>, the result of
-      following the guidelines and procedures outlined below should be a
+      following the guidelines and procedures outlined here should be a
       usable MySQL Cluster which meets minimum requirements for
       availability and safeguarding of data.
     </para>
@@ -757,9 +757,8 @@
       </orderedlist>
 
       <para>
-        Remember that the steps listed above must be performed
-        separately for each machine on which a storage or SQL node is to
-        reside.
+        Remember that the preceding steps must be performed separately
+        for each machine on which a storage or SQL node is to reside.
       </para>
 
       <para>
@@ -895,9 +894,9 @@
 </programlisting>
 
       <para>
-        After entering the above, save this file and exit the text
-        editor. Do this for the machines hosting data node "A", data
-        node "B", and the SQL node.
+        After entering the preceding information, save this file and
+        exit the text editor. Do this for the machines hosting data node
+        "A", data node "B", and the SQL node.
       </para>
 
       <para>
@@ -1081,7 +1080,7 @@
         If all has gone well, and the cluster has been set up correctly,
         the cluster should now be operational. You can test this by
         invoking the <command>ndb_mgm</command> management node client;
-        the output should look like what is shown below:
+        the output should look like what is shown here:
       </para>
 
 <programlisting>
@@ -1219,7 +1218,8 @@
             instances of <literal>TYPE=MyISAM</literal> with
             <literal>ENGINE=NDBCLUSTER</literal>. If you do not wish to
             modify the file, you can also use <literal>ALTER
-            TABLE</literal>; see below for particulars.
+            TABLE</literal> to change their type. The particulars are
+            given later in this section.
           </para>
 
           <para>
@@ -1236,9 +1236,9 @@
 </programlisting>
 
           <para>
-            It is very important to keep in mind that the above command
-            must be executed on the host where the SQL node is running
-            -- in this case, on the machine with the IP address
+            It is very important to keep in mind that the preceding
+            command must be executed on the host where the SQL node is
+            running -- in this case, on the machine with the IP address
             <emphasis role="bold">192.168.0.20</emphasis>.
           </para>
 
@@ -1256,7 +1256,8 @@
           <para>
             Of course, the SQL script must be readable by the
             <literal>mysql</literal> system user. If you save the file
-            to a different location, adjust the above accordingly.
+            to a different location, adjust the preceding instructions
+            accordingly.
           </para>
 
           <para>
@@ -1355,9 +1356,9 @@
             Applications using MySQL can use standard APIs. It is
             important to remember that your application must access the
             SQL node, and not the MGM or storage nodes. This brief
-            example shows how we might execute the same query as above
-            using PHP 5's <literal>mysqli</literal> extension running on
-            a Web server elsewhere on the network:
+            example shows how we might execute the same query shown
+            earlier using PHP 5's <literal>mysqli</literal> extension
+            running on a Web server elsewhere on the network:
           </para>
 
 <programlisting>
@@ -1566,8 +1567,8 @@
     </para>
 
     <para>
-      Since the MySQL server is a part of the cluster, it will also need
-      to know how to access an MGM node in order to obtain the cluster
+      The MySQL server is a part of the cluster, so it will also need to
+      know how to access an MGM node in order to obtain the cluster
       configuration data. The default behavior is to look for the MGM
       node on <literal>localhost</literal>. However, should you need to
       specify its location elsewhere, this can be done in
@@ -1800,9 +1801,9 @@
 </programlisting>
 
       <para>
-        (Note that the row numbers shown in the example output above may
-        be different from those shown on your system, depending upon the
-        MySQL version being used and how it is configured.)
+        (Note that the row numbers shown in the preceding example output
+        may be different from those shown on your system, depending upon
+        the MySQL version being used and how it is configured.)
       </para>
 
 <programlisting>
@@ -1919,7 +1920,7 @@
 
         <para>
           In order to support MySQL Cluster, you will need to update
-          <filename>my.cnf</filename> as shown in the example below.
+          <filename>my.cnf</filename> as shown in the following example.
           Note that the options shown here should not be confused with
           those occurring in <filename>config.ini</filename> files. You
           may also specify these parameters when invoking the
@@ -2038,7 +2039,7 @@
           and nodes involved in the cluster and on which computers these
           nodes are located. An example of a simple configuration file
           for a cluster consisting of one management server, two data
-          nodes and two MySQL servers is shown below:
+          nodes and two MySQL servers is shown here:
         </para>
 
 <programlisting>
@@ -2123,9 +2124,9 @@
 
         <para>
           Note that each node has its own section in the
-          <filename>config.ini</filename>. For instance, since this
-          cluster has two data nodes, the configuration file contains
-          two sections defining these nodes.
+          <filename>config.ini</filename>. For instance, this cluster
+          has two data nodes, so the configuration file contains two
+          sections defining these nodes.
         </para>
 
         <para>
@@ -2179,7 +2180,7 @@
           connectstring, the default port is 1186.
           (<emphasis role="bold">Note</emphasis>: Prior to MySQL 4.1.8,
           the default port was 2200.) This port should always be
-          available on the network, since it has been assigned by IANA
+          available on the network because it has been assigned by IANA
           for this purpose (see
           <ulink url="http://www.iana.org/assignments/port-numbers"/>
           for details).
@@ -2203,7 +2204,7 @@
 
           <listitem>
             <para>
-              Each executable has its own command line option which
+              Each executable has its own command-line option which
               enables specifying the management server at startup. (See
               the documentation for the respective executable.)
             </para>
@@ -2653,11 +2654,11 @@
             <para>
               Each node in the cluster uses a port to connect to other
               nodes. This port is used also for non-TCP transporters in
-              the connection setup phase. Since, the default port is
-              allocated dynamically in such a way as to ensure that no
-              two nodes on the same computer receive the same port
-              number, it should not normally be necessary to specify a
-              value for this parameter.
+              the connection setup phase. The default port is allocated
+              dynamically in such a way as to ensure that no two nodes
+              on the same computer receive the same port number, so it
+              should not normally be necessary to specify a value for
+              this parameter.
             </para>
           </listitem>
 
@@ -2979,10 +2980,10 @@
               It is highly recommended that
               <literal>DataMemory</literal> and
               <literal>IndexMemory</literal> be set to the same values
-              for all nodes. Since data is distributed evenly over all
-              nodes in the cluster the maximum amount of space available
-              for any node can be no greater than that of the smallest
-              node in the cluster.
+              for all nodes. Data distribution is even over all nodes in
+              the cluster, so the maximum amount of space available for
+              any node can be no greater than that of the smallest node
+              in the cluster.
             </para>
 
             <para>
@@ -3345,9 +3346,9 @@
               by performing a full table scan. The second case is
               encountered when there is no hash index to support the
               query but there is an ordered index. Using the ordered
-              index means executing a parallel range scan. Since the
-              order is kept on the local partitions only, it is
-              necessary to perform the index scan on all partitions.
+              index means executing a parallel range scan. The order is
+              kept on the local partitions only, so it is necessary to
+              perform the index scan on all partitions.
             </para>
 
             <para>
@@ -3806,8 +3807,8 @@
           There are a number of <literal>[NDBD]</literal> parameters
           specifying timeouts and intervals between various actions in
           Cluster data nodes. Most of the timeout values are specified
-          in milliseconds. Any exceptions to this will be mentioned
-          where applicable below.
+          in milliseconds. Any exceptions to this are mentioned where
+          applicable.
         </para>
 
         <itemizedlist>
@@ -3852,7 +3853,7 @@
 
             <para>
               The default value is 30000 milliseconds (30 seconds).
-              <literal>0</literal> means eternal time out; in other
+              <literal>0</literal> means eternal timeout; in other
               words, the cluster may start only if all nodes are
               available.
             </para>
@@ -3934,7 +3935,7 @@
               Each data node sends heartbeat signals to each MySQL
               server (SQL node) to ensure that it remains in contact. If
               a MySQL server fails to send a heartbeat in time it is
-              declared <quote>dead</quote>, in which case all ongoing
+              declared <quote>dead,</quote> in which case all ongoing
               transactions are completed and all resources released. The
               SQL node cannot reconnect until all activities initiated
               by the previous MySQL instance have been completed. The
@@ -4028,7 +4029,7 @@
             </para>
 
             <para>
-              Time-out handling is performed by checking a timer on each
+              Timeout handling is performed by checking a timer on each
               transaction once for every interval specified by this
               parameter. Thus, if this parameter is set to 1000
               milliseconds, then every transaction will be checked for
@@ -4328,7 +4329,7 @@
             </para>
 
             <para>
-              Since UNDO log entries tend to grow larger as more
+              Because UNDO log entries tend to grow larger as more
               operations are logged, this buffer is also larger than its
               index memory counterpart, with a default value of 16MB.
             </para>
@@ -5299,10 +5300,12 @@
 
       <itemizedlist>
 
-        <para>
-          Use <option>--ndbcluster</option> as a startup option when
-          starting <command>mysqld</command>
-        </para>
+        <listitem>
+          <para>
+            Use <option>--ndbcluster</option> as a startup option when
+            starting <command>mysqld</command>
+          </para>
+        </listitem>
 
         <listitem>
           <para>
@@ -5325,7 +5328,7 @@
         output), you are not running an <literal>NDB</literal>-enabled
         version of MySQL. If you see <literal>DISABLED</literal> in this
         row, then you need to enable it in either one of the two ways
-        shown above.
+        just described.
       </para>
 
       <para>
@@ -5711,10 +5714,10 @@
 
       <para>
         When starting the management client, it is necessary to supply
-        the hostname and port of the management server as in the example
-        below. The default values are <literal>localhost</literal> and
-        <literal>1186</literal> (prior to MySQL 4.1.8, the default
-        Cluster port was 2200).
+        the hostname and port of the management server as in the
+        following example The default values are
+        <literal>localhost</literal> and <literal>1186</literal> (prior
+        to MySQL 4.1.8, the default Cluster port was 2200).
       </para>
 
 <programlisting>
@@ -5737,11 +5740,11 @@
         All MySQL Cluster executables (except for
         <command>mysqld</command>) take the following options as of
         4.1.8. Users of earlier MySQL Cluster versions should note that
-        some of these switches have been changed in order to make them
+        some of these options have been changed in order to make them
         consistent with one another as well as with
         <command>mysqld</command>. (For example, the <option>-V</option>
         switch was <option>-v</option> in earlier versions.) You can use
-        the <option>-?</option> switch to view a list of supported
+        the <option>--help</option> option to view a list of supported
         options.
       </para>
 
@@ -6483,7 +6486,7 @@
 
       <para>
         In addition to the central configuration file, a cluster may
-        also be controlled through a command line interface available
+        also be controlled through a command-line interface available
         through the management client <command>ndb_mgm</command>. This
         is the primary administrative interface to a running cluster.
       </para>
@@ -6593,7 +6596,7 @@
           </para>
 
           <para>
-            Exists single user mode allowing all SQL nodes (that is, all
+            Exits single-user mode, allowing all SQL nodes (that is, all
             running <command>mysqld</command> processes) to access the
             database.
           </para>
@@ -6661,7 +6664,7 @@
 
       <para>
         <emphasis role="bold">Note</emphasis>: The cluster log is the
-        log recommended for most uses, since it provides logging
+        log recommended for most uses because it provides logging
         information for an entire cluster in a single file. Node logs
         are intended to be used only during application development, or
         for debugging application code.
@@ -6691,7 +6694,7 @@
             <emphasis>Priority</emphasis>: This is represented by one of
             the numbers from 1 to 15 inclusive, where 1 indicates
             <quote>most important</quote> and 15 <quote>least
-            important</quote>.
+            important.</quote>
           </para>
         </listitem>
 
@@ -6988,7 +6991,7 @@
         </para>
 
         <para>
-          The logging messages shown below are associated with
+          The logging messages shown here are associated with
           checkpoints.
         </para>
 
@@ -7571,17 +7574,17 @@
       <para>
         Single user mode allows the database administrator to restrict
         access to the database system to a single MySQL server (SQL
-        node). When entering single user mode all connections to all
+        node). When entering single-user mode, all connections to all
         other MySQL servers are closed gracefully and all running
         transactions are aborted. No new transactions are allowed to be
         started.
       </para>
 
       <para>
-        Once the cluster has entered single user mode, only the
+        Once the cluster has entered single-user mode, only the
         designated SQL node is granted access to the database. You can
         use the <command>ALL STATUS</command> command to see when the
-        cluster has entered single user mode.
+        cluster has entered single-user mode.
       </para>
 
       <para>
@@ -7598,26 +7601,26 @@
 
       <para>
         After this command has executed and the cluster has entered
-        single user mode, the SQL node whose node ID is
+        single-user mode, the SQL node whose node ID is
         <literal>5</literal> becomes the cluster's only permitted user.
       </para>
 
       <para>
-        The node specified in the command above must be a MySQL Server
-        node; An attempt to specify any other type of node will be
-        rejected.
+        The node specified in the preceding command must be a MySQL
+        Server node; An attempt to specify any other type of node will
+        be rejected.
       </para>
 
       <para>
-        <emphasis role="bold">Note</emphasis>: When the above commmand
-        is invoked, all transactions running on the designated node are
-        aborted, the connection is closed, and the server must be
-        restarted.
+        <emphasis role="bold">Note</emphasis>: When the preceding
+        commmand is invoked, all transactions running on the designated
+        node are aborted, the connection is closed, and the server must
+        be restarted.
       </para>
 
       <para>
         The command <command>EXIT SINGLE USER MODE</command> changes the
-        state of the cluster's data nodes from single user mode to
+        state of the cluster's data nodes from single-user mode to
         normal mode. MySQL Servers waiting for a connection (that is,
         for the cluster to become ready and available), are now
         permitted to connect. The MySQL Server denoted as the
@@ -7639,7 +7642,7 @@
 
       <para>
         The recommended way to handle a node failure when running in
-        single user mode is to do either of the following:
+        single-user mode is to do either of the following:
       </para>
 
       <itemizedlist>
@@ -7649,7 +7652,7 @@
 
             <listitem>
               <para>
-                Finish all single user mode transactions
+                Finish all single-user mode transactions
               </para>
             </listitem>
 
@@ -7679,7 +7682,7 @@
 
         <listitem>
           <para>
-            Restart database nodes prior to entering single user mode.
+            Restart database nodes prior to entering single-user mode.
           </para>
         </listitem>
 
@@ -7777,7 +7780,7 @@
               A log file containing records of committed transactions.
               Only transactions on tables stored in the backup are
               stored in the log. Nodes involved in the backup save
-              different records, since different nodes host different
+              different records because different nodes host different
               database fragments.
             </para>
           </listitem>
@@ -7933,7 +7936,7 @@
 
         <para>
           The cluster restoration program is implemented as a separate
-          command line utility <command>ndb_restore</command>, which
+          command-line utility <command>ndb_restore</command>, which
           reads the files created by the backup and inserts the stored
           information into the database. The restore program must be
           executed once for each set of backup files, that is, as many
@@ -7950,9 +7953,9 @@
           free connection in order to connect to the cluster. This can
           be verified with the <command>ndb_mgm</command> command
           <command>SHOW</command> (you can accomplish this from a system
-          shell using <command>ndb_mgm -e SHOW</command>). The switch
+          shell using <command>ndb_mgm -e SHOW</command>). The
           <option>-c <replaceable>connectstring</replaceable></option>
-          may be used to locate the MGM node (see
+          option may be used to locate the MGM node (see
           <xref linkend="mysql-cluster-connectstring"/>, for information
           on connectstrings). The backup files must be present in the
           directory given as an argument to the restoration program.
@@ -8059,7 +8062,7 @@
           In MySQL &current-series;, <literal>NDB</literal> does not
           support repeatable reads, which can cause problems with the
           restore process. While the backup process is
-          <quote>hot</quote>, restoring a MySQL Cluster from backup is
+          <quote>hot,</quote> restoring a MySQL Cluster from backup is
           not a 100% <quote>hot</quote> process. This is due to the fact
           that, for the duration of the restore process, running
           transactions get non-repeatable reads from the restored data.
@@ -8094,16 +8097,16 @@
     </para>
 
     <para>
-      Currently the MySQL Cluster codebase includes support for 4
+      Currently the MySQL Cluster codebase includes support for four
       different transporters. Most users today employ TCP/IP over
-      Ethernet since it is ubiquitous. This is also by far the
+      Ethernet because it is ubiquitous. TCP/IP is also by far the
       best-tested transporter in MySQL Cluster.
     </para>
 
     <para>
       We are working to make sure that communication with the
       <command>ndbd</command> process is made in <quote>chunks</quote>
-      that are as large as possible since this benefits all types of
+      that are as large as possible because this benefits all types of
       data transmission.
     </para>
 
@@ -8140,7 +8143,7 @@
 
       <para>
         It is possible to use SCI Sockets with any version of MySQL
-        Cluster. No special builds are needed since it uses normal
+        Cluster. No special builds are needed because it uses normal
         socket calls which are already available in MySQL Cluster.
         However, SCI Sockets are currently supported only on the Linux
         2.4 and 2.6 kernels. SCI Transporters have been tested
@@ -8725,7 +8728,7 @@
         interest in communicating between <command>ndbd</command>
         processes. Using the SCI transporter is also only of interest if
         a CPU can be dedicated to the <command>ndbd</command> process
-        since the SCI transporter ensures that this process will never
+        because the SCI transporter ensures that this process will never
         go to sleep. It is also important to ensure that the
         <command>ndbd</command> process priority is set in such a way
         that the process does not lose priority due to running for an
@@ -9169,7 +9172,7 @@
               <listitem>
                 <para>
                   You must give nodes explicit IDs in connectstrings
-                  since automatic allocation of node IDs does not work
+                  because automatic allocation of node IDs does not work
                   across multiple management servers.
                 </para>
               </listitem>
@@ -9200,7 +9203,7 @@
               supported. Use of these is liable to cause problems
               because, in the event of a data node failure, an SQL node
               waits for confirmation that the data node went down but
-              never receives it since another route to that data node
+              never receives it because another route to that data node
               remains open. This can effectively make the cluster
               inoperable.
             </para>
@@ -9438,7 +9441,7 @@
 
       <listitem>
         <para>
-          <emphasis>Since MySQL Cluster uses TCP/IP, does that mean I
+          <emphasis>Because MySQL Cluster uses TCP/IP, does that mean I
           can run it over the Internet, with one or more nodes in a
           remote location?</emphasis>
         </para>
@@ -9587,7 +9590,8 @@
         <para>
           This stands for
           <quote><emphasis role="bold">N</emphasis>etwork
-          <emphasis role="bold">D</emphasis>ata<emphasis role="bold">b</emphasis>ase</quote>.
+          <emphasis role="bold">D</emphasis>ata<emphasis
+role="bold">b</emphasis>ase.</quote>
         </para>
       </listitem>
 
@@ -9704,9 +9708,9 @@
               <literal>USING HASH</literal> for all primary keys and
               unique indexes will generally cause table updates to run
               more quickly. This is due to the fact that less memory is
-              required (since no ordered indexes are created), and that
-              less CPU must be utilized (since fewer indexes must be
-              read and possibly updated).
+              required (because no ordered indexes are created), and
+              that less CPU must be utilized (because fewer indexes must
+              be read and possibly updated).
             </para>
           </listitem>
 
@@ -10025,8 +10029,8 @@
         </para>
 
         <para>
-          The above information is somewhat simplified; a more complete
-          explanation taking into account node groups follows below:
+          The preceding information is somewhat simplified; a more
+          complete explanation taking into account node groups follows:
         </para>
 
         <para>
@@ -10479,10 +10483,10 @@
           <emphasis role="bold">Note Regarding Obsolete
           Terms</emphasis>: In older versions of the MySQL Cluster
           documentation, data nodes were sometimes referred to as
-          <quote>database nodes</quote>, <quote>DB nodes</quote>, or
-          occasionally <quote>storage nodes</quote>. In addition, SQL
+          <quote>database nodes,</quote> <quote>DB nodes,</quote> or
+          occasionally <quote>storage nodes.</quote> In addition, SQL
           nodes were sometimes known as <quote>client nodes</quote> or
-          <quote>API nodes</quote>. This older terminology has been
+          <quote>API nodes.</quote> This older terminology has been
           deprecated in order to minimize confusion, and for these
           reasons should be avoided.
         </para>

Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/optimization.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -352,7 +352,7 @@
 
       <para>
         We solved this problem by storing all information per month in
-        compressed <quote>transaction tables</quote>. We had a set of
+        compressed <quote>transaction tables.</quote> We had a set of
         simple macros that generated summary tables grouped by different
         criteria (product group, customer id, store, and so on) from the
         tables in which the transactions were stored. The reports were
@@ -1692,10 +1692,10 @@
         <literal>ISAM</literal> tables, indexes may not be used at all
         unless the columns are declared the same.) In this context,
         <literal>VARCHAR</literal> and <literal>CHAR</literal> are
-        considered the same if they are declared as the same size. Since
+        considered the same if they are declared as the same size.
         <literal>tt.ActualPC</literal> is declared as
         <literal>CHAR(10)</literal> and <literal>et.EMPLOYID</literal>
-        is <literal>CHAR(15)</literal>, there is a length mismatch.
+        is <literal>CHAR(15)</literal>, so there is a length mismatch.
       </para>
 
       <para>
@@ -2229,7 +2229,7 @@
           conveniently represented by corresponding conditions in the
           <literal>WHERE</literal> clause, so we speak of
           <firstterm>range conditions</firstterm> rather than
-          <quote>intervals</quote>.
+          <quote>intervals.</quote>
         </para>
 
         <para>
@@ -3424,9 +3424,9 @@
           <literal>GROUP BY</literal> queries. If there are range
           conditions in the <literal>WHERE</literal> clause, this method
           reads only the keys that satisfy these conditions. Otherwise,
-          it performs an index scan. Since this method reads all keys in
-          each range defined by the <literal>WHERE</literal> clause, or
-          scans the whole index if there are no range conditions, we
+          it performs an index scan. Because this method reads all keys
+          in each range defined by the <literal>WHERE</literal> clause,
+          or scans the whole index if there are no range conditions, we
           term it a <firstterm>tight index scan</firstterm>. Notice that
           with a tight index scan, the grouping operation is performed
           only after all keys that satisfy the range conditions have
@@ -4196,7 +4196,7 @@
             If you need to collect statistics from large log tables, use
             summary tables instead of scanning the entire log table.
             Maintaining the summaries should be much faster than trying
-            to calculate statistics <quote>live</quote>. Regenerating
+            to calculate statistics <quote>live.</quote> Regenerating
             new summary tables from the logs when things change
             (depending on business decisions) is faster than changing
             the running application.
@@ -4206,7 +4206,7 @@
         <listitem>
           <para>
             If possible, you should classify reports as
-            <quote>live</quote> or as <quote>statistical</quote>, where
+            <quote>live</quote> or as <quote>statistical,</quote> where
             data needed for statistical reports is created only from
             summary tables that are generated periodically from the live
             data.
@@ -4762,8 +4762,8 @@
             time as many readers. This means that the database or table
             supports different views for the data depending on when
             access begins. Other common terms for this are <quote>time
-            travel</quote>, <quote>copy on write</quote>, or <quote>copy
-            on demand</quote>.
+            travel,</quote> <quote>copy on write,</quote> or <quote>copy
+            on demand.</quote>
           </para>
         </listitem>
 
@@ -5189,7 +5189,7 @@
           <para>
             Use the smaller integer types if possible to get smaller
             tables. For example, <literal>MEDIUMINT</literal> is often a
-            better choice than <literal>INT</literal> since a
+            better choice than <literal>INT</literal> because a
             <literal>MEDIUMINT</literal> column uses 25% less space.
           </para>
         </listitem>
@@ -5795,7 +5795,7 @@
         One circumstance under which this occurs is when the optimizer
         estimates that using the index would require MySQL to access a
         very large percentage of the rows in the table. (In this case, a
-        table scan is likely to be much faster, since it requires fewer
+        table scan is likely to be much faster because it requires fewer
         seeks.) However, if such a query uses <literal>LIMIT</literal>
         to retrieve only some of the rows, MySQL uses an index anyway,
         because it can much more quickly find the few rows to return in
@@ -5972,7 +5972,7 @@
 
       <para>
         If it happens that a block selected for replacement has been
-        modified, the block is considered <quote>dirty</quote>. In this
+        modified, the block is considered <quote>dirty.</quote> In this
         case, prior to being replaced, its contents are flushed to the
         table index from which it came.
       </para>

Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/replication.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -662,7 +662,7 @@
         using <command>mysqlbinlog</command>. A relay log is
         automatically deleted by the SQL thread as soon as it has
         executed all its events and no longer needs it). There is no
-        explicit mechanism for deleting relay logs, because the SQL
+        explicit mechanism for deleting relay logs because the SQL
         thread takes care of doing so. However, from MySQL 4.0.14,
         <literal>FLUSH LOGS</literal> rotates relay logs, which
         influences when the SQL thread deletes them.

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -4228,7 +4228,7 @@
       <para>
         <literal>Records</literal> indicates the number of rows
         processed by the statement. (This is not necessarily the number
-        of rows actually inserted, since <literal>Duplicates</literal>
+        of rows actually inserted because <literal>Duplicates</literal>
         can be non-zero.) <literal>Duplicates</literal> indicates the
         number of rows that could not be inserted because they would
         duplicate some existing unique index value.
@@ -7485,7 +7485,7 @@
             They are, in many people's opinion, readable. Indeed, it was
             the innovation of subqueries that gave people the original
             idea of calling the early SQL <quote>Structured Query
-            Language</quote>.
+            Language.</quote>
           </para>
         </listitem>
 
@@ -7715,7 +7715,7 @@
           comparison operator, means <quote>return
           <literal>TRUE</literal> if the comparison is
           <literal>TRUE</literal> for <literal>ANY</literal> of the
-          values in the column that the subquery returns</quote>. For
+          values in the column that the subquery returns.</quote> For
           example:
         </para>
 
@@ -7768,9 +7768,9 @@
           Use of the word <literal>SOME</literal> is rare, but this
           example shows why it might be useful. To most people's ears,
           the English phrase <quote>a is not equal to any b</quote>
-          means <quote>there is no b which is equal to a</quote>, but
+          means <quote>there is no b which is equal to a,</quote> but
           that is not what is meant by the SQL syntax. The syntax means
-          <quote>there is some b to which a is not equal</quote>. Using
+          <quote>there is some b to which a is not equal.</quote> Using
           <literal>&lt;&gt; SOME</literal> instead helps ensure that
           everyone understands the true meaning of the query.
         </para>
@@ -7852,7 +7852,7 @@
         <para>
           In general, <emphasis>tables containing
           <literal>NULL</literal> values</emphasis> and <emphasis>empty
-          tables</emphasis> are <quote>edge cases</quote>. When writing
+          tables</emphasis> are <quote>edge cases.</quote> When writing
           subquery code, always consider whether you have taken those
           two possibilities into account.
         </para>
@@ -7953,9 +7953,10 @@
           For the preceding example, if <literal>t2</literal> contains
           any rows, even rows with nothing but <literal>NULL</literal>
           values, then the <literal>EXISTS</literal> condition is
-          <literal>TRUE</literal>. This is actually an unlikely example,
-          since almost always a <literal>[NOT] EXISTS</literal> subquery
-          contains correlations. Here are some more realistic examples:
+          <literal>TRUE</literal>. This is actually an unlikely example
+          because a <literal>[NOT] EXISTS</literal> subquery almost
+          always contains correlations. Here are some more realistic
+          examples:
         </para>
 
         <itemizedlist>
@@ -8007,7 +8008,7 @@
           EXISTS</literal> clause within a <literal>NOT EXISTS</literal>
           clause. Formally, it answers the question <quote>does a city
           exist with a store that is not in
-          <literal>Stores</literal>?</quote>. But it is easier to say
+          <literal>Stores</literal></quote>? But it is easier to say
           that a nested <literal>NOT EXISTS</literal> answers the
           question <quote>is x <literal>TRUE</literal> for all
           y?</quote>
@@ -8130,7 +8131,7 @@
           in the <replaceable>subquery</replaceable> select list must
           have unique names. You can find this syntax described
           elsewhere in this manual, where the term used is
-          <quote>derived tables</quote>.
+          <quote>derived tables.</quote>
         </para>
 
         <remark role="todo">
@@ -8320,7 +8321,7 @@
 
             <para>
               You can use a subquery for assignment within an
-              <literal>UPDATE</literal> statement, since subqueries are
+              <literal>UPDATE</literal> statement because subqueries are
               legal in <literal>UPDATE</literal> and
               <literal>DELETE</literal> statements as well as in
               <literal>SELECT</literal> statements. However, you cannot

Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-4.1/storage-engines.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -2041,9 +2041,9 @@
             <literal>DROP TABLE</literal> on a table that is in use by a
             <literal>MERGE</literal> table does not work on Windows
             because the <literal>MERGE</literal> storage engine's table
-            mapping is hidden from the upper layer of MySQL. Since
-            Windows does not allow the deletion of open files, you first
-            must flush all <literal>MERGE</literal> tables (with
+            mapping is hidden from the upper layer of MySQL. Windows
+            does not allow the deletion of open files, so you first must
+            flush all <literal>MERGE</literal> tables (with
             <literal>FLUSH TABLES</literal>) or drop the
             <literal>MERGE</literal> table before dropping the table.
           </para>
@@ -3596,8 +3596,8 @@
     </para>
 
     <para>
-      Since the dummy process does not actually store any data, there is
-      little processing over head incurred by running the additional
+      The dummy process does not actually store any data, so there is
+      little processing overhead incurred by running the additional
       <literal>mysqld</literal> process on the replication master host.
       This type of setup can be repeated with additional replication
       slaves.
@@ -3626,8 +3626,8 @@
 
       <listitem>
         <para>
-          since <literal>BLACKHOLE</literal> is essentially a
-          <quote>no-op</quote> storage engine, it could be used for
+          <literal>BLACKHOLE</literal> is essentially a
+          <quote>no-op</quote> storage engine, so it could be used for
           finding performance bottlenecks not related to the storage
           engine itself.
         </para>

Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/apis.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -177,8 +177,9 @@
         the MySQL server library into a compiled version of a program,
         use the GNU C compiler (<literal>gcc</literal>). The compiler
         will need to know where to find various files and need
-        instructions on how to compile the program. Below is an example
-        of how a program could be compiled from the command-line:
+        instructions on how to compile the program. The following
+        example shows how a program could be compiled from the command
+        line:
       </para>
 
 <programlisting>
@@ -11621,7 +11622,7 @@
           the most recently invoked prepared statement API function that
           can succeed or fail. The error code consists of five
           characters. <literal>"00000"</literal> means <quote>no
-          error</quote>. The values are specified by ANSI SQL and ODBC.
+          error.</quote> The values are specified by ANSI SQL and ODBC.
           For a list of possible values, see
           <xref linkend="error-handling"/>.
         </para>

Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/charset.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -1361,8 +1361,8 @@
       <para>
         Standard SQL resolves such questions using what used to be
         called <quote>coercibility</quote> rules. Basically, this means:
-        Since both <literal>x</literal> and <literal>'Y'</literal> have
-        collations, whose collation takes precedence? This can be
+        Both <literal>x</literal> and <literal>'Y'</literal> have
+        collations, so which collation takes precedence? This can be
         difficult to resolve, but the following rules take care of most
         situations:
       </para>
@@ -2066,7 +2066,7 @@
 
     <para>
       <firstterm>Metadata</firstterm> is <quote>the data about the
-      data</quote>. Anything that <emphasis>describes</emphasis> the
+      data.</quote> Anything that <emphasis>describes</emphasis> the
       database &mdash; as opposed to being the
       <emphasis>contents</emphasis> of the database &mdash; is metadata.
       Thus column names, database names, usernames, version names, and
@@ -2191,9 +2191,9 @@
     <para>
       Although automatic conversion is not in the SQL standard, the SQL
       standard document does say that every character set is (in terms
-      of supported characters) a <quote>subset</quote> of Unicode. Since
-      it is a well-known principle that <quote>what applies to a
-      superset can apply to a subset</quote>, we believe that a
+      of supported characters) a <quote>subset</quote> of Unicode.
+      Because it is a well-known principle that <quote>what applies to a
+      superset can apply to a subset,</quote> we believe that a
       collation for Unicode can apply for comparisons with non-Unicode
       strings.
     </para>
@@ -2726,7 +2726,7 @@
             <foreignphrase>Deutsches Institut für
             Normung</foreignphrase> (the German equivalent of ANSI).
             DIN-1 is called the <quote>dictionary collation</quote> and
-            DIN-2 is called the <quote>phone book collation</quote>.
+            DIN-2 is called the <quote>phone book collation.</quote>
           </para>
 
           <itemizedlist>
@@ -2821,7 +2821,7 @@
         same as the official <literal>ISO 8859-1</literal> or IANA
         (Internet Assigned Numbers Authority) <literal>latin1</literal>,
         but IANA <literal>latin1</literal> treats the code points
-        between 0x80 and 0x9f as <quote>undefined</quote>, while
+        between 0x80 and 0x9f as <quote>undefined,</quote> while
         <literal>cp1252</literal>, and therefore MySQL's
         <literal>latin1</literal>, assign characters for those
         positions. For example, 0x80 is the Euro sign. For the

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -4599,7 +4599,7 @@
           When the first <command>mysql</command> process terminates,
           the server drops the temporary table. When the second
           <command>mysql</command> process attempts to use the table,
-          the server reports <quote>unknown table</quote>.
+          the server reports <quote>unknown table.</quote>
         </para>
 
         <para>
@@ -5415,7 +5415,7 @@
         <para>
           If you are doing a backup on the server, and your tables all
           are <literal>MyISAM</literal> tables, you could consider using
-          the <command>mysqlhotcopy</command> instead since faster
+          the <command>mysqlhotcopy</command> instead because faster
           backups and faster restores can be accomplished with the
           latter. See <xref linkend="mysqlhotcopy"/>.
         </para>
@@ -6416,7 +6416,7 @@
 
         <para>
           For point-in-time recovery (also known as
-          <quote>roll-forward</quote>, when you need to restore an old
+          <quote>roll-forward,</quote> when you need to restore an old
           backup and replay the changes which happened since that
           backup), it is often useful to rotate the binary log (see
           <xref linkend="binary-log"/>) or at least know the binary log

Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/connector-j.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -992,7 +992,7 @@
 
         <para>
           Starting with Connector/J 3.1.9, we don't ship the .class
-          files <quote>unbundled</quote>, they are only available in the
+          files <quote>unbundled,</quote> they are only available in the
           JAR archives that ship with the driver.
         </para>
 
@@ -1290,7 +1290,7 @@
 
             <para>
               Starting with Connector/J 3.1.9, we don't ship the .class
-              files <quote>unbundled</quote>, they are only available in
+              files <quote>unbundled,</quote> they are only available in
               the JAR archives that ship with the driver.
             </para>
 
@@ -2677,7 +2677,7 @@
             <listitem>
               <para>
                 If a parameter changes from <quote>large</quote> to
-                non-<quote>large</quote>, the driver must reset the
+                non-<quote>large,</quote> the driver must reset the
                 server-side state of the prepared statement to allow the
                 parameter that is being changed to take the place of the
                 prior <quote>large</quote> value. This removes all of
@@ -4082,7 +4082,7 @@
         that comes with Connector/J to the <filename>lib</filename>
         directory for your server configuration (which is usually called
         "<filename>default</filename>"). Then, in the same configuration
-        directory, in the subdirectory named <quote>deploy</quote>,
+        directory, in the subdirectory named <quote>deploy,</quote>
         create a datasource configuration file that ends with "-ds.xml",
         which tells JBoss to deploy this file as a JDBC Datasource. The
         file should have the following contents:

Modified: trunk/refman-5.0/connector-mxj.xml
===================================================================
--- trunk/refman-5.0/connector-mxj.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/connector-mxj.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -128,11 +128,12 @@
 
     <para>
       The first thing to do is make sure that the components will work
-      on the platform. Since the ''MysqldResource'' class is really a
-      wrapper for a native version of MySQL, not all platforms are
-      supported. At the time of this writing, Linux on the i386
-      architecture has been tested and seems to work quite well, as does
-      OS X v10.3. There has been limited testing on Windows and Solaris.
+      on the platform. The <classname>MysqldResource</classname> class
+      is really a wrapper for a native version of MySQL, so not all
+      platforms are supported. At the time of this writing, Linux on the
+      i386 architecture has been tested and seems to work quite well, as
+      does OS X v10.3. There has been limited testing on Windows and
+      Solaris.
     </para>
 
     <para>
@@ -227,11 +228,11 @@
         <para>
           The tests attempt to launch MySQL on the port 3336. If you
           have a MySQL running, it may conflict, but this isn't very
-          likely since thedefault port for MySQL is 3306. However, You
-          may set the "c-mxj_test_port" Java property to a port of your
-          choosing. Alternatively, you may wish to start by shutting
-          down any instances of MySQL you have running on the target
-          machine.
+          likely because the default port for MySQL is 3306. However,
+          You may set the "c-mxj_test_port" Java property to a port of
+          your choosing. Alternatively, you may wish to start by
+          shutting down any instances of MySQL you have running on the
+          target machine.
         </para>
 
         <para>

Modified: trunk/refman-5.0/connector-net.xml
===================================================================
--- trunk/refman-5.0/connector-net.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/connector-net.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -653,7 +653,7 @@
               information from the stored procedure specified in the
               MySqlCommand and populates the Parameters collection of
               the specified MySqlCommand object. This method is not
-              currently supported since stored procedures are not
+              currently supported because stored procedures are not
               available in MySql.
             </para>
           </listitem>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/database-administration.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -2469,8 +2469,8 @@
           Once you've set up a password file for the MySQL Instance
           Manager and the IM is running, you can connect to it. You can
           use the <command>mysql</command> client tool connect through a
-          standard MySQL API. Below goes the list of commands the MySQL
-          Instance Manager currently accepts, with samples.
+          standard MySQL API. The following list of commands shows the
+          MySQL Instance Manager currently accepts, with samples.
         </para>
 
         <itemizedlist>
@@ -6439,7 +6439,7 @@
             <para>
               The number of days for automatic binary log removal. The
               default is 0, which means <quote>no automatic
-              removal</quote>. Possible removals happen at startup and
+              removal.</quote> Possible removals happen at startup and
               at binary log rotation.
             </para>
           </listitem>
@@ -11633,7 +11633,7 @@
             escaped character sequences in Web forms, URLs, or whatever
             application you have built. Be sure that your application
             remains secure if a user enters something like
-            <quote><literal>; DROP DATABASE mysql;</literal></quote>.
+            <quote><literal>; DROP DATABASE mysql;</literal>.</quote>
             This is an extreme example, but large security leaks and
             data loss might occur as a result of hackers using similar
             techniques, if you do not prepare for them.
@@ -15765,7 +15765,7 @@
           <para>
             Upgrading from MySQL 4.1 (4.1.1 or later in the 4.1 series)
             to MySQL &current-series; should not give rise to any issues
-            in this regard, since both versions use the same password
+            in this regard because both versions use the same password
             hashing mechanism. If you wish to upgrade an older release
             of MySQL to version &current-series;, you should upgrade to
             version 4.1 first, then upgrade the 4.1 installation to
@@ -18469,7 +18469,7 @@
         <literal>SELECT INTO ... OUTFILE</literal> or <literal>BACKUP
         TABLE</literal>. For <literal>SELECT INTO ... OUTFILE</literal>,
         the output file cannot previously exist. This is also true of
-        <literal>BACKUP TABLE</literal>, since allowing extant files to
+        <literal>BACKUP TABLE</literal> because allowing extant files to
         be overwritten would constitute a security risk. See
         <xref linkend="select"/>, and <xref linkend="backup-table"/>.
       </para>

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/functions.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -8810,7 +8810,7 @@
           date actually occurs in the 52nd week of 1999. We decided to
           return <literal>0</literal> instead because we want the
           function to return <quote>the week number in the given
-          year</quote>. This makes use of the <literal>WEEK()</literal>
+          year.</quote> This makes use of the <literal>WEEK()</literal>
           function reliable when combined with other functions that
           extract a date part from a date.
         </para>
@@ -11602,7 +11602,7 @@
           <para>
             These functions allow encryption and decryption of data
             using the official AES (Advanced Encryption Standard)
-            algorithm, previously known as <quote>Rijndael</quote>.
+            algorithm, previously known as <quote>Rijndael.</quote>
             Encoding with a 128-bit key length is used, but you can
             extend it up to 256 bits by modifying the source. We chose
             128 bits because it is much faster and it is secure enough
@@ -14858,7 +14858,7 @@
         can use columns or calculations in the <literal>SELECT</literal>
         list that do not appear in the <literal>GROUP BY</literal>
         clause. This stands for <quote>any possible value for this
-        group</quote>. You can use this to get better performance by
+        group.</quote> You can use this to get better performance by
         avoiding sorting and grouping on unnecessary items. For example,
         you do not need to group on <literal>customer.name</literal> in
         the following query:

Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/innodb.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -994,7 +994,7 @@
           The size of the buffer pool (in MB), if it is placed in the
           AWE memory. This is relevant only in 32-bit Windows. If your
           32-bit Windows operating system supports more than 4GB memory,
-          using so-called <quote>Address Windowing Extensions</quote>,
+          using so-called <quote>Address Windowing Extensions,</quote>
           you can allocate the <literal>InnoDB</literal> buffer pool
           into the AWE physical memory using this variable. The maximum
           possible value for this variable is 63000. If it is greater
@@ -3034,8 +3034,8 @@
       <command>mysqldump</command>. The reason for this is that a binary
       file might be corrupted without you noticing it. Dumped tables are
       stored into text files that are human-readable, so spotting table
-      corruption becomes easier. Also, since the format is simpler, the
-      chance for serious data corruption is smaller.
+      corruption becomes easier. Also, because the format is simpler,
+      the chance for serious data corruption is smaller.
       <command>mysqldump</command> also has a
       <option>--single-transaction</option> option that you can use to
       make a consistent snapshot without locking out other clients.
@@ -3785,7 +3785,7 @@
             non-locking fashion, but a possible earlier version of a
             record might be used. Thus, using this isolation level, such
             reads are not consistent. This is also called a <quote>dirty
-            read</quote>. Otherwise, this isolation level works like
+            read.</quote> Otherwise, this isolation level works like
             <literal>READ COMMITTED</literal>.
           </para>
         </listitem>
@@ -3967,7 +3967,7 @@
         a unique identifier to each child added to table
         <literal>child</literal>. Obviously, using a consistent read or
         a shared mode read to read the present value of the counter is
-        not a good idea, since two users of the database may then see
+        not a good idea because two users of the database may then see
         the same value for the counter, and a duplicate-key error occurs
         if two users attempt to add children with the same identifier to
         the table.
@@ -4048,7 +4048,7 @@
         <literal>R</literal> in an index, another user cannot insert a
         new index record immediately before <literal>R</literal> in the
         index order. This locking of gaps is done to prevent the
-        so-called <quote>phantom problem</quote>. Suppose that you want
+        so-called <quote>phantom problem.</quote> Suppose that you want
         to read and lock all children from the <literal>child</literal>
         table having an identifier value greater than 100, with the
         intention of updating some column in the selected rows later:
@@ -4333,7 +4333,7 @@
             <literal>InnoDB</literal> knows about row-level locks.
             Otherwise, <literal>InnoDB</literal>'s automatic deadlock
             detection cannot detect deadlocks where such table locks are
-            involved. Also, since the higher MySQL layer does not know
+            involved. Also, because the higher MySQL layer does not know
             about row-level locks, it is possible to get a table lock on
             a table where another user currently has row-level locks.
             However, this does not endanger transaction integrity, as
@@ -4653,8 +4653,8 @@
           Wrap several modifications into one transaction.
           <literal>InnoDB</literal> must flush the log to disk at each
           transaction commit if that transaction made modifications to
-          the database. Since the rotation speed of a disk is typically
-          at most 167 revolutions/second, that constrains the number of
+          the database. The rotation speed of a disk is typically at
+          most 167 revolutions/second, which constrains the number of
           commits to the same 167<superscript>th</superscript> of a
           second if the disk does not <quote>fool</quote> the operating
           system.

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/installing.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -2664,7 +2664,7 @@
       The next several sections cover the installation of MySQL on
       platforms where we offer packages using the native packaging
       format of the respective platform. (This is also known as
-      performing a <quote>binary install</quote>.) However, binary
+      performing a <quote>binary install.</quote>) However, binary
       distributions of MySQL are available for many other platforms as
       well. See <xref linkend="installing-binary"/>, for generic
       installation instructions for these packages that apply to all
@@ -8249,10 +8249,10 @@
 
           <para>
             Normally, you do not have to build the documentation
-            yourself, since we already provide it in a number of formats
-            at <ulink url="&base-url-docs;"/>. The formats you can
-            download there (HTML, PDF, etc.) are built on a daily basis,
-            so you gain little by creating them yourself from the
+            yourself because we already provide it in a number of
+            formats at <ulink url="&base-url-docs;"/>. The formats you
+            can download there (HTML, PDF, etc.) are built on a daily
+            basis, so you gain little by creating them yourself from the
             DocBook XML base format in the <literal>mysqldoc</literal>
             tree. If you would like to copy the documentation
             repository, anyway, use the following command:

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/ndbcluster.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -142,7 +142,7 @@
       The data stored in the data nodes for MySQL Cluster can be
       mirrored; the cluster can handle failures of individual data nodes
       with no other impact than that a small number of transactions are
-      aborted due to losing the transaction state. Since transactional
+      aborted due to losing the transaction state. Because transactional
       applications are expected to handle transaction failure, this
       should not be a source of problems.
     </para>
@@ -371,7 +371,7 @@
       basics for how to plan, install, configure, and run a MySQL
       Cluster. Unlike the example in
       <xref linkend="mysql-cluster-configuration"/>, the result of
-      following the guidelines and procedures outlined below should be a
+      following the guidelines and procedures outlined here should be a
       usable MySQL Cluster which meets minimum requirements for
       availability and safeguarding of data.
     </para>
@@ -763,9 +763,8 @@
       </orderedlist>
 
       <para>
-        Remember that the steps listed above must be performed
-        separately for each machine on which a storage or SQL node is to
-        reside.
+        Remember that the preceding steps must be performed separately
+        for each machine on which a storage or SQL node is to reside.
       </para>
 
       <para>
@@ -901,9 +900,9 @@
 </programlisting>
 
       <para>
-        After entering the above, save this file and exit the text
-        editor. Do this for the machines hosting data node "A", data
-        node "B", and the SQL node.
+        After entering the preceding information, save this file and
+        exit the text editor. Do this for the machines hosting data node
+        "A", data node "B", and the SQL node.
       </para>
 
       <para>
@@ -1087,7 +1086,7 @@
         If all has gone well, and the cluster has been set up correctly,
         the cluster should now be operational. You can test this by
         invoking the <command>ndb_mgm</command> management node client;
-        the output should look like what is shown below:
+        the output should look like what is shown here:
       </para>
 
 <programlisting>
@@ -1226,7 +1225,8 @@
             <literal>ENGINE=MyISAM</literal> with
             <literal>ENGINE=NDBCLUSTER</literal>. If you do not wish to
             modify the file, you can also use <literal>ALTER
-            TABLE</literal>; see below for particulars.
+            TABLE</literal> to change their type. The particulars are
+            given later in this section.
           </para>
 
           <para>
@@ -1243,9 +1243,9 @@
 </programlisting>
 
           <para>
-            It is very important to keep in mind that the above command
-            must be executed on the host where the SQL node is running
-            -- in this case, on the machine with the IP address
+            It is very important to keep in mind that the preceding
+            command must be executed on the host where the SQL node is
+            running -- in this case, on the machine with the IP address
             <emphasis role="bold">192.168.0.20</emphasis>.
           </para>
 
@@ -1263,7 +1263,8 @@
           <para>
             Of course, the SQL script must be readable by the
             <literal>mysql</literal> system user. If you save the file
-            to a different location, adjust the above accordingly.
+            to a different location, adjust the preceding instructions
+            accordingly.
           </para>
 
           <para>
@@ -1363,9 +1364,9 @@
             Applications using MySQL can use standard APIs. It is
             important to remember that your application must access the
             SQL node, and not the MGM or storage nodes. This brief
-            example shows how we might execute the same query as above
-            using PHP 5's <literal>mysqli</literal> extension running on
-            a Web server elsewhere on the network:
+            example shows how we might execute the same query shown
+            earlier using PHP 5's <literal>mysqli</literal> extension
+            running on a Web server elsewhere on the network:
           </para>
 
 <programlisting>
@@ -1574,8 +1575,8 @@
     </para>
 
     <para>
-      Since the MySQL server is a part of the cluster, it will also need
-      to know how to access an MGM node in order to obtain the cluster
+      The MySQL server is a part of the cluster, so it will also need to
+      know how to access an MGM node in order to obtain the cluster
       configuration data. The default behavior is to look for the MGM
       node on <literal>localhost</literal>. However, should you need to
       specify its location elsewhere, this can be done in
@@ -1807,9 +1808,9 @@
 </programlisting>
 
       <para>
-        (Note that the row numbers shown in the example output above may
-        be different from those shown on your system, depending upon the
-        MySQL version being used and how it is configured.)
+        (Note that the row numbers shown in the preceding example output
+        may be different from those shown on your system, depending upon
+        the MySQL version being used and how it is configured.)
       </para>
 
 <programlisting>
@@ -1926,7 +1927,7 @@
 
         <para>
           In order to support MySQL Cluster, you will need to update
-          <filename>my.cnf</filename> as shown in the example below.
+          <filename>my.cnf</filename> as shown in the following example.
           Note that the options shown here should not be confused with
           those occurring in <filename>config.ini</filename> files. You
           may also specify these parameters when invoking the
@@ -2034,7 +2035,7 @@
           and nodes involved in the cluster and on which computers these
           nodes are located. An example of a simple configuration file
           for a cluster consisting of one management server, two data
-          nodes and two MySQL servers is shown below:
+          nodes and two MySQL servers is shown here:
         </para>
 
 <programlisting>
@@ -2119,9 +2120,9 @@
 
         <para>
           Note that each node has its own section in the
-          <filename>config.ini</filename>. For instance, since this
-          cluster has two data nodes, the configuration file contains
-          two sections defining these nodes.
+          <filename>config.ini</filename>. For instance, this cluster
+          has two data nodes, so the configuration file contains two
+          sections defining these nodes.
         </para>
 
         <para>
@@ -2172,8 +2173,8 @@
           default connectstring value if none is provided. If
           <literal>&lt;port&gt;</literal> is omitted from the
           connectstring, the default port is 1186. This port should
-          always be available on the network, since it has been assigned
-          by IANA for this purpose (see
+          always be available on the network because it has been
+          assigned by IANA for this purpose (see
           <ulink url="http://www.iana.org/assignments/port-numbers"/>
           for details).
         </para>
@@ -2196,7 +2197,7 @@
 
           <listitem>
             <para>
-              Each executable has its own command line option which
+              Each executable has its own command-line option which
               enables specifying the management server at startup. (See
               the documentation for the respective executable.)
             </para>
@@ -2650,11 +2651,11 @@
             <para>
               Each node in the cluster uses a port to connect to other
               nodes. This port is used also for non-TCP transporters in
-              the connection setup phase. Since, the default port is
-              allocated dynamically in such a way as to ensure that no
-              two nodes on the same computer receive the same port
-              number, it should not normally be necessary to specify a
-              value for this parameter.
+              the connection setup phase. The default port is allocated
+              dynamically in such a way as to ensure that no two nodes
+              on the same computer receive the same port number, so it
+              should not normally be necessary to specify a value for
+              this parameter.
             </para>
           </listitem>
 
@@ -2984,10 +2985,10 @@
               It is highly recommended that
               <literal>DataMemory</literal> and
               <literal>IndexMemory</literal> be set to the same values
-              for all nodes. Since data is distributed evenly over all
-              nodes in the cluster the maximum amount of space available
-              for any node can be no greater than that of the smallest
-              node in the cluster.
+              for all nodes. Data distribution is even over all nodes in
+              the cluster, so the maximum amount of space available for
+              any node can be no greater than that of the smallest node
+              in the cluster.
             </para>
 
             <para>
@@ -3354,9 +3355,9 @@
               by performing a full table scan. The second case is
               encountered when there is no hash index to support the
               query but there is an ordered index. Using the ordered
-              index means executing a parallel range scan. Since the
-              order is kept on the local partitions only, it is
-              necessary to perform the index scan on all partitions.
+              index means executing a parallel range scan. The order is
+              kept on the local partitions only, so it is necessary to
+              perform the index scan on all partitions.
             </para>
 
             <para>
@@ -3819,8 +3820,8 @@
           There are a number of <literal>[NDBD]</literal> parameters
           specifying timeouts and intervals between various actions in
           Cluster data nodes. Most of the timeout values are specified
-          in milliseconds. Any exceptions to this will be mentioned
-          where applicable below.
+          in milliseconds. Any exceptions to this are mentioned where
+          applicable.
         </para>
 
         <itemizedlist>
@@ -3865,7 +3866,7 @@
 
             <para>
               The default value is 30000 milliseconds (30 seconds).
-              <literal>0</literal> means eternal time out; in other
+              <literal>0</literal> means eternal timeout; in other
               words, the cluster may start only if all nodes are
               available.
             </para>
@@ -3947,7 +3948,7 @@
               Each data node sends heartbeat signals to each MySQL
               server (SQL node) to ensure that it remains in contact. If
               a MySQL server fails to send a heartbeat in time it is
-              declared <quote>dead</quote>, in which case all ongoing
+              declared <quote>dead,</quote> in which case all ongoing
               transactions are completed and all resources released. The
               SQL node cannot reconnect until all activities initiated
               by the previous MySQL instance have been completed. The
@@ -4041,7 +4042,7 @@
             </para>
 
             <para>
-              Time-out handling is performed by checking a timer on each
+              Timeout handling is performed by checking a timer on each
               transaction once for every interval specified by this
               parameter. Thus, if this parameter is set to 1000
               milliseconds, then every transaction will be checked for
@@ -4341,7 +4342,7 @@
             </para>
 
             <para>
-              Since UNDO log entries tend to grow larger as more
+              Because UNDO log entries tend to grow larger as more
               operations are logged, this buffer is also larger than its
               index memory counterpart, with a default value of 16MB.
             </para>
@@ -5312,10 +5313,12 @@
 
       <itemizedlist>
 
-        <para>
-          Use <option>--ndbcluster</option> as a startup option when
-          starting <command>mysqld</command>
-        </para>
+        <listitem>
+          <para>
+            Use <option>--ndbcluster</option> as a startup option when
+            starting <command>mysqld</command>
+          </para>
+        </listitem>
 
         <listitem>
           <para>
@@ -5338,7 +5341,7 @@
         output), you are not running an <literal>NDB</literal>-enabled
         version of MySQL. If you see <literal>DISABLED</literal> in this
         row, then you need to enable it in either one of the two ways
-        shown above.
+        just described.
       </para>
 
       <para>
@@ -5699,9 +5702,9 @@
 
       <para>
         When starting the management client, it is necessary to supply
-        the hostname and port of the management server as in the example
-        below. The default values are <literal>localhost</literal> and
-        <literal>1186</literal>.
+        the hostname and port of the management server as in the
+        following example. The default values are
+        <literal>localhost</literal> and <literal>1186</literal>.
       </para>
 
 <programlisting>
@@ -5724,10 +5727,11 @@
         All MySQL Cluster executables (except for
         <command>mysqld</command>) take the following options. Users of
         earlier MySQL Cluster versions should note that some of these
-        switches have been changed from those in MySQL 4.1 Cluster in
+        options have been changed from those in MySQL 4.1 Cluster in
         order to make them consistent with one another as well as with
-        <command>mysqld</command>. You can use the <option>-?</option>
-        switch to view a list of supported options.
+        <command>mysqld</command>. You can use the
+        <option>--help</option> option to view a list of supported
+        options.
       </para>
 
       <itemizedlist>
@@ -6462,7 +6466,7 @@
 
       <para>
         In addition to the central configuration file, a cluster may
-        also be controlled through a command line interface available
+        also be controlled through a command-line interface available
         through the management client <command>ndb_mgm</command>. This
         is the primary administrative interface to a running cluster.
       </para>
@@ -6572,7 +6576,7 @@
           </para>
 
           <para>
-            Exists single user mode allowing all SQL nodes (that is, all
+            Exits single-user mode, allowing all SQL nodes (that is, all
             running <command>mysqld</command> processes) to access the
             database.
           </para>
@@ -6640,7 +6644,7 @@
 
       <para>
         <emphasis role="bold">Note</emphasis>: The cluster log is the
-        log recommended for most uses, since it provides logging
+        log recommended for most uses because it provides logging
         information for an entire cluster in a single file. Node logs
         are intended to be used only during application development, or
         for debugging application code.
@@ -6670,7 +6674,7 @@
             <emphasis>Priority</emphasis>: This is represented by one of
             the numbers from 1 to 15 inclusive, where 1 indicates
             <quote>most important</quote> and 15 <quote>least
-            important</quote>.
+            important.</quote>
           </para>
         </listitem>
 
@@ -6967,7 +6971,7 @@
         </para>
 
         <para>
-          The logging messages shown below are associated with
+          The logging messages shown here are associated with
           checkpoints.
         </para>
 
@@ -7550,17 +7554,17 @@
       <para>
         Single user mode allows the database administrator to restrict
         access to the database system to a single MySQL server (SQL
-        node). When entering single user mode all connections to all
+        node). When entering single-user mode, all connections to all
         other MySQL servers are closed gracefully and all running
         transactions are aborted. No new transactions are allowed to be
         started.
       </para>
 
       <para>
-        Once the cluster has entered single user mode, only the
+        Once the cluster has entered single-user mode, only the
         designated SQL node is granted access to the database. You can
         use the <command>ALL STATUS</command> command to see when the
-        cluster has entered single user mode.
+        cluster has entered single-user mode.
       </para>
 
       <para>
@@ -7577,26 +7581,26 @@
 
       <para>
         After this command has executed and the cluster has entered
-        single user mode, the SQL node whose node ID is
+        single-user mode, the SQL node whose node ID is
         <literal>5</literal> becomes the cluster's only permitted user.
       </para>
 
       <para>
-        The node specified in the command above must be a MySQL Server
-        node; An attempt to specify any other type of node will be
-        rejected.
+        The node specified in the preceding command must be a MySQL
+        Server node; An attempt to specify any other type of node will
+        be rejected.
       </para>
 
       <para>
-        <emphasis role="bold">Note</emphasis>: When the above commmand
-        is invoked, all transactions running on the designated node are
-        aborted, the connection is closed, and the server must be
-        restarted.
+        <emphasis role="bold">Note</emphasis>: When the preceding
+        commmand is invoked, all transactions running on the designated
+        node are aborted, the connection is closed, and the server must
+        be restarted.
       </para>
 
       <para>
         The command <command>EXIT SINGLE USER MODE</command> changes the
-        state of the cluster's data nodes from single user mode to
+        state of the cluster's data nodes from single-user mode to
         normal mode. MySQL Servers waiting for a connection (that is,
         for the cluster to become ready and available), are now
         permitted to connect. The MySQL Server denoted as the
@@ -7618,7 +7622,7 @@
 
       <para>
         The recommended way to handle a node failure when running in
-        single user mode is to do either of the following:
+        single-user mode is to do either of the following:
       </para>
 
       <itemizedlist>
@@ -7628,7 +7632,7 @@
 
             <listitem>
               <para>
-                Finish all single user mode transactions
+                Finish all single-user mode transactions
               </para>
             </listitem>
 
@@ -7658,7 +7662,7 @@
 
         <listitem>
           <para>
-            Restart database nodes prior to entering single user mode.
+            Restart database nodes prior to entering single-user mode.
           </para>
         </listitem>
 
@@ -7756,7 +7760,7 @@
               A log file containing records of committed transactions.
               Only transactions on tables stored in the backup are
               stored in the log. Nodes involved in the backup save
-              different records, since different nodes host different
+              different records because different nodes host different
               database fragments.
             </para>
           </listitem>
@@ -7912,7 +7916,7 @@
 
         <para>
           The cluster restoration program is implemented as a separate
-          command line utility <command>ndb_restore</command>, which
+          command-line utility <command>ndb_restore</command>, which
           reads the files created by the backup and inserts the stored
           information into the database. The restore program must be
           executed once for each set of backup files, that is, as many
@@ -7929,9 +7933,9 @@
           free connection in order to connect to the cluster. This can
           be verified with the <command>ndb_mgm</command> command
           <command>SHOW</command> (you can accomplish this from a system
-          shell using <command>ndb_mgm -e SHOW</command>). The switch
+          shell using <command>ndb_mgm -e SHOW</command>). The
           <option>-c <replaceable>connectstring</replaceable></option>
-          may be used to locate the MGM node (see
+          option may be used to locate the MGM node (see
           <xref linkend="mysql-cluster-connectstring"/>, for information
           on connectstrings). The backup files must be present in the
           directory given as an argument to the restoration program.
@@ -8037,7 +8041,7 @@
         <para>
           <literal>NDB</literal> does not support repeatable reads,
           which can cause problems with the restoration process.
-          Although the backup process is <quote>hot</quote>, restoring a
+          Although the backup process is <quote>hot,</quote> restoring a
           MySQL Cluster from backup is not a 100% <quote>hot</quote>
           process. This is due to the fact that, for the duration of the
           restore process, running transactions get non-repeatable reads
@@ -8072,16 +8076,16 @@
     </para>
 
     <para>
-      Currently the MySQL Cluster codebase includes support for 4
+      Currently the MySQL Cluster codebase includes support for four
       different transporters. Most users today employ TCP/IP over
-      Ethernet since it is ubiquitous. This is also by far the
+      Ethernet because it is ubiquitous. TCP/IP is also by far the
       best-tested transporter in MySQL Cluster.
     </para>
 
     <para>
       We are working to make sure that communication with the
       <command>ndbd</command> process is made in <quote>chunks</quote>
-      that are as large as possible since this benefits all types of
+      that are as large as possible because this benefits all types of
       data transmission.
     </para>
 
@@ -8118,7 +8122,7 @@
 
       <para>
         It is possible to use SCI Sockets with any version of MySQL
-        Cluster. No special builds are needed since it uses normal
+        Cluster. No special builds are needed because it uses normal
         socket calls which are already available in MySQL Cluster.
         However, SCI Sockets are currently supported only on the Linux
         2.4 and 2.6 kernels. SCI Transporters have been tested
@@ -8702,7 +8706,7 @@
         interest in communicating between <command>ndbd</command>
         processes. Using the SCI transporter is also only of interest if
         a CPU can be dedicated to the <command>ndbd</command> process
-        since the SCI transporter ensures that this process will never
+        because the SCI transporter ensures that this process will never
         go to sleep. It is also important to ensure that the
         <command>ndbd</command> process priority is set in such a way
         that the process does not lose priority due to running for an
@@ -9154,7 +9158,7 @@
               <listitem>
                 <para>
                   You must give nodes explicit IDs in connectstrings
-                  since automatic allocation of node IDs does not work
+                  because automatic allocation of node IDs does not work
                   across multiple management servers.
                 </para>
               </listitem>
@@ -9185,7 +9189,7 @@
               supported. Use of these is liable to cause problems
               because, in the event of a data node failure, an SQL node
               waits for confirmation that the data node went down but
-              never receives it since another route to that data node
+              never receives it because another route to that data node
               remains open. This can effectively make the cluster
               inoperable.
             </para>
@@ -9360,7 +9364,7 @@
             executed in parallel. This means that queries against
             non-indexed columns can run as much as 5 to 10 times,
             <emphasis>times the number of data nodes</emphasis>, faster
-            than previously, since multiple CPUs can work on the query
+            than previously because multiple CPUs can work on the query
             in parallel.
           </para>
 
@@ -9378,9 +9382,9 @@
             &current-series;, each record consumes approximately 25
             bytes of index memory, and every unique index uses 25 bytes
             per record of index memory (in addition to some data memory
-            since these are stored in a separate table). This is because
-            there is no storage of the primary key in the index memory
-            anymore.
+            because these are stored in a separate table). This is
+            because there is no storage of the primary key in the index
+            memory anymore.
           </para>
         </listitem>
 
@@ -9720,7 +9724,7 @@
 
       <listitem>
         <para>
-          <emphasis>Since MySQL Cluster uses TCP/IP, does that mean I
+          <emphasis>Because MySQL Cluster uses TCP/IP, does that mean I
           can run it over the Internet, with one or more nodes in a
           remote location?</emphasis>
         </para>
@@ -9869,7 +9873,8 @@
         <para>
           This stands for
           <quote><emphasis role="bold">N</emphasis>etwork
-          <emphasis role="bold">D</emphasis>ata<emphasis role="bold">b</emphasis>ase</quote>.
+          <emphasis role="bold">D</emphasis>ata<emphasis
+role="bold">b</emphasis>ase.</quote>
         </para>
       </listitem>
 
@@ -9994,9 +9999,9 @@
               <literal>USING HASH</literal> for all primary keys and
               unique indexes will generally cause table updates to run
               more quickly. This is due to the fact that less memory is
-              required (since no ordered indexes are created), and that
-              less CPU must be utilized (since fewer indexes must be
-              read and possibly updated).
+              required (because no ordered indexes are created), and
+              that less CPU must be utilized (because fewer indexes must
+              be read and possibly updated).
             </para>
           </listitem>
 
@@ -10315,8 +10320,8 @@
         </para>
 
         <para>
-          The above information is somewhat simplified; a more complete
-          explanation taking into account node groups follows below:
+          The preceding information is somewhat simplified; a more
+          complete explanation taking into account node groups follows:
         </para>
 
         <para>
@@ -10768,10 +10773,10 @@
           <emphasis role="bold">Note Regarding Obsolete
           Terms</emphasis>: In older versions of the MySQL Cluster
           documentation, data nodes were sometimes referred to as
-          <quote>database nodes</quote>, <quote>DB nodes</quote>, or
-          occasionally <quote>storage nodes</quote>. In addition, SQL
+          <quote>database nodes,</quote> <quote>DB nodes,</quote> or
+          occasionally <quote>storage nodes.</quote> In addition, SQL
           nodes were sometimes known as <quote>client nodes</quote> or
-          <quote>API nodes</quote>. This older terminology has been
+          <quote>API nodes.</quote> This older terminology has been
           deprecated in order to minimize confusion, and for these
           reasons should be avoided.
         </para>

Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/optimization.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -357,7 +357,7 @@
 
       <para>
         We solved this problem by storing all information per month in
-        compressed <quote>transaction tables</quote>. We had a set of
+        compressed <quote>transaction tables.</quote> We had a set of
         simple macros that generated summary tables grouped by different
         criteria (product group, customer id, store, and so on) from the
         tables in which the transactions were stored. The reports were
@@ -1863,10 +1863,10 @@
         efficiently if they are declared as the same type and size. In
         this context, <literal>VARCHAR</literal> and
         <literal>CHAR</literal> are considered the same if they are
-        declared as the same size. Since <literal>tt.ActualPC</literal>
-        is declared as <literal>CHAR(10)</literal> and
+        declared as the same size. <literal>tt.ActualPC</literal> is
+        declared as <literal>CHAR(10)</literal> and
         <literal>et.EMPLOYID</literal> is <literal>CHAR(15)</literal>,
-        there is a length mismatch.
+        so there is a length mismatch.
       </para>
 
       <para>
@@ -2401,7 +2401,7 @@
           conveniently represented by corresponding conditions in the
           <literal>WHERE</literal> clause, so we speak of
           <firstterm>range conditions</firstterm> rather than
-          <quote>intervals</quote>.
+          <quote>intervals.</quote>
         </para>
 
         <para>
@@ -4760,8 +4760,8 @@
           the keys are ordered. This property allows use of lookup
           groups in an index without having to consider all keys in the
           index that satisfy all <literal>WHERE</literal> conditions.
-          Since this access method considers only a fraction of the keys
-          in an index, it is called a <firstterm>loose index
+          This access method considers only a fraction of the keys in an
+          index, so it is called a <firstterm>loose index
           scan</firstterm>. When there is no <literal>WHERE</literal>
           clause, a loose index scan reads as many keys as the number of
           groups, which may be a much smaller number than that of all
@@ -4895,9 +4895,9 @@
           <literal>GROUP BY</literal> queries. If there are range
           conditions in the <literal>WHERE</literal> clause, this method
           reads only the keys that satisfy these conditions. Otherwise,
-          it performs an index scan. Since this method reads all keys in
-          each range defined by the <literal>WHERE</literal> clause, or
-          scans the whole index if there are no range conditions, we
+          it performs an index scan. Because this method reads all keys
+          in each range defined by the <literal>WHERE</literal> clause,
+          or scans the whole index if there are no range conditions, we
           term it a <firstterm>tight index scan</firstterm>. Notice that
           with a tight index scan, the grouping operation is performed
           only after all keys that satisfy the range conditions have
@@ -5666,7 +5666,7 @@
             If you need to collect statistics from large log tables, use
             summary tables instead of scanning the entire log table.
             Maintaining the summaries should be much faster than trying
-            to calculate statistics <quote>live</quote>. Regenerating
+            to calculate statistics <quote>live.</quote> Regenerating
             new summary tables from the logs when things change
             (depending on business decisions) is faster than changing
             the running application.
@@ -5676,7 +5676,7 @@
         <listitem>
           <para>
             If possible, you should classify reports as
-            <quote>live</quote> or as <quote>statistical</quote>, where
+            <quote>live</quote> or as <quote>statistical,</quote> where
             data needed for statistical reports is created only from
             summary tables that are generated periodically from the live
             data.
@@ -6228,8 +6228,8 @@
             time as many readers. This means that the database or table
             supports different views for the data depending on when
             access begins. Other common terms for this are <quote>time
-            travel</quote>, <quote>copy on write</quote>, or <quote>copy
-            on demand</quote>.
+            travel,</quote> <quote>copy on write,</quote> or <quote>copy
+            on demand.</quote>
           </para>
         </listitem>
 
@@ -6654,7 +6654,7 @@
           <para>
             Use the smaller integer types if possible to get smaller
             tables. For example, <literal>MEDIUMINT</literal> is often a
-            better choice than <literal>INT</literal> since a
+            better choice than <literal>INT</literal> because a
             <literal>MEDIUMINT</literal> column uses 25% less space.
           </para>
         </listitem>
@@ -6705,8 +6705,8 @@
             <literal>CHAR(<replaceable>n</replaceable>)</literal>
             occupies 3*<replaceable>n</replaceable> bytes, given that
             the maximum length of a UTF-8 encoded character is 3 bytes.
-            Since many languages can be written mostly with single-byte
-            UTF-8 characters, a fixed storage length often wastes space.
+            Many languages can be written mostly with single-byte UTF-8
+            characters, so a fixed storage length often wastes space.
             The <literal>ROW_FORMAT=COMPACT</literal> format allocates a
             variable amount of
             <replaceable>n</replaceable>..3*<replaceable>n</replaceable>
@@ -7289,7 +7289,7 @@
         One circumstance under which this occurs is when the optimizer
         estimates that using the index would require MySQL to access a
         very large percentage of the rows in the table. (In this case, a
-        table scan is likely to be much faster, since it requires fewer
+        table scan is likely to be much faster because it requires fewer
         seeks.) However, if such a query uses <literal>LIMIT</literal>
         to retrieve only some of the rows, MySQL uses an index anyway,
         because it can much more quickly find the few rows to return in
@@ -7456,7 +7456,7 @@
 
       <para>
         If it happens that a block selected for replacement has been
-        modified, the block is considered <quote>dirty</quote>. In this
+        modified, the block is considered <quote>dirty.</quote> In this
         case, prior to being replaced, its contents are flushed to the
         table index from which it came.
       </para>
@@ -7737,7 +7737,7 @@
           By default, the key cache management system uses the LRU
           strategy for choosing key cache blocks to be evicted, but it
           also supports a more sophisticated method called the
-          <quote>midpoint insertion strategy</quote>.
+          <quote>midpoint insertion strategy.</quote>
         </para>
 
         <para>
@@ -7745,7 +7745,7 @@
           divided into two parts: a hot sub-chain and a warm sub-chain.
           The division point between two parts is not fixed, but the key
           cache management system takes care that the warm part is not
-          <quote>too short</quote>, always containing at least
+          <quote>too short,</quote> always containing at least
           <literal>key_cache_division_limit</literal> percent of the key
           cache blocks. <literal>key_cache_division_limit</literal> is a
           component of structured key cache variables, so its value is a

Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/problems.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -2966,7 +2966,7 @@
         tables. It also applies for writes to binary log files and
         binary log index file, except that references to
         <quote>row</quote> and <quote>record</quote> should be
-        understood to mean <quote>event</quote>.
+        understood to mean <quote>event.</quote>
       </para>
 
       <para>

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/replication.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -650,10 +650,10 @@
         using <command>mysqlbinlog</command>. A relay log is
         automatically deleted by the SQL thread as soon as it has
         executed all its events and no longer needs it. There is no
-        explicit mechanism for deleting relay logs, since the SQL thread
-        takes care of doing so. However, <literal>FLUSH LOGS</literal>
-        rotates relay logs, which influences when the SQL thread deletes
-        them.
+        explicit mechanism for deleting relay logs because the SQL
+        thread takes care of doing so. However, <literal>FLUSH
+        LOGS</literal> rotates relay logs, which influences when the SQL
+        thread deletes them.
       </para>
 
       <para>

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -4236,7 +4236,7 @@
       <para>
         <literal>Records</literal> indicates the number of rows
         processed by the statement. (This is not necessarily the number
-        of rows actually inserted, since <literal>Duplicates</literal>
+        of rows actually inserted because <literal>Duplicates</literal>
         can be non-zero.) <literal>Duplicates</literal> indicates the
         number of rows that could not be inserted because they would
         duplicate some existing unique index value.
@@ -7926,7 +7926,7 @@
             They are, in many people's opinion, readable. Indeed, it was
             the innovation of subqueries that gave people the original
             idea of calling the early SQL <quote>Structured Query
-            Language</quote>.
+            Language.</quote>
           </para>
         </listitem>
 
@@ -8156,7 +8156,7 @@
           comparison operator, means <quote>return
           <literal>TRUE</literal> if the comparison is
           <literal>TRUE</literal> for <literal>ANY</literal> of the
-          values in the column that the subquery returns</quote>. For
+          values in the column that the subquery returns.</quote> For
           example:
         </para>
 
@@ -8209,9 +8209,9 @@
           Use of the word <literal>SOME</literal> is rare, but this
           example shows why it might be useful. To most people's ears,
           the English phrase <quote>a is not equal to any b</quote>
-          means <quote>there is no b which is equal to a</quote>, but
+          means <quote>there is no b which is equal to a,</quote> but
           that is not what is meant by the SQL syntax. The syntax means
-          <quote>there is some b to which a is not equal</quote>. Using
+          <quote>there is some b to which a is not equal.</quote> Using
           <literal>&lt;&gt; SOME</literal> instead helps ensure that
           everyone understands the true meaning of the query.
         </para>
@@ -8293,7 +8293,7 @@
         <para>
           In general, <emphasis>tables containing
           <literal>NULL</literal> values</emphasis> and <emphasis>empty
-          tables</emphasis> are <quote>edge cases</quote>. When writing
+          tables</emphasis> are <quote>edge cases.</quote> When writing
           subquery code, always consider whether you have taken those
           two possibilities into account.
         </para>
@@ -8394,9 +8394,10 @@
           For the preceding example, if <literal>t2</literal> contains
           any rows, even rows with nothing but <literal>NULL</literal>
           values, then the <literal>EXISTS</literal> condition is
-          <literal>TRUE</literal>. This is actually an unlikely example,
-          since almost always a <literal>[NOT] EXISTS</literal> subquery
-          contains correlations. Here are some more realistic examples:
+          <literal>TRUE</literal>. This is actually an unlikely example
+          because a <literal>[NOT] EXISTS</literal> subquery almost
+          always contains correlations. Here are some more realistic
+          examples:
         </para>
 
         <itemizedlist>
@@ -8448,7 +8449,7 @@
           EXISTS</literal> clause within a <literal>NOT EXISTS</literal>
           clause. Formally, it answers the question <quote>does a city
           exist with a store that is not in
-          <literal>Stores</literal>?</quote>. But it is easier to say
+          <literal>Stores</literal></quote>? But it is easier to say
           that a nested <literal>NOT EXISTS</literal> answers the
           question <quote>is x <literal>TRUE</literal> for all
           y?</quote>
@@ -8571,7 +8572,7 @@
           in the <replaceable>subquery</replaceable> select list must
           have unique names. You can find this syntax described
           elsewhere in this manual, where the term used is
-          <quote>derived tables</quote>.
+          <quote>derived tables.</quote>
         </para>
 
         <remark role="todo">
@@ -8739,7 +8740,7 @@
 
             <para>
               You can use a subquery for assignment within an
-              <literal>UPDATE</literal> statement, since subqueries are
+              <literal>UPDATE</literal> statement because subqueries are
               legal in <literal>UPDATE</literal> and
               <literal>DELETE</literal> statements as well as in
               <literal>SELECT</literal> statements. However, you cannot

Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.0/storage-engines.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -2028,9 +2028,9 @@
             <literal>DROP TABLE</literal> on a table that is in use by a
             <literal>MERGE</literal> table does not work on Windows
             because the <literal>MERGE</literal> storage engine's table
-            mapping is hidden from the upper layer of MySQL. Since
-            Windows does not allow the deletion of open files, you first
-            must flush all <literal>MERGE</literal> tables (with
+            mapping is hidden from the upper layer of MySQL. Windows
+            does not allow the deletion of open files, so you first must
+            flush all <literal>MERGE</literal> tables (with
             <literal>FLUSH TABLES</literal>) or drop the
             <literal>MERGE</literal> table before dropping the table.
           </para>
@@ -4012,8 +4012,8 @@
     </para>
 
     <para>
-      Since the dummy process does not actually store any data, there is
-      little processing over head incurred by running the additional
+      The dummy process does not actually store any data, so there is
+      little processing overhead incurred by running the additional
       <literal>mysqld</literal> process on the replication master host.
       This type of setup can be repeated with additional replication
       slaves.
@@ -4042,8 +4042,8 @@
 
       <listitem>
         <para>
-          since <literal>BLACKHOLE</literal> is essentially a
-          <quote>no-op</quote> storage engine, it could be used for
+          <literal>BLACKHOLE</literal> is essentially a
+          <quote>no-op</quote> storage engine, so it could be used for
           finding performance bottlenecks not related to the storage
           engine itself.
         </para>

Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/apis.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -177,8 +177,9 @@
         the MySQL server library into a compiled version of a program,
         use the GNU C compiler (<literal>gcc</literal>). The compiler
         will need to know where to find various files and need
-        instructions on how to compile the program. Below is an example
-        of how a program could be compiled from the command-line:
+        instructions on how to compile the program. The following
+        example shows how a program could be compiled from the command
+        line:
       </para>
 
 <programlisting>
@@ -11625,7 +11626,7 @@
           the most recently invoked prepared statement API function that
           can succeed or fail. The error code consists of five
           characters. <literal>"00000"</literal> means <quote>no
-          error</quote>. The values are specified by ANSI SQL and ODBC.
+          error.</quote> The values are specified by ANSI SQL and ODBC.
           For a list of possible values, see
           <xref linkend="error-handling"/>.
         </para>

Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/charset.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -1361,8 +1361,8 @@
       <para>
         Standard SQL resolves such questions using what used to be
         called <quote>coercibility</quote> rules. Basically, this means:
-        Since both <literal>x</literal> and <literal>'Y'</literal> have
-        collations, whose collation takes precedence? This can be
+        Both <literal>x</literal> and <literal>'Y'</literal> have
+        collations, so which collation takes precedence? This can be
         difficult to resolve, but the following rules take care of most
         situations:
       </para>
@@ -2065,7 +2065,7 @@
 
     <para>
       <firstterm>Metadata</firstterm> is <quote>the data about the
-      data</quote>. Anything that <emphasis>describes</emphasis> the
+      data.</quote> Anything that <emphasis>describes</emphasis> the
       database &mdash; as opposed to being the
       <emphasis>contents</emphasis> of the database &mdash; is metadata.
       Thus column names, database names, usernames, version names, and
@@ -2190,9 +2190,9 @@
     <para>
       Although automatic conversion is not in the SQL standard, the SQL
       standard document does say that every character set is (in terms
-      of supported characters) a <quote>subset</quote> of Unicode. Since
-      it is a well-known principle that <quote>what applies to a
-      superset can apply to a subset</quote>, we believe that a
+      of supported characters) a <quote>subset</quote> of Unicode.
+      Because it is a well-known principle that <quote>what applies to a
+      superset can apply to a subset,</quote> we believe that a
       collation for Unicode can apply for comparisons with non-Unicode
       strings.
     </para>
@@ -2723,7 +2723,7 @@
             <foreignphrase>Deutsches Institut für
             Normung</foreignphrase> (the German equivalent of ANSI).
             DIN-1 is called the <quote>dictionary collation</quote> and
-            DIN-2 is called the <quote>phone book collation</quote>.
+            DIN-2 is called the <quote>phone book collation.</quote>
           </para>
 
           <itemizedlist>
@@ -2818,7 +2818,7 @@
         same as the official <literal>ISO 8859-1</literal> or IANA
         (Internet Assigned Numbers Authority) <literal>latin1</literal>,
         but IANA <literal>latin1</literal> treats the code points
-        between 0x80 and 0x9f as <quote>undefined</quote>, while
+        between 0x80 and 0x9f as <quote>undefined,</quote> while
         <literal>cp1252</literal>, and therefore MySQL's
         <literal>latin1</literal>, assign characters for those
         positions. For example, 0x80 is the Euro sign. For the

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -4623,7 +4623,7 @@
           When the first <command>mysql</command> process terminates,
           the server drops the temporary table. When the second
           <command>mysql</command> process attempts to use the table,
-          the server reports <quote>unknown table</quote>.
+          the server reports <quote>unknown table.</quote>
         </para>
 
         <para>
@@ -5439,7 +5439,7 @@
         <para>
           If you are doing a backup on the server, and your tables all
           are <literal>MyISAM</literal> tables, you could consider using
-          the <command>mysqlhotcopy</command> instead since faster
+          the <command>mysqlhotcopy</command> instead because faster
           backups and faster restores can be accomplished with the
           latter. See <xref linkend="mysqlhotcopy"/>.
         </para>
@@ -6449,7 +6449,7 @@
 
         <para>
           For point-in-time recovery (also known as
-          <quote>roll-forward</quote>, when you need to restore an old
+          <quote>roll-forward,</quote> when you need to restore an old
           backup and replay the changes which happened since that
           backup), it is often useful to rotate the binary log (see
           <xref linkend="binary-log"/>) or at least know the binary log

Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/connector-j.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -992,7 +992,7 @@
 
         <para>
           Starting with Connector/J 3.1.9, we don't ship the .class
-          files <quote>unbundled</quote>, they are only available in the
+          files <quote>unbundled,</quote> they are only available in the
           JAR archives that ship with the driver.
         </para>
 
@@ -1290,7 +1290,7 @@
 
             <para>
               Starting with Connector/J 3.1.9, we don't ship the .class
-              files <quote>unbundled</quote>, they are only available in
+              files <quote>unbundled,</quote> they are only available in
               the JAR archives that ship with the driver.
             </para>
 
@@ -2677,7 +2677,7 @@
             <listitem>
               <para>
                 If a parameter changes from <quote>large</quote> to
-                non-<quote>large</quote>, the driver must reset the
+                non-<quote>large,</quote> the driver must reset the
                 server-side state of the prepared statement to allow the
                 parameter that is being changed to take the place of the
                 prior <quote>large</quote> value. This removes all of
@@ -4082,7 +4082,7 @@
         that comes with Connector/J to the <filename>lib</filename>
         directory for your server configuration (which is usually called
         "<filename>default</filename>"). Then, in the same configuration
-        directory, in the subdirectory named <quote>deploy</quote>,
+        directory, in the subdirectory named <quote>deploy,</quote>
         create a datasource configuration file that ends with "-ds.xml",
         which tells JBoss to deploy this file as a JDBC Datasource. The
         file should have the following contents:

Modified: trunk/refman-5.1/connector-mxj.xml
===================================================================
--- trunk/refman-5.1/connector-mxj.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/connector-mxj.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -128,11 +128,12 @@
 
     <para>
       The first thing to do is make sure that the components will work
-      on the platform. Since the ''MysqldResource'' class is really a
-      wrapper for a native version of MySQL, not all platforms are
-      supported. At the time of this writing, Linux on the i386
-      architecture has been tested and seems to work quite well, as does
-      OS X v10.3. There has been limited testing on Windows and Solaris.
+      on the platform. The <classname>MysqldResource</classname> class
+      is really a wrapper for a native version of MySQL, so not all
+      platforms are supported. At the time of this writing, Linux on the
+      i386 architecture has been tested and seems to work quite well, as
+      does OS X v10.3. There has been limited testing on Windows and
+      Solaris.
     </para>
 
     <para>
@@ -227,11 +228,11 @@
         <para>
           The tests attempt to launch MySQL on the port 3336. If you
           have a MySQL running, it may conflict, but this isn't very
-          likely since thedefault port for MySQL is 3306. However, You
-          may set the "c-mxj_test_port" Java property to a port of your
-          choosing. Alternatively, you may wish to start by shutting
-          down any instances of MySQL you have running on the target
-          machine.
+          likely because the default port for MySQL is 3306. However,
+          You may set the "c-mxj_test_port" Java property to a port of
+          your choosing. Alternatively, you may wish to start by
+          shutting down any instances of MySQL you have running on the
+          target machine.
         </para>
 
         <para>

Modified: trunk/refman-5.1/connector-net.xml
===================================================================
--- trunk/refman-5.1/connector-net.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/connector-net.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -653,7 +653,7 @@
               information from the stored procedure specified in the
               MySqlCommand and populates the Parameters collection of
               the specified MySqlCommand object. This method is not
-              currently supported since stored procedures are not
+              currently supported because stored procedures are not
               available in MySql.
             </para>
           </listitem>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/database-administration.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -2453,8 +2453,8 @@
           Once you've set up a password file for the MySQL Instance
           Manager and the IM is running, you can connect to it. You can
           use the <command>mysql</command> client tool connect through a
-          standard MySQL API. Below goes the list of commands the MySQL
-          Instance Manager currently accepts, with samples.
+          standard MySQL API. The following list of commands shows the
+          MySQL Instance Manager currently accepts, with samples.
         </para>
 
         <itemizedlist>
@@ -6406,7 +6406,7 @@
             <para>
               The number of days for automatic binary log removal. The
               default is 0, which means <quote>no automatic
-              removal</quote>. Possible removals happen at startup and
+              removal.</quote> Possible removals happen at startup and
               at binary log rotation.
             </para>
           </listitem>
@@ -11609,7 +11609,7 @@
             escaped character sequences in Web forms, URLs, or whatever
             application you have built. Be sure that your application
             remains secure if a user enters something like
-            <quote><literal>; DROP DATABASE mysql;</literal></quote>.
+            <quote><literal>; DROP DATABASE mysql;</literal>.</quote>
             This is an extreme example, but large security leaks and
             data loss might occur as a result of hackers using similar
             techniques, if you do not prepare for them.
@@ -15719,7 +15719,7 @@
           <para>
             Upgrading from MySQL 4.1 (4.1.1 or later in the 4.1 series)
             to MySQL &current-series; should not give rise to any issues
-            in this regard, since both versions use the same password
+            in this regard because both versions use the same password
             hashing mechanism. If you wish to upgrade an older release
             of MySQL to version &current-series;, you should upgrade to
             version 4.1 first, then upgrade the 4.1 installation to
@@ -18418,7 +18418,7 @@
         <literal>SELECT INTO ... OUTFILE</literal> or <literal>BACKUP
         TABLE</literal>. For <literal>SELECT INTO ... OUTFILE</literal>,
         the output file cannot previously exist. This is also true of
-        <literal>BACKUP TABLE</literal>, since allowing extant files to
+        <literal>BACKUP TABLE</literal> because allowing extant files to
         be overwritten would constitute a security risk. See
         <xref linkend="select"/>, and <xref linkend="backup-table"/>.
       </para>

Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/extending-mysql.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -769,7 +769,7 @@
             determining how to split up input into words. For example,
             the built-in parser considers the text
             <quote>case-sensitive</quote> to consist of two words
-            <quote>case</quote> and <quote>sensitive</quote>, whereas an
+            <quote>case</quote> and <quote>sensitive,</quote> whereas an
             application might need to treat the text as a single word.
           </para>
         </listitem>

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/functions.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -8754,7 +8754,7 @@
           date actually occurs in the 52nd week of 1999. We decided to
           return <literal>0</literal> instead because we want the
           function to return <quote>the week number in the given
-          year</quote>. This makes use of the <literal>WEEK()</literal>
+          year.</quote> This makes use of the <literal>WEEK()</literal>
           function reliable when combined with other functions that
           extract a date part from a date.
         </para>
@@ -11537,7 +11537,7 @@
           <para>
             These functions allow encryption and decryption of data
             using the official AES (Advanced Encryption Standard)
-            algorithm, previously known as <quote>Rijndael</quote>.
+            algorithm, previously known as <quote>Rijndael.</quote>
             Encoding with a 128-bit key length is used, but you can
             extend it up to 256 bits by modifying the source. We chose
             128 bits because it is much faster and it is secure enough
@@ -14743,7 +14743,7 @@
         can use columns or calculations in the <literal>SELECT</literal>
         list that do not appear in the <literal>GROUP BY</literal>
         clause. This stands for <quote>any possible value for this
-        group</quote>. You can use this to get better performance by
+        group.</quote> You can use this to get better performance by
         avoiding sorting and grouping on unnecessary items. For example,
         you do not need to group on <literal>customer.name</literal> in
         the following query:

Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/innodb.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -994,7 +994,7 @@
           The size of the buffer pool (in MB), if it is placed in the
           AWE memory. This is relevant only in 32-bit Windows. If your
           32-bit Windows operating system supports more than 4GB memory,
-          using so-called <quote>Address Windowing Extensions</quote>,
+          using so-called <quote>Address Windowing Extensions,</quote>
           you can allocate the <literal>InnoDB</literal> buffer pool
           into the AWE physical memory using this variable. The maximum
           possible value for this variable is 63000. If it is greater
@@ -3009,8 +3009,8 @@
       <command>mysqldump</command>. The reason for this is that a binary
       file might be corrupted without you noticing it. Dumped tables are
       stored into text files that are human-readable, so spotting table
-      corruption becomes easier. Also, since the format is simpler, the
-      chance for serious data corruption is smaller.
+      corruption becomes easier. Also, because the format is simpler,
+      the chance for serious data corruption is smaller.
       <command>mysqldump</command> also has a
       <option>--single-transaction</option> option that you can use to
       make a consistent snapshot without locking out other clients.
@@ -3760,7 +3760,7 @@
             non-locking fashion, but a possible earlier version of a
             record might be used. Thus, using this isolation level, such
             reads are not consistent. This is also called a <quote>dirty
-            read</quote>. Otherwise, this isolation level works like
+            read.</quote> Otherwise, this isolation level works like
             <literal>READ COMMITTED</literal>.
           </para>
         </listitem>
@@ -3942,7 +3942,7 @@
         a unique identifier to each child added to table
         <literal>child</literal>. Obviously, using a consistent read or
         a shared mode read to read the present value of the counter is
-        not a good idea, since two users of the database may then see
+        not a good idea because two users of the database may then see
         the same value for the counter, and a duplicate-key error occurs
         if two users attempt to add children with the same identifier to
         the table.
@@ -4023,7 +4023,7 @@
         <literal>R</literal> in an index, another user cannot insert a
         new index record immediately before <literal>R</literal> in the
         index order. This locking of gaps is done to prevent the
-        so-called <quote>phantom problem</quote>. Suppose that you want
+        so-called <quote>phantom problem.</quote> Suppose that you want
         to read and lock all children from the <literal>child</literal>
         table having an identifier value greater than 100, with the
         intention of updating some column in the selected rows later:
@@ -4308,7 +4308,7 @@
             <literal>InnoDB</literal> knows about row-level locks.
             Otherwise, <literal>InnoDB</literal>'s automatic deadlock
             detection cannot detect deadlocks where such table locks are
-            involved. Also, since the higher MySQL layer does not know
+            involved. Also, because the higher MySQL layer does not know
             about row-level locks, it is possible to get a table lock on
             a table where another user currently has row-level locks.
             However, this does not endanger transaction integrity, as
@@ -4613,8 +4613,8 @@
           Wrap several modifications into one transaction.
           <literal>InnoDB</literal> must flush the log to disk at each
           transaction commit if that transaction made modifications to
-          the database. Since the rotation speed of a disk is typically
-          at most 167 revolutions/second, that constrains the number of
+          the database. The rotation speed of a disk is typically at
+          most 167 revolutions/second, which constrains the number of
           commits to the same 167<superscript>th</superscript> of a
           second if the disk does not <quote>fool</quote> the operating
           system.

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/installing.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -2664,7 +2664,7 @@
       The next several sections cover the installation of MySQL on
       platforms where we offer packages using the native packaging
       format of the respective platform. (This is also known as
-      performing a <quote>binary install</quote>.) However, binary
+      performing a <quote>binary install.</quote>) However, binary
       distributions of MySQL are available for many other platforms as
       well. See <xref linkend="installing-binary"/>, for generic
       installation instructions for these packages that apply to all
@@ -8241,10 +8241,10 @@
 
           <para>
             Normally, you do not have to build the documentation
-            yourself, since we already provide it in a number of formats
-            at <ulink url="&base-url-docs;"/>. The formats you can
-            download there (HTML, PDF, etc.) are built on a daily basis,
-            so you gain little by creating them yourself from the
+            yourself because we already provide it in a number of
+            formats at <ulink url="&base-url-docs;"/>. The formats you
+            can download there (HTML, PDF, etc.) are built on a daily
+            basis, so you gain little by creating them yourself from the
             DocBook XML base format in the <literal>mysqldoc</literal>
             tree. If you would like to copy the documentation
             repository, anyway, use the following command:

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -142,7 +142,7 @@
       The data stored in the data nodes for MySQL Cluster can be
       mirrored; the cluster can handle failures of individual data nodes
       with no other impact than that a small number of transactions are
-      aborted due to losing the transaction state. Since transactional
+      aborted due to losing the transaction state. Because transactional
       applications are expected to handle transaction failure, this
       should not be a source of problems.
     </para>
@@ -371,7 +371,7 @@
       basics for how to plan, install, configure, and run a MySQL
       Cluster. Unlike the example in
       <xref linkend="mysql-cluster-configuration"/>, the result of
-      following the guidelines and procedures outlined below should be a
+      following the guidelines and procedures outlined here should be a
       usable MySQL Cluster which meets minimum requirements for
       availability and safeguarding of data.
     </para>
@@ -763,9 +763,8 @@
       </orderedlist>
 
       <para>
-        Remember that the steps listed above must be performed
-        separately for each machine on which a storage or SQL node is to
-        reside.
+        Remember that the preceding steps must be performed separately
+        for each machine on which a storage or SQL node is to reside.
       </para>
 
       <para>
@@ -901,9 +900,9 @@
 </programlisting>
 
       <para>
-        After entering the above, save this file and exit the text
-        editor. Do this for the machines hosting data node "A", data
-        node "B", and the SQL node.
+        After entering the preceding information, save this file and
+        exit the text editor. Do this for the machines hosting data node
+        "A", data node "B", and the SQL node.
       </para>
 
       <para>
@@ -1087,7 +1086,7 @@
         If all has gone well, and the cluster has been set up correctly,
         the cluster should now be operational. You can test this by
         invoking the <command>ndb_mgm</command> management node client;
-        the output should look like what is shown below:
+        the output should look like what is shown here:
       </para>
 
 <programlisting>
@@ -1226,7 +1225,8 @@
             <literal>ENGINE=MyISAM</literal> with
             <literal>ENGINE=NDBCLUSTER</literal>. If you do not wish to
             modify the file, you can also use <literal>ALTER
-            TABLE</literal>; see below for particulars.
+            TABLE</literal> to change their type. The particulars are
+            given later in this section.
           </para>
 
           <para>
@@ -1243,9 +1243,9 @@
 </programlisting>
 
           <para>
-            It is very important to keep in mind that the above command
-            must be executed on the host where the SQL node is running
-            -- in this case, on the machine with the IP address
+            It is very important to keep in mind that the preceding
+            command must be executed on the host where the SQL node is
+            running -- in this case, on the machine with the IP address
             <emphasis role="bold">192.168.0.20</emphasis>.
           </para>
 
@@ -1263,7 +1263,8 @@
           <para>
             Of course, the SQL script must be readable by the
             <literal>mysql</literal> system user. If you save the file
-            to a different location, adjust the above accordingly.
+            to a different location, adjust the preceding instructions
+            accordingly.
           </para>
 
           <para>
@@ -1361,9 +1362,9 @@
             Applications using MySQL can use standard APIs. It is
             important to remember that your application must access the
             SQL node, and not the MGM or storage nodes. This brief
-            example shows how we might execute the same query as above
-            using PHP 5's <literal>mysqli</literal> extension running on
-            a Web server elsewhere on the network:
+            example shows how we might execute the same query shown
+            earlier using PHP 5's <literal>mysqli</literal> extension
+            running on a Web server elsewhere on the network:
           </para>
 
 <programlisting>
@@ -1572,8 +1573,8 @@
     </para>
 
     <para>
-      Since the MySQL server is a part of the cluster, it will also need
-      to know how to access an MGM node in order to obtain the cluster
+      The MySQL server is a part of the cluster, so it will also need to
+      know how to access an MGM node in order to obtain the cluster
       configuration data. The default behavior is to look for the MGM
       node on <literal>localhost</literal>. However, should you need to
       specify its location elsewhere, this can be done in
@@ -1805,9 +1806,9 @@
 </programlisting>
 
       <para>
-        (Note that the row numbers shown in the example output above may
-        be different from those shown on your system, depending upon the
-        MySQL version being used and how it is configured.)
+        (Note that the row numbers shown in the preceding example output
+        may be different from those shown on your system, depending upon
+        the MySQL version being used and how it is configured.)
       </para>
 
 <programlisting>
@@ -1924,7 +1925,7 @@
 
         <para>
           In order to support MySQL Cluster, you will need to update
-          <filename>my.cnf</filename> as shown in the example below.
+          <filename>my.cnf</filename> as shown in the following example.
           Note that the options shown here should not be confused with
           those occurring in <filename>config.ini</filename> files. You
           may also specify these parameters when invoking the
@@ -2032,7 +2033,7 @@
           and nodes involved in the cluster and on which computers these
           nodes are located. An example of a simple configuration file
           for a cluster consisting of one management server, two data
-          nodes and two MySQL servers is shown below:
+          nodes and two MySQL servers is shown here:
         </para>
 
 <programlisting>
@@ -2117,9 +2118,9 @@
 
         <para>
           Note that each node has its own section in the
-          <filename>config.ini</filename>. For instance, since this
-          cluster has two data nodes, the configuration file contains
-          two sections defining these nodes.
+          <filename>config.ini</filename>. For instance, this cluster
+          has two data nodes, so the configuration file contains two
+          sections defining these nodes.
         </para>
 
         <para>
@@ -2170,8 +2171,8 @@
           default connectstring value if none is provided. If
           <literal>&lt;port&gt;</literal> is omitted from the
           connectstring, the default port is 1186. This port should
-          always be available on the network, since it has been assigned
-          by IANA for this purpose (see
+          always be available on the network because it has been
+          assigned by IANA for this purpose (see
           <ulink url="http://www.iana.org/assignments/port-numbers"/>
           for details).
         </para>
@@ -2194,7 +2195,7 @@
 
           <listitem>
             <para>
-              Each executable has its own command line option which
+              Each executable has its own command-line option which
               enables specifying the management server at startup. (See
               the documentation for the respective executable.)
             </para>
@@ -2648,11 +2649,11 @@
             <para>
               Each node in the cluster uses a port to connect to other
               nodes. This port is used also for non-TCP transporters in
-              the connection setup phase. Since, the default port is
-              allocated dynamically in such a way as to ensure that no
-              two nodes on the same computer receive the same port
-              number, it should not normally be necessary to specify a
-              value for this parameter.
+              the connection setup phase. The default port is allocated
+              dynamically in such a way as to ensure that no two nodes
+              on the same computer receive the same port number, so it
+              should not normally be necessary to specify a value for
+              this parameter.
             </para>
           </listitem>
 
@@ -2982,10 +2983,10 @@
               It is highly recommended that
               <literal>DataMemory</literal> and
               <literal>IndexMemory</literal> be set to the same values
-              for all nodes. Since data is distributed evenly over all
-              nodes in the cluster the maximum amount of space available
-              for any node can be no greater than that of the smallest
-              node in the cluster.
+              for all nodes. Data distribution is even over all nodes in
+              the cluster, so the maximum amount of space available for
+              any node can be no greater than that of the smallest node
+              in the cluster.
             </para>
 
             <para>
@@ -3352,9 +3353,9 @@
               by performing a full table scan. The second case is
               encountered when there is no hash index to support the
               query but there is an ordered index. Using the ordered
-              index means executing a parallel range scan. Since the
-              order is kept on the local partitions only, it is
-              necessary to perform the index scan on all partitions.
+              index means executing a parallel range scan. The order is
+              kept on the local partitions only, so it is necessary to
+              perform the index scan on all partitions.
             </para>
 
             <para>
@@ -3817,8 +3818,8 @@
           There are a number of <literal>[NDBD]</literal> parameters
           specifying timeouts and intervals between various actions in
           Cluster data nodes. Most of the timeout values are specified
-          in milliseconds. Any exceptions to this will be mentioned
-          where applicable below.
+          in milliseconds. Any exceptions to this are mentioned where
+          applicable.
         </para>
 
         <itemizedlist>
@@ -3863,7 +3864,7 @@
 
             <para>
               The default value is 30000 milliseconds (30 seconds).
-              <literal>0</literal> means eternal time out; in other
+              <literal>0</literal> means eternal timeout; in other
               words, the cluster may start only if all nodes are
               available.
             </para>
@@ -3945,7 +3946,7 @@
               Each data node sends heartbeat signals to each MySQL
               server (SQL node) to ensure that it remains in contact. If
               a MySQL server fails to send a heartbeat in time it is
-              declared <quote>dead</quote>, in which case all ongoing
+              declared <quote>dead,</quote> in which case all ongoing
               transactions are completed and all resources released. The
               SQL node cannot reconnect until all activities initiated
               by the previous MySQL instance have been completed. The
@@ -4039,7 +4040,7 @@
             </para>
 
             <para>
-              Time-out handling is performed by checking a timer on each
+              Timeout handling is performed by checking a timer on each
               transaction once for every interval specified by this
               parameter. Thus, if this parameter is set to 1000
               milliseconds, then every transaction will be checked for
@@ -4339,7 +4340,7 @@
             </para>
 
             <para>
-              Since UNDO log entries tend to grow larger as more
+              Because UNDO log entries tend to grow larger as more
               operations are logged, this buffer is also larger than its
               index memory counterpart, with a default value of 16MB.
             </para>
@@ -5310,10 +5311,12 @@
 
       <itemizedlist>
 
-        <para>
-          Use <option>--ndbcluster</option> as a startup option when
-          starting <command>mysqld</command>
-        </para>
+        <listitem>
+          <para>
+            Use <option>--ndbcluster</option> as a startup option when
+            starting <command>mysqld</command>
+          </para>
+        </listitem>
 
         <listitem>
           <para>
@@ -5336,7 +5339,7 @@
         output), you are not running an <literal>NDB</literal>-enabled
         version of MySQL. If you see <literal>DISABLED</literal> in this
         row, then you need to enable it in either one of the two ways
-        shown above.
+        just described.
       </para>
 
       <para>
@@ -5697,9 +5700,9 @@
 
       <para>
         When starting the management client, it is necessary to supply
-        the hostname and port of the management server as in the example
-        below. The default values are <literal>localhost</literal> and
-        <literal>1186</literal>.
+        the hostname and port of the management server as in the
+        following example. The default values are
+        <literal>localhost</literal> and <literal>1186</literal>.
       </para>
 
 <programlisting>
@@ -5722,10 +5725,11 @@
         All MySQL Cluster executables (except for
         <command>mysqld</command>) take the following options. Users of
         earlier MySQL Cluster versions should note that some of these
-        switches have been changed from those in MySQL 4.1 Cluster in
+        options have been changed from those in MySQL 4.1 Cluster in
         order to make them consistent with one another as well as with
-        <command>mysqld</command>. You can use the <option>-?</option>
-        switch to view a list of supported options.
+        <command>mysqld</command>. You can use the
+        <option>--help</option> option to view a list of supported
+        options.
       </para>
 
       <itemizedlist>
@@ -6460,7 +6464,7 @@
 
       <para>
         In addition to the central configuration file, a cluster may
-        also be controlled through a command line interface available
+        also be controlled through a command-line interface available
         through the management client <command>ndb_mgm</command>. This
         is the primary administrative interface to a running cluster.
       </para>
@@ -6570,7 +6574,7 @@
           </para>
 
           <para>
-            Exists single user mode allowing all SQL nodes (that is, all
+            Exits single-user mode, allowing all SQL nodes (that is, all
             running <command>mysqld</command> processes) to access the
             database.
           </para>
@@ -6638,7 +6642,7 @@
 
       <para>
         <emphasis role="bold">Note</emphasis>: The cluster log is the
-        log recommended for most uses, since it provides logging
+        log recommended for most uses because it provides logging
         information for an entire cluster in a single file. Node logs
         are intended to be used only during application development, or
         for debugging application code.
@@ -6668,7 +6672,7 @@
             <emphasis>Priority</emphasis>: This is represented by one of
             the numbers from 1 to 15 inclusive, where 1 indicates
             <quote>most important</quote> and 15 <quote>least
-            important</quote>.
+            important.</quote>
           </para>
         </listitem>
 
@@ -6965,7 +6969,7 @@
         </para>
 
         <para>
-          The logging messages shown below are associated with
+          The logging messages shown here are associated with
           checkpoints.
         </para>
 
@@ -7548,17 +7552,17 @@
       <para>
         Single user mode allows the database administrator to restrict
         access to the database system to a single MySQL server (SQL
-        node). When entering single user mode all connections to all
+        node). When entering single-user mode, all connections to all
         other MySQL servers are closed gracefully and all running
         transactions are aborted. No new transactions are allowed to be
         started.
       </para>
 
       <para>
-        Once the cluster has entered single user mode, only the
+        Once the cluster has entered single-user mode, only the
         designated SQL node is granted access to the database. You can
         use the <command>ALL STATUS</command> command to see when the
-        cluster has entered single user mode.
+        cluster has entered single-user mode.
       </para>
 
       <para>
@@ -7575,26 +7579,26 @@
 
       <para>
         After this command has executed and the cluster has entered
-        single user mode, the SQL node whose node ID is
+        single-user mode, the SQL node whose node ID is
         <literal>5</literal> becomes the cluster's only permitted user.
       </para>
 
       <para>
-        The node specified in the command above must be a MySQL Server
-        node; An attempt to specify any other type of node will be
-        rejected.
+        The node specified in the preceding command must be a MySQL
+        Server node; An attempt to specify any other type of node will
+        be rejected.
       </para>
 
       <para>
-        <emphasis role="bold">Note</emphasis>: When the above commmand
-        is invoked, all transactions running on the designated node are
-        aborted, the connection is closed, and the server must be
-        restarted.
+        <emphasis role="bold">Note</emphasis>: When the preceding
+        commmand is invoked, all transactions running on the designated
+        node are aborted, the connection is closed, and the server must
+        be restarted.
       </para>
 
       <para>
         The command <command>EXIT SINGLE USER MODE</command> changes the
-        state of the cluster's data nodes from single user mode to
+        state of the cluster's data nodes from single-user mode to
         normal mode. MySQL Servers waiting for a connection (that is,
         for the cluster to become ready and available), are now
         permitted to connect. The MySQL Server denoted as the
@@ -7616,7 +7620,7 @@
 
       <para>
         The recommended way to handle a node failure when running in
-        single user mode is to do either of the following:
+        single-user mode is to do either of the following:
       </para>
 
       <itemizedlist>
@@ -7626,7 +7630,7 @@
 
             <listitem>
               <para>
-                Finish all single user mode transactions
+                Finish all single-user mode transactions
               </para>
             </listitem>
 
@@ -7656,7 +7660,7 @@
 
         <listitem>
           <para>
-            Restart database nodes prior to entering single user mode.
+            Restart database nodes prior to entering single-user mode.
           </para>
         </listitem>
 
@@ -7754,7 +7758,7 @@
               A log file containing records of committed transactions.
               Only transactions on tables stored in the backup are
               stored in the log. Nodes involved in the backup save
-              different records, since different nodes host different
+              different records because different nodes host different
               database fragments.
             </para>
           </listitem>
@@ -7910,7 +7914,7 @@
 
         <para>
           The cluster restoration program is implemented as a separate
-          command line utility <command>ndb_restore</command>, which
+          command-line utility <command>ndb_restore</command>, which
           reads the files created by the backup and inserts the stored
           information into the database. The restore program must be
           executed once for each set of backup files, that is, as many
@@ -7927,9 +7931,9 @@
           free connection in order to connect to the cluster. This can
           be verified with the <command>ndb_mgm</command> command
           <command>SHOW</command> (you can accomplish this from a system
-          shell using <command>ndb_mgm -e SHOW</command>). The switch
+          shell using <command>ndb_mgm -e SHOW</command>). The
           <option>-c <replaceable>connectstring</replaceable></option>
-          may be used to locate the MGM node (see
+          option may be used to locate the MGM node (see
           <xref linkend="mysql-cluster-connectstring"/>, for information
           on connectstrings). The backup files must be present in the
           directory given as an argument to the restoration program.
@@ -8035,7 +8039,7 @@
         <para>
           <literal>NDB</literal> does not support repeatable reads,
           which can cause problems with the restoration process.
-          Although the backup process is <quote>hot</quote>, restoring a
+          Although the backup process is <quote>hot,</quote> restoring a
           MySQL Cluster from backup is not a 100% <quote>hot</quote>
           process. This is due to the fact that, for the duration of the
           restore process, running transactions get non-repeatable reads
@@ -8068,7 +8072,7 @@
     <para>
       Previous to MySQL 5.1, <firstterm>asynchronous
         replication</firstterm>, more usually referred to simply as
-      <quote>replication</quote>, was not available when using MySQL
+      <quote>replication,</quote> was not available when using MySQL
       Cluster. This section explains how to set up and manage a
       configuration wherein one group of computers operating as a MySQL
       Cluster replicates to a second computer or group of computers. We
@@ -8090,7 +8094,7 @@
       Cluster storage engine on the slave. However, for maximum
       availability, it  is possible to replicate from one MySQL Cluster to
       another, and it is this type of configuration that we discuss, as
-      shown in the figure below:
+      shown in the following figure:
     </para>  
   
     <mediaobject>
@@ -8339,7 +8343,7 @@
   </programlisting>
   
       <para>
-        In the figure below, the relationship of the MySQL Cluster
+        In the following figure, the relationship of the MySQL Cluster
         replication master server, its binlog injector thread, and the
         <literal>cluster_replication.binlog_index</literal> table are
         shown.
@@ -8441,9 +8445,9 @@
           
           <para>
             For example, to create a slave user account with the name
-            <quote><literal>myslave</literal></quote>, logging in from the
-            host named <quote><literal>rep-slave</literal></quote>, and
-            using the password <quote><literal>53cr37</literal></quote>,
+            <quote><literal>myslave</literal>,</quote> logging in from the
+            host named <quote><literal>rep-slave</literal>,</quote> and
+            using the password <quote><literal>53cr37</literal>,</quote>
             you would use the following <literal>GRANT</literal> command:
           </para>
   
@@ -8489,7 +8493,7 @@
           <para>
             For example, to tell the slave to replicate from the MySQL
             server whose hostname is
-            <quote><literal>rep-master</literal></quote>, using the
+            <quote><literal>rep-master</literal>,</quote> using the
             replication slave account created in the previous step, you
             would use the following command:
           </para>
@@ -8511,8 +8515,8 @@
             You can also configure the slave to use the master by setting
             the corresponding startup options in the slave server's
             <filename>my.cnf</filename> file. To configure the slave in
-            the same way as the example <literal>CHANGE MASTER
-              TO</literal> command above, the following information would
+            the same way as the preceding example <literal>CHANGE MASTER
+              TO</literal> statement, the following information would
             need to be included in the slave's <filename>my.cnf</filename>
             file: 
           </para>
@@ -9267,7 +9271,7 @@
         channel, it is necessary only to repeat these steps, substituting
         the hostnames and IDs of the secondary master and slave for those
         of the primary master and slave replication servers where
-        appropriate, and running the above commands on them. 
+        appropriate, and running the preceding commands on them. 
       </para>
       
       <para>
@@ -9682,16 +9686,16 @@
     </para>
 
     <para>
-      Currently the MySQL Cluster codebase includes support for 4
+      Currently the MySQL Cluster codebase includes support for four
       different transporters. Most users today employ TCP/IP over
-      Ethernet since it is ubiquitous. This is also by far the
+      Ethernet because it is ubiquitous. TCP/IP is also by far the
       best-tested transporter in MySQL Cluster.
     </para>
 
     <para>
       We are working to make sure that communication with the
       <command>ndbd</command> process is made in <quote>chunks</quote>
-      that are as large as possible since this benefits all types of
+      that are as large as possible because this benefits all types of
       data transmission.
     </para>
 
@@ -9728,7 +9732,7 @@
 
       <para>
         It is possible to use SCI Sockets with any version of MySQL
-        Cluster. No special builds are needed since it uses normal
+        Cluster. No special builds are needed because it uses normal
         socket calls which are already available in MySQL Cluster.
         However, SCI Sockets are currently supported only on the Linux
         2.4 and 2.6 kernels. SCI Transporters have been tested
@@ -10312,7 +10316,7 @@
         interest in communicating between <command>ndbd</command>
         processes. Using the SCI transporter is also only of interest if
         a CPU can be dedicated to the <command>ndbd</command> process
-        since the SCI transporter ensures that this process will never
+        because the SCI transporter ensures that this process will never
         go to sleep. It is also important to ensure that the
         <command>ndbd</command> process priority is set in such a way
         that the process does not lose priority due to running for an
@@ -10398,19 +10402,19 @@
               however, spatial indexes are not supported.
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
               It is not possible to drop partitions from
               <literal>NDB</literal> tables using <literal>ALTER TABLE
-                ... DROP PARTITION</literal>. The other partitioning
+              ... DROP PARTITION</literal>. The other partitioning
               extensions to <literal>ALTER TABLE</literal> &mdash;
               <literal>ADD PARTITION</literal>, <literal>REORGANIZE
-                PARTITION</literal>, and <literal>COALESCE
-                  PARTITION</literal> &mdash; are supported for Cluster
-              tables, but use copying and so are not optimised. See 
-              <xref linkend="partitioning-management-range-list"/> 
-              and <xref linkend="alter-table"/>.
+              PARTITION</literal>, and <literal>COALESCE
+              PARTITION</literal> &mdash; are supported for Cluster
+              tables, but use copying and so are not optimised. See
+              <xref linkend="partitioning-management-range-list"/> and
+              <xref linkend="alter-table"/>.
             </para>
           </listitem>
 
@@ -10781,7 +10785,7 @@
               <listitem>
                 <para>
                   You must give nodes explicit IDs in connectstrings
-                  since automatic allocation of node IDs does not work
+                  because automatic allocation of node IDs does not work
                   across multiple management servers.
                 </para>
               </listitem>
@@ -10812,7 +10816,7 @@
               supported. Use of these is liable to cause problems
               because, in the event of a data node failure, an SQL node
               waits for confirmation that the data node went down but
-              never receives it since another route to that data node
+              never receives it because another route to that data node
               remains open. This can effectively make the cluster
               inoperable.
             </para>
@@ -10962,7 +10966,7 @@
             executed in parallel. This means that queries against
             non-indexed columns can run as much as 5 to 10 times,
             <emphasis>times the number of data nodes</emphasis>, faster
-            than previously, since multiple CPUs can work on the query
+            than previously because multiple CPUs can work on the query
             in parallel.
           </para>
         </listitem>
@@ -10974,9 +10978,9 @@
             &current-series;, each record consumes approximately 25
             bytes of index memory, and every unique index uses 25 bytes
             per record of index memory (in addition to some data memory
-            since these are stored in a separate table). This is because
-            there is no storage of the primary key in the index memory
-            anymore.
+            because these are stored in a separate table). This is
+            because there is no storage of the primary key in the index
+            memory anymore.
           </para>
         </listitem>
 
@@ -11316,7 +11320,7 @@
 
       <listitem>
         <para>
-          <emphasis>Since MySQL Cluster uses TCP/IP, does that mean I
+          <emphasis>Because MySQL Cluster uses TCP/IP, does that mean I
           can run it over the Internet, with one or more nodes in a
           remote location?</emphasis>
         </para>
@@ -11465,7 +11469,8 @@
         <para>
           This stands for
           <quote><emphasis role="bold">N</emphasis>etwork
-          <emphasis role="bold">D</emphasis>ata<emphasis role="bold">b</emphasis>ase</quote>.
+          <emphasis role="bold">D</emphasis>ata<emphasis
+role="bold">b</emphasis>ase.</quote>
         </para>
       </listitem>
 
@@ -11590,9 +11595,9 @@
               <literal>USING HASH</literal> for all primary keys and
               unique indexes will generally cause table updates to run
               more quickly. This is due to the fact that less memory is
-              required (since no ordered indexes are created), and that
-              less CPU must be utilized (since fewer indexes must be
-              read and possibly updated).
+              required (because no ordered indexes are created), and
+              that less CPU must be utilized (because fewer indexes must
+              be read and possibly updated).
             </para>
           </listitem>
 
@@ -11911,8 +11916,8 @@
         </para>
 
         <para>
-          The above information is somewhat simplified; a more complete
-          explanation taking into account node groups follows below:
+          The preceding information is somewhat simplified; a more
+          complete explanation taking into account node groups follows:
         </para>
 
         <para>
@@ -12364,10 +12369,10 @@
           <emphasis role="bold">Note Regarding Obsolete
           Terms</emphasis>: In older versions of the MySQL Cluster
           documentation, data nodes were sometimes referred to as
-          <quote>database nodes</quote>, <quote>DB nodes</quote>, or
-          occasionally <quote>storage nodes</quote>. In addition, SQL
+          <quote>database nodes,</quote> <quote>DB nodes,</quote> or
+          occasionally <quote>storage nodes.</quote> In addition, SQL
           nodes were sometimes known as <quote>client nodes</quote> or
-          <quote>API nodes</quote>. This older terminology has been
+          <quote>API nodes.</quote> This older terminology has been
           deprecated in order to minimize confusion, and for these
           reasons should be avoided.
         </para>

Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/optimization.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -357,7 +357,7 @@
 
       <para>
         We solved this problem by storing all information per month in
-        compressed <quote>transaction tables</quote>. We had a set of
+        compressed <quote>transaction tables.</quote> We had a set of
         simple macros that generated summary tables grouped by different
         criteria (product group, customer id, store, and so on) from the
         tables in which the transactions were stored. The reports were
@@ -1856,10 +1856,10 @@
         efficiently if they are declared as the same type and size. In
         this context, <literal>VARCHAR</literal> and
         <literal>CHAR</literal> are considered the same if they are
-        declared as the same size. Since <literal>tt.ActualPC</literal>
-        is declared as <literal>CHAR(10)</literal> and
+        declared as the same size. <literal>tt.ActualPC</literal> is
+        declared as <literal>CHAR(10)</literal> and
         <literal>et.EMPLOYID</literal> is <literal>CHAR(15)</literal>,
-        there is a length mismatch.
+        so there is a length mismatch.
       </para>
 
       <para>
@@ -2394,7 +2394,7 @@
           conveniently represented by corresponding conditions in the
           <literal>WHERE</literal> clause, so we speak of
           <firstterm>range conditions</firstterm> rather than
-          <quote>intervals</quote>.
+          <quote>intervals.</quote>
         </para>
 
         <para>
@@ -4731,8 +4731,8 @@
           the keys are ordered. This property allows use of lookup
           groups in an index without having to consider all keys in the
           index that satisfy all <literal>WHERE</literal> conditions.
-          Since this access method considers only a fraction of the keys
-          in an index, it is called a <firstterm>loose index
+          This access method considers only a fraction of the keys in an
+          index, so it is called a <firstterm>loose index
           scan</firstterm>. When there is no <literal>WHERE</literal>
           clause, a loose index scan reads as many keys as the number of
           groups, which may be a much smaller number than that of all
@@ -4866,9 +4866,9 @@
           <literal>GROUP BY</literal> queries. If there are range
           conditions in the <literal>WHERE</literal> clause, this method
           reads only the keys that satisfy these conditions. Otherwise,
-          it performs an index scan. Since this method reads all keys in
-          each range defined by the <literal>WHERE</literal> clause, or
-          scans the whole index if there are no range conditions, we
+          it performs an index scan. Because this method reads all keys
+          in each range defined by the <literal>WHERE</literal> clause,
+          or scans the whole index if there are no range conditions, we
           term it a <firstterm>tight index scan</firstterm>. Notice that
           with a tight index scan, the grouping operation is performed
           only after all keys that satisfy the range conditions have
@@ -5637,7 +5637,7 @@
             If you need to collect statistics from large log tables, use
             summary tables instead of scanning the entire log table.
             Maintaining the summaries should be much faster than trying
-            to calculate statistics <quote>live</quote>. Regenerating
+            to calculate statistics <quote>live.</quote> Regenerating
             new summary tables from the logs when things change
             (depending on business decisions) is faster than changing
             the running application.
@@ -5647,7 +5647,7 @@
         <listitem>
           <para>
             If possible, you should classify reports as
-            <quote>live</quote> or as <quote>statistical</quote>, where
+            <quote>live</quote> or as <quote>statistical,</quote> where
             data needed for statistical reports is created only from
             summary tables that are generated periodically from the live
             data.
@@ -6198,8 +6198,8 @@
             time as many readers. This means that the database or table
             supports different views for the data depending on when
             access begins. Other common terms for this are <quote>time
-            travel</quote>, <quote>copy on write</quote>, or <quote>copy
-            on demand</quote>.
+            travel,</quote> <quote>copy on write,</quote> or <quote>copy
+            on demand.</quote>
           </para>
         </listitem>
 
@@ -6624,7 +6624,7 @@
           <para>
             Use the smaller integer types if possible to get smaller
             tables. For example, <literal>MEDIUMINT</literal> is often a
-            better choice than <literal>INT</literal> since a
+            better choice than <literal>INT</literal> because a
             <literal>MEDIUMINT</literal> column uses 25% less space.
           </para>
         </listitem>
@@ -6675,8 +6675,8 @@
             <literal>CHAR(<replaceable>n</replaceable>)</literal>
             occupies 3*<replaceable>n</replaceable> bytes, given that
             the maximum length of a UTF-8 encoded character is 3 bytes.
-            Since many languages can be written mostly with single-byte
-            UTF-8 characters, a fixed storage length often wastes space.
+            Many languages can be written mostly with single-byte UTF-8
+            characters, so a fixed storage length often wastes space.
             The <literal>ROW_FORMAT=COMPACT</literal> format allocates a
             variable amount of
             <replaceable>n</replaceable>..3*<replaceable>n</replaceable>
@@ -7259,7 +7259,7 @@
         One circumstance under which this occurs is when the optimizer
         estimates that using the index would require MySQL to access a
         very large percentage of the rows in the table. (In this case, a
-        table scan is likely to be much faster, since it requires fewer
+        table scan is likely to be much faster because it requires fewer
         seeks.) However, if such a query uses <literal>LIMIT</literal>
         to retrieve only some of the rows, MySQL uses an index anyway,
         because it can much more quickly find the few rows to return in
@@ -7425,7 +7425,7 @@
 
       <para>
         If it happens that a block selected for replacement has been
-        modified, the block is considered <quote>dirty</quote>. In this
+        modified, the block is considered <quote>dirty.</quote> In this
         case, prior to being replaced, its contents are flushed to the
         table index from which it came.
       </para>
@@ -7706,7 +7706,7 @@
           By default, the key cache management system uses the LRU
           strategy for choosing key cache blocks to be evicted, but it
           also supports a more sophisticated method called the
-          <quote>midpoint insertion strategy</quote>.
+          <quote>midpoint insertion strategy.</quote>
         </para>
 
         <para>
@@ -7714,7 +7714,7 @@
           divided into two parts: a hot sub-chain and a warm sub-chain.
           The division point between two parts is not fixed, but the key
           cache management system takes care that the warm part is not
-          <quote>too short</quote>, always containing at least
+          <quote>too short,</quote> always containing at least
           <literal>key_cache_division_limit</literal> percent of the key
           cache blocks. <literal>key_cache_division_limit</literal> is a
           component of structured key cache variables, so its value is a

Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/partitioning.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -372,7 +372,7 @@
           easily be parallelized. A simple example of such a query might
           be <literal>SELECT salesperson_id, COUNT(orders) as
           order_total FROM sales GROUP BY salesperson_id;</literal>. By
-          <quote>parallelized</quote>, we mean that the query can be run
+          <quote>parallelized,</quote> we mean that the query can be run
           simultaneously on each partition, and the final result
           obtained merely by summing the results obtained for all
           partitions.
@@ -588,7 +588,7 @@
         but what happens when your chain adds a
         21<superscript>st</superscript> store? Under this scheme, there
         is no rule that covers a row whose <literal>store_id</literal>
-        is greater than 20, so an error results since the server does
+        is greater than 20, so an error results because the server does
         not know where to place it. You can keep this from occurring by
         using a <quote>catchall</quote> <literal>VALUES LESS
         THAN</literal> clause in the <literal>CREATE TABLE</literal>
@@ -2179,13 +2179,13 @@
 mysql&gt; <userinput>ALTER TABLE tr DROP PARTITION p2;</userinput>
 Query OK, 0 rows affected (0.03 sec)
 </programlisting>
-      
+
       <para>
         Note: In MySQL &current-series;, the <literal>NDB
-          Cluster</literal> storage engine does not support
-        <literal>ALTER TABLE ... DROP PARTITION</literal>. It does,
-        however, support the other partitioning-related extensions to
-        <literal>ALTER TABLE</literal> that are described in this chapter. 
+        Cluster</literal> storage engine does not support <literal>ALTER
+        TABLE ... DROP PARTITION</literal>. It does, however, support
+        the other partitioning-related extensions to <literal>ALTER
+        TABLE</literal> that are described in this chapter.
       </para>
 
       <para>
@@ -2807,7 +2807,7 @@
         are presented for purposes of eliciting feedback from users
         testing the software during the 5.1 pre-production development
         cycle. (In other words, <quote>Please do not file bugs saying
-        that these commands do not work</quote>.) This information is
+        that these commands do not work.</quote>) This information is
         highly subject to change as MySQL 5.1 partitioning development
         continues. We will update this section as our partitioning
         features are implemented and improved.
@@ -3026,10 +3026,10 @@
             of a single column named
             <literal>Partitions_in_<replaceable>tbl_name</replaceable></literal>,
             where <replaceable>tbl_name</replaceable> is the name of the
-            partitioned table. Since it is not possible to
+            partitioned table. It is not possible to
             <quote>select</quote> a table in the sense that one selects
             a database and it thereafter serves as the default database
-            for <literal>SHOW TABLES</literal>, it is likely that
+            for <literal>SHOW TABLES</literal>, so it is likely that
             <literal>SHOW PARTITIONS</literal> will require the use of a
             <literal>FROM</literal> clause so that MySQL knows which
             table is intended.

Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/problems.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -2966,7 +2966,7 @@
         tables. It also applies for writes to binary log files and
         binary log index file, except that references to
         <quote>row</quote> and <quote>record</quote> should be
-        understood to mean <quote>event</quote>.
+        understood to mean <quote>event.</quote>
       </para>
 
       <para>

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/replication.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -853,10 +853,10 @@
         using <command>mysqlbinlog</command>. A relay log is
         automatically deleted by the SQL thread as soon as it has
         executed all its events and no longer needs it. There is no
-        explicit mechanism for deleting relay logs, since the SQL thread
-        takes care of doing so. However, <literal>FLUSH LOGS</literal>
-        rotates relay logs, which influences when the SQL thread deletes
-        them.
+        explicit mechanism for deleting relay logs because the SQL
+        thread takes care of doing so. However, <literal>FLUSH
+        LOGS</literal> rotates relay logs, which influences when the SQL
+        thread deletes them.
       </para>
 
       <para>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -856,12 +856,12 @@
 
 <programlisting>
 ALTER TABLE DROP PARTITION p0, p1;
-</programlisting>          
-          
+</programlisting>
+
           <para>
             Note that <literal>DROP PARTITION</literal> does not work
             with tables that use the <literal>NDB Cluster</literal>
-            storage engine. See 
+            storage engine. See
             <xref linkend="partitioning-management-range-list"/> and
             <xref linkend="mysql-cluster-limitations"/>.
           </para>
@@ -4828,7 +4828,7 @@
       <para>
         <literal>Records</literal> indicates the number of rows
         processed by the statement. (This is not necessarily the number
-        of rows actually inserted, since <literal>Duplicates</literal>
+        of rows actually inserted because <literal>Duplicates</literal>
         can be non-zero.) <literal>Duplicates</literal> indicates the
         number of rows that could not be inserted because they would
         duplicate some existing unique index value.
@@ -8489,7 +8489,7 @@
             They are, in many people's opinion, readable. Indeed, it was
             the innovation of subqueries that gave people the original
             idea of calling the early SQL <quote>Structured Query
-            Language</quote>.
+            Language.</quote>
           </para>
         </listitem>
 
@@ -8719,7 +8719,7 @@
           comparison operator, means <quote>return
           <literal>TRUE</literal> if the comparison is
           <literal>TRUE</literal> for <literal>ANY</literal> of the
-          values in the column that the subquery returns</quote>. For
+          values in the column that the subquery returns.</quote> For
           example:
         </para>
 
@@ -8772,9 +8772,9 @@
           Use of the word <literal>SOME</literal> is rare, but this
           example shows why it might be useful. To most people's ears,
           the English phrase <quote>a is not equal to any b</quote>
-          means <quote>there is no b which is equal to a</quote>, but
+          means <quote>there is no b which is equal to a,</quote> but
           that is not what is meant by the SQL syntax. The syntax means
-          <quote>there is some b to which a is not equal</quote>. Using
+          <quote>there is some b to which a is not equal.</quote> Using
           <literal>&lt;&gt; SOME</literal> instead helps ensure that
           everyone understands the true meaning of the query.
         </para>
@@ -8856,7 +8856,7 @@
         <para>
           In general, <emphasis>tables containing
           <literal>NULL</literal> values</emphasis> and <emphasis>empty
-          tables</emphasis> are <quote>edge cases</quote>. When writing
+          tables</emphasis> are <quote>edge cases.</quote> When writing
           subquery code, always consider whether you have taken those
           two possibilities into account.
         </para>
@@ -8957,9 +8957,10 @@
           For the preceding example, if <literal>t2</literal> contains
           any rows, even rows with nothing but <literal>NULL</literal>
           values, then the <literal>EXISTS</literal> condition is
-          <literal>TRUE</literal>. This is actually an unlikely example,
-          since almost always a <literal>[NOT] EXISTS</literal> subquery
-          contains correlations. Here are some more realistic examples:
+          <literal>TRUE</literal>. This is actually an unlikely example
+          because a <literal>[NOT] EXISTS</literal> subquery almost
+          always contains correlations. Here are some more realistic
+          examples:
         </para>
 
         <itemizedlist>
@@ -9011,7 +9012,7 @@
           EXISTS</literal> clause within a <literal>NOT EXISTS</literal>
           clause. Formally, it answers the question <quote>does a city
           exist with a store that is not in
-          <literal>Stores</literal>?</quote>. But it is easier to say
+          <literal>Stores</literal></quote>? But it is easier to say
           that a nested <literal>NOT EXISTS</literal> answers the
           question <quote>is x <literal>TRUE</literal> for all
           y?</quote>
@@ -9134,7 +9135,7 @@
           in the <replaceable>subquery</replaceable> select list must
           have unique names. You can find this syntax described
           elsewhere in this manual, where the term used is
-          <quote>derived tables</quote>.
+          <quote>derived tables.</quote>
         </para>
 
         <remark role="todo">
@@ -9302,7 +9303,7 @@
 
             <para>
               You can use a subquery for assignment within an
-              <literal>UPDATE</literal> statement, since subqueries are
+              <literal>UPDATE</literal> statement because subqueries are
               legal in <literal>UPDATE</literal> and
               <literal>DELETE</literal> statements as well as in
               <literal>SELECT</literal> statements. However, you cannot

Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-5.1/storage-engines.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -2028,9 +2028,9 @@
             <literal>DROP TABLE</literal> on a table that is in use by a
             <literal>MERGE</literal> table does not work on Windows
             because the <literal>MERGE</literal> storage engine's table
-            mapping is hidden from the upper layer of MySQL. Since
-            Windows does not allow the deletion of open files, you first
-            must flush all <literal>MERGE</literal> tables (with
+            mapping is hidden from the upper layer of MySQL. Windows
+            does not allow the deletion of open files, so you first must
+            flush all <literal>MERGE</literal> tables (with
             <literal>FLUSH TABLES</literal>) or drop the
             <literal>MERGE</literal> table before dropping the table.
           </para>
@@ -4038,8 +4038,8 @@
     </para>
 
     <para>
-      Since the dummy process does not actually store any data, there is
-      little processing over head incurred by running the additional
+      The dummy process does not actually store any data, so there is
+      little processing overhead incurred by running the additional
       <literal>mysqld</literal> process on the replication master host.
       This type of setup can be repeated with additional replication
       slaves.
@@ -4068,8 +4068,8 @@
 
       <listitem>
         <para>
-          since <literal>BLACKHOLE</literal> is essentially a
-          <quote>no-op</quote> storage engine, it could be used for
+          <literal>BLACKHOLE</literal> is essentially a
+          <quote>no-op</quote> storage engine, so it could be used for
           finding performance bottlenecks not related to the storage
           engine itself.
         </para>

Modified: trunk/refman-common/manual-conventions.en.xml
===================================================================
--- trunk/refman-common/manual-conventions.en.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-common/manual-conventions.en.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -37,7 +37,7 @@
         statements; database, table, and column names; program listings
         and source code; and environment variables. Example: <quote>To
         reload the grant tables, use the <literal>FLUSH
-        PRIVILEGES</literal> statement</quote>.
+        PRIVILEGES</literal> statement.</quote>
       </para>
     </listitem>
 
@@ -69,7 +69,7 @@
       <para>
         Filenames and directory names are written like this: <quote>The
         global <filename>my.cnf</filename> file is located in the
-        <filename>/etc</filename> directory</quote>.
+        <filename>/etc</filename> directory.</quote>
       </para>
     </listitem>
 
@@ -77,7 +77,7 @@
       <para>
         Character sequences are written like this: <quote>To specify a
         wildcard, use the &lsquo;<literal>%</literal>&rsquo;
-        character</quote>.
+        character.</quote>
       </para>
     </listitem>
 

Modified: trunk/refman-common/news-innodb.xml
===================================================================
--- trunk/refman-common/news-innodb.xml	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-common/news-innodb.xml	2006-01-11 18:35:54 UTC (rev 763)
@@ -866,7 +866,7 @@
           KEY</literal> constraint, unless the user does <literal>SET
           FOREIGN_KEY_CHECKS=0</literal>. The error message here is
           somewhat misleading <quote>Cannot delete or update a parent
-          row...</quote>, and must be changed in a future version 4.1.x.
+          row...,</quote> and must be changed in a future version 4.1.x.
         </para>
       </listitem>
 

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-11 12:27:32 UTC (rev 762)
+++ trunk/refman-common/titles.en.ent	2006-01-11 18:35:54 UTC (rev 763)
@@ -839,7 +839,7 @@
 <!ENTITY title-mysql-cluster-roadmap "MySQL Cluster Development Roadmap">
 <!ENTITY title-mysql-cluster-sci-definition "MySQL Cluster SCI Transport Connections">
 <!ENTITY title-mysql-cluster-shm-definition "MySQL Cluster Shared-Memory Connections">
-<!ENTITY title-mysql-cluster-single-user-mode "Single User Mode">
+<!ENTITY title-mysql-cluster-single-user-mode "Single-User Mode">
 <!ENTITY title-mysql-cluster-startup-phases "MySQL Cluster Startup Phases">
 <!ENTITY title-mysql-cluster-tcp-definition "MySQL Cluster TCP/IP Connections">
 <!ENTITY title-mysql-commands "<command>mysql</command> Commands">

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