List:Commits« Previous MessageNext Message »
From:paul Date:January 25 2006 3:22am
Subject:svn commit - mysqldoc@docsrva: r1028 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-25 04:22:41 +0100 (Wed, 25 Jan 2006)
New Revision: 1028

Log:
 r6660@frost:  paul | 2006-01-24 21:22:28 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/apis.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/language-structure.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/apis.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/language-structure.xml
   trunk/refman-5.0/restrictions.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/apis.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/language-structure.xml
   trunk/refman-5.1/restrictions.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-4.1/apis.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -658,7 +658,7 @@
       buffer sizes are increased only as demand warrants, simply
       increasing the default maximum limit does not in itself cause more
       resources to be used. This size check is mostly a check for
-      erroneous queries and communication packets.
+      erroneous statements and communication packets.
     </para>
 
     <para>
@@ -1724,8 +1724,8 @@
       </para>
 
       <para>
-        While a connection is active, the client may send SQL queries to
-        the server using <literal>mysql_query()</literal> or
+        While a connection is active, the client may send SQL statements
+        to the server using <literal>mysql_query()</literal> or
         <literal>mysql_real_query()</literal>. The difference between
         the two is that <literal>mysql_query()</literal> expects the
         query to be specified as a null-terminated string whereas
@@ -1820,23 +1820,24 @@
 
       <para>
         The API makes it possible for clients to respond appropriately
-        to queries (retrieving rows only as necessary) without knowing
-        whether or not the query is a <literal>SELECT</literal>. You can
-        do this by calling <literal>mysql_store_result()</literal> after
-        each <literal>mysql_query()</literal> (or
+        to statements (retrieving rows only as necessary) without
+        knowing whether or not the statement is a
+        <literal>SELECT</literal>. You can do this by calling
+        <literal>mysql_store_result()</literal> after each
+        <literal>mysql_query()</literal> (or
         <literal>mysql_real_query()</literal>). If the result set call
-        succeeds, the query was a <literal>SELECT</literal> and you can
-        read the rows. If the result set call fails, call
+        succeeds, the statement was a <literal>SELECT</literal> and you
+        can read the rows. If the result set call fails, call
         <literal>mysql_field_count()</literal> to determine whether a
         result was actually to be expected. If
-        <literal>mysql_field_count()</literal> returns zero, the query
-        returned no data (indicating that it was an
+        <literal>mysql_field_count()</literal> returns zero, the
+        statement returned no data (indicating that it was an
         <literal>INSERT</literal>, <literal>UPDATE</literal>,
         <literal>DELETE</literal>, and so forth), and was not expected
         to return rows. If <literal>mysql_field_count()</literal> is
-        non-zero, the query should have returned rows, but didn't. This
-        indicates that the query was a <literal>SELECT</literal> that
-        failed. See the description for
+        non-zero, the statement should have returned rows, but didn't.
+        This indicates that the statement was a
+        <literal>SELECT</literal> that failed. See the description for
         <literal>mysql_field_count()</literal> for an example of how
         this can be done.
       </para>
@@ -13334,7 +13335,7 @@
 
         <refsynopsisdiv>
           <cmdsynopsis>
-            <command>msql2mysql<replaceable>C-source-file</replaceable> &hellip;</command>
+            <command>msql2mysql<replaceable>C-source-file</replaceable> ...</command>
           </cmdsynopsis>
         </refsynopsisdiv>
 

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-4.1/database-administration.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -3725,8 +3725,8 @@
             </para>
 
             <para>
-              Whether logging of all queries to the general query log is
-              enabled. See <xref linkend="query-log"/>.
+              Whether logging of all statements to the general query log
+              is enabled. See <xref linkend="query-log"/>.
             </para>
           </listitem>
 
@@ -4349,12 +4349,13 @@
             </para>
 
             <para>
-              The communication buffer is reset to this size between
-              queries. This should not normally be changed, but if you
-              have very little memory, you can set it to the expected
-              length of SQL statements sent by clients. If statements
-              exceed this length, the buffer is automatically enlarged,
-              up to <literal>max_allowed_packet</literal> bytes.
+              The communication buffer is reset to this size between SQL
+              statements. This should not normally be changed, but if
+              you have very little memory, you can set it to the
+              expected length of statements sent by clients. If
+              statements exceed this length, the buffer is automatically
+              enlarged, up to <literal>max_allowed_packet</literal>
+              bytes.
             </para>
           </listitem>
 
@@ -4518,10 +4519,10 @@
 
             <para>
               The allocation size of memory blocks that are allocated
-              for objects created during query parsing and execution. If
-              you have problems with memory fragmentation, it might help
-              to increase this a bit. This variable was added in MySQL
-              4.0.16.
+              for objects created during statement parsing and
+              execution. If you have problems with memory fragmentation,
+              it might help to increase this a bit. This variable was
+              added in MySQL 4.0.16.
             </para>
           </listitem>
 
@@ -4640,9 +4641,9 @@
             </para>
 
             <para>
-              The size of the persistent buffer used for query parsing
-              and execution. This buffer is not freed between queries.
-              If you are running complex queries, a larger
+              The size of the persistent buffer used for statement
+              parsing and execution. This buffer is not freed between
+              statements. If you are running complex queries, a larger
               <literal>query_prealloc_size</literal> value might be
               helpful in improving performance, because it can reduce
               the need for the server to perform memory allocation
@@ -6877,7 +6878,8 @@
             </para>
 
             <para>
-              The number of queries that have been sent to the server.
+              The number of statements that have been sent to the
+              server.
             </para>
           </listitem>
 
@@ -7726,7 +7728,7 @@
               connection, the connection to the client is broken and the
               thread is marked as killed. Threads die when they notice
               that they are so marked. Threads for idle connections die
-              quickly. Threads that currently are processing queries
+              quickly. Threads that currently are processing statements
               check their state periodically and take longer to die. For
               additional information about thread termination, see
               <xref linkend="kill"/>, in particular for the instructions
@@ -10160,10 +10162,10 @@
             Do not grant the <literal>PROCESS</literal> or
             <literal>SUPER</literal> privilege to non-administrative
             users. The output of <command>mysqladmin
-            processlist</command> shows the text of the currently
-            executing queries, so any user who is allowed to execute
-            that command might be able to see whether another user
-            issues a statement such as <literal>UPDATE user SET
+            processlist</command> shows the text of any statements
+            currently being executed, so any user who is allowed to
+            execute that command might be able to see whether another
+            user issues a statement such as <literal>UPDATE user SET
             password=PASSWORD('<replaceable>plaintext-password</replaceable>');</literal>.
           </para>
 
@@ -11836,8 +11838,8 @@
         <listitem>
           <para>
             The <literal>PROCESS</literal> privilege can be used to view
-            the plain text of currently executing queries, including
-            queries that set or change passwords.
+            the plain text of currently executing statements, including
+            statements that set or change passwords.
           </para>
         </listitem>
 
@@ -16653,7 +16655,7 @@
             In your case, you may want to re-run only certain binary
             logs, from certain positions (usually you want to re-run all
             binary logs from the date of the restored backup, excepting
-            possibly some incorrect queries). See
+            possibly some incorrect statements). See
             <xref linkend="mysqlbinlog"/>, for more information on the
             <command>mysqlbinlog</command> utility and how to use it.
           </para>
@@ -17815,8 +17817,8 @@
           that when you do <command>mysqladmin shutdown</command> on a
           remote server, the <command>mysqld</command> server is still
           alive for a while after <command>mysqladmin</command> returns,
-          until all queries are stopped and all keys have been flushed
-          to disk.
+          until all statement-processing has stopped and all keys have
+          been flushed to disk.
         </para>
 
         <para>
@@ -20321,7 +20323,7 @@
             <literal>USE</literal>) is
             <replaceable>db_name</replaceable>. All other databases that
             are not explicitly mentioned are ignored. If you use this,
-            you should ensure that you only do updates in the current
+            you should ensure that you only do updates in the default
             database.
           </para>
 
@@ -20575,7 +20577,7 @@
         entire transaction to the binary log before the
         <literal>COMMIT</literal> is executed. When the thread that
         handles the transaction starts, it allocates a buffer of
-        <literal>binlog_cache_size</literal> to buffer queries. If a
+        <literal>binlog_cache_size</literal> to buffer statements. If a
         statement is bigger than this, the thread opens a temporary file
         to store the transaction. The temporary file is deleted when the
         thread ends.

Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-4.1/language-structure.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -2098,7 +2098,7 @@
 <programlisting>
 mysql&gt; <userinput>CREATE TABLE abs(val INT);</userinput>
 ERROR 1064 (42000) at line 2: You have an error in your SQL
-syntax &hellip; near 'abs(val INT)'
+syntax ... near 'abs(val INT)'
 </programlisting>
 
     <para>

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -62,22 +62,23 @@
       <remark role="help-description-begin"/>
 
       <para>
-        <literal>ALTER DATABASE</literal> allows you to change the
+        <literal>ALTER DATABASE</literal> enables you to change the
         overall characteristics of a database. These characteristics are
         stored in the <filename>db.opt</filename> file in the database
         directory. To use <literal>ALTER DATABASE</literal>, you need
         the <literal>ALTER</literal> privilege on the database.
       </para>
 
-      <remark role="help-description-end"/>
-
       <para>
         The <literal>CHARACTER SET</literal> clause changes the default
         database character set. The <literal>COLLATE</literal> clause
-        changes the default database collation. Character set and
-        collation names are discussed in <xref linkend="charset"/>.
+        changes the default database collation.
+        <xref linkend="charset"/>, discusses character set and collation
+        names.
       </para>
 
+      <remark role="help-description-end"/>
+
       <remark>
         It is really 4.1.0, but with a different syntax than in 4.1.1.
         (COLLATE is not supported.)
@@ -85,8 +86,8 @@
 
       <para>
         <literal>ALTER DATABASE</literal> was added in MySQL 4.1.1.
-        Beginning with MySQL 4.1.8, the database name can be omitted.
-        The statement applies to the default database in this case.
+        Beginning with MySQL 4.1.8, the database name can be omitted, in
+        which case the statement applies to the default database.
       </para>
 
     </section>
@@ -158,7 +159,7 @@
       <remark role="help-description-begin"/>
 
       <para>
-        <literal>ALTER TABLE</literal> allows you to change the
+        <literal>ALTER TABLE</literal> enables you to change the
         structure of an existing table. For example, you can add or
         delete columns, create or destroy indexes, change the type of
         existing columns, or rename columns or the table itself. You can
@@ -175,8 +176,8 @@
         <literal>AUTO_INCREMENT</literal>, and
         <literal>AVG_ROW_LENGTH</literal>. (However, <literal>ALTER
         TABLE</literal> ignores the <literal>DATA DIRECTORY</literal>
-        and <literal>INDEX DIRECTORY</literal> table options.) See
-        <xref linkend="create-table"/>.
+        and <literal>INDEX DIRECTORY</literal> table options.)
+        <xref linkend="create-table"/>, lists all table options.
       </para>
 
       <para>
@@ -212,12 +213,12 @@
       </para>
 
       <para>
-        Note that if you use any other option to <literal>ALTER
-        TABLE</literal> than <literal>RENAME</literal>, MySQL always
-        creates a temporary table, even if the data wouldn't strictly
-        need to be copied (such as when you change the name of a
-        column). For <literal>MyISAM</literal> tables, you can speed up
-        the index re-creation operation (which is the slowest part of
+        Note that if you use any option to <literal>ALTER
+        TABLE</literal> other than <literal>RENAME</literal>, MySQL
+        always creates a temporary table, even if the data wouldn't
+        strictly need to be copied (such as when you change the name of
+        a column). For <literal>MyISAM</literal> tables, you can speed
+        up the index re-creation operation (which is the slowest part of
         the alteration process) by setting the
         <literal>myisam_sort_buffer_size</literal> system variable to a
         high value.
@@ -241,10 +242,10 @@
             warnings occur when <literal>STRICT</literal> mode is
             enabled. If <literal>IGNORE</literal> is not specified, the
             copy is aborted and rolled back if duplicate-key errors
-            occur. If <literal>IGNORE</literal> is specified, then for
-            rows with duplicates on a unique key, only the first row is
-            used. The others conflicting rows are deleted. Wrong values
-            are truncated to the closest matching acceptable value.
+            occur. If <literal>IGNORE</literal> is specified, only the
+            first row is used of rows with duplicates on a unique key,
+            The other conflicting rows are deleted. Incorrect values are
+            truncated to the closest matching acceptable value.
           </para>
         </listitem>
 
@@ -256,7 +257,8 @@
             TABLE</literal> statement, separated by commas. This is a
             MySQL extension to standard SQL, which allows only one of
             each clause per <literal>ALTER TABLE</literal> statement.
-            For example, to drop multiple columns in a single statement:
+            For example, to drop multiple columns in a single statement,
+            do this:
           </para>
 
 <programlisting>
@@ -502,12 +504,12 @@
               <primary>ORDER BY</primary>
             </indexterm>
 
-            <literal>ORDER BY</literal> allows you to create the new
+            <literal>ORDER BY</literal> enables you to create the new
             table with the rows in a specific order. Note that the table
             does not remain in this order after inserts and deletes.
             This option is mainly useful when you know that you are
             mostly going to query the rows in a certain order; by using
-            this option after big changes to the table, you might be
+            this option after major changes to the table, you might be
             able to get higher performance. In some cases, it might make
             sorting easier for MySQL if the table is in order by the
             column that you want to order it by later.
@@ -1022,7 +1024,7 @@
         Normally, you create all indexes on a table at the time the
         table itself is created with <literal>CREATE TABLE</literal>.
         See <xref linkend="create-table"/>. <literal>CREATE
-        INDEX</literal> allows you to add indexes to existing tables.
+        INDEX</literal> enables you to add indexes to existing tables.
       </para>
 
       <para>
@@ -2269,7 +2271,7 @@
             row). Compare this to the ordinary case where the following
             keys takes <literal>storage_size_for_key +
             pointer_size</literal> (where the pointer size is usually
-            4). Conversely, you get a big benefit from prefix
+            4). Conversely, you get a significant benefit from prefix
             compression only if you have many numbers that are the same.
             If all keys are totally different, you use one byte more per
             key, if the key is not a key that can have
@@ -3485,10 +3487,11 @@
       </para>
 
       <para>
-        The examples above show inner joins using the comma operator,
-        but multiple-table <literal>DELETE</literal> statements can use
-        any type of join allowed in <literal>SELECT</literal>
-        statements, such as <literal>LEFT JOIN</literal>.
+        The preceding examples show inner joins that use the comma
+        operator, but multiple-table <literal>DELETE</literal>
+        statements can use any type of join allowed in
+        <literal>SELECT</literal> statements, such as <literal>LEFT
+        JOIN</literal>.
       </para>
 
       <para>
@@ -3786,9 +3789,9 @@
 
         <listitem>
           <para>
-            <literal>HANDLER</literal> allows you to traverse a database
-            in a manner that is difficult (or even impossible) to
-            accomplish with <literal>SELECT</literal>. The
+            <literal>HANDLER</literal> enables you to traverse a
+            database in a manner that is difficult (or even impossible)
+            to accomplish with <literal>SELECT</literal>. The
             <literal>HANDLER</literal> interface is a more natural way
             to look at data when working with applications that provide
             an interactive user interface to the database.
@@ -3925,7 +3928,7 @@
             explicitly set a column to its default value. (New in MySQL
             4.0.3.) This makes it easier to write
             <literal>INSERT</literal> statements that assign values to
-            all but a few columns, because it allows you to avoid
+            all but a few columns, because it enables you to avoid
             writing an incomplete <literal>VALUES</literal> list that
             does not include a value for each column in the table.
             Otherwise, you would have to write out the list of column
@@ -8994,10 +8997,11 @@
 </programlisting>
 
       <para>
-        The example above shows an inner join using the comma operator,
-        but multiple-table <literal>UPDATE</literal> statements can use
-        any type of join allowed in <literal>SELECT</literal>
-        statements, such as <literal>LEFT JOIN</literal>.
+        The preceding example shows an inner join that uses the comma
+        operator, but multiple-table <literal>UPDATE</literal>
+        statements can use any type of join allowed in
+        <literal>SELECT</literal> statements, such as <literal>LEFT
+        JOIN</literal>.
       </para>
 
       <para>
@@ -10294,7 +10298,7 @@
 
         <para>
           The <literal>GRANT</literal> and <literal>REVOKE</literal>
-          statements allow system administrators to create MySQL user
+          statements enable system administrators to create MySQL user
           accounts and to grant rights to and revoke them from accounts.
           <literal>GRANT</literal> and <literal>REVOKE</literal> are
           implemented in MySQL 3.22.11 or later. For earlier MySQL
@@ -10452,23 +10456,23 @@
               </row>
               <row>
                 <entry><literal>ALTER</literal></entry>
-                <entry>Allows use of <literal>ALTER TABLE</literal></entry>
+                <entry>Enables use of <literal>ALTER TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>CREATE</literal></entry>
-                <entry>Allows use of <literal>CREATE TABLE</literal></entry>
+                <entry>Enables use of <literal>CREATE TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>CREATE TEMPORARY TABLES</literal></entry>
-                <entry>Allows use of <literal>CREATE TEMPORARY TABLE</literal></entry>
+                <entry>Enables use of <literal>CREATE TEMPORARY TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>DELETE</literal></entry>
-                <entry>Allows use of <literal>DELETE</literal></entry>
+                <entry>Enables use of <literal>DELETE</literal></entry>
               </row>
               <row>
                 <entry><literal>DROP</literal></entry>
-                <entry>Allows use of <literal>DROP TABLE</literal></entry>
+                <entry>Enables use of <literal>DROP TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>EXECUTE</literal></entry>
@@ -10476,26 +10480,26 @@
               </row>
               <row>
                 <entry><literal>FILE</literal></entry>
-                <entry>Allows use of <literal>SELECT ... INTO OUTFILE</literal> and
+                <entry>Enables use of <literal>SELECT ... INTO OUTFILE</literal> and
                   <literal>LOAD DATA INFILE</literal></entry>
               </row>
               <row>
                 <entry><literal>INDEX</literal></entry>
-                <entry>Allows use of <literal>CREATE INDEX</literal> and <literal>DROP
+                <entry>Enables use of <literal>CREATE INDEX</literal> and <literal>DROP
                   INDEX</literal></entry>
               </row>
               <row>
                 <entry><literal>INSERT</literal></entry>
-                <entry>Allows use of <literal>INSERT</literal></entry>
+                <entry>Enables use of <literal>INSERT</literal></entry>
               </row>
               <row>
                 <entry><literal>LOCK TABLES</literal></entry>
-                <entry>Allows use of <literal>LOCK TABLES</literal> on tables for which you
+                <entry>Enables use of <literal>LOCK TABLES</literal> on tables for which you
                   have the <literal>SELECT</literal> privilege</entry>
               </row>
               <row>
                 <entry><literal>PROCESS</literal></entry>
-                <entry>Allows use of <literal>SHOW FULL PROCESSLIST</literal></entry>
+                <entry>Enables use of <literal>SHOW FULL PROCESSLIST</literal></entry>
               </row>
               <row>
                 <entry><literal>REFERENCES</literal></entry>
@@ -10503,11 +10507,11 @@
               </row>
               <row>
                 <entry><literal>RELOAD</literal></entry>
-                <entry>Allows use of <literal>FLUSH</literal></entry>
+                <entry>Enables use of <literal>FLUSH</literal></entry>
               </row>
               <row>
                 <entry><literal>REPLICATION CLIENT</literal></entry>
-                <entry>Allows the user to ask where slave or master servers are</entry>
+                <entry>Enables the user to ask where slave or master servers are</entry>
               </row>
               <row>
                 <entry><literal>REPLICATION SLAVE</literal></entry>
@@ -10516,7 +10520,7 @@
               </row>
               <row>
                 <entry><literal>SELECT</literal></entry>
-                <entry>Allows use of <literal>SELECT</literal></entry>
+                <entry>Enables use of <literal>SELECT</literal></entry>
               </row>
               <row>
                 <entry><literal>SHOW DATABASES</literal></entry>
@@ -10524,19 +10528,20 @@
               </row>
               <row>
                 <entry><literal>SHUTDOWN</literal></entry>
-                <entry>Allows use of <command>mysqladmin shutdown</command></entry>
+                <entry>Enables use of <command>mysqladmin shutdown</command></entry>
               </row>
               <row>
                 <entry><literal>SUPER</literal></entry>
-                <entry>Allows use of <literal>CHANGE MASTER</literal>, <literal>KILL</literal>,
-                  <literal>PURGE MASTER LOGS</literal>, and <literal>SET
-                  GLOBAL</literal> statements, the <command>mysqladmin
-                  debug</command> command; allows you to connect (once)
-                  even if <literal>max_connections</literal> is reached</entry>
+                <entry>Enables use of <literal>CHANGE MASTER</literal>,
+                  <literal>KILL</literal>, <literal>PURGE MASTER
+                  LOGS</literal>, and <literal>SET GLOBAL</literal>
+                  statements, the <command>mysqladmin debug</command>
+                  command; allows you to connect (once) even if
+                  <literal>max_connections</literal> is reached</entry>
               </row>
               <row>
                 <entry><literal>UPDATE</literal></entry>
-                <entry>Allows use of <literal>UPDATE</literal></entry>
+                <entry>Enables use of <literal>UPDATE</literal></entry>
               </row>
               <row>
                 <entry><literal>USAGE</literal></entry>
@@ -10544,7 +10549,7 @@
               </row>
               <row>
                 <entry><literal>GRANT OPTION</literal></entry>
-                <entry>Allows privileges to be granted</entry>
+                <entry>Enables privileges to be granted</entry>
               </row>
             </tbody>
           </tgroup>
@@ -10651,7 +10656,7 @@
           tables that do not exist. In such cases, the privileges to be
           granted must include the <literal>CREATE</literal> privilege.
           <emphasis>This behavior is by design</emphasis>, and is
-          intended to allow the database administrator to prepare user
+          intended to enable the database administrator to prepare user
           accounts and privileges for databases and tables that are to
           be created at a later time.
         </para>
@@ -10889,7 +10894,7 @@
         </para>
 
         <para>
-          The <literal>SHOW DATABASES</literal> privilege allows the
+          The <literal>SHOW DATABASES</literal> privilege enables the
           account to see database names by issuing the <literal>SHOW
           DATABASE</literal> statement. Accounts that do not have this
           privilege see only databases for which they have some
@@ -10910,7 +10915,7 @@
         <para>
           You cannot grant another user a privilege which you yourself
           do not have; the <literal>GRANT OPTION</literal> privilege
-          allows you to assign only those privileges which you yourself
+          enables you to assign only those privileges which you yourself
           possess.
         </para>
 
@@ -15898,7 +15903,7 @@
         <remark role="help-description-end"/>
 
         <para>
-          The syntax of <literal>CACHE INDEX</literal> allows you to
+          The syntax of <literal>CACHE INDEX</literal> enables you to
           specify that only particular indexes from a table should be
           assigned to the cache. However, the current implementation
           assigns all the table's indexes to the cache, so there is no
@@ -16392,7 +16397,7 @@
         </para>
 
         <para>
-          The syntax of <literal>LOAD INDEX INTO CACHE</literal> allows
+          The syntax of <literal>LOAD INDEX INTO CACHE</literal> enables
           you to specify that only particular indexes from a table
           should be preloaded. However, the current implementation
           preloads all the table's indexes into the cache, so there is

Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-5.0/apis.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -706,7 +706,7 @@
       buffer sizes are increased only as demand warrants, simply
       increasing the default maximum limit does not in itself cause more
       resources to be used. This size check is mostly a check for
-      erroneous queries and communication packets.
+      erroneous statements and communication packets.
     </para>
 
     <para>
@@ -1772,8 +1772,8 @@
       </para>
 
       <para>
-        While a connection is active, the client may send SQL queries to
-        the server using <literal>mysql_query()</literal> or
+        While a connection is active, the client may send SQL statements
+        to the server using <literal>mysql_query()</literal> or
         <literal>mysql_real_query()</literal>. The difference between
         the two is that <literal>mysql_query()</literal> expects the
         query to be specified as a null-terminated string whereas
@@ -1868,23 +1868,24 @@
 
       <para>
         The API makes it possible for clients to respond appropriately
-        to queries (retrieving rows only as necessary) without knowing
-        whether or not the query is a <literal>SELECT</literal>. You can
-        do this by calling <literal>mysql_store_result()</literal> after
-        each <literal>mysql_query()</literal> (or
+        to statements (retrieving rows only as necessary) without
+        knowing whether or not the statement is a
+        <literal>SELECT</literal>. You can do this by calling
+        <literal>mysql_store_result()</literal> after each
+        <literal>mysql_query()</literal> (or
         <literal>mysql_real_query()</literal>). If the result set call
-        succeeds, the query was a <literal>SELECT</literal> and you can
-        read the rows. If the result set call fails, call
+        succeeds, the statement was a <literal>SELECT</literal> and you
+        can read the rows. If the result set call fails, call
         <literal>mysql_field_count()</literal> to determine whether a
         result was actually to be expected. If
-        <literal>mysql_field_count()</literal> returns zero, the query
-        returned no data (indicating that it was an
+        <literal>mysql_field_count()</literal> returns zero, the
+        statement returned no data (indicating that it was an
         <literal>INSERT</literal>, <literal>UPDATE</literal>,
         <literal>DELETE</literal>, and so forth), and was not expected
         to return rows. If <literal>mysql_field_count()</literal> is
-        non-zero, the query should have returned rows, but didn't. This
-        indicates that the query was a <literal>SELECT</literal> that
-        failed. See the description for
+        non-zero, the statement should have returned rows, but didn't.
+        This indicates that the statement was a
+        <literal>SELECT</literal> that failed. See the description for
         <literal>mysql_field_count()</literal> for an example of how
         this can be done.
       </para>
@@ -13301,7 +13302,7 @@
 
         <refsynopsisdiv>
           <cmdsynopsis>
-            <command>msql2mysql<replaceable>C-source-file</replaceable> &hellip;</command>
+            <command>msql2mysql<replaceable>C-source-file</replaceable> ...</command>
           </cmdsynopsis>
         </refsynopsisdiv>
 

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-5.0/database-administration.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -3992,8 +3992,8 @@
             </para>
 
             <para>
-              Whether logging of all queries to the general query log is
-              enabled. See <xref linkend="query-log"/>.
+              Whether logging of all statements to the general query log
+              is enabled. See <xref linkend="query-log"/>.
             </para>
           </listitem>
 
@@ -4657,12 +4657,13 @@
             </para>
 
             <para>
-              The communication buffer is reset to this size between
-              queries. This should not normally be changed, but if you
-              have very little memory, you can set it to the expected
-              length of SQL statements sent by clients. If statements
-              exceed this length, the buffer is automatically enlarged,
-              up to <literal>max_allowed_packet</literal> bytes.
+              The communication buffer is reset to this size between SQL
+              statements. This should not normally be changed, but if
+              you have very little memory, you can set it to the
+              expected length of statements sent by clients. If
+              statements exceed this length, the buffer is automatically
+              enlarged, up to <literal>max_allowed_packet</literal>
+              bytes.
             </para>
           </listitem>
 
@@ -4864,9 +4865,9 @@
 
             <para>
               The allocation size of memory blocks that are allocated
-              for objects created during query parsing and execution. If
-              you have problems with memory fragmentation, it might help
-              to increase this a bit.
+              for objects created during statement parsing and
+              execution. If you have problems with memory fragmentation,
+              it might help to increase this a bit.
             </para>
           </listitem>
 
@@ -4982,9 +4983,9 @@
             </para>
 
             <para>
-              The size of the persistent buffer used for query parsing
-              and execution. This buffer is not freed between queries.
-              If you are running complex queries, a larger
+              The size of the persistent buffer used for statement
+              parsing and execution. This buffer is not freed between
+              statements. If you are running complex queries, a larger
               <literal>query_prealloc_size</literal> value might be
               helpful in improving performance, because it can reduce
               the need for the server to perform memory allocation
@@ -7748,7 +7749,8 @@
             </para>
 
             <para>
-              The number of queries that have been sent to the server.
+              The number of statements that have been sent to the
+              server.
             </para>
           </listitem>
 
@@ -8933,7 +8935,7 @@
               connection, the connection to the client is broken and the
               thread is marked as killed. Threads die when they notice
               that they are so marked. Threads for idle connections die
-              quickly. Threads that currently are processing queries
+              quickly. Threads that currently are processing statements
               check their state periodically and take longer to die. For
               additional information about thread termination, see
               <xref linkend="kill"/>, in particular for the instructions
@@ -12204,11 +12206,11 @@
             Don't grant the <literal>PROCESS</literal> or
             <literal>SUPER</literal> privilege to non-administrative
             users. The output of <command>mysqladmin
-            processlist</command> shows the text of any executing
-            queries currently being executed, so any user who is allowed
-            to run that command might be able to see whether another
-            user issues a statement such as <literal>UPDATE user SET
-            password=PASSWORD('not_secure')</literal>.
+            processlist</command> shows the text of any statements
+            currently being executed, so any user who is allowed to
+            execute to run that command might be able to see whether
+            another user issues a statement such as <literal>UPDATE user
+            SET password=PASSWORD('not_secure')</literal>.
           </para>
 
           <para>
@@ -14006,8 +14008,8 @@
         <listitem>
           <para>
             The <literal>PROCESS</literal> privilege can be used to view
-            the plain text of currently executing queries, including
-            queries that set or change passwords.
+            the plain text of currently executing statements, including
+            statements that set or change passwords.
           </para>
         </listitem>
 
@@ -18952,7 +18954,7 @@
             In some cases, you may want to re-run only certain binary
             logs, from certain positions (usually you want to re-run all
             binary logs from the date of the restored backup, excepting
-            possibly some incorrect queries). See
+            possibly some incorrect statements). See
             <xref linkend="mysqlbinlog"/>, for more information on the
             <command>mysqlbinlog</command> utility and how to use it.
           </para>
@@ -20078,8 +20080,8 @@
           that when you do <command>mysqladmin shutdown</command> on a
           remote server, the <command>mysqld</command> server is still
           alive for a while after <command>mysqladmin</command> returns,
-          until all queries are stopped and all keys have been flushed
-          to disk.
+          until all statement-processing has stopped and all keys have
+          been flushed to disk.
         </para>
 
         <para>
@@ -22386,7 +22388,7 @@
             <literal>USE</literal>) is
             <replaceable>db_name</replaceable>. All other databases that
             are not explicitly mentioned are ignored. If you use this,
-            you should ensure that you only do updates in the current
+            you should ensure that you only do updates in the default
             database.
           </para>
 
@@ -22395,7 +22397,7 @@
             <literal>CREATE DATABASE</literal>, <literal>ALTER
             DATABASE</literal>, and <literal>DROP DATABASE</literal>
             statements, which use the database manipulated to decide if
-            it should log the statement rather than the current
+            it should log the statement rather than the default
             database.
           </para>
 
@@ -22642,7 +22644,7 @@
         whole transaction to the binary log before the
         <literal>COMMIT</literal> is executed. When the thread that
         handles the transaction starts, it allocates a buffer of
-        <literal>binlog_cache_size</literal> to buffer queries. If a
+        <literal>binlog_cache_size</literal> to buffer statements. If a
         statement is bigger than this, the thread opens a temporary file
         to store the transaction. The temporary file is deleted when the
         thread ends.

Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-5.0/language-structure.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -2039,7 +2039,7 @@
 <programlisting>
 mysql&gt; <userinput>CREATE TABLE abs(val INT);</userinput>
 ERROR 1064 (42000) at line 2: You have an error in your SQL
-syntax &hellip; near 'abs(val INT)'
+syntax ... near 'abs(val INT)'
 </programlisting>
 
     <para>

Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-5.0/restrictions.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -126,8 +126,8 @@
           <literal>SELECT</literal> statements that do not have an
           <literal>INTO</literal> clause and <literal>SHOW</literal>
           statements. A function can process a result set either with
-          <literal>SELECT &hellip; INTO</literal> or by using a cursor
-          and <literal>FETCH</literal> statements.
+          <literal>SELECT ... INTO</literal> or by using a cursor and
+          <literal>FETCH</literal> statements.
         </para>
       </listitem>
 

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -14,9 +14,42 @@
   <title>&title-sql-syntax;</title>
 
   <para>
-    This chapter describes the syntax for SQL statements.
+    This chapter describes the syntax for most of the SQL statements
+    supported by MySQL. Additional statement descriptions can be found
+    in the following chapters:
   </para>
 
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        <xref linkend="optimization"/>, discusses the
+        <literal>EXPLAIN</literal> statement.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <xref linkend="stored-procedures"/>, covers statements for
+        writing stored routines.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <xref linkend="triggers"/>, covers statements for writing
+        triggers.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <xref linkend="views"/>, covers view-related statements.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
   <section id="data-definition">
 
     <title>&title-data-definition;</title>
@@ -75,28 +108,32 @@
       <remark role="help-description-begin"/>
 
       <para>
-        <literal>ALTER DATABASE</literal> allows you to change the
+        <literal>ALTER DATABASE</literal> enables you to change the
         overall characteristics of a database. These characteristics are
         stored in the <filename>db.opt</filename> file in the database
         directory. To use <literal>ALTER DATABASE</literal>, you need
         the <literal>ALTER</literal> privilege on the database.
+        <literal>ALTER SCHEMA</literal> is a synonym for <literal>ALTER
+        DATABASE</literal> as of MySQL 5.0.2.
       </para>
 
-      <remark role="help-description-end"/>
-
       <para>
         The <literal>CHARACTER SET</literal> clause changes the default
         database character set. The <literal>COLLATE</literal> clause
         changes the default database collation. Character set and
         collation names are discussed in <xref linkend="charset"/>.
+        changes the default database collation.
+        <xref linkend="charset"/>, discusses character set and collation
+        names.
       </para>
 
       <para>
-        The database name can be omitted, in which case, the statement
-        applies to the default database. <literal>ALTER SCHEMA</literal>
-        can be used as of MySQL 5.0.2.
+        The database name can be omitted, in which case the statement
+        applies to the default database.
       </para>
 
+      <remark role="help-description-end"/>
+
     </section>
 
     <section id="alter-table">
@@ -166,7 +203,7 @@
       <remark role="help-description-begin"/>
 
       <para>
-        <literal>ALTER TABLE</literal> allows you to change the
+        <literal>ALTER TABLE</literal> enables you to change the
         structure of an existing table. For example, you can add or
         delete columns, create or destroy indexes, change the type of
         existing columns, or rename columns or the table itself. You can
@@ -183,8 +220,8 @@
         <literal>AUTO_INCREMENT</literal>, and
         <literal>AVG_ROW_LENGTH</literal>. (However, <literal>ALTER
         TABLE</literal> ignores the <literal>DATA DIRECTORY</literal>
-        and <literal>INDEX DIRECTORY</literal> table options.) See
-        <xref linkend="create-table"/>.
+        and <literal>INDEX DIRECTORY</literal> table options.)
+        <xref linkend="create-table"/>, lists all table options.
       </para>
 
       <para>
@@ -219,12 +256,12 @@
       </para>
 
       <para>
-        Note that if you use any other option to <literal>ALTER
-        TABLE</literal> than <literal>RENAME</literal>, MySQL always
-        creates a temporary table, even if the data wouldn't strictly
-        need to be copied (such as when you change the name of a
-        column). For <literal>MyISAM</literal> tables, you can speed up
-        the index re-creation operation (which is the slowest part of
+        Note that if you use any option to <literal>ALTER
+        TABLE</literal> other than <literal>RENAME</literal>, MySQL
+        always creates a temporary table, even if the data wouldn't
+        strictly need to be copied (such as when you change the name of
+        a column). For <literal>MyISAM</literal> tables, you can speed
+        up the index re-creation operation (which is the slowest part of
         the alteration process) by setting the
         <literal>myisam_sort_buffer_size</literal> system variable to a
         high value.
@@ -248,10 +285,10 @@
             warnings occur when <literal>STRICT</literal> mode is
             enabled. If <literal>IGNORE</literal> is not specified, the
             copy is aborted and rolled back if duplicate-key errors
-            occur. If <literal>IGNORE</literal> is specified, then for
-            rows with duplicates on a unique key, only the first row is
-            used. The others conflicting rows are deleted. Wrong values
-            are truncated to the closest matching acceptable value.
+            occur. If <literal>IGNORE</literal> is specified, only the
+            first row is used of rows with duplicates on a unique key,
+            The other conflicting rows are deleted. Incorrect values are
+            truncated to the closest matching acceptable value.
           </para>
         </listitem>
 
@@ -263,7 +300,8 @@
             TABLE</literal> statement, separated by commas. This is a
             MySQL extension to standard SQL, which allows only one of
             each clause per <literal>ALTER TABLE</literal> statement.
-            For example, to drop multiple columns in a single statement:
+            For example, to drop multiple columns in a single statement,
+            do this:
           </para>
 
 <programlisting>
@@ -507,12 +545,12 @@
               <primary>ORDER BY</primary>
             </indexterm>
 
-            <literal>ORDER BY</literal> allows you to create the new
+            <literal>ORDER BY</literal> enables you to create the new
             table with the rows in a specific order. Note that the table
             does not remain in this order after inserts and deletes.
             This option is mainly useful when you know that you are
             mostly going to query the rows in a certain order; by using
-            this option after big changes to the table, you might be
+            this option after major changes to the table, you might be
             able to get higher performance. In some cases, it might make
             sorting easier for MySQL if the table is in order by the
             column that you want to order it by later.
@@ -1027,7 +1065,7 @@
         Normally, you create all indexes on a table at the time the
         table itself is created with <literal>CREATE TABLE</literal>.
         See <xref linkend="create-table"/>. <literal>CREATE
-        INDEX</literal> allows you to add indexes to existing tables.
+        INDEX</literal> enables you to add indexes to existing tables.
       </para>
 
       <para>
@@ -2364,7 +2402,7 @@
             row). Compare this to the ordinary case where the following
             keys takes <literal>storage_size_for_key +
             pointer_size</literal> (where the pointer size is usually
-            4). Conversely, you get a big benefit from prefix
+            4). Conversely, you get a significant benefit from prefix
             compression only if you have many numbers that are the same.
             If all keys are totally different, you use one byte more per
             key, if the key is not a key that can have
@@ -3511,10 +3549,11 @@
       </para>
 
       <para>
-        The examples above show inner joins using the comma operator,
-        but multiple-table <literal>DELETE</literal> statements can use
-        any type of join allowed in <literal>SELECT</literal>
-        statements, such as <literal>LEFT JOIN</literal>.
+        The preceding examples show inner joins that use the comma
+        operator, but multiple-table <literal>DELETE</literal>
+        statements can use any type of join allowed in
+        <literal>SELECT</literal> statements, such as <literal>LEFT
+        JOIN</literal>.
       </para>
 
       <para>
@@ -3787,9 +3826,9 @@
 
         <listitem>
           <para>
-            <literal>HANDLER</literal> allows you to traverse a database
-            in a manner that is difficult (or even impossible) to
-            accomplish with <literal>SELECT</literal>. The
+            <literal>HANDLER</literal> enables you to traverse a
+            database in a manner that is difficult (or even impossible)
+            to accomplish with <literal>SELECT</literal>. The
             <literal>HANDLER</literal> interface is a more natural way
             to look at data when working with applications that provide
             an interactive user interface to the database.
@@ -3930,7 +3969,7 @@
             Use the keyword <literal>DEFAULT</literal> to set a column
             explicitly to its default value. This makes it easier to
             write <literal>INSERT</literal> statements that assign
-            values to all but a few columns, because it allows you to
+            values to all but a few columns, because it enables you to
             avoid writing an incomplete <literal>VALUES</literal> list
             that does not include a value for each column in the table.
             Otherwise, you would have to write out the list of column
@@ -9405,10 +9444,11 @@
 </programlisting>
 
       <para>
-        The example above shows an inner join using the comma operator,
-        but multiple-table <literal>UPDATE</literal> statements can use
-        any type of join allowed in <literal>SELECT</literal>
-        statements, such as <literal>LEFT JOIN</literal>.
+        The preceding example shows an inner join that uses the comma
+        operator, but multiple-table <literal>UPDATE</literal>
+        statements can use any type of join allowed in
+        <literal>SELECT</literal> statements, such as <literal>LEFT
+        JOIN</literal>.
       </para>
 
       <para>
@@ -9670,8 +9710,8 @@
       AUTOCOMMIT</literal>, <literal>START TRANSACTION</literal>,
       <literal>COMMIT</literal>, and <literal>ROLLBACK</literal>. See
       <xref linkend="commit"/>. Beginning with MySQL 5.0, XA transaction
-      support is available so that MySQL can participate in distributed
-      transactions as well. See <xref linkend="xa"/>.
+      support is available, which enables MySQL to participate in
+      distributed transactions as well. See <xref linkend="xa"/>.
     </para>
 
     <section id="commit">
@@ -10659,7 +10699,7 @@
       </itemizedlist>
 
       <para>
-        The MySQL implementation of XA MySQL allows a MySQL server to
+        The MySQL implementation of XA MySQL enables a MySQL server to
         act as a Resource Manager that handles XA transactions within a
         global transaction. A client program that connects to the MySQL
         server acts as the Transaction Manager.
@@ -11415,7 +11455,7 @@
 
         <para>
           The <literal>GRANT</literal> and <literal>REVOKE</literal>
-          statements allow system administrators to create MySQL user
+          statements enable system administrators to create MySQL user
           accounts and to grant rights to and revoke them from accounts.
         </para>
 
@@ -11584,7 +11624,7 @@
               </row>
               <row>
                 <entry><literal>ALTER</literal></entry>
-                <entry>Allows use of <literal>ALTER TABLE</literal></entry>
+                <entry>Enables use of <literal>ALTER TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>ALTER ROUTINE</literal></entry>
@@ -11592,7 +11632,7 @@
               </row>
               <row>
                 <entry><literal>CREATE</literal></entry>
-                <entry>Allows use of <literal>CREATE TABLE</literal></entry>
+                <entry>Enables use of <literal>CREATE TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>CREATE ROUTINE</literal></entry>
@@ -11600,52 +11640,52 @@
               </row>
               <row>
                 <entry><literal>CREATE TEMPORARY TABLES</literal></entry>
-                <entry>Allows use of <literal>CREATE TEMPORARY TABLE</literal></entry>
+                <entry>Enables use of <literal>CREATE TEMPORARY TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>CREATE USER</literal></entry>
-                <entry>Allows use of <literal>CREATE USER</literal>, <literal>DROP
+                <entry>Enables use of <literal>CREATE USER</literal>, <literal>DROP
                   USER</literal>, <literal>RENAME USER</literal>, and
                   <literal>REVOKE ALL PRIVILEGES</literal>.</entry>
               </row>
               <row>
                 <entry><literal>CREATE VIEW</literal></entry>
-                <entry>Allows use of <literal>CREATE VIEW</literal></entry>
+                <entry>Enables use of <literal>CREATE VIEW</literal></entry>
               </row>
               <row>
                 <entry><literal>DELETE</literal></entry>
-                <entry>Allows use of <literal>DELETE</literal></entry>
+                <entry>Enables use of <literal>DELETE</literal></entry>
               </row>
               <row>
                 <entry><literal>DROP</literal></entry>
-                <entry>Allows use of <literal>DROP TABLE</literal></entry>
+                <entry>Enables use of <literal>DROP TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>EXECUTE</literal></entry>
-                <entry>Allows the user to run stored routines</entry>
+                <entry>Enables the user to run stored routines</entry>
               </row>
               <row>
                 <entry><literal>FILE</literal></entry>
-                <entry>Allows use of <literal>SELECT ... INTO OUTFILE</literal> and
+                <entry>Enables use of <literal>SELECT ... INTO OUTFILE</literal> and
                   <literal>LOAD DATA INFILE</literal></entry>
               </row>
               <row>
                 <entry><literal>INDEX</literal></entry>
-                <entry>Allows use of <literal>CREATE INDEX</literal> and <literal>DROP
+                <entry>Enables use of <literal>CREATE INDEX</literal> and <literal>DROP
                   INDEX</literal></entry>
               </row>
               <row>
                 <entry><literal>INSERT</literal></entry>
-                <entry>Allows use of <literal>INSERT</literal></entry>
+                <entry>Enables use of <literal>INSERT</literal></entry>
               </row>
               <row>
                 <entry><literal>LOCK TABLES</literal></entry>
-                <entry>Allows use of <literal>LOCK TABLES</literal> on tables for which you
+                <entry>Enables use of <literal>LOCK TABLES</literal> on tables for which you
                   have the <literal>SELECT</literal> privilege</entry>
               </row>
               <row>
                 <entry><literal>PROCESS</literal></entry>
-                <entry>Allows use of <literal>SHOW FULL PROCESSLIST</literal></entry>
+                <entry>Enables use of <literal>SHOW FULL PROCESSLIST</literal></entry>
               </row>
               <row>
                 <entry><literal>REFERENCES</literal></entry>
@@ -11653,11 +11693,11 @@
               </row>
               <row>
                 <entry><literal>RELOAD</literal></entry>
-                <entry>Allows use of <literal>FLUSH</literal></entry>
+                <entry>Enables use of <literal>FLUSH</literal></entry>
               </row>
               <row>
                 <entry><literal>REPLICATION CLIENT</literal></entry>
-                <entry>Allows the user to ask where slave or master servers are</entry>
+                <entry>Enables the user to ask where slave or master servers are</entry>
               </row>
               <row>
                 <entry><literal>REPLICATION SLAVE</literal></entry>
@@ -11666,7 +11706,7 @@
               </row>
               <row>
                 <entry><literal>SELECT</literal></entry>
-                <entry>Allows use of <literal>SELECT</literal></entry>
+                <entry>Enables use of <literal>SELECT</literal></entry>
               </row>
               <row>
                 <entry><literal>SHOW DATABASES</literal></entry>
@@ -11674,23 +11714,24 @@
               </row>
               <row>
                 <entry><literal>SHOW VIEW</literal></entry>
-                <entry>Allows use of <literal>SHOW CREATE VIEW</literal></entry>
+                <entry>Enables use of <literal>SHOW CREATE VIEW</literal></entry>
               </row>
               <row>
                 <entry><literal>SHUTDOWN</literal></entry>
-                <entry>Allows use of <command>mysqladmin shutdown</command></entry>
+                <entry>Enables use of <command>mysqladmin shutdown</command></entry>
               </row>
               <row>
                 <entry><literal>SUPER</literal></entry>
-                <entry>Allows use of <literal>CHANGE MASTER</literal>, <literal>KILL</literal>,
-                  <literal>PURGE MASTER LOGS</literal>, and <literal>SET
-                  GLOBAL</literal> statements, the <command>mysqladmin
-                  debug</command> command; allows you to connect (once)
-                  even if <literal>max_connections</literal> is reached</entry>
+                <entry>Enables use of <literal>CHANGE MASTER</literal>,
+                  <literal>KILL</literal>, <literal>PURGE MASTER
+                  LOGS</literal>, and <literal>SET GLOBAL</literal>
+                  statements, the <command>mysqladmin debug</command>
+                  command; allows you to connect (once) even if
+                  <literal>max_connections</literal> is reached</entry>
               </row>
               <row>
                 <entry><literal>UPDATE</literal></entry>
-                <entry>Allows use of <literal>UPDATE</literal></entry>
+                <entry>Enables use of <literal>UPDATE</literal></entry>
               </row>
               <row>
                 <entry><literal>USAGE</literal></entry>
@@ -11698,7 +11739,7 @@
               </row>
               <row>
                 <entry><literal>GRANT OPTION</literal></entry>
-                <entry>Allows privileges to be granted</entry>
+                <entry>Enables privileges to be granted</entry>
               </row>
             </tbody>
           </tgroup>
@@ -11799,7 +11840,7 @@
           that do not exist. In such cases, the privileges to be granted
           must include the <literal>CREATE</literal> privilege.
           <emphasis>This behavior is by design</emphasis>, and is
-          intended to allow the database administrator to prepare user
+          intended to enable the database administrator to prepare user
           accounts and privileges for database objects that are to be
           created at a later time.
         </para>
@@ -12044,7 +12085,7 @@
         </para>
 
         <para>
-          The <literal>SHOW DATABASES</literal> privilege allows the
+          The <literal>SHOW DATABASES</literal> privilege enables the
           account to see database names by issuing the <literal>SHOW
           DATABASE</literal> statement. Accounts that do not have this
           privilege see only databases for which they have some
@@ -12065,7 +12106,7 @@
         <para>
           You cannot grant another user a privilege which you yourself
           do not have; the <literal>GRANT OPTION</literal> privilege
-          allows you to assign only those privileges which you yourself
+          enables you to assign only those privileges which you yourself
           possess.
         </para>
 
@@ -17405,7 +17446,7 @@
         <remark role="help-description-end"/>
 
         <para>
-          The syntax of <literal>CACHE INDEX</literal> allows you to
+          The syntax of <literal>CACHE INDEX</literal> enables you to
           specify that only particular indexes from a table should be
           assigned to the cache. However, the current implementation
           assigns all the table's indexes to the cache, so there is no
@@ -17922,7 +17963,7 @@
         </para>
 
         <para>
-          The syntax of <literal>LOAD INDEX INTO CACHE</literal> allows
+          The syntax of <literal>LOAD INDEX INTO CACHE</literal> enables
           you to specify that only particular indexes from a table
           should be preloaded. However, the current implementation
           preloads all the table's indexes into the cache, so there is

Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-5.1/apis.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -706,7 +706,7 @@
       buffer sizes are increased only as demand warrants, simply
       increasing the default maximum limit does not in itself cause more
       resources to be used. This size check is mostly a check for
-      erroneous queries and communication packets.
+      erroneous statements and communication packets.
     </para>
 
     <para>
@@ -1770,8 +1770,8 @@
       </para>
 
       <para>
-        While a connection is active, the client may send SQL queries to
-        the server using <literal>mysql_query()</literal> or
+        While a connection is active, the client may send SQL statements
+        to the server using <literal>mysql_query()</literal> or
         <literal>mysql_real_query()</literal>. The difference between
         the two is that <literal>mysql_query()</literal> expects the
         query to be specified as a null-terminated string whereas
@@ -1866,23 +1866,24 @@
 
       <para>
         The API makes it possible for clients to respond appropriately
-        to queries (retrieving rows only as necessary) without knowing
-        whether or not the query is a <literal>SELECT</literal>. You can
-        do this by calling <literal>mysql_store_result()</literal> after
-        each <literal>mysql_query()</literal> (or
+        to statements (retrieving rows only as necessary) without
+        knowing whether or not the statement is a
+        <literal>SELECT</literal>. You can do this by calling
+        <literal>mysql_store_result()</literal> after each
+        <literal>mysql_query()</literal> (or
         <literal>mysql_real_query()</literal>). If the result set call
-        succeeds, the query was a <literal>SELECT</literal> and you can
-        read the rows. If the result set call fails, call
+        succeeds, the statement was a <literal>SELECT</literal> and you
+        can read the rows. If the result set call fails, call
         <literal>mysql_field_count()</literal> to determine whether a
         result was actually to be expected. If
-        <literal>mysql_field_count()</literal> returns zero, the query
-        returned no data (indicating that it was an
+        <literal>mysql_field_count()</literal> returns zero, the
+        statement returned no data (indicating that it was an
         <literal>INSERT</literal>, <literal>UPDATE</literal>,
         <literal>DELETE</literal>, and so forth), and was not expected
         to return rows. If <literal>mysql_field_count()</literal> is
-        non-zero, the query should have returned rows, but didn't. This
-        indicates that the query was a <literal>SELECT</literal> that
-        failed. See the description for
+        non-zero, the statement should have returned rows, but didn't.
+        This indicates that the statement was a
+        <literal>SELECT</literal> that failed. See the description for
         <literal>mysql_field_count()</literal> for an example of how
         this can be done.
       </para>
@@ -13305,7 +13306,7 @@
 
         <refsynopsisdiv>
           <cmdsynopsis>
-            <command>msql2mysql<replaceable>C-source-file</replaceable> &hellip;</command>
+            <command>msql2mysql<replaceable>C-source-file</replaceable> ...</command>
           </cmdsynopsis>
         </refsynopsisdiv>
 

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-5.1/database-administration.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -4048,8 +4048,8 @@
             </para>
 
             <para>
-              Whether logging of all queries to the general query log is
-              enabled. See <xref linkend="query-log"/>.
+              Whether logging of all statements to the general query log
+              is enabled. See <xref linkend="query-log"/>.
             </para>
           </listitem>
 
@@ -4696,12 +4696,13 @@
             </para>
 
             <para>
-              The communication buffer is reset to this size between
-              queries. This should not normally be changed, but if you
-              have very little memory, you can set it to the expected
-              length of SQL statements sent by clients. If statements
-              exceed this length, the buffer is automatically enlarged,
-              up to <literal>max_allowed_packet</literal> bytes.
+              The communication buffer is reset to this size between SQL
+              statements. This should not normally be changed, but if
+              you have very little memory, you can set it to the
+              expected length of statements sent by clients. If
+              statements exceed this length, the buffer is automatically
+              enlarged, up to <literal>max_allowed_packet</literal>
+              bytes.
             </para>
           </listitem>
 
@@ -4912,9 +4913,9 @@
 
             <para>
               The allocation size of memory blocks that are allocated
-              for objects created during query parsing and execution. If
-              you have problems with memory fragmentation, it might help
-              to increase this a bit.
+              for objects created during statement parsing and
+              execution. If you have problems with memory fragmentation,
+              it might help to increase this a bit.
             </para>
           </listitem>
 
@@ -5030,9 +5031,9 @@
             </para>
 
             <para>
-              The size of the persistent buffer used for query parsing
-              and execution. This buffer is not freed between queries.
-              If you are running complex queries, a larger
+              The size of the persistent buffer used for statement
+              parsing and execution. This buffer is not freed between
+              statements. If you are running complex queries, a larger
               <literal>query_prealloc_size</literal> value might be
               helpful in improving performance, because it can reduce
               the need for the server to perform memory allocation
@@ -7813,7 +7814,8 @@
             </para>
 
             <para>
-              The number of queries that have been sent to the server.
+              The number of statements that have been sent to the
+              server.
             </para>
           </listitem>
 
@@ -8985,7 +8987,7 @@
               connection, the connection to the client is broken and the
               thread is marked as killed. Threads die when they notice
               that they are so marked. Threads for idle connections die
-              quickly. Threads that currently are processing queries
+              quickly. Threads that currently are processing statements
               check their state periodically and take longer to die. For
               additional information about thread termination, see
               <xref linkend="kill"/>, in particular for the instructions
@@ -12250,11 +12252,11 @@
             Don't grant the <literal>PROCESS</literal> or
             <literal>SUPER</literal> privilege to non-administrative
             users. The output of <command>mysqladmin
-            processlist</command> shows the text of any executing
-            queries currently being executed, so any user who is allowed
-            to run that command might be able to see whether another
-            user issues a statement such as <literal>UPDATE user SET
-            password=PASSWORD('not_secure')</literal>.
+            processlist</command> shows the text of any statements
+            currently being executed, so any user who is allowed to
+            execute to run that command might be able to see whether
+            another user issues a statement such as <literal>UPDATE user
+            SET password=PASSWORD('not_secure')</literal>.
           </para>
 
           <para>
@@ -14024,8 +14026,8 @@
         <listitem>
           <para>
             The <literal>PROCESS</literal> privilege can be used to view
-            the plain text of currently executing queries, including
-            queries that set or change passwords.
+            the plain text of currently executing statements, including
+            statements that set or change passwords.
           </para>
         </listitem>
 
@@ -18965,7 +18967,7 @@
             In some cases, you may want to re-run only certain binary
             logs, from certain positions (usually you want to re-run all
             binary logs from the date of the restored backup, excepting
-            possibly some incorrect queries). See
+            possibly some incorrect statements). See
             <xref linkend="mysqlbinlog"/>, for more information on the
             <command>mysqlbinlog</command> utility and how to use it.
           </para>
@@ -20091,8 +20093,8 @@
           that when you do <command>mysqladmin shutdown</command> on a
           remote server, the <command>mysqld</command> server is still
           alive for a while after <command>mysqladmin</command> returns,
-          until all queries are stopped and all keys have been flushed
-          to disk.
+          until all statement-processing has stopped and all keys have
+          been flushed to disk.
         </para>
 
         <para>
@@ -22399,7 +22401,7 @@
             <literal>USE</literal>) is
             <replaceable>db_name</replaceable>. All other databases that
             are not explicitly mentioned are ignored. If you use this,
-            you should ensure that you only do updates in the current
+            you should ensure that you only do updates in the default
             database.
           </para>
 
@@ -22408,7 +22410,7 @@
             <literal>CREATE DATABASE</literal>, <literal>ALTER
             DATABASE</literal>, and <literal>DROP DATABASE</literal>
             statements, which use the database manipulated to decide if
-            it should log the statement rather than the current
+            it should log the statement rather than the default
             database.
           </para>
 
@@ -22655,7 +22657,7 @@
         whole transaction to the binary log before the
         <literal>COMMIT</literal> is executed. When the thread that
         handles the transaction starts, it allocates a buffer of
-        <literal>binlog_cache_size</literal> to buffer queries. If a
+        <literal>binlog_cache_size</literal> to buffer statements. If a
         statement is bigger than this, the thread opens a temporary file
         to store the transaction. The temporary file is deleted when the
         thread ends.

Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-5.1/language-structure.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -2039,7 +2039,7 @@
 <programlisting>
 mysql&gt; <userinput>CREATE TABLE abs(val INT);</userinput>
 ERROR 1064 (42000) at line 2: You have an error in your SQL
-syntax &hellip; near 'abs(val INT)'
+syntax ... near 'abs(val INT)'
 </programlisting>
 
     <para>

Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-5.1/restrictions.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -117,8 +117,8 @@
           <literal>SELECT</literal> statements that do not have an
           <literal>INTO</literal> clause and <literal>SHOW</literal>
           statements. A function can process a result set either with
-          <literal>SELECT &hellip; INTO</literal> or by using a cursor
-          and <literal>FETCH</literal> statements.
+          <literal>SELECT ... INTO</literal> or by using a cursor and
+          <literal>FETCH</literal> statements.
         </para>
       </listitem>
 

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-25 01:13:59 UTC (rev 1027)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-25 03:22:41 UTC (rev 1028)
@@ -14,9 +14,42 @@
   <title>&title-sql-syntax;</title>
 
   <para>
-    This chapter describes the syntax for SQL statements.
+    This chapter describes the syntax for most of the SQL statements
+    supported by MySQL. Additional statement descriptions can be found
+    in the following chapters:
   </para>
 
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        <xref linkend="optimization"/>, discusses the
+        <literal>EXPLAIN</literal> statement.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <xref linkend="stored-procedures"/>, covers statements for
+        writing stored routines.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <xref linkend="triggers"/>, covers statements for writing
+        triggers.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <xref linkend="views"/>, covers view-related statements.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
   <section id="data-definition">
 
     <title>&title-data-definition;</title>
@@ -75,28 +108,31 @@
       <remark role="help-description-begin"/>
 
       <para>
-        <literal>ALTER DATABASE</literal> allows you to change the
+        <literal>ALTER DATABASE</literal> enables you to change the
         overall characteristics of a database. These characteristics are
         stored in the <filename>db.opt</filename> file in the database
         directory. To use <literal>ALTER DATABASE</literal>, you need
         the <literal>ALTER</literal> privilege on the database.
+        <literal>ALTER SCHEMA</literal> is a synonym for <literal>ALTER
+        DATABASE</literal>.
       </para>
 
-      <remark role="help-description-end"/>
-
       <para>
         The <literal>CHARACTER SET</literal> clause changes the default
         database character set. The <literal>COLLATE</literal> clause
-        changes the default database collation. Character set and
-        collation names are discussed in <xref linkend="charset"/>.
+        changes the default database collation.
+        <xref linkend="charset"/>, discusses character set and collation
+        names.
       </para>
 
       <para>
-        The database name can be omitted, in which case, the statement
+        The database name can be omitted, in which case the statement
         applies to the default database. <literal>ALTER SCHEMA</literal>
         can be also used.
       </para>
 
+      <remark role="help-description-end"/>
+
     </section>
 
     <section id="alter-table">
@@ -178,7 +214,7 @@
       <remark role="help-description-begin"/>
 
       <para>
-        <literal>ALTER TABLE</literal> allows you to change the
+        <literal>ALTER TABLE</literal> enables you to change the
         structure of an existing table. For example, you can add or
         delete columns, create or destroy indexes, change the type of
         existing columns, or rename columns or the table itself. You can
@@ -195,8 +231,8 @@
         <literal>AUTO_INCREMENT</literal>, and
         <literal>AVG_ROW_LENGTH</literal>. (However, <literal>ALTER
         TABLE</literal> ignores the <literal>DATA DIRECTORY</literal>
-        and <literal>INDEX DIRECTORY</literal> table options.) See
-        <xref linkend="create-table"/>.
+        and <literal>INDEX DIRECTORY</literal> table options.)
+        <xref linkend="create-table"/>, lists all table options.
       </para>
 
       <para>
@@ -207,19 +243,6 @@
       </para>
 
       <para>
-        If you use <literal>ALTER TABLE</literal> to change a column
-        specification but <literal>DESCRIBE
-        <replaceable>tbl_name</replaceable></literal> indicates that
-        your column was not changed, it is possible that MySQL ignored
-        your modification for one of the reasons described in
-        <xref linkend="silent-column-changes"/>. For example, if you try
-        to change a <literal>VARCHAR</literal> column to
-        <literal>CHAR</literal>, MySQL still uses
-        <literal>VARCHAR</literal> if the table contains other
-        variable-length columns.
-      </para>
-
-      <para>
         <literal>ALTER TABLE</literal> works by making a temporary copy
         of the original table. The alteration is performed on the copy,
         and then the original table is deleted and the new one is
@@ -231,12 +254,12 @@
       </para>
 
       <para>
-        Note that if you use any other option to <literal>ALTER
-        TABLE</literal> than <literal>RENAME</literal>, MySQL always
-        creates a temporary table, even if the data wouldn't strictly
-        need to be copied (such as when you change the name of a
-        column). For <literal>MyISAM</literal> tables, you can speed up
-        the index re-creation operation (which is the slowest part of
+        Note that if you use any option to <literal>ALTER
+        TABLE</literal> other than <literal>RENAME</literal>, MySQL
+        always creates a temporary table, even if the data wouldn't
+        strictly need to be copied (such as when you change the name of
+        a column). For <literal>MyISAM</literal> tables, you can speed
+        up the index re-creation operation (which is the slowest part of
         the alteration process) by setting the
         <literal>myisam_sort_buffer_size</literal> system variable to a
         high value.
@@ -260,10 +283,10 @@
             warnings occur when <literal>STRICT</literal> mode is
             enabled. If <literal>IGNORE</literal> is not specified, the
             copy is aborted and rolled back if duplicate-key errors
-            occur. If <literal>IGNORE</literal> is specified, then for
-            rows with duplicates on a unique key, only the first row is
-            used. The others conflicting rows are deleted. Wrong values
-            are truncated to the closest matching acceptable value.
+            occur. If <literal>IGNORE</literal> is specified, only the
+            first row is used of rows with duplicates on a unique key,
+            The other conflicting rows are deleted. Incorrect values are
+            truncated to the closest matching acceptable value.
           </para>
         </listitem>
 
@@ -275,7 +298,8 @@
             TABLE</literal> statement, separated by commas. This is a
             MySQL extension to standard SQL, which allows only one of
             each clause per <literal>ALTER TABLE</literal> statement.
-            For example, to drop multiple columns in a single statement:
+            For example, to drop multiple columns in a single statement,
+            do this:
           </para>
 
 <programlisting>
@@ -519,12 +543,12 @@
               <primary>ORDER BY</primary>
             </indexterm>
 
-            <literal>ORDER BY</literal> allows you to create the new
+            <literal>ORDER BY</literal> enables you to create the new
             table with the rows in a specific order. Note that the table
             does not remain in this order after inserts and deletes.
             This option is mainly useful when you know that you are
             mostly going to query the rows in a certain order; by using
-            this option after big changes to the table, you might be
+            this option after major changes to the table, you might be
             able to get higher performance. In some cases, it might make
             sorting easier for MySQL if the table is in order by the
             column that you want to order it by later.
@@ -785,13 +809,11 @@
             follows the same syntax and other rules as apply to the
             <replaceable>partition_options</replaceable> clause for
             <literal>CREATE TABLE</literal> (see
-            <xref
-              linkend="create-table"/> for more
-            detailed information).
-            <emphasis role="bold">Note</emphasis>: This syntax currently
-            is accepted by the MySQL 5.1 server, but does not yet
-            actually do anything; we expect to implement this as MySQL
-            5.1 is developed.
+            <xref linkend="create-table"/>, for more detailed
+            information). <emphasis role="bold">Note</emphasis>: This
+            syntax currently is accepted by the MySQL 5.1 server, but
+            does not yet actually do anything; we expect to implement
+            this as MySQL 5.1 is developed.
           </para>
 
           <para>
@@ -855,7 +877,7 @@
             Note that <literal>DROP PARTITION</literal> does not work
             with tables that use the <literal>NDB Cluster</literal>
             storage engine. See
-            <xref linkend="partitioning-management-range-list"/> and
+            <xref linkend="partitioning-management-range-list"/>, and
             <xref linkend="mysql-cluster-limitations"/>.
           </para>
 
@@ -977,8 +999,7 @@
             partitions must already exist in the table to be altered.
             Multiple partition names are separated by commas. For more
             information, and for examples of these, see
-            <xref
-              linkend="partitioning-maintenance"/>.
+            <xref linkend="partitioning-maintenance"/>.
           </para>
         </listitem>
 
@@ -1255,7 +1276,7 @@
         Normally, you create all indexes on a table at the time the
         table itself is created with <literal>CREATE TABLE</literal>.
         See <xref linkend="create-table"/>. <literal>CREATE
-        INDEX</literal> allows you to add indexes to existing tables.
+        INDEX</literal> enables you to add indexes to existing tables.
       </para>
 
       <para>
@@ -2590,7 +2611,7 @@
             row). Compare this to the ordinary case where the following
             keys takes <literal>storage_size_for_key +
             pointer_size</literal> (where the pointer size is usually
-            4). Conversely, you get a big benefit from prefix
+            4). Conversely, you get a significant benefit from prefix
             compression only if you have many numbers that are the same.
             If all keys are totally different, you use one byte more per
             key, if the key is not a key that can have
@@ -2744,14 +2765,12 @@
             shown in the syntax for
             <replaceable>partition_options</replaceable> at the
             beginning of this section are available for all partitioning
-            types. Please see the listings for the individual types
-            below for information specific to each type, and see
-            <xref
-              linkend="partitioning"/> for more
-            complete information about the workings of and uses for
-            partitioning in MySQL, as well as additional examples of
-            table creation and other commands relating to MySQL
-            partitioning.
+            types. Please see the following listings for the individual
+            types for information specific to each type, and see
+            <xref linkend="partitioning"/>, for more complete
+            information about the workings of and uses for partitioning
+            in MySQL, as well as additional examples of table creation
+            and other commands relating to MySQL partitioning.
           </para>
 
           <itemizedlist>
@@ -2790,8 +2809,7 @@
                 of <replaceable>expr</replaceable> divided by the number
                 of partitions (that is, the modulus). For examples and
                 additional information, see
-                <xref
-                  linkend="partitioning-hash"/>.
+                <xref linkend="partitioning-hash"/>.
               </para>
 
               <para>
@@ -2829,13 +2847,10 @@
                 <literal>HASH</literal>; that is, the partition number
                 is found using the <literal>&amp;</literal> operator
                 rather than the modulus (see
-                <xref
-                  linkend="partitioning-linear-hash"/>
-                and
-                <xref
-                    linkend="partitioning-key"/>
-                for details). This example uses linear partitioning by
-                key to distribute data between 5 partitions:
+                <xref linkend="partitioning-linear-hash"/>, and
+                <xref linkend="partitioning-key"/>, for details). This
+                example uses linear partitioning by key to distribute
+                data between 5 partitions:
               </para>
 
 <programlisting>
@@ -3072,9 +3087,7 @@
                 IN</literal> clause for each partition. This is used to
                 determine which rows are to be stored in this partition.
                 See the discussions of partitioning types in
-                <xref
-                  linkend="partitioning"/> for
-                syntax examples.
+                <xref linkend="partitioning"/>, for syntax examples.
               </para>
             </listitem>
 
@@ -3224,9 +3237,8 @@
             Partitions can be modified, merged, added to tables, and
             dropped from tables. For basic information about the MySQL
             commands to accomplish these tasks, see
-            <xref
-              linkend="alter-table"/>. For more
-            detailed descriptions and examples, see
+            <xref linkend="alter-table"/>. For more detailed
+            descriptions and examples, see
             <xref linkend="partitioning-management"/>.
           </para>
         </listitem>
@@ -4102,10 +4114,11 @@
       </para>
 
       <para>
-        The examples above show inner joins using the comma operator,
-        but multiple-table <literal>DELETE</literal> statements can use
-        any type of join allowed in <literal>SELECT</literal>
-        statements, such as <literal>LEFT JOIN</literal>.
+        The preceding examples show inner joins that use the comma
+        operator, but multiple-table <literal>DELETE</literal>
+        statements can use any type of join allowed in
+        <literal>SELECT</literal> statements, such as <literal>LEFT
+        JOIN</literal>.
       </para>
 
       <para>
@@ -4378,9 +4391,9 @@
 
         <listitem>
           <para>
-            <literal>HANDLER</literal> allows you to traverse a database
-            in a manner that is difficult (or even impossible) to
-            accomplish with <literal>SELECT</literal>. The
+            <literal>HANDLER</literal> enables you to traverse a
+            database in a manner that is difficult (or even impossible)
+            to accomplish with <literal>SELECT</literal>. The
             <literal>HANDLER</literal> interface is a more natural way
             to look at data when working with applications that provide
             an interactive user interface to the database.
@@ -4521,7 +4534,7 @@
             Use the keyword <literal>DEFAULT</literal> to set a column
             explicitly to its default value. This makes it easier to
             write <literal>INSERT</literal> statements that assign
-            values to all but a few columns, because it allows you to
+            values to all but a few columns, because it enables you to
             avoid writing an incomplete <literal>VALUES</literal> list
             that does not include a value for each column in the table.
             Otherwise, you would have to write out the list of column
@@ -9973,10 +9986,11 @@
 </programlisting>
 
       <para>
-        The example above shows an inner join using the comma operator,
-        but multiple-table <literal>UPDATE</literal> statements can use
-        any type of join allowed in <literal>SELECT</literal>
-        statements, such as <literal>LEFT JOIN</literal>.
+        The preceding example shows an inner join that uses the comma
+        operator, but multiple-table <literal>UPDATE</literal>
+        statements can use any type of join allowed in
+        <literal>SELECT</literal> statements, such as <literal>LEFT
+        JOIN</literal>.
       </para>
 
       <para>
@@ -10223,7 +10237,7 @@
       connection) through statements such as <literal>SET
       AUTOCOMMIT</literal>, <literal>START TRANSACTION</literal>,
       <literal>COMMIT</literal>, and <literal>ROLLBACK</literal>. See
-      <xref linkend="commit"/>. XA transaction support allows MySQL to
+      <xref linkend="commit"/>. XA transaction support enables MySQL to
       participate in distributed transactions as well. See
       <xref linkend="xa"/>.
     </para>
@@ -11203,7 +11217,7 @@
       </itemizedlist>
 
       <para>
-        The MySQL implementation of XA MySQL allows a MySQL server to
+        The MySQL implementation of XA MySQL enables a MySQL server to
         act as a Resource Manager that handles XA transactions within a
         global transaction. A client program that connects to the MySQL
         server acts as the Transaction Manager.
@@ -11906,7 +11920,7 @@
 
         <para>
           The <literal>GRANT</literal> and <literal>REVOKE</literal>
-          statements allow system administrators to create MySQL user
+          statements enable system administrators to create MySQL user
           accounts and to grant rights to and revoke them from accounts.
         </para>
 
@@ -12074,7 +12088,7 @@
               </row>
               <row>
                 <entry><literal>ALTER</literal></entry>
-                <entry>Allows use of <literal>ALTER TABLE</literal></entry>
+                <entry>Enables use of <literal>ALTER TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>ALTER ROUTINE</literal></entry>
@@ -12082,7 +12096,7 @@
               </row>
               <row>
                 <entry><literal>CREATE</literal></entry>
-                <entry>Allows use of <literal>CREATE TABLE</literal></entry>
+                <entry>Enables use of <literal>CREATE TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>CREATE ROUTINE</literal></entry>
@@ -12090,52 +12104,52 @@
               </row>
               <row>
                 <entry><literal>CREATE TEMPORARY TABLES</literal></entry>
-                <entry>Allows use of <literal>CREATE TEMPORARY TABLE</literal></entry>
+                <entry>Enables use of <literal>CREATE TEMPORARY TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>CREATE USER</literal></entry>
-                <entry>Allows use of <literal>CREATE USER</literal>, <literal>DROP
+                <entry>Enables use of <literal>CREATE USER</literal>, <literal>DROP
                   USER</literal>, <literal>RENAME USER</literal>, and
                   <literal>REVOKE ALL PRIVILEGES</literal>.</entry>
               </row>
               <row>
                 <entry><literal>CREATE VIEW</literal></entry>
-                <entry>Allows use of <literal>CREATE VIEW</literal></entry>
+                <entry>Enables use of <literal>CREATE VIEW</literal></entry>
               </row>
               <row>
                 <entry><literal>DELETE</literal></entry>
-                <entry>Allows use of <literal>DELETE</literal></entry>
+                <entry>Enables use of <literal>DELETE</literal></entry>
               </row>
               <row>
                 <entry><literal>DROP</literal></entry>
-                <entry>Allows use of <literal>DROP TABLE</literal></entry>
+                <entry>Enables use of <literal>DROP TABLE</literal></entry>
               </row>
               <row>
                 <entry><literal>EXECUTE</literal></entry>
-                <entry>Allows the user to run stored routines</entry>
+                <entry>Enables the user to run stored routines</entry>
               </row>
               <row>
                 <entry><literal>FILE</literal></entry>
-                <entry>Allows use of <literal>SELECT ... INTO OUTFILE</literal> and
+                <entry>Enables use of <literal>SELECT ... INTO OUTFILE</literal> and
                   <literal>LOAD DATA INFILE</literal></entry>
               </row>
               <row>
                 <entry><literal>INDEX</literal></entry>
-                <entry>Allows use of <literal>CREATE INDEX</literal> and <literal>DROP
+                <entry>Enables use of <literal>CREATE INDEX</literal> and <literal>DROP
                   INDEX</literal></entry>
               </row>
               <row>
                 <entry><literal>INSERT</literal></entry>
-                <entry>Allows use of <literal>INSERT</literal></entry>
+                <entry>Enables use of <literal>INSERT</literal></entry>
               </row>
               <row>
                 <entry><literal>LOCK TABLES</literal></entry>
-                <entry>Allows use of <literal>LOCK TABLES</literal> on tables for which you
+                <entry>Enables use of <literal>LOCK TABLES</literal> on tables for which you
                   have the <literal>SELECT</literal> privilege</entry>
               </row>
               <row>
                 <entry><literal>PROCESS</literal></entry>
-                <entry>Allows use of <literal>SHOW FULL PROCESSLIST</literal></entry>
+                <entry>Enables use of <literal>SHOW FULL PROCESSLIST</literal></entry>
               </row>
               <row>
                 <entry><literal>REFERENCES</literal></entry>
@@ -12143,11 +12157,11 @@
               </row>
               <row>
                 <entry><literal>RELOAD</literal></entry>
-                <entry>Allows use of <literal>FLUSH</literal></entry>
+                <entry>Enables use of <literal>FLUSH</literal></entry>
               </row>
               <row>
                 <entry><literal>REPLICATION CLIENT</literal></entry>
-                <entry>Allows the user to ask where slave or master servers are</entry>
+                <entry>Enables the user to ask where slave or master servers are</entry>
               </row>
               <row>
                 <entry><literal>REPLICATION SLAVE</literal></entry>
@@ -12156,7 +12170,7 @@
               </row>
               <row>
                 <entry><literal>SELECT</literal></entry>
-                <entry>Allows use of <literal>SELECT</literal></entry>
+                <entry>Enables use of <literal>SELECT</literal></entry>
               </row>
               <row>
                 <entry><literal>SHOW DATABASES</literal></entry>
@@ -12164,23 +12178,24 @@
               </row>
               <row>
                 <entry><literal>SHOW VIEW</literal></entry>
-                <entry>Allows use of <literal>SHOW CREATE VIEW</literal></entry>
+                <entry>Enables use of <literal>SHOW CREATE VIEW</literal></entry>
               </row>
               <row>
                 <entry><literal>SHUTDOWN</literal></entry>
-                <entry>Allows use of <command>mysqladmin shutdown</command></entry>
+                <entry>Enables use of <command>mysqladmin shutdown</command></entry>
               </row>
               <row>
                 <entry><literal>SUPER</literal></entry>
-                <entry>Allows use of <literal>CHANGE MASTER</literal>, <literal>KILL</literal>,
-                  <literal>PURGE MASTER LOGS</literal>, and <literal>SET
-                  GLOBAL</literal> statements, the <command>mysqladmin
-                  debug</command> command; allows you to connect (once)
-                  even if <literal>max_connections</literal> is reached</entry>
+                <entry>Enables use of <literal>CHANGE MASTER</literal>,
+                  <literal>KILL</literal>, <literal>PURGE MASTER
+                  LOGS</literal>, and <literal>SET GLOBAL</literal>
+                  statements, the <command>mysqladmin debug</command>
+                  command; allows you to connect (once) even if
+                  <literal>max_connections</literal> is reached</entry>
               </row>
               <row>
                 <entry><literal>UPDATE</literal></entry>
-                <entry>Allows use of <literal>UPDATE</literal></entry>
+                <entry>Enables use of <literal>UPDATE</literal></entry>
               </row>
               <row>
                 <entry><literal>USAGE</literal></entry>
@@ -12188,7 +12203,7 @@
               </row>
               <row>
                 <entry><literal>GRANT OPTION</literal></entry>
-                <entry>Allows privileges to be granted</entry>
+                <entry>Enables privileges to be granted</entry>
               </row>
             </tbody>
           </tgroup>
@@ -12200,9 +12215,8 @@
           USER</literal>, <literal>CREATE ROUTINE</literal>, and
           <literal>ALTER ROUTINE</literal> privileges when upgrading
           from an earlier version of MySQL that does not have them, you
-          must first upgrade your grant tables as described in
-          <xref
-            linkend="mysql-fix-privilege-tables"/>.
+          must first upgrade your grant tables, as described in
+          <xref linkend="mysql-fix-privilege-tables"/>.
         </para>
 
         <para>
@@ -12288,7 +12302,7 @@
           that do not exist. In such cases, the privileges to be granted
           must include the <literal>CREATE</literal> privilege.
           <emphasis>This behavior is by design</emphasis>, and is
-          intended to allow the database administrator to prepare user
+          intended to enable the database administrator to prepare user
           accounts and privileges for database objects that are to be
           created at a later time.
         </para>
@@ -12533,7 +12547,7 @@
         </para>
 
         <para>
-          The <literal>SHOW DATABASES</literal> privilege allows the
+          The <literal>SHOW DATABASES</literal> privilege enables the
           account to see database names by issuing the <literal>SHOW
           DATABASE</literal> statement. Accounts that do not have this
           privilege see only databases for which they have some
@@ -12554,7 +12568,7 @@
         <para>
           You cannot grant another user a privilege which you yourself
           do not have; the <literal>GRANT OPTION</literal> privilege
-          allows you to assign only those privileges which you yourself
+          enables you to assign only those privileges which you yourself
           possess.
         </para>
 
@@ -15539,8 +15553,7 @@
           <literal>Support</literal> value for the
           <literal>InnoDB</literal> row has the value
           <literal>DEFAULT</literal>. See
-          <xref
-            linkend="storage-engines"/>.
+          <xref linkend="storage-engines"/>.
         </para>
 
         <para>
@@ -17933,7 +17946,7 @@
         <remark role="help-description-end"/>
 
         <para>
-          The syntax of <literal>CACHE INDEX</literal> allows you to
+          The syntax of <literal>CACHE INDEX</literal> enables you to
           specify that only particular indexes from a table should be
           assigned to the cache. However, the current implementation
           assigns all the table's indexes to the cache, so there is no
@@ -18449,7 +18462,7 @@
         </para>
 
         <para>
-          The syntax of <literal>LOAD INDEX INTO CACHE</literal> allows
+          The syntax of <literal>LOAD INDEX INTO CACHE</literal> enables
           you to specify that only particular indexes from a table
           should be preloaded. However, the current implementation
           preloads all the table's indexes into the cache, so there is
@@ -20428,9 +20441,7 @@
 
     <para>
       Placeholders can be used in the <literal>LIMIT</literal> clause
-      when using prepared statements. See
-      <xref
-        linkend="select"/>.
+      when using prepared statements. See <xref linkend="select"/>.
     </para>
 
   </section>

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