MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:jon Date:September 17 2008 12:26pm
Subject:svn commit - mysqldoc@docsrva: r11844 - in trunk: administrator dynamic-docs/build-configure dynamic-docs/changelog dynamic-docs/command-optvars migra...
View as plain text  
Author: jstephens
Date: 2008-09-17 14:26:21 +0200 (Wed, 17 Sep 2008)
New Revision: 11844

Log:

Fix for Docs Bug #39368 + blanket reformat



Modified:
   trunk/administrator/service-control.xml
   trunk/dynamic-docs/build-configure/mysqld.xml
   trunk/dynamic-docs/changelog/connector-net.xml
   trunk/dynamic-docs/changelog/connector-odbc-versions.xml
   trunk/dynamic-docs/changelog/connector-odbc.xml
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/dynamic-docs/changelog/mysqld.xml
   trunk/dynamic-docs/changelog/workbench-versions.xml
   trunk/dynamic-docs/changelog/workbench.xml
   trunk/dynamic-docs/command-optvars/mysql_commands.xml
   trunk/dynamic-docs/command-optvars/mysqladmin_commands.xml
   trunk/dynamic-docs/command-optvars/mysqlbinlog.xml
   trunk/dynamic-docs/command-optvars/mysqldump.xml
   trunk/dynamic-docs/command-optvars/mysqlhotcopy.xml
   trunk/dynamic-docs/command-optvars/ndb_restore.xml
   trunk/dynamic-docs/command-optvars/ndb_show_tables.xml
   trunk/migration-toolkit/extending.xml
   trunk/mysqldoc-guide/entities.xml
   trunk/mysqltest/command-reference.xml
   trunk/ndbapi/class-tablespace.xml
   trunk/ndbapi/ndb-internals.xml
   trunk/refman-4.1/backup.xml
   trunk/refman-4.1/data-types.xml
   trunk/refman-4.1/extending-mysql.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/internationalization.xml
   trunk/refman-4.1/mysql-cluster-configuration.xml
   trunk/refman-4.1/mysql-cluster-limitations.xml
   trunk/refman-4.1/mysql-cluster-management.xml
   trunk/refman-4.1/mysql-cluster-multi-computer.xml
   trunk/refman-4.1/mysql-cluster-utilities.xml
   trunk/refman-4.1/optimization.xml
   trunk/refman-4.1/programs-client.xml
   trunk/refman-4.1/programs-using.xml
   trunk/refman-4.1/sql-syntax-data-definition.xml
   trunk/refman-4.1/sql-syntax-data-manipulation.xml
   trunk/refman-4.1/sql-syntax-server-administration.xml
   trunk/refman-4.1/sql-syntax-utility.xml
   trunk/refman-5.0/backup.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/extending-mysql.xml
   trunk/refman-5.0/faqs.xml
   trunk/refman-5.0/installing-cs-core.xml
   trunk/refman-5.0/internationalization.xml
   trunk/refman-5.0/mysql-cluster-configuration.xml
   trunk/refman-5.0/mysql-cluster-limitations.xml
   trunk/refman-5.0/mysql-cluster-management.xml
   trunk/refman-5.0/mysql-cluster-multi-computer.xml
   trunk/refman-5.0/mysql-cluster-utilities.xml
   trunk/refman-5.0/optimization.xml
   trunk/refman-5.0/programs-admin-util-core.xml
   trunk/refman-5.0/programs-client-core.xml
   trunk/refman-5.0/programs-installation.xml
   trunk/refman-5.0/programs-using.xml
   trunk/refman-5.0/replication-configuration.xml
   trunk/refman-5.0/replication-solutions.xml
   trunk/refman-5.0/restrictions.xml
   trunk/refman-5.0/se-federated.xml
   trunk/refman-5.0/se-merge.xml
   trunk/refman-5.0/sql-syntax-data-manipulation.xml
   trunk/refman-5.0/sql-syntax-server-administration.xml
   trunk/refman-5.0/sql-syntax-transactions.xml
   trunk/refman-5.0/sql-syntax-utility.xml
   trunk/refman-5.1-maria/sql-syntax-server-administration.xml
   trunk/refman-5.1/backup.xml
   trunk/refman-5.1/data-types.xml
   trunk/refman-5.1/dba-core.xml
   trunk/refman-5.1/faqs.xml
   trunk/refman-5.1/functions-core.xml
   trunk/refman-5.1/installing-core-new-tmp.xml
   trunk/refman-5.1/installing-core.xml
   trunk/refman-5.1/internationalization.xml
   trunk/refman-5.1/language-structure-core.xml
   trunk/refman-5.1/mysql-cluster-configuration.xml
   trunk/refman-5.1/mysql-cluster-limitations.xml
   trunk/refman-5.1/mysql-cluster-management.xml
   trunk/refman-5.1/mysql-cluster-multi-computer.xml
   trunk/refman-5.1/mysql-cluster-optvar-core.xml
   trunk/refman-5.1/mysql-cluster-replication.xml
   trunk/refman-5.1/mysql-cluster-utilities.xml
   trunk/refman-5.1/mysql-cluster.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.1/precision-math.xml
   trunk/refman-5.1/programs-admin-util-core.xml
   trunk/refman-5.1/programs-client-core.xml
   trunk/refman-5.1/programs-installation.xml
   trunk/refman-5.1/programs-using.xml
   trunk/refman-5.1/replication-configuration.xml
   trunk/refman-5.1/replication-notes.xml
   trunk/refman-5.1/replication-solutions.xml
   trunk/refman-5.1/restrictions.xml
   trunk/refman-5.1/se-federated.xml
   trunk/refman-5.1/se-innodb-core.xml
   trunk/refman-5.1/se-merge.xml
   trunk/refman-5.1/sql-syntax-data-definition.xml
   trunk/refman-5.1/sql-syntax-data-manipulation.xml
   trunk/refman-5.1/sql-syntax-replication.xml
   trunk/refman-5.1/sql-syntax-server-administration.xml
   trunk/refman-5.1/sql-syntax-transactions.xml
   trunk/refman-5.1/sql-syntax-utility.xml
   trunk/refman-5.1/storage-engines.xml
   trunk/refman-5.1/stored-programs-views.xml
   trunk/refman-6.0/backup.xml
   trunk/refman-6.0/collation-tmp.xml
   trunk/refman-6.0/data-types.xml
   trunk/refman-6.0/faqs.xml
   trunk/refman-6.0/installing-core.xml
   trunk/refman-6.0/internationalization.xml
   trunk/refman-6.0/optimization.xml
   trunk/refman-6.0/precision-math.xml
   trunk/refman-6.0/programs-client-core.xml
   trunk/refman-6.0/programs-installation.xml
   trunk/refman-6.0/programs-using.xml
   trunk/refman-6.0/replication-configuration.xml
   trunk/refman-6.0/replication-notes.xml
   trunk/refman-6.0/replication-solutions.xml
   trunk/refman-6.0/restrictions.xml
   trunk/refman-6.0/se-federated.xml
   trunk/refman-6.0/se-innodb-core.xml
   trunk/refman-6.0/se-merge.xml
   trunk/refman-6.0/sql-syntax-data-manipulation.xml
   trunk/refman-6.0/sql-syntax-replication.xml
   trunk/refman-6.0/sql-syntax-server-administration.xml
   trunk/refman-6.0/sql-syntax-utility.xml
   trunk/refman-6.0/stored-programs-views.xml
   trunk/refman-common/bug-reports.xml
   trunk/refman-common/gpl-license.xml
   trunk/refman-common/ha-drbd.xml
   trunk/refman-common/ha-heartbeat.xml
   trunk/refman-common/ha-memcached-core.xml
   trunk/refman-common/licenses.xml
   trunk/refman-common/load-balancer.xml
   trunk/refman-common/mysql-proxy-core.xml
   trunk/ro/administrator/service-control.xml
   trunk/th/administrator/service-control.xml
   trunk/th/refman-common/bug-reports.xml
   trunk/th/refman-common/gpl-license.xml
   trunk/th/refman-common/licenses.xml
   trunk/workbench/plugins.xml
   trunk/workbench/reference.xml


Modified: trunk/administrator/service-control.xml
===================================================================
--- trunk/administrator/service-control.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/administrator/service-control.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 706 bytes

@@ -313,7 +313,7 @@
               of the MySQL server binary file as it is listed in the
               Windows service manager (for example
               <literal>C:\mysql\bin\mysqld-max-nt</literal>). Note that
-              the the Windows service manager does not display the
+              the Windows service manager does not display the
               <literal>.exe</literal> extension.
             </para>
           </listitem>


Modified: trunk/dynamic-docs/build-configure/mysqld.xml
===================================================================
--- trunk/dynamic-docs/build-configure/mysqld.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/build-configure/mysqld.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 554 bytes

@@ -429,7 +429,7 @@
 
     <formatbase format="--without-extra-tools">
 
-      <description>Skip building utilites in the tools directory</description>
+      <description>Skip building utilities in the tools directory</description>
 
     </formatbase>
     <versions>


Modified: trunk/dynamic-docs/changelog/connector-net.xml
===================================================================
--- trunk/dynamic-docs/changelog/connector-net.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/changelog/connector-net.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 5; 910 bytes

@@ -4240,7 +4240,7 @@
 
       <para>
         Building a connection string within a tight loop would show slow
-        peformance.
+        performance.
       </para>
 
     </message>

@@ -5421,10 +5421,9 @@
     <message>
 
       <para>
-        Attempting to change the the <literal>Connection
-        Protocol</literal> property within a
-        <literal>PropertyGrid</literal> control would raise an
-        exception.
+        Attempting to change the <literal>Connection Protocol</literal>
+        property within a <literal>PropertyGrid</literal> control would
+        raise an exception.
       </para>
 
     </message>


Modified: trunk/dynamic-docs/changelog/connector-odbc-versions.xml
===================================================================
--- trunk/dynamic-docs/changelog/connector-odbc-versions.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/changelog/connector-odbc-versions.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 583 bytes

@@ -228,7 +228,7 @@
     </versionentrypreamble>
 
   </versionentry>
-  <versionentry ver="3.51.12" reldate="11 Febrauary 2005"/>
+  <versionentry ver="3.51.12" reldate="11 February 2005"/>
   <versionentry ver="3.51.11" reldate="28 January 2005"/>
 
 </versionlog>


Modified: trunk/dynamic-docs/changelog/connector-odbc.xml
===================================================================
--- trunk/dynamic-docs/changelog/connector-odbc.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/changelog/connector-odbc.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1038 bytes

@@ -5372,7 +5372,7 @@
 
       <para>
         Fixed an issue where the <command>myodbc3i</command> would
-        update the the user ODBC configuration file
+        update the user ODBC configuration file
         (<filename>~/Library/ODBC/odbcinst.ini</filename>) instead of
         the system <filename>/Library/ODBC/odbcinst.ini</filename>. This
         was caused because <command>myodbc3i</command> was not honouring

@@ -5439,7 +5439,7 @@
 
       <para>
         Using stored procedures with ADO, where the
-        <literal>CommantType</literal> has been set correctly to
+        <literal>CommandType</literal> has been set correctly to
         <literal>adCmdStoredProc</literal>, calls to stored procedures
         would fail.
       </para>


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 4, Lines Added: 6, Lines Deleted: 6; 2122 bytes

@@ -5916,8 +5916,8 @@
         Executing a prepared statement associated with a materialized
         cursor sent to the client a metadata packet with incorrect table
         and database names. The problem occurred because the server sent
-        the the name of the temporary table used by the cursor instead
-        of the table name of the original table.
+        the name of the temporary table used by the cursor instead of
+        the table name of the original table.
       </para>
 
       <para>

@@ -6239,7 +6239,7 @@
       <para>
         For <literal>DISTINCT</literal> queries, 4.0 and 4.1 stopped
         reading joined tables as soon as the first matching row was
-        found. However, this optimzation was lost in MySQL 5.0, which
+        found. However, this optimization was lost in MySQL 5.0, which
         instead read all matching rows. This fix for this regression may
         result in a major improvement in performance for
         <literal>DISTINCT</literal> queries in cases where many rows

@@ -11514,8 +11514,8 @@
         statement were also allowed in <literal>OPTIMIZE TABLE</literal>
         and <literal>ANALYZE TABLE</literal> statements, but caused
         corruption during their execution. These options were never
-        supported for the these statements, and an error is now raised
-        if you try to apply these options to these statements.
+        supported for these statements, and an error is now raised if
+        you try to apply these options to these statements.
       </para>
 
     </message>

@@ -22709,7 +22709,7 @@
 
       <para>
         The range optimizer ignored conditions on inner tables in
-        semi-join <literal>IN</literal> subqueries, causing the the
+        semi-join <literal>IN</literal> subqueries, causing the
         optimizer to miss good query execution plans.
       </para>
 


Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/changelog/mysqld.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 979 bytes

@@ -12950,7 +12950,7 @@
 
       <para>
         For a debug server, a reference to an undefined user variable in
-        a prepared statment executed with <literal>EXECUTE</literal>
+        a prepared statement executed with <literal>EXECUTE</literal>
         caused an assertion failure.
       </para>
 

@@ -92379,7 +92379,7 @@
         </literal>, which participated in equality propagation and also
         was used for <literal>ref</literal> access, then early
         <literal>ref</literal>-access <literal>NULL</literal> filtering
-        was not peformed for the condition. This could make query
+        was not performed for the condition. This could make query
         execution slower.
       </para>
 


Modified: trunk/dynamic-docs/changelog/workbench-versions.xml
===================================================================
--- trunk/dynamic-docs/changelog/workbench-versions.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/changelog/workbench-versions.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 52, Lines Deleted: 74; 4611 bytes

@@ -3,177 +3,155 @@
 <versionlog>
 
   <mysqlproductname title="MySQL Workbench"/>
-  
   <versionentry ver="5.0.25" reldate="12th September 2008">
-    
+
     <versionentrypreamble>
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.24.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
- 
   <versionentry ver="5.0.24" reldate="12th August 2008">
-    
+
     <versionentrypreamble>
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.23.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
-  
   <versionentry ver="5.0.23" reldate="25th June 2008">
-    
+
     <versionentrypreamble>
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.22.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
   <versionentry ver="5.0.22" reldate="27th May 2008">
-    
+
     <versionentrypreamble>
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.21.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
   <versionentry ver="5.0.21" reldate="27 April 2008">
-    
+
     <versionentrypreamble>
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.20.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
   <versionentry ver="5.0.20" reldate="26 April 2008">
-    
+
     <versionentrypreamble>
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.19.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
   <versionentry ver="5.0.19" reldate="15 April 2008">
-    
+
     <versionentrypreamble>
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.18rc.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
   <versionentry ver="5.0.18rc" reldate="not released">
-    
+
     <versionentrypreamble>
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.17rc.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
   <versionentry ver="5.0.17rc" reldate="07 April 2008">
-    
+
     <versionentrypreamble>
-      
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.16rc.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
   <versionentry ver="5.0.16rc" reldate="26 March 2008">
-    
+
     <versionentrypreamble>
-      
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.15rc.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
-  
   <versionentry ver="5.0.15rc" reldate="17 March 2008">
-    
+
     <versionentrypreamble>
-      
-      
+
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.14abeta.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
-    
   <versionentry ver="5.0.14abeta" reldate="28 February 2008">
-    
+
     <versionentrypreamble>
-      
-      
+
       <para>
-        This unscheduled beta release fixes bug#34847
-        Other bug fixes that have been
-        applied since the release of 5.0.14beta are also documented.
+        This unscheduled beta release fixes bug#34847 Other bug fixes
+        that have been applied since the release of 5.0.14beta are also
+        documented.
       </para>
-      
+
     </versionentrypreamble>
-    
+
   </versionentry>
-  
   <versionentry ver="5.0.14beta" reldate="25 February 2008">
 
     <versionentrypreamble>
 
-
       <para>
         This section documents all changes and bug fixes that have been
         applied since the release of 5.0.13beta.

@@ -182,5 +160,5 @@
     </versionentrypreamble>
 
   </versionentry>
-  
+
 </versionlog>


Modified: trunk/dynamic-docs/changelog/workbench.xml
===================================================================
--- trunk/dynamic-docs/changelog/workbench.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/changelog/workbench.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 812 bytes

@@ -2016,7 +2016,7 @@
     <message>
 
       <para>
-        The precise postition of individual connections would not be
+        The precise position of individual connections would not be
         retained when the schema was saved.
       </para>
 

@@ -3130,7 +3130,7 @@
 
       <para>
         An <guimenu>Export as SVG</guimenu> menu option has been added
-        under the the <guimenu>File</guimenu>, <guimenu>Export</guimenu>
+        under the <guimenu>File</guimenu>, <guimenu>Export</guimenu>
         menu option.
       </para>
 


Modified: trunk/dynamic-docs/command-optvars/mysql_commands.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysql_commands.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/command-optvars/mysql_commands.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 695 bytes

@@ -1,7 +1,8 @@
 <!DOCTYPE mysqloptions SYSTEM "options.dtd">
 <mysqloptions>
- <mysqloption id="command-help">
 
+  <mysqloption id="command-help">
+
 <!--xrefto id="command_mysql_help"/-->
 
     <name>help</name>

@@ -559,7 +560,6 @@
       <manual version="6.0"/>
     </versions>
 
-  </mysqloption>   
-    
-    
-</mysqloptions>
\ No newline at end of file
+  </mysqloption>
+
+</mysqloptions>


Modified: trunk/dynamic-docs/command-optvars/mysqladmin_commands.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqladmin_commands.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/command-optvars/mysqladmin_commands.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 488 bytes

@@ -37,7 +37,7 @@
 
 <!--command-->
 
-    <!--xrefto id="command_mysqladmin_debug"/-->
+<!--xrefto id="command_mysqladmin_debug"/-->
 
     <name>cmd-debug</name>
 


Modified: trunk/dynamic-docs/command-optvars/mysqlbinlog.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlbinlog.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/command-optvars/mysqlbinlog.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 4; 1022 bytes

@@ -26,7 +26,7 @@
 
   </mysqloption>
 
-  <!--mysqloption id="bind-address">
+<!--mysqloption id="bind-address">
 
     <xrefto id="option_mysqlbinlog_bind-address"/>
 

@@ -395,7 +395,8 @@
       <choice value="AUTO"/>
       <choice value="ALWAYS"/>
       <choice value="NEVER"/>
-      <choice value="DECODE-ROWS"/>  <!-- from 5.1.28/6.0.7 -->
+      <choice value="DECODE-ROWS"/>
+<!-- from 5.1.28/6.0.7 -->
 
     </values>
 

@@ -907,11 +908,11 @@
 
   </mysqloption>
 
-  <!--mysqloption id="open_files_limit"-->
+<!--mysqloption id="open_files_limit"-->
 
 <!--right format for id?-->
 
-    <!--xrefto id="option_mysqlbinlog_open-files-limit"/>
+<!--xrefto id="option_mysqlbinlog_open-files-limit"/>
 
     <name>open_files_limit</name>
 


Modified: trunk/dynamic-docs/command-optvars/mysqldump.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqldump.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/command-optvars/mysqldump.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 10; 1111 bytes

@@ -1171,24 +1171,24 @@
     </versions>
 
   </mysqloption>
-  
+
   <mysqloption id="no-data">
-    
+
     <xrefto id="option_mysqldump_no-data"/>
-    
+
     <name>no-data</name>
-    
+
     <shortdescription lang="en">
-      Do not write any table row information 
-      (that is, do not dump table contents)
+      Do not write any table row information (that is, do not dump table
+      contents)
     </shortdescription>
-    
+
     <types>
       <optype class="cmdline" format="--no-data"/>
       <optype class="cmdline" format="-d"/>
       <optype class="mycnf"/>
     </types>
-    
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>

@@ -1196,9 +1196,8 @@
       <manual version="5.2"/>
       <manual version="6.0"/>
     </versions>
-    
+
   </mysqloption>
-  
 
   <mysqloption id="no-autocommit">
 


Modified: trunk/dynamic-docs/command-optvars/mysqlhotcopy.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlhotcopy.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/command-optvars/mysqlhotcopy.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 20, Lines Added: 20, Lines Deleted: 20; 3654 bytes

@@ -3,7 +3,7 @@
 
   <mysqloption id="help">
 
-<xrefto id="option_mysqlhotcopy_help"/>
+    <xrefto id="option_mysqlhotcopy_help"/>
 
     <name>help</name>
 

@@ -28,7 +28,7 @@
 
   <mysqloption id="debug">
 
-<xrefto id="option_mysqlhotcopy_debug"/>
+    <xrefto id="option_mysqlhotcopy_debug"/>
 
     <name>debug</name>
 

@@ -53,7 +53,7 @@
 
   <mysqloption id="host">
 
-<xrefto id="option_mysqlhotcopy_host"/>
+    <xrefto id="option_mysqlhotcopy_host"/>
 
     <name>host</name>
 

@@ -85,7 +85,7 @@
 
   <mysqloption id="password">
 
-<xrefto id="option_mysqlhotcopy_password"/>
+    <xrefto id="option_mysqlhotcopy_password"/>
 
     <name>password</name>
 

@@ -113,7 +113,7 @@
 
   <mysqloption id="port">
 
-<xrefto id="option_mysqlhotcopy_port"/>
+    <xrefto id="option_mysqlhotcopy_port"/>
 
     <name>port</name>
 

@@ -145,7 +145,7 @@
 
   <mysqloption id="socket">
 
-<xrefto id="option_mysqlhotcopy_socket"/>
+    <xrefto id="option_mysqlhotcopy_socket"/>
 
     <name>socket</name>
 

@@ -173,7 +173,7 @@
 
   <mysqloption id="user">
 
-<xrefto id="option_mysqlhotcopy_user"/>
+    <xrefto id="option_mysqlhotcopy_user"/>
 
     <name>user</name>
 

@@ -201,7 +201,7 @@
 
   <mysqloption id="version">
 
-<xrefto id="option_mysqlhotcopy_version"/>
+    <xrefto id="option_mysqlhotcopy_version"/>
 
     <name>version</name>
 

@@ -226,7 +226,7 @@
 
   <mysqloption id="addtodest">
 
-<xrefto id="option_mysqlhotcopy_addtodest"/>
+    <xrefto id="option_mysqlhotcopy_addtodest"/>
 
     <name>addtodest</name>
 

@@ -252,7 +252,7 @@
 
   <mysqloption id="allowold">
 
-<xrefto id="option_mysqlhotcopy_allowold"/>
+    <xrefto id="option_mysqlhotcopy_allowold"/>
 
     <name>allowold</name>
 

@@ -278,7 +278,7 @@
 
   <mysqloption id="checkpoint">
 
-<xrefto id="option_mysqlhotcopy_checkpoint"/>
+    <xrefto id="option_mysqlhotcopy_checkpoint"/>
 
     <name>checkpoint</name>
 

@@ -332,7 +332,7 @@
 
   <mysqloption id="dryrun">
 
-<xrefto id="option_mysqlhotcopy_dryrun"/>
+    <xrefto id="option_mysqlhotcopy_dryrun"/>
 
     <name>dryrun</name>
 

@@ -358,7 +358,7 @@
 
   <mysqloption id="flushlogs">
 
-<xrefto id="option_mysqlhotcopy_flushlogs"/>
+    <xrefto id="option_mysqlhotcopy_flushlogs"/>
 
     <name>flushlogs</name>
 

@@ -383,7 +383,7 @@
 
   <mysqloption id="keepold">
 
-<xrefto id="option_mysqlhotcopy_keepold"/>
+    <xrefto id="option_mysqlhotcopy_keepold"/>
 
     <name>keepold</name>
 

@@ -408,7 +408,7 @@
 
   <mysqloption id="noindices">
 
-<xrefto id="option_mysqlhotcopy_noindices"/>
+    <xrefto id="option_mysqlhotcopy_noindices"/>
 
     <name>noindices</name>
 

@@ -433,7 +433,7 @@
 
   <mysqloption id="quiet">
 
-<xrefto id="option_mysqlhotcopy_quiet"/>
+    <xrefto id="option_mysqlhotcopy_quiet"/>
 
     <name>quiet</name>
 

@@ -459,7 +459,7 @@
 
   <mysqloption id="regexp">
 
-<xrefto id="option_mysqlhotcopy_regexp"/>
+    <xrefto id="option_mysqlhotcopy_regexp"/>
 
     <name>regexp</name>
 

@@ -485,7 +485,7 @@
 
   <mysqloption id="resetmaster">
 
-<xrefto id="option_mysqlhotcopy_resetmaster"/>
+    <xrefto id="option_mysqlhotcopy_resetmaster"/>
 
     <name>resetmaster</name>
 

@@ -510,7 +510,7 @@
 
   <mysqloption section="replication" id="resetslave">
 
-<xrefto id="option_mysqlhotcopy_resetslave"/>
+    <xrefto id="option_mysqlhotcopy_resetslave"/>
 
     <name>resetslave</name>
 

@@ -535,7 +535,7 @@
 
   <mysqloption id="tmpdir">
 
-<xrefto id="option_mysqlhotcopy_tmpdir"/>
+    <xrefto id="option_mysqlhotcopy_tmpdir"/>
 
     <name>tmpdir</name>
 


Modified: trunk/dynamic-docs/command-optvars/ndb_restore.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/ndb_restore.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/command-optvars/ndb_restore.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 235, Lines Deleted: 65; 16164 bytes

@@ -1,502 +1,672 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mysqloptions SYSTEM "options.dtd">
 <mysqloptions>
+
   <mysqloption id="option_ndb_restore_connect">
+
     <name>connect</name>
+
     <shortdescription lang="en">
       Same as connectstring
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--connect"/>
       <optype class="cmdline" format="-C"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_nodeid">
+
     <name>nodeid</name>
+
     <shortdescription lang="en">
       Back up files from node with this ID
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--nodeid=#"/>
       <optype class="cmdline" format="-n"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_backupid">
+
     <name>backupid</name>
+
     <shortdescription lang="en">
       Restore from the backup with the given ID
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--backupid=#"/>
       <optype class="cmdline" format="-b"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
-  
+
   <mysqloption id="option_ndb_restore_data">
-      <name>restore_data</name>
-      <shortdescription lang="en">
-        Restore table data and logs into NDB Cluster using the NDB API
-      </shortdescription>
-      <types>
-        <optype class="cmdline" format="--"/>
-      </types>
-      <versions>
-        <manual version="4.1"/>
-        <manual version="5.0"/>
-        <manual version="5.1"/>
-      </versions>
-    </mysqloption>
+
+    <name>restore_data</name>
+
+    <shortdescription lang="en">
+      Restore table data and logs into NDB Cluster using the NDB API
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--"/>
+    </types>
+
+    <versions>
+      <manual version="4.1"/>
+      <manual version="5.0"/>
+      <manual version="5.1"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption id="option_ndb_restore_meta">
+
     <name>restore_meta</name>
+
     <shortdescription lang="en">
       Restore metadata to NDB Cluster using the NDB API
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--restore_meta"/>
       <optype class="cmdline" format="-m"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
+
   <mysqloption id="option_ndb_restore_no-upgrade">
+
     <name>no-upgrade</name>
+
     <shortdescription lang="en">
       Do not upgrade array type for varsize attributes which do not
       already resize VAR data, and do not change column attributes
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--no-upgrade"/>
       <optype class="cmdline" format="-u"/>
     </types>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.19"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_promote-attributes">
+
     <name>promote-attributes</name>
+
     <shortdescription lang="en">
       Allow attributes to be promoted when restoring data from backup
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--promote-attributes"/>
       <optype class="cmdline" format="-A"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
       <introduced version="5.1.23-ndb-6.3.8"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_preserve-trailing-spaces">
+
     <name>preserve-trailing-spaces</name>
+
     <shortdescription lang="en">
-      Allow preservation of tailing spaces (including padding) when CHAR is
-      promoted to VARCHAR or BINARY is promoted to VARBINARY
+      Allow preservation of tailing spaces (including padding) when CHAR
+      is promoted to VARCHAR or BINARY is promoted to VARBINARY
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--preserve-trailing-spaces"/>
       <optype class="cmdline" format="-P"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
       <introduced version="5.1.23-ndb-6.3.8"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_no-restore-disk-objects">
+
     <name>no-restore-disk-objects</name>
+
     <shortdescription lang="en">
-      Do not restore Disk Data objects such as tablespaces and log file groups
+      Do not restore Disk Data objects such as tablespaces and log file
+      groups
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--no-restore-disk-objects"/>
       <optype class="cmdline" format="-d"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_restore_epoch">
+
     <name>restore_epoch</name>
+
     <shortdescription lang="en">
-      Restore epoch info into the status table. Convenient on a
-      MySQL Cluster replication slave for starting
-      replication. The row in mysql.ndb_apply_status with id 0
-      will be updated/inserted.
+      Restore epoch info into the status table. Convenient on a MySQL
+      Cluster replication slave for starting replication. The row in
+      mysql.ndb_apply_status with id 0 will be updated/inserted.
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--restore_epoch"/>
       <optype class="cmdline" format="-e"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
-  
+
   <mysqloption id="option_ndb_restore_skip-table-check">
+
     <name>skip-table-check</name>
+
     <shortdescription lang="en">
       Skip table structure check during restoring of data
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--skip-table-check"/>
       <optype class="cmdline" format="-s"/>
     </types>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.17"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_parallelism">
+
     <name>parallelism</name>
+
     <shortdescription lang="en">
       Number of parallel transactions during restoration of data
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--parallelism=#"/>
       <optype class="cmdline" format="-p"/>
     </types>
+
     <values vartype="numeric" platform="all">
+
       <value default="128"/>
       <value minimum="1"/>
       <value maximum="1024"/>
+
     </values>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
-  
+
   <mysqloption id="option_ndb_restore_print">
+
     <name>print</name>
+
     <shortdescription lang="en">
       Print metadata, data and log to stdout (equivalent to --print_meta
       --print_data --print_log)
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--print"/>
     </types>
+
     <values vartype="boolean" platform="all">
+
       <value default="FALSE"/>
+
     </values>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_print_metadata">
+
     <name>print_metadata</name>
+
     <shortdescription lang="en">
       Print metadata to stdout
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--print_metadata"/>
     </types>
+
     <values vartype="boolean" platform="all">
+
       <value default="FALSE"/>
+
     </values>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_print_data">
+
     <name>print_data</name>
+
     <shortdescription lang="en">
       Print data to stdout
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--print_data"/>
     </types>
+
     <values vartype="boolean" platform="all">
+
       <value default="FALSE"/>
+
     </values>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_print_log">
+
     <name>print_log</name>
+
     <shortdescription lang="en">
       Print to stdout
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--print_log"/>
     </types>
+
     <values vartype="boolean" platform="all">
+
       <value default="FALSE"/>
+
     </values>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_backup_path">
+
     <name>backup_path</name>
+
     <shortdescription lang="en">
       Path to backup files directory
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--backup_path=path"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_dont_ignore_systab_0">
+
     <name>dont_ignore_systab_0</name>
+
     <shortdescription lang="en">
-      Do not ignore system table during restore. Experimental only; not for
-      production use
+      Do not ignore system table during restore. Experimental only; not
+      for production use
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--dont_ignore_systab_0"/>
       <optype class="cmdline" format="-f"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
-  
+
   <mysqloption id="option_ndb_restore_ndb-nodegroup-map">
+
     <name>ndb-nodegroup-map</name>
+
     <shortdescription lang="en">
       Nodegroup map for NDBCLUSTER storage engine. Syntax: list of
       (source_nodegroup, destination_nodegroup)
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--ndb-nodegroup-map=map"/>
       <optype class="cmdline" format="-z"/>
     </types>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
-  
-  
-  
+
   <mysqloption id="option_ndb_restore_fields-enclosed-by">
+
     <name>fields-enclosed-by</name>
+
     <shortdescription lang="en">
       Fields are enclosed with the indicated character
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--fields-enclosed-by=char"/>
     </types>
+
     <values vartype="string" platform="all">
+
       <value default=""/>
+
     </values>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.18"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_fields-terminated-by">
+
     <name>fields-terminated-by</name>
+
     <shortdescription lang="en">
       Fields are terminated by the indicated character
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--fields-terminated-by=char"/>
     </types>
+
     <values vartype="string" platform="all">
+
       <value default="\t (tab)"/>
-    </values>    
+
+    </values>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.18"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_fields-optionally-enclosed-by=char">
+
     <name>fields-optionally-enclosed-by</name>
+
     <shortdescription lang="en">
       Fields are optionally enclosed with the indicated character
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--fields-optionally-enclosed-by"/>
     </types>
+
     <values vartype="string" platform="all">
+
       <value default=""/>
+
     </values>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.18"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_lines-terminated-by">
+
     <name>lines-terminated-by</name>
+
     <shortdescription lang="en">
       Lines are terminated by the indicated character
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--lines-terminated-by=char"/>
     </types>
+
     <values vartype="string" platform="all">
+
       <value default="\n (linebreak)"/>
+
     </values>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.18"/>
     </versions>
+
   </mysqloption>
-  
-  
+
   <mysqloption id="option_ndb_restore_hex">
+
     <name>hex</name>
+
     <shortdescription lang="en">
       Print binary types in hexadecimal format
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--hex"/>
     </types>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.18"/>
     </versions>
+
   </mysqloption>
 
+  <mysqloption id="option_ndb_restore_tab">
 
-  <mysqloption id="option_ndb_restore_tab">
     <name>tab</name>
-    <shortdescription lang="en">Creates tab separated a .txt file for each table
-      in the given path 
+
+    <shortdescription lang="en">
+      Creates tab separated a .txt file for each table in the given path
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--tab=path"/>
       <optype class="cmdline" format="-T"/>
     </types>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.18"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_append">
-    <name>append</name> 
+
+    <name>append</name>
+
     <shortdescription lang="en">
       Append data to a tab-delimited file
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--append"/>
     </types>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.18"/>
     </versions>
+
   </mysqloption>
-  
-  
+
   <mysqloption id="option_ndb_restore_progress-frequency">
+
     <name>progress-frequency</name>
+
     <shortdescription lang="en">
       Print status of restoration each given number of seconds
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--progress-frequency=#"/>
     </types>
+
     <values vartype="numeric" platform="all">
+
       <value default="0"/>
       <value minimum="0"/>
       <value maximum="65535"/>
+
     </values>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.?"/>
     </versions>
+
   </mysqloption>
-  
+
   <mysqloption id="option_ndb_restore_no-binlog">
+
     <name>no-binlog</name>
+
     <shortdescription lang="en">
-      If a mysqld is connected and using binary logging, do not log the restored
-      data
+      If a mysqld is connected and using binary logging, do not log the
+      restored data
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--no-binlog"/>
     </types>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.24-ndb-6.2.16"/>
       <introduced version="5.1.24-ndb-6.3.16"/>
     </versions>
+
   </mysqloption>
-  
-  
+
   <mysqloption id="option_ndb_restore_verbose">
+
     <name>verbose</name>
+
     <shortdescription lang="en">
       Control level of verbosity in output
     </shortdescription>
+
     <types>
       <optype class="cmdline" format="--verbose=#"/>
     </types>
+
     <values vartype="numeric" platform="all">
+
       <value default="1"/>
       <value minimum="0"/>
       <value maximum="255"/>
+
     </values>
+
     <versions>
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>
     </versions>
+
   </mysqloption>
+
 </mysqloptions>
-
-


Modified: trunk/dynamic-docs/command-optvars/ndb_show_tables.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/ndb_show_tables.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/dynamic-docs/command-optvars/ndb_show_tables.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 2; 627 bytes

@@ -72,7 +72,7 @@
     </types>
 
     <values vartype="enumeration" platform="all">
-      
+
       <choice value="0" default="yes">all</choice>
       <choice value="1" default="no">SystemTable</choice>
       <choice value="2" default="no">UserTable</choice>

@@ -169,4 +169,3 @@
   </mysqloption>
 
 </mysqloptions>
-


Modified: trunk/migration-toolkit/extending.xml
===================================================================
--- trunk/migration-toolkit/extending.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/migration-toolkit/extending.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 636 bytes

@@ -27,7 +27,7 @@
       and converts them into GRT objects, and one module that migrates
       the source GRT objects into MySQL GRT objects. The
       &migration_toolkit; then converts the GRT MySQL objects into SQL
-      statements that create the the target MySQL server objects.
+      statements that create the target MySQL server objects.
     </para>
 
     <para>


Modified: trunk/mysqldoc-guide/entities.xml
===================================================================
--- trunk/mysqldoc-guide/entities.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/mysqldoc-guide/entities.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 893 bytes

@@ -94,9 +94,9 @@
     <filename>all-entities.ent</filename> can refer to other entity
     files. Suppose that the XML files in the directory need the
     character entities defined in the
-    <filename>fixedchars.ent</filename> file of the the
+    <filename>fixedchars.ent</filename> file of the
     <filename>common</filename> directory, the URLs defined in the
-    <filename>urls.ent</filename> file of the the
+    <filename>urls.ent</filename> file of the
     <filename>../refman-common</filename> directory, and the
     directory-specific version numbers defined in the
     <filename>versions.ent</filename> file of the main document


Modified: trunk/mysqltest/command-reference.xml
===================================================================
--- trunk/mysqltest/command-reference.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/mysqltest/command-reference.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 573 bytes

@@ -433,7 +433,7 @@
         <para>
           Changes the current user and causes the database specified by
           <replaceable>db_name</replaceable> to become the default
-          database for the the current connection.
+          database for the current connection.
         </para>
 
 <programlisting>


Modified: trunk/ndbapi/class-tablespace.xml
===================================================================
--- trunk/ndbapi/class-tablespace.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/ndbapi/class-tablespace.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 621 bytes

@@ -1202,7 +1202,7 @@
 
       <note>
         <para>
-          There is no method for setting a logfile group as the the
+          There is no method for setting a logfile group as the
           default for a tablespace by referencing the logfile group's
           ID. (In other words, there is no
           <literal>set<replaceable>*</replaceable>()</literal> method


Modified: trunk/ndbapi/ndb-internals.xml
===================================================================
--- trunk/ndbapi/ndb-internals.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/ndbapi/ndb-internals.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 904 bytes

@@ -10417,7 +10417,7 @@
 
       <para>
         This is the tuple manager, which manages the physical storage of
-        cluster data. It consists of the the following files found in
+        cluster data. It consists of the following files found in
         the directory
         <filename>storage/ndb/src/kernel/blocks/dbtup</filename>:
 

@@ -10786,7 +10786,7 @@
 
       <para>
         This kernel block handles the local management of ordered
-        indexes. It consists of the the following files found in the
+        indexes. It consists of the following files found in the
         <filename>storage/ndb/src/kernel/blocks/dbtux</filename>
         directory:
 


Modified: trunk/refman-4.1/backup.xml
===================================================================
--- trunk/refman-4.1/backup.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/backup.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 877 bytes

@@ -122,7 +122,7 @@
 
         <listitem>
           <para>
-            Output is larger than for physical backup, paticularly when
+            Output is larger than for physical backup, particularly when
             saved in text format.
           </para>
         </listitem>

@@ -2664,7 +2664,7 @@
             What percentage of the keyblocks are used. When a table has
             just been reorganized with <command>myisamchk</command>, as
             for the table in the examples, the values are very high
-            (very near the theoretical maximum).
+            (very near theoretical maximum).
           </para>
         </listitem>
 


Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/data-types.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 659 bytes

@@ -3700,7 +3700,7 @@
               one, or neither. (For example, you can specify <literal>ON
               UPDATE</literal> to enable auto-update without also having
               the column auto-initialized.) The following column
-              definitions demonstrate each of the possiblities:
+              definitions demonstrate each of the possibilities:
             </para>
 
             <itemizedlist>


Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/extending-mysql.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 739 bytes

@@ -1895,7 +1895,7 @@
             <literal>simple_expr</literal> parsing rule that defines the
             function parameters. You will need an item for each syntax
             with which the function can be called. For an example that
-            shows how this this is done, check all occurrences of
+            shows how this is done, check all occurrences of
             <literal>ATAN</literal> in <filename>sql_yacc.yy</filename>.
           </para>
         </listitem>


Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/installing.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1133 bytes

@@ -6234,7 +6234,7 @@
 
     <para>
       To see all files in an RPM package (for example, a
-      <literal>MySQL-server</literal> RPM), run a commnd like this:
+      <literal>MySQL-server</literal> RPM), run a command like this:
     </para>
 
 <programlisting>

@@ -10366,7 +10366,7 @@
         may not be able to view all databases. For example, if you have
         assigned the password <quote>secretpass</quote> to the MySQL
         <literal>root</literal> account, then you can invoke
-        <command>mysqlshow</command>and <command>mysql</command> as
+        <command>mysqlshow</command> and <command>mysql</command> as
         shown here:
 
 <programlisting>

@@ -17412,7 +17412,7 @@
         </para>
 
         <para>
-          The maximum file size on an OpenSever 5.0.x system is 2GB.
+          The maximum file size on an OpenServer 5.0.x system is 2GB.
         </para>
 
         <para>


Modified: trunk/refman-4.1/internationalization.xml
===================================================================
--- trunk/refman-4.1/internationalization.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/internationalization.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 841 bytes

@@ -1093,7 +1093,7 @@
           <literal>05</literal> and <literal>5C</literal>) is a valid
           multi-byte character. Hence, the first two bytes of the string
           are interpreted as a single <literal>sjis</literal> character,
-          and the <quote><literal>\</literal></quote> is not intrepreted
+          and the <quote><literal>\</literal></quote> is not interpreted
           as an escape character. The following
           <quote><literal>n</literal></quote> (hex value
           <literal>6E</literal>) is not interpreted as part of an escape


Modified: trunk/refman-4.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-configuration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/mysql-cluster-configuration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1160 bytes

@@ -4224,7 +4224,7 @@
             The default value of this parameter from its of 64 KB; 1M is
             recommended in most situations where the size of the receive
             buffer needs to be set. The minimum possible value is 16K;
-            the theoretical maximum is 4G.
+            theoretical maximum is 4G.
           </para>
         </listitem>
 

@@ -5917,7 +5917,7 @@
     <para>
       It is also important to remember that the disk also handles writes
       to the REDO log and UNDO log, so if you find that the amount of
-      data being written to disk as detemined by the values of
+      data being written to disk as determined by the values of
       <literal>NoOfDiskPagesToDiskAfterRestartACC</literal> and
       <literal>NoOfDiskPagesToDiskAfterRestartTUP</literal> is
       approaching the amount of disk bandwidth available, you may wish


Modified: trunk/refman-4.1/mysql-cluster-limitations.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-limitations.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/mysql-cluster-limitations.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 741 bytes

@@ -1361,7 +1361,7 @@
 
               <para>
                 DDL operations are not node failure safe. If a node
-                fails while trying to peform one of these (such as
+                fails while trying to perform one of these (such as
                 <literal>CREATE TABLE</literal> or <literal>ALTER
                 TABLE</literal>), the data dictionary is locked and no
                 further DDL statements can be executed without


Modified: trunk/refman-4.1/mysql-cluster-management.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-management.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/mysql-cluster-management.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 704 bytes

@@ -2228,7 +2228,7 @@
       <note>
         <para>
           Setting the threshold for <literal>STATISTICS</literal> to 15
-          causes the cluster log to become very verbose, and to gow
+          causes the cluster log to become very verbose, and to grow
           quite rapidly in size, in direct proportion to the number of
           cluster nodes and the amount of activity on the cluster.
         </para>


Modified: trunk/refman-4.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-multi-computer.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/mysql-cluster-multi-computer.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 990 bytes

@@ -480,8 +480,8 @@
       Cluster - Storage engine basic tools</emphasis> RPM (for example,
       <filename>MySQL-ndb-tools-&current-version;-0.glibc23.i386.rpm</filename>),
       which supplies several useful applications for working with a
-      MySQL Cluster. The most important of the these is the MySQL
-      Cluster management client (<command>ndb_mgm</command>). The
+      MySQL Cluster. The most important of these is the MySQL Cluster
+      management client (<command>ndb_mgm</command>). The
       <emphasis role="bold">NDB Cluster - Storage engine extra
       tools</emphasis> RPM (for example,
       <filename>MySQL-ndb-extra-&current-version;-0.glibc23.i386.rpm</filename>)


Modified: trunk/refman-4.1/mysql-cluster-utilities.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-utilities.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/mysql-cluster-utilities.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 756 bytes

@@ -855,7 +855,7 @@
         <para>
           This utility is found in the <filename>libexec</filename>
           directory. It is part of an internal automated test framework
-          used in testing and bedugging MySQL Cluster. Because it can
+          used in testing and debugging MySQL Cluster. Because it can
           control processes on remote systems, it is not advisable to
           use <command>ndb_cpcd</command> in a production cluster.
         </para>


Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/optimization.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 8; 2004 bytes

@@ -4302,11 +4302,11 @@
       <para>
         To delete all rows from a table, <literal>TRUNCATE TABLE
         <replaceable>tbl_name</replaceable></literal> is faster than
-        than <literal>DELETE FROM Truncate operations are not
-        transaction-safe; an error occurs when attempting one in the
-        course of an active transaction or active table lock.
-        <replaceable>tbl_name</replaceable></literal>. See
-        <xref linkend="truncate"/>.
+        than <literal>DELETE FROM
+        <replaceable>tbl_name</replaceable></literal>. Truncate
+        operations are not transaction-safe; an error occurs when
+        attempting one in the course of an active transaction or active
+        table lock. See <xref linkend="truncate"/>.
       </para>
 
     </section>

@@ -5609,7 +5609,7 @@
             You should not start the server with the
             <option>--delay-key-write=ALL</option> option or use the
             <literal>DELAY_KEY_WRITE=1</literal> table option for any
-            shared tables. Otherise, index corruption can occur.
+            shared tables. Otherwise, index corruption can occur.
           </para>
         </listitem>
 

@@ -8821,7 +8821,7 @@
 
         <listitem>
           <para>
-            The <command>myqladmin processlist</command> command
+            The <command>mysqladmin processlist</command> command
             (<xref linkend="mysqladmin"/>)
           </para>
         </listitem>

@@ -10865,7 +10865,7 @@
             </para>
 
             <para>
-              A generic state in which the the thread is waiting for a
+              A generic state in which the thread is waiting for a
               condition to become true. No specific state information is
               available.
             </para>


Modified: trunk/refman-4.1/programs-client.xml
===================================================================
--- trunk/refman-4.1/programs-client.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/programs-client.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 703 bytes

@@ -922,7 +922,7 @@
 
           <para>
             For tabular output, the <quote>boxing</quote> around columns
-            enables one column value to be distinquished from another.
+            enables one column value to be distinguished from another.
             For non-tabular output (such as is produced in batch mode or
             when the <option>--batch</option> or
             <option>--silent</option> option is given), special


Modified: trunk/refman-4.1/programs-using.xml
===================================================================
--- trunk/refman-4.1/programs-using.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/programs-using.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1725 bytes

@@ -729,7 +729,7 @@
     <para>
       Be aware that the use of option prefixes can cause problems in the
       event that new options are implemented for a program. A prefix
-      that is unambigious now might become ambiguous in the future.
+      that is unambiguous now might become ambiguous in the future.
     </para>
 
     <para>

@@ -1767,7 +1767,7 @@
       <para>
         A variable can be specified by writing it in full or as any
         unambiguous prefix. For example, the
-        <literal>max_buffer_length</literal> variable can be set for
+        <literal>max_allowed_packet</literal> variable can be set for
         <command>mysql</command> as <option>--max_a</option>, but not as
         <option>--max</option> because the latter is ambiguous:
       </para>

@@ -1780,7 +1780,7 @@
       <para>
         Be aware that the use of variable prefixes can cause problems in
         the event that new variables are implemented for a program. A
-        prefix that is unambigious now might become ambiguous in the
+        prefix that is unambiguous now might become ambiguous in the
         future.
       </para>
 

@@ -2038,7 +2038,7 @@
 <errortext>ERROR 2005 (HY000): Unknown MySQL server host '--user' (1)</errortext>
 </programlisting>
 
-        Howver, in option files, an equals sign is not assumed. Suppose
+        However, in option files, an equals sign is not assumed. Suppose
         the <filename>my.cnf</filename> file is as shown here:
 
 <programlisting>


Modified: trunk/refman-4.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-definition.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/sql-syntax-data-definition.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 721 bytes

@@ -91,7 +91,8 @@
         common occurrence and may indicate a security breach. Advisors
         provided as part of the MySQL Enterprise Monitor automatically
         alert you when data definition statements are issued. For more
-        information, see <ulink url="&base-url-enterprise;advisors.html"/>.
+        information, see
+        <ulink url="&base-url-enterprise;advisors.html"/>.
       </para>
 
     </formalpara>


Modified: trunk/refman-4.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-manipulation.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/sql-syntax-data-manipulation.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 701 bytes

@@ -1307,7 +1307,7 @@
 
         <listitem>
           <para>
-            To avoid ambigious column reference problems when the
+            To avoid ambiguous column reference problems when the
             <literal>SELECT</literal> and the <literal>INSERT</literal>
             refer to the same table, provide a unique alias for each
             table used in the <literal>SELECT</literal> part, and


Modified: trunk/refman-4.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-server-administration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/sql-syntax-server-administration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 5; 1790 bytes

@@ -270,7 +270,8 @@
         <para>
           For automated notification of users with inappropriate
           privileges, subscribe to the MySQL Enterprise Monitor. For
-          more information, see <ulink url="&base-url-enterprise;advisors.html"/>.
+          more information, see
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>

@@ -1543,8 +1544,8 @@
       </para>
 
       <para>
-        For more information on how the analysis works
-        within<literal>InnoDB</literal>, see
+        For more information on how the analysis works within
+        <literal>InnoDB</literal>, see
         <xref linkend="innodb-restrictions"/>.
       </para>
 

@@ -2870,7 +2871,8 @@
       <para>
         The MySQL Enterprise Monitor makes extensive use of system
         variables to determine the state of your server. For more
-        information see <ulink url="&base-url-enterprise;advisors.html"/>.
+        information see
+        <ulink url="&base-url-enterprise;advisors.html"/>.
       </para>
 
     </formalpara>

@@ -4225,7 +4227,8 @@
           statement provides valuable information about the state of
           your server. For expert interpretation of this information,
           subscribe to the MySQL Enterprise Monitor. For more
-          information see <ulink url="&base-url-enterprise;advisors.html"/>.
+          information see
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>


Modified: trunk/refman-4.1/sql-syntax-utility.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-utility.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-4.1/sql-syntax-utility.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1103 bytes

@@ -281,7 +281,7 @@
     <para>
       The following descriptions indicate the forms that the result set
       can take. Output for the example statements is shown using the
-      familar <quote>tabular</quote> or <quote>vertical</quote> format
+      familiar <quote>tabular</quote> or <quote>vertical</quote> format
       that you see when using the <command>mysql</command> client, but
       note that <command>mysql</command> itself reformats
       <literal>HELP</literal> result sets in a different way.

@@ -326,8 +326,8 @@
 
           <listitem>
             <para>
-              <literal>example</literal>: Usage example or exmples. This
-              column might be blank.
+              <literal>example</literal>: Usage example or examples.
+              This column might be blank.
             </para>
           </listitem>
 


Modified: trunk/refman-5.0/backup.xml
===================================================================
--- trunk/refman-5.0/backup.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/backup.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 877 bytes

@@ -122,7 +122,7 @@
 
         <listitem>
           <para>
-            Output is larger than for physical backup, paticularly when
+            Output is larger than for physical backup, particularly when
             saved in text format.
           </para>
         </listitem>

@@ -2636,7 +2636,7 @@
             What percentage of the keyblocks are used. When a table has
             just been reorganized with <command>myisamchk</command>, as
             for the table in the examples, the values are very high
-            (very near the theoretical maximum).
+            (very near theoretical maximum).
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/data-types.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 659 bytes

@@ -3462,7 +3462,7 @@
               one, or neither. (For example, you can specify <literal>ON
               UPDATE</literal> to enable auto-update without also having
               the column auto-initialized.) The following column
-              definitions demonstrate each of the possiblities:
+              definitions demonstrate each of the possibilities:
             </para>
 
             <itemizedlist>


Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/extending-mysql.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 739 bytes

@@ -2009,7 +2009,7 @@
             <literal>simple_expr</literal> parsing rule that defines the
             function parameters. You will need an item for each syntax
             with which the function can be called. For an example that
-            shows how this this is done, check all occurrences of
+            shows how this is done, check all occurrences of
             <literal>ATAN</literal> in <filename>sql_yacc.yy</filename>.
           </para>
         </listitem>


Modified: trunk/refman-5.0/faqs.xml
===================================================================
--- trunk/refman-5.0/faqs.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/faqs.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 480 bytes

@@ -62,7 +62,7 @@
         <question>
 
           <para>
-            Can MySQL &current-series; peform multiple-table inserts,
+            Can MySQL &current-series; perform multiple-table inserts,
             updates, and deletes?
           </para>
 


Modified: trunk/refman-5.0/installing-cs-core.xml
===================================================================
--- trunk/refman-5.0/installing-cs-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/installing-cs-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1776 bytes

@@ -4052,7 +4052,7 @@
             different service name for each version that you install. If
             you do not choose a different service for each installed
             version then the service manager information will be
-            inconsitent and this will cause problems when you try to
+            inconsistent and this will cause problems when you try to
             uninstall a previous version.
           </para>
 

@@ -10291,7 +10291,7 @@
         <para>
           You can build MySQL on Windows by using a combination of
           <command>cmake</command> and Microsoft Visual Studio .NET 2003
-          (7.1), Micrsofot Visual Studio 2005 (8.0) or Microsoft Visual
+          (7.1), Microsoft Visual Studio 2005 (8.0) or Microsoft Visual
           C++ 2005 Express Edition. You must have the appropriate
           Microsoft Platform SDK installed.
         </para>

@@ -11079,7 +11079,7 @@
         may not be able to view all databases. For example, if you have
         assigned the password <quote>secretpass</quote> to the MySQL
         <literal>root</literal> account, then you can invoke
-        <command>mysqlshow</command>and <command>mysql</command> as
+        <command>mysqlshow</command> and <command>mysql</command> as
         shown here:
 
 <programlisting>

@@ -17870,7 +17870,7 @@
         </para>
 
         <para>
-          The maximum file size on an OpenSever 5.0.x system is 2GB.
+          The maximum file size on an OpenServer 5.0.x system is 2GB.
         </para>
 
         <para>


Modified: trunk/refman-5.0/internationalization.xml
===================================================================
--- trunk/refman-5.0/internationalization.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/internationalization.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 6; 2321 bytes

@@ -1087,7 +1087,7 @@
           <literal>05</literal> and <literal>5C</literal>) is a valid
           multi-byte character. Hence, the first two bytes of the string
           are interpreted as a single <literal>sjis</literal> character,
-          and the <quote><literal>\</literal></quote> is not intrepreted
+          and the <quote><literal>\</literal></quote> is not interpreted
           as an escape character. The following
           <quote><literal>n</literal></quote> (hex value
           <literal>6E</literal>) is not interpreted as part of an escape

@@ -6378,8 +6378,8 @@
 </programlisting>
 
       <para>
-        For the ouput just shown, you could choose an ID higher than 210
-        for the new collation.
+        For the output just shown, you could choose an ID higher than
+        210 for the new collation.
       </para>
 
       <para>

@@ -6555,7 +6555,7 @@
       <title>Adding a UCA Collation to a Unicode Character Set</title>
 
       <para>
-        UCA collations for Unicode character serts can be added to MySQL
+        UCA collations for Unicode character sets can be added to MySQL
         without recompiling by using a subset of the Locale Data Markup
         Language (LDML), which is available at
         <ulink url="http://www.unicode.org/reports/tr35/"/>. In

@@ -6661,7 +6661,7 @@
 
         <listitem>
           <para>
-            Use secondary differences to distiguish accent variations.
+            Use secondary differences to distinguish accent variations.
           </para>
         </listitem>
 

@@ -7433,7 +7433,7 @@
       default value is <literal>'en_US'</literal> regardless of your
       system's locale setting, but you can set the value at server
       startup or set the <literal>GLOBAL</literal> value if you have the
-      <literal>SUPER</literal> privilge. Any client can examine the
+      <literal>SUPER</literal> privilege. Any client can examine the
       value of <literal>lc_time_names</literal> or set its
       <literal>SESSION</literal> value to affect the locale for its own
       connection.


Modified: trunk/refman-5.0/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-configuration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/mysql-cluster-configuration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1160 bytes

@@ -4266,7 +4266,7 @@
             The default value of this parameter from its of 64 KB; 1M is
             recommended in most situations where the size of the receive
             buffer needs to be set. The minimum possible value is 16K;
-            the theoretical maximum is 4G.
+            theoretical maximum is 4G.
           </para>
         </listitem>
 

@@ -5968,7 +5968,7 @@
     <para>
       It is also important to remember that the disk also handles writes
       to the REDO log and UNDO log, so if you find that the amount of
-      data being written to disk as detemined by the values of
+      data being written to disk as determined by the values of
       <literal>NoOfDiskPagesToDiskAfterRestartACC</literal> and
       <literal>NoOfDiskPagesToDiskAfterRestartTUP</literal> is
       approaching the amount of disk bandwidth available, you may wish


Modified: trunk/refman-5.0/mysql-cluster-limitations.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-limitations.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/mysql-cluster-limitations.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 801 bytes

@@ -1281,7 +1281,7 @@
                 DDL operations (such as <literal>CREATE TABLE</literal>
                 or <literal>ALTER TABLE</literal>) are not safe from
                 data node failures. If a data node fails while trying to
-                peform one of these, the data dictionary is locked and
+                perform one of these, the data dictionary is locked and
                 no further DDL statements can be executed without
                 restarting the cluster.
               </para>


Modified: trunk/refman-5.0/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-management.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/mysql-cluster-management.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 704 bytes

@@ -2264,7 +2264,7 @@
       <note>
         <para>
           Setting the threshold for <literal>STATISTICS</literal> to 15
-          causes the cluster log to become very verbose, and to gow
+          causes the cluster log to become very verbose, and to grow
           quite rapidly in size, in direct proportion to the number of
           cluster nodes and the amount of activity on the cluster.
         </para>


Modified: trunk/refman-5.0/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-multi-computer.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/mysql-cluster-multi-computer.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 990 bytes

@@ -470,8 +470,8 @@
       Cluster - Storage engine basic tools</emphasis> RPM (for example,
       <filename>MySQL-ndb-tools-&current-version;-0.glibc23.i386.rpm</filename>),
       which supplies several useful applications for working with a
-      MySQL Cluster. The most important of the these is the MySQL
-      Cluster management client (<command>ndb_mgm</command>). The
+      MySQL Cluster. The most important of these is the MySQL Cluster
+      management client (<command>ndb_mgm</command>). The
       <emphasis role="bold">NDB Cluster - Storage engine extra
       tools</emphasis> RPM (for example,
       <filename>MySQL-ndb-extra-&current-version;-0.glibc23.i386.rpm</filename>)


Modified: trunk/refman-5.0/mysql-cluster-utilities.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-utilities.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/mysql-cluster-utilities.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 756 bytes

@@ -856,7 +856,7 @@
         <para>
           This utility is found in the <filename>libexec</filename>
           directory. It is part of an internal automated test framework
-          used in testing and bedugging MySQL Cluster. Because it can
+          used in testing and debugging MySQL Cluster. Because it can
           control processes on remote systems, it is not advisable to
           use <command>ndb_cpcd</command> in a production cluster.
         </para>


Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/optimization.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 5, Lines Added: 9, Lines Deleted: 9; 2567 bytes

@@ -3224,7 +3224,7 @@
         This optimization improves the efficiency of a direct comparison
         between a non-indexed column and a constant. In such cases, the
         condition is <quote>pushed down</quote> to the storage engine
-        for evaluation. In MySQL &current-series;, this optimzation can
+        for evaluation. In MySQL &current-series;, this optimization can
         be used only by the <literal>NDBCLUSTER</literal> storage
         engine, but we intend to implement it for additional storage
         engines in future versions of MySQL.

@@ -6548,11 +6548,11 @@
       <para>
         To delete all rows from a table, <literal>TRUNCATE TABLE
         <replaceable>tbl_name</replaceable></literal> is faster than
-        than <literal>DELETE FROM Truncate operations are not
-        transaction-safe; an error occurs when attempting one in the
-        course of an active transaction or active table lock.
-        <replaceable>tbl_name</replaceable></literal>. See
-        <xref linkend="truncate"/>.
+        than <literal>DELETE FROM
+        <replaceable>tbl_name</replaceable></literal>. Truncate
+        operations are not transaction-safe; an error occurs when
+        attempting one in the course of an active transaction or active
+        table lock. See <xref linkend="truncate"/>.
       </para>
 
     </section>

@@ -7867,7 +7867,7 @@
             You should not start the server with the
             <option>--delay-key-write=ALL</option> option or use the
             <literal>DELAY_KEY_WRITE=1</literal> table option for any
-            shared tables. Otherise, index corruption can occur.
+            shared tables. Otherwise, index corruption can occur.
           </para>
         </listitem>
 

@@ -11226,7 +11226,7 @@
 
         <listitem>
           <para>
-            The <command>myqladmin processlist</command> command
+            The <command>mysqladmin processlist</command> command
             (<xref linkend="mysqladmin"/>)
           </para>
         </listitem>

@@ -13275,7 +13275,7 @@
             </para>
 
             <para>
-              A generic state in which the the thread is waiting for a
+              A generic state in which the thread is waiting for a
               condition to become true. No specific state information is
               available.
             </para>


Modified: trunk/refman-5.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.0/programs-admin-util-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/programs-admin-util-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 692 bytes

@@ -6554,7 +6554,7 @@
         Use of the <option>--password</option> option fails if
         <command>mysqlmanager</command> is invoked directly from an IBM
         5250 terminal. To work around this, use a command like the
-        following from the coommand line to generate the password entry:
+        following from the command line to generate the password entry:
       </para>
 
 <programlisting>


Modified: trunk/refman-5.0/programs-client-core.xml
===================================================================
--- trunk/refman-5.0/programs-client-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/programs-client-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1282 bytes

@@ -979,7 +979,7 @@
 
           <para>
             For tabular output, the <quote>boxing</quote> around columns
-            enables one column value to be distinquished from another.
+            enables one column value to be distinguished from another.
             For non-tabular output (such as is produced in batch mode or
             when the <option>--batch</option> or
             <option>--silent</option> option is given), special

@@ -6151,7 +6151,7 @@
             One use for this option is to cause
             <command>mysqldump</command> to continue executing even when
             it encounters a view that has become invalid because the
-            defintion refers to a table that has been dropped. Without
+            definition refers to a table that has been dropped. Without
             <option>--force</option>, <command>mysqldump</command> exits
             with an error message. With <option>--force</option>,
             <command>mysqldump</command> prints the error message, but


Modified: trunk/refman-5.0/programs-installation.xml
===================================================================
--- trunk/refman-5.0/programs-installation.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/programs-installation.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 712 bytes

@@ -1370,7 +1370,7 @@
           <emphasis>before</emphasis> you upgrade your MySQL
           installation and run <command>mysql_upgrade</command>. See
           <xref linkend="upgrade"/>, for instructions on determining
-          whether any such incompatibilies apply to your installation
+          whether any such incompatibilities apply to your installation
           and how to handle them.
         </para>
       </caution>


Modified: trunk/refman-5.0/programs-using.xml
===================================================================
--- trunk/refman-5.0/programs-using.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/programs-using.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1725 bytes

@@ -725,7 +725,7 @@
     <para>
       Be aware that the use of option prefixes can cause problems in the
       event that new options are implemented for a program. A prefix
-      that is unambigious now might become ambiguous in the future.
+      that is unambiguous now might become ambiguous in the future.
     </para>
 
     <para>

@@ -1795,7 +1795,7 @@
       <para>
         A variable can be specified by writing it in full or as any
         unambiguous prefix. For example, the
-        <literal>max_buffer_length</literal> variable can be set for
+        <literal>max_allowed_packet</literal> variable can be set for
         <command>mysql</command> as <option>--max_a</option>, but not as
         <option>--max</option> because the latter is ambiguous:
       </para>

@@ -1808,7 +1808,7 @@
       <para>
         Be aware that the use of variable prefixes can cause problems in
         the event that new variables are implemented for a program. A
-        prefix that is unambigious now might become ambiguous in the
+        prefix that is unambiguous now might become ambiguous in the
         future.
       </para>
 

@@ -2038,7 +2038,7 @@
 <errortext>ERROR 2005 (HY000): Unknown MySQL server host '--user' (1)</errortext>
 </programlisting>
 
-        Howver, in option files, an equals sign is not assumed. Suppose
+        However, in option files, an equals sign is not assumed. Suppose
         the <filename>my.cnf</filename> file is as shown here:
 
 <programlisting>


Modified: trunk/refman-5.0/replication-configuration.xml
===================================================================
--- trunk/refman-5.0/replication-configuration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/replication-configuration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 820 bytes

@@ -1190,8 +1190,8 @@
                 <listitem>
                   <para>
                     Copy the contents of the existing slave&apos;s relay
-                    log index file into the the new slave&apos;s relay
-                    log index file, making sure to overwrite any content
+                    log index file into the new slave&apos;s relay log
+                    index file, making sure to overwrite any content
                     already in the file.
                   </para>
                 </listitem>


Modified: trunk/refman-5.0/replication-solutions.xml
===================================================================
--- trunk/refman-5.0/replication-solutions.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/replication-solutions.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1199 bytes

@@ -808,7 +808,7 @@
       time, using the <literal>CHANGE MASTER TO</literal> statement. The
       slave will not check whether the databases on the master are
       compatible with the slave, it will just start executing events
-      from the specified log and postition on the new master. In a
+      from the specified log and position on the new master. In a
       failover situation all the servers in the group are probably
       executing the same events from the same binary log, so changing
       the source of the events should not affect the database structure

@@ -1007,7 +1007,7 @@
 
     <para>
       To enable SSL on the master you will need to create or obtain
-      suitable certficates and then add the following configuration
+      suitable certificates and then add the following configuration
       options to the master's configuration within the
       <literal>mysqld</literal> section:
     </para>


Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/restrictions.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 535 bytes

@@ -270,8 +270,7 @@
 
     <para>
       Use of stored routines can cause replication problems. This issue
-      is discussed further in
-      <xref linkend="stored-programs-logging"/>.
+      is discussed further in <xref linkend="stored-programs-logging"/>.
     </para>
 
     <para>


Modified: trunk/refman-5.0/se-federated.xml
===================================================================
--- trunk/refman-5.0/se-federated.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/se-federated.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 666 bytes

@@ -145,8 +145,8 @@
 
       <listitem>
         <para>
-          The remote server processes the statement and the the local
-          server retrieves any result that the statement produces (an
+          The remote server processes the statement and the local server
+          retrieves any result that the statement produces (an
           affected-rows count or a result set).
         </para>
       </listitem>


Modified: trunk/refman-5.0/se-merge.xml
===================================================================
--- trunk/refman-5.0/se-merge.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/se-merge.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 663 bytes

@@ -220,8 +220,8 @@
     <listitem>
       <para>
         Underlying table must have at least the same amount of keys that
-        merge table has. The underlying table may have morekeys than the
-        <literal>MERGE</literal> table, but cannot have less.
+        merge table has. The underlying table may have more keys than
+        the <literal>MERGE</literal> table, but cannot have less.
       </para>
 
       <note>


Modified: trunk/refman-5.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-manipulation.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/sql-syntax-data-manipulation.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 701 bytes

@@ -1410,7 +1410,7 @@
 
         <listitem>
           <para>
-            To avoid ambigious column reference problems when the
+            To avoid ambiguous column reference problems when the
             <literal>SELECT</literal> and the <literal>INSERT</literal>
             refer to the same table, provide a unique alias for each
             table used in the <literal>SELECT</literal> part, and


Modified: trunk/refman-5.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 9, Lines Added: 20, Lines Deleted: 14; 4185 bytes

@@ -42,7 +42,8 @@
         In a production environment it is always prudent to examine any
         changes to users' accounts. The MySQL Enterprise Monitor
         provides notification whenever users' privileges are altered.
-        For more information, see <ulink url="&base-url-enterprise;advisors.html"/>.
+        For more information, see
+        <ulink url="&base-url-enterprise;advisors.html"/>.
       </para>
 
     </formalpara>

@@ -371,7 +372,8 @@
         <para>
           For automated notification of users with inappropriate
           privileges, subscribe to the MySQL Enterprise Monitor. For
-          more information, see <ulink url="&base-url-enterprise;advisors.html"/>.
+          more information, see
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>

@@ -1067,7 +1069,8 @@
           MySQL server. Subscribers to the MySQL Enterprise Monitor are
           alerted when servers are started without the
           <option>--skip-show-database</option> option. For more
-          information, see <ulink url="&base-url-enterprise;advisors.html"/>.
+          information, see
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>

@@ -1739,7 +1742,8 @@
         <para>
           For automated notification of users without passwords,
           subscribe to the MySQL Enterprise Monitor. For more
-          information see <ulink url="&base-url-enterprise;advisors.html"/>.
+          information see
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>

@@ -1789,8 +1793,8 @@
       </para>
 
       <para>
-        For more information on how the analysis works
-        within<literal>InnoDB</literal>, see
+        For more information on how the analysis works within
+        <literal>InnoDB</literal>, see
         <xref linkend="innodb-restrictions"/>.
       </para>
 

@@ -3239,7 +3243,8 @@
       <para>
         The MySQL Enterprise Monitor makes extensive use of system
         variables to determine the state of your server. For more
-        information see <ulink url="&base-url-enterprise;advisors.html"/>.
+        information see
+        <ulink url="&base-url-enterprise;advisors.html"/>.
       </para>
 
     </formalpara>

@@ -4801,7 +4806,8 @@
           statement provides valuable information about the state of
           your server. For expert interpretation of this information,
           subscribe to the MySQL Enterprise Monitor. For more
-          information see <ulink url="&base-url-enterprise;advisors.html"/>.
+          information see
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>

@@ -6244,10 +6250,10 @@
           <para>
             The statement that the thread is executing, or
             <literal>NULL</literal> if it is not executing any
-            statement. The statment might be the one sent to the server,
-            or an innermost statement if the statement executes other
-            statements. For example, if a <literal>CALL p1()</literal>
-            statement executes a stored procedure
+            statement. The statement might be the one sent to the
+            server, or an innermost statement if the statement executes
+            other statements. For example, if a <literal>CALL
+            p1()</literal> statement executes a stored procedure
             <literal>p1()</literal>, and the procedure is executing a
             <literal>SELECT</literal> statement, the
             <literal>Info</literal> value shows the

@@ -7754,8 +7760,8 @@
 
       <para>
         For the trigger <literal>ins_sum</literal> as defined in
-        <xref linkend="triggers"/>, the output of this statement
-        is as shown here:
+        <xref linkend="triggers"/>, the output of this statement is as
+        shown here:
       </para>
 
 <programlisting>


Modified: trunk/refman-5.0/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-transactions.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/sql-syntax-transactions.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 701 bytes

@@ -1816,7 +1816,8 @@
           this subject in the Knowledge Base article,
           <ulink url="https://kb.mysql.com/view.php?id=5199"> Can I Undo
           a Set of SQL Statements?</ulink> To subscribe to MySQL
-          Enterprise see <ulink url="&base-url-enterprise;advisors.html"/>.
+          Enterprise see
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>


Modified: trunk/refman-5.0/sql-syntax-utility.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-utility.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.0/sql-syntax-utility.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1103 bytes

@@ -282,7 +282,7 @@
     <para>
       The following descriptions indicate the forms that the result set
       can take. Output for the example statements is shown using the
-      familar <quote>tabular</quote> or <quote>vertical</quote> format
+      familiar <quote>tabular</quote> or <quote>vertical</quote> format
       that you see when using the <command>mysql</command> client, but
       note that <command>mysql</command> itself reformats
       <literal>HELP</literal> result sets in a different way.

@@ -327,8 +327,8 @@
 
           <listitem>
             <para>
-              <literal>example</literal>: Usage example or exmples. This
-              column might be blank.
+              <literal>example</literal>: Usage example or examples.
+              This column might be blank.
             </para>
           </listitem>
 


Modified: trunk/refman-5.1/backup.xml
===================================================================
--- trunk/refman-5.1/backup.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/backup.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 877 bytes

@@ -122,7 +122,7 @@
 
         <listitem>
           <para>
-            Output is larger than for physical backup, paticularly when
+            Output is larger than for physical backup, particularly when
             saved in text format.
           </para>
         </listitem>

@@ -2645,7 +2645,7 @@
             What percentage of the keyblocks are used. When a table has
             just been reorganized with <command>myisamchk</command>, as
             for the table in the examples, the values are very high
-            (very near the theoretical maximum).
+            (very near theoretical maximum).
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/data-types.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1012 bytes

@@ -3281,7 +3281,7 @@
               one, or neither. (For example, you can specify <literal>ON
               UPDATE</literal> to enable auto-update without also having
               the column auto-initialized.) The following column
-              definitions demonstrate each of the possiblities:
+              definitions demonstrate each of the possibilities:
             </para>
 
             <itemizedlist>

@@ -4403,7 +4403,7 @@
       </para>
 
       <para>
-        Beginning with MySQL MySQL 5.1.24, truncation of excess trailing
+        Beginning with MySQL 5.1.24, truncation of excess trailing
         spaces from values to be inserted into <literal>TEXT</literal>
         columns always generates a warning, regardless of the SQL mode.
         (Bug #30059)


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/dba-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1147 bytes

@@ -1032,7 +1032,7 @@
           <para>
             Enable support for named pipes. This option applies only on
             Windows NT, 2000, XP, and 2003 systems. For MySQL 5.1.20 and
-            earler, this option is available only when using the
+            earlier, this option is available only when using the
             <command>mysqld-nt</command> and
             <literal>mysqld-debug</literal> servers that support
             named-pipe connections. For MySQL 5.1.21 and later,

@@ -14250,8 +14250,8 @@
 
                 <listitem>
                   <para>
-                    Beginning with MySQL MySQL 5.1.24, when a statement
-                    refers to one or more system variables. (Bug #31168)
+                    Beginning with MySQL 5.1.24, when a statement refers
+                    to one or more system variables. (Bug #31168)
                   </para>
                 </listitem>
 


Modified: trunk/refman-5.1/faqs.xml
===================================================================
--- trunk/refman-5.1/faqs.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/faqs.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 480 bytes

@@ -62,7 +62,7 @@
         <question>
 
           <para>
-            Can MySQL &current-series; peform multiple-table inserts,
+            Can MySQL &current-series; perform multiple-table inserts,
             updates, and deletes?
           </para>
 


Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/functions-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 617 bytes

@@ -9984,7 +9984,7 @@
         </para>
 
         <para>
-          Beginning with MySQL MySQL 5.1.24, it is possible to use
+          Beginning with MySQL 5.1.24, it is possible to use
           <literal>MICROSECOND</literal> in place of
           <literal>FRAC_SECOND</literal> with this function, and
           <literal>FRAC_SECOND</literal> is deprecated.


Modified: trunk/refman-5.1/installing-core-new-tmp.xml
===================================================================
--- trunk/refman-5.1/installing-core-new-tmp.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/installing-core-new-tmp.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 755 bytes

@@ -3208,7 +3208,7 @@
             <para>
               You can build MySQL on Windows by using a combination of
               <command>cmake</command> and Microsoft Visual Studio .NET
-              2003 (7.1), Micrsofot Visual Studio 2005 (8.0) or
+              2003 (7.1), Microsoft Visual Studio 2005 (8.0) or
               Microsoft Visual C++ 2005 Express Edition. You must have
               the appropriate Microsoft Platform SDK installed.
             </para>


Modified: trunk/refman-5.1/installing-core.xml
===================================================================
--- trunk/refman-5.1/installing-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/installing-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 5; 2022 bytes

@@ -3867,7 +3867,7 @@
             different service name for each version that you install. If
             you do not choose a different service for each installed
             version then the service manager information will be
-            inconsitent and this will cause problems when you try to
+            inconsistent and this will cause problems when you try to
             uninstall a previous version.
           </para>
 

@@ -6032,7 +6032,7 @@
 
     <para>
       To see all files in an RPM package (for example, a
-      <literal>MySQL-server</literal> RPM), run a commnd like this:
+      <literal>MySQL-server</literal> RPM), run a command like this:
     </para>
 
 <programlisting>

@@ -9795,7 +9795,7 @@
         <para>
           You can build MySQL on Windows by using a combination of
           <command>cmake</command> and Microsoft Visual Studio .NET 2003
-          (7.1), Micrsofot Visual Studio 2005 (8.0) or Microsoft Visual
+          (7.1), Microsoft Visual Studio 2005 (8.0) or Microsoft Visual
           C++ 2005 Express Edition. You must have the appropriate
           Microsoft Platform SDK installed.
         </para>

@@ -10348,7 +10348,7 @@
         may not be able to view all databases. For example, if you have
         assigned the password <quote>secretpass</quote> to the MySQL
         <literal>root</literal> account, then you can invoke
-        <command>mysqlshow</command>and <command>mysql</command> as
+        <command>mysqlshow</command> and <command>mysql</command> as
         shown here:
 
 <programlisting>

@@ -16778,7 +16778,7 @@
         </para>
 
         <para>
-          The maximum file size on an OpenSever 5.0.x system is 2GB.
+          The maximum file size on an OpenServer 5.0.x system is 2GB.
         </para>
 
         <para>


Modified: trunk/refman-5.1/internationalization.xml
===================================================================
--- trunk/refman-5.1/internationalization.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/internationalization.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 6; 2321 bytes

@@ -1087,7 +1087,7 @@
           <literal>05</literal> and <literal>5C</literal>) is a valid
           multi-byte character. Hence, the first two bytes of the string
           are interpreted as a single <literal>sjis</literal> character,
-          and the <quote><literal>\</literal></quote> is not intrepreted
+          and the <quote><literal>\</literal></quote> is not interpreted
           as an escape character. The following
           <quote><literal>n</literal></quote> (hex value
           <literal>6E</literal>) is not interpreted as part of an escape

@@ -6376,8 +6376,8 @@
 </programlisting>
 
       <para>
-        For the ouput just shown, you could choose an ID higher than 210
-        for the new collation.
+        For the output just shown, you could choose an ID higher than
+        210 for the new collation.
       </para>
 
       <para>

@@ -6553,7 +6553,7 @@
       <title>Adding a UCA Collation to a Unicode Character Set</title>
 
       <para>
-        UCA collations for Unicode character serts can be added to MySQL
+        UCA collations for Unicode character sets can be added to MySQL
         without recompiling by using a subset of the Locale Data Markup
         Language (LDML), which is available at
         <ulink url="http://www.unicode.org/reports/tr35/"/>. In

@@ -6659,7 +6659,7 @@
 
         <listitem>
           <para>
-            Use secondary differences to distiguish accent variations.
+            Use secondary differences to distinguish accent variations.
           </para>
         </listitem>
 

@@ -7431,7 +7431,7 @@
       default value is <literal>'en_US'</literal> regardless of your
       system's locale setting, but you can set the value at server
       startup or set the <literal>GLOBAL</literal> value if you have the
-      <literal>SUPER</literal> privilge. Any client can examine the
+      <literal>SUPER</literal> privilege. Any client can examine the
       value of <literal>lc_time_names</literal> or set its
       <literal>SESSION</literal> value to affect the locale for its own
       connection.


Modified: trunk/refman-5.1/language-structure-core.xml
===================================================================
--- trunk/refman-5.1/language-structure-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/language-structure-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 817 bytes

@@ -1774,7 +1774,7 @@
         interpretation are those listed in the
         <literal>sql_functions[]</literal> array of the
         <filename>sql/lex.h</filename> source file. Before MySQL 5.1,
-        these are are rather numerous (about 200), so you may find it
+        these are rather numerous (about 200), so you may find it
         easiest to treat the no-whitespace requirement as applying to
         all function calls. In MySQL 5.1, parser improvements reduce to
         about 30 the number of affected function names.


Modified: trunk/refman-5.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-configuration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/mysql-cluster-configuration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 5, Lines Added: 7, Lines Deleted: 7; 2670 bytes

@@ -2360,7 +2360,7 @@
 
       <para>
         This parameter was introduced in MySQL 5.1.20, MySQL Cluster NDB
-        6.1.12 and MySQL MySQL Cluster NDB 6.2.3.
+        6.1.12 and MySQL Cluster NDB 6.2.3.
       </para>
 
       <formalpara>

@@ -2461,12 +2461,12 @@
             size of redo log files. This can be useful in situations
             when MySQL Cluster is operating under a high load and it is
             unable to close fragment log files quickly enough before
-            attemtping to open new ones (only 2 fragment log files can
+            attempting to open new ones (only 2 fragment log files can
             be open at one time); increasing the size of the fragment
             log files gives the cluster more time before having to open
             each new fragment log file. The default value for this
             parameter is 16M. <literal>FragmentLogFileSize</literal> was
-            added in MySQL MySQL Cluster NDB 6.1.11.
+            added in MySQL Cluster NDB 6.1.11.
           </para>
 
           <para>

@@ -4968,7 +4968,7 @@
             The default value of this parameter from its of 64 KB; 1M is
             recommended in most situations where the size of the receive
             buffer needs to be set. The minimum possible value is 16K;
-            the theoretical maximum is 4G.
+            theoretical maximum is 4G.
           </para>
         </listitem>
 

@@ -5974,8 +5974,8 @@
             </row>
             <row>
               <entry><literal><link linkend="mysql-cluster-param-ndbd-definition-maxallocate">MaxAllocate</link></literal>
-                (Added in MySQL Cluster NDB 6.1.12 and MySQL MySQL
-                Cluster NDB 6.2.3)</entry>
+                (Added in MySQL Cluster NDB 6.1.12 and MySQL Cluster NDB
+                6.2.3)</entry>
               <entry>integer (bytes)</entry>
               <entry>32M</entry>
               <entry>1M</entry>

@@ -6916,7 +6916,7 @@
     <para>
       It is also important to remember that the disk also handles writes
       to the REDO log, so if you find that the amount of data being
-      written to disk as detemined by the values of
+      written to disk as determined by the values of
       <literal>NoOfDiskPagesToDiskAfterRestartACC</literal> and
       <literal>NoOfDiskPagesToDiskAfterRestartTUP</literal> is
       approaching the amount of disk bandwidth available, you may wish


Modified: trunk/refman-5.1/mysql-cluster-limitations.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-limitations.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/mysql-cluster-limitations.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 801 bytes

@@ -1451,7 +1451,7 @@
                 DDL operations (such as <literal>CREATE TABLE</literal>
                 or <literal>ALTER TABLE</literal>) are not safe from
                 data node failures. If a data node fails while trying to
-                peform one of these, the data dictionary is locked and
+                perform one of these, the data dictionary is locked and
                 no further DDL statements can be executed without
                 restarting the cluster.
               </para>


Modified: trunk/refman-5.1/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-management.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/mysql-cluster-management.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 704 bytes

@@ -2320,7 +2320,7 @@
       <note>
         <para>
           Setting the threshold for <literal>STATISTICS</literal> to 15
-          causes the cluster log to become very verbose, and to gow
+          causes the cluster log to become very verbose, and to grow
           quite rapidly in size, in direct proportion to the number of
           cluster nodes and the amount of activity on the cluster.
         </para>


Modified: trunk/refman-5.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-multi-computer.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/mysql-cluster-multi-computer.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 843 bytes

@@ -472,7 +472,7 @@
       Cluster - Storage engine basic tools</emphasis> RPM (for example,
       <filename>MySQL-ndb-tools-&current-version;-0.glibc23.i386.rpm</filename>),
       which supplies several useful applications for working with a
-      MySQL Cluster. The most important of the these is the MySQL
+      MySQL Cluster. The most important of these is the MySQL
       Cluster management client (<command>ndb_mgm</command>). The
       <emphasis role="bold">NDB Cluster - Storage engine extra
       tools</emphasis> RPM (for example,


Modified: trunk/refman-5.1/mysql-cluster-optvar-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-optvar-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/mysql-cluster-optvar-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 1476 bytes

@@ -439,11 +439,11 @@
         </para>
 
         <para>
-          Begiunning with MySQL Cluster NDB 6.3.4, this option takes one
+          Beginning with MySQL Cluster NDB 6.3.4, this option takes one
           of the integer values <literal>0</literal>,
           <literal>1</literal>, <literal>2</literal>, or
-          <literal>3</literal>, with <literal>1</literal> being the
-          default. These values affect node selection as follows:
+          <literal>3</literal>. <literal>1</literal> is the default.
+          These values affect node selection as follows:
 
           <itemizedlist>
 

@@ -461,8 +461,8 @@
             <listitem>
               <para>
                 <literal>1</literal>: If a data node process is running
-                on the the same host as the SQL node, this data node is
-                used as the transaction coordinator. (This is the same
+                on the same host as the SQL node, this data node is used
+                as the transaction coordinator. (This is the same
                 behavior as caused by setting this option to
                 <literal>1</literal> or <literal>ON</literal> in
                 previous MySQL versions.)


Modified: trunk/refman-5.1/mysql-cluster-replication.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-replication.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/mysql-cluster-replication.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1608 bytes

@@ -791,7 +791,7 @@
                 given previously may not apply. See
                 <citetitle>Replication from
                 <literal>NDBCLUSTER</literal> to other storage
-                engines</citetitle> elsewhere in this this section for
+                engines</citetitle> elsewhere in this section for
                 details.
               </para>
             </note>

@@ -1500,7 +1500,7 @@
 
     <para>
       It is also possible to use two replication channels, in a manner
-      simlar to the procedure described in the next section; the
+      simliar to the procedure described in the next section; the
       differences between this and using a single replication channel
       are covered in
       <xref linkend="mysql-cluster-replication-two-channels"/>.

@@ -2857,7 +2857,7 @@
         slave, or both, depending on the conflict resolution type and
         method to be employed. This table is used to control logging and
         conflict resolution functions on a per-table basis, and has one
-        row per table invoved in replication.
+        row per table involved in replication.
         <literal>ndb_replication</literal> is created and filled with
         control information on the server where the conflict is to be
         resolved. In a simple master-slave setup where data can also be


Modified: trunk/refman-5.1/mysql-cluster-utilities.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-utilities.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/mysql-cluster-utilities.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 756 bytes

@@ -875,7 +875,7 @@
         <para>
           This utility is found in the <filename>libexec</filename>
           directory. It is part of an internal automated test framework
-          used in testing and bedugging MySQL Cluster. Because it can
+          used in testing and debugging MySQL Cluster. Because it can
           control processes on remote systems, it is not advisable to
           use <command>ndb_cpcd</command> in a production cluster.
         </para>


Modified: trunk/refman-5.1/mysql-cluster.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/mysql-cluster.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 808 bytes

@@ -66,7 +66,7 @@
       is no longer applied to the MySQL Cluster software &mdash; which
       is now known simply as <quote>MySQL Cluster</quote> &mdash; but
       rather to a commercial licensing and support package. You can
-      learn more about available options for commerical licensing of
+      learn more about available options for commercial licensing of
       MySQL Cluster from
       <citetitle><ulink url="http://mysql.com/products/database/cluster/features.html">MySQL
       Cluster Features</ulink></citetitle>, on the MySQL web site.


Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/optimization.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 8, Lines Added: 13, Lines Deleted: 14; 4114 bytes

@@ -1689,9 +1689,8 @@
                 user-defined clustered index, that index can be used
                 even when <literal>Using index</literal> is absent from
                 the <literal>Extra</literal> column. This is the case if
-                if <literal>type</literal> is <literal>index</literal>
-                and <literal>key</literal> is
-                <literal>PRIMARY</literal>.
+                <literal>type</literal> is <literal>index</literal> and
+                <literal>key</literal> is <literal>PRIMARY</literal>.
               </para>
             </listitem>
 

@@ -3371,7 +3370,7 @@
         This optimization improves the efficiency of a direct comparison
         between a non-indexed column and a constant. In such cases, the
         condition is <quote>pushed down</quote> to the storage engine
-        for evaluation. In MySQL &current-series;, this optimzation can
+        for evaluation. In MySQL &current-series;, this optimization can
         be used only by the <literal>NDBCLUSTER</literal> storage
         engine, but we intend to implement it for additional storage
         engines in future versions of MySQL.

@@ -7402,11 +7401,11 @@
       <para>
         To delete all rows from a table, <literal>TRUNCATE TABLE
         <replaceable>tbl_name</replaceable></literal> is faster than
-        than <literal>DELETE FROM Truncate operations are not
-        transaction-safe; an error occurs when attempting one in the
-        course of an active transaction or active table lock.
-        <replaceable>tbl_name</replaceable></literal>. See
-        <xref linkend="truncate"/>.
+        than <literal>DELETE FROM
+        <replaceable>tbl_name</replaceable></literal>. Truncate
+        operations are not transaction-safe; an error occurs when
+        attempting one in the course of an active transaction or active
+        table lock. See <xref linkend="truncate"/>.
       </para>
 
     </section>

@@ -8706,7 +8705,7 @@
             You should not start the server with the
             <option>--delay-key-write=ALL</option> option or use the
             <literal>DELAY_KEY_WRITE=1</literal> table option for any
-            shared tables. Otherise, index corruption can occur.
+            shared tables. Otherwise, index corruption can occur.
           </para>
         </listitem>
 

@@ -11644,7 +11643,7 @@
               that were executed via the text protocol (that is, it is
               compared with other SQL PS statements and non-prepared
               statements). As of MySQL 5.1.21, this limitation is lifted
-              and prepared statments that contain parameter markers can
+              and prepared statements that contain parameter markers can
               be cached because expansion directly substitutes the user
               variable values.
             </para>

@@ -12019,7 +12018,7 @@
         <note>
           <para>
             You can set the maximum size that can be specified for the
-            query cache during runtine with the <literal>SET</literal>
+            query cache at run time with the <literal>SET</literal>
             statement by using the
             <literal>--maximum-query_cache_size=<replaceable>32M</replaceable></literal>
             option on the command line or in the configuration file.

@@ -12250,7 +12249,7 @@
 
         <listitem>
           <para>
-            The <command>myqladmin processlist</command> command
+            The <command>mysqladmin processlist</command> command
             (<xref linkend="mysqladmin"/>)
           </para>
         </listitem>

@@ -14290,7 +14289,7 @@
             </para>
 
             <para>
-              A generic state in which the the thread is waiting for a
+              A generic state in which the thread is waiting for a
               condition to become true. No specific state information is
               available.
             </para>


Modified: trunk/refman-5.1/precision-math.xml
===================================================================
--- trunk/refman-5.1/precision-math.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/precision-math.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 486 bytes

@@ -892,7 +892,7 @@
 </programlisting>
 
     <para>
-      Howver, an overflow condition occurs if strict mode is in effect:
+      However, an overflow condition occurs if strict mode is in effect:
     </para>
 
 <programlisting>


Modified: trunk/refman-5.1/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.1/programs-admin-util-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/programs-admin-util-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 692 bytes

@@ -7364,7 +7364,7 @@
         Use of the <option>--password</option> option fails if
         <command>mysqlmanager</command> is invoked directly from an IBM
         5250 terminal. To work around this, use a command like the
-        following from the coommand line to generate the password entry:
+        following from the command line to generate the password entry:
       </para>
 
 <programlisting>


Modified: trunk/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/refman-5.1/programs-client-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/programs-client-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1284 bytes

@@ -1028,7 +1028,7 @@
 
           <para>
             For tabular output, the <quote>boxing</quote> around columns
-            enables one column value to be distinquished from another.
+            enables one column value to be distinguished from another.
             For non-tabular output (such as is produced in batch mode or
             when the <option>--batch</option> or
             <option>--silent</option> option is given), special

@@ -6397,7 +6397,7 @@
             One use for this option is to cause
             <command>mysqldump</command> to continue executing even when
             it encounters a view that has become invalid because the
-            defintion refers to a table that has been dropped. Without
+            definition refers to a table that has been dropped. Without
             <option>--force</option>, <command>mysqldump</command> exits
             with an error message. With <option>--force</option>,
             <command>mysqldump</command> prints the error message, but


Modified: trunk/refman-5.1/programs-installation.xml
===================================================================
--- trunk/refman-5.1/programs-installation.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/programs-installation.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 712 bytes

@@ -1227,7 +1227,7 @@
           <emphasis>before</emphasis> you upgrade your MySQL
           installation and run <command>mysql_upgrade</command>. See
           <xref linkend="upgrade"/>, for instructions on determining
-          whether any such incompatibilies apply to your installation
+          whether any such incompatibilities apply to your installation
           and how to handle them.
         </para>
       </caution>


Modified: trunk/refman-5.1/programs-using.xml
===================================================================
--- trunk/refman-5.1/programs-using.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/programs-using.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1725 bytes

@@ -725,7 +725,7 @@
     <para>
       Be aware that the use of option prefixes can cause problems in the
       event that new options are implemented for a program. A prefix
-      that is unambigious now might become ambiguous in the future.
+      that is unambiguous now might become ambiguous in the future.
     </para>
 
     <para>

@@ -1795,7 +1795,7 @@
       <para>
         A variable can be specified by writing it in full or as any
         unambiguous prefix. For example, the
-        <literal>max_buffer_length</literal> variable can be set for
+        <literal>max_allowed_packet</literal> variable can be set for
         <command>mysql</command> as <option>--max_a</option>, but not as
         <option>--max</option> because the latter is ambiguous:
       </para>

@@ -1808,7 +1808,7 @@
       <para>
         Be aware that the use of variable prefixes can cause problems in
         the event that new variables are implemented for a program. A
-        prefix that is unambigious now might become ambiguous in the
+        prefix that is unambiguous now might become ambiguous in the
         future.
       </para>
 

@@ -2038,7 +2038,7 @@
 <errortext>ERROR 2005 (HY000): Unknown MySQL server host '--user' (1)</errortext>
 </programlisting>
 
-        Howver, in option files, an equals sign is not assumed. Suppose
+        However, in option files, an equals sign is not assumed. Suppose
         the <filename>my.cnf</filename> file is as shown here:
 
 <programlisting>


Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/replication-configuration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 820 bytes

@@ -1200,8 +1200,8 @@
                 <listitem>
                   <para>
                     Copy the contents of the existing slave&apos;s relay
-                    log index file into the the new slave&apos;s relay
-                    log index file, making sure to overwrite any content
+                    log index file into the new slave&apos;s relay log
+                    index file, making sure to overwrite any content
                     already in the file.
                   </para>
                 </listitem>


Modified: trunk/refman-5.1/replication-notes.xml
===================================================================
--- trunk/refman-5.1/replication-notes.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/replication-notes.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 7; 2081 bytes

@@ -226,8 +226,8 @@
             prevented from changing the <emphasis>global</emphasis>
             value of these variables; as stated previously, the master
             and slave must always have identical global character set
-            values. This is true wther you are using statement-based or
-            row-based replication.
+            values. This is true whether you are using statement-based
+            or row-based replication.
           </para>
         </listitem>
 

@@ -1685,10 +1685,10 @@
                 </indexterm>
 
                 For columns holding numeric data types, the sizes may
-                differ, as long as the size of the the slave&apos;s
-                version of the column is equal or greater to the size of
-                the master&apos;s version of the column. This is
-                sometimes referred to as <firstterm>attribute
+                differ, as long as the size of the slave&apos;s version
+                of the column is equal or greater to the size of the
+                master&apos;s version of the column. This is sometimes
+                referred to as <firstterm>attribute
                 promotion</firstterm>, because the data type of the
                 master&apos;s version of the column is promoted to a
                 type that is the same size or larger on the slave.

@@ -1764,7 +1764,7 @@
                 </informaltable>
 
                 Unsigned integer columns can be promoted to larger
-                unisgned types; for example, a column declared as
+                unsigned types; for example, a column declared as
                 <literal>TINYINT UNSIGNED</literal> can be restored to a
                 column declared as <literal>SMALLINT UNSIGNED</literal>,
                 <literal>MEDIUMINT UNSIGNED</literal>, <literal>INT


Modified: trunk/refman-5.1/replication-solutions.xml
===================================================================
--- trunk/refman-5.1/replication-solutions.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/replication-solutions.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1201 bytes

@@ -1070,7 +1070,7 @@
       time, using the <literal>CHANGE MASTER TO</literal> statement. The
       slave will not check whether the databases on the master are
       compatible with the slave, it will just start executing events
-      from the specified log and postition on the new master. In a
+      from the specified log and position on the new master. In a
       failover situation all the servers in the group are probably
       executing the same events from the same binary log, so changing
       the source of the events should not affect the database structure

@@ -1269,7 +1269,7 @@
 
     <para>
       To enable SSL on the master you will need to create or obtain
-      suitable certficates and then add the following configuration
+      suitable certificates and then add the following configuration
       options to the master's configuration within the
       <literal>mysqld</literal> section:
     </para>


Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/restrictions.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 535 bytes

@@ -267,8 +267,7 @@
 
     <para>
       Use of stored routines can cause replication problems. This issue
-      is discussed further in
-      <xref linkend="stored-programs-logging"/>.
+      is discussed further in <xref linkend="stored-programs-logging"/>.
     </para>
 
     <para>


Modified: trunk/refman-5.1/se-federated.xml
===================================================================
--- trunk/refman-5.1/se-federated.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/se-federated.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1221 bytes

@@ -159,8 +159,8 @@
 
       <listitem>
         <para>
-          The remote server processes the statement and the the local
-          server retrieves any result that the statement produces (an
+          The remote server processes the statement and the local server
+          retrieves any result that the statement produces (an
           affected-rows count or a result set).
         </para>
       </listitem>

@@ -691,7 +691,7 @@
           As of MySQL 5.1.21, <literal>FEDERATED</literal> performs
           bulk-insert handling such that multiple rows are sent to the
           remote table in a batch. This provides a performance
-          improvement and enables the the remote table to perform
+          improvement and enables the remote table to perform
           improvement. Also, if the remote table is transactional, it
           enables the remote storage engine to perform statement
           rollback properly should an error occur. This capability has


Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/se-innodb-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 4; 1052 bytes

@@ -143,9 +143,7 @@
           plugin, see
           <ulink url="http://www.innodb.com/wp/2008/04/15/innodb-plugin-announced/"/>.
           For the changelog of plugin bug fixes, see
-
           <ulink url="http://www.innodb.com/changelogs/ChangeLog-1.0"/>
-
           .
         </para>
       </listitem>

@@ -2737,8 +2735,8 @@
               which in the worst case is in effect an
               <literal>INSERT</literal> followed by a
               <literal>UPDATE</literal>, where the allocated value for
-              the the <literal>AUTO_INCREMENT</literal> column may or
-              may not be used during the update phase.
+              the <literal>AUTO_INCREMENT</literal> column may or may
+              not be used during the update phase.
             </para>
           </listitem>
 


Modified: trunk/refman-5.1/se-merge.xml
===================================================================
--- trunk/refman-5.1/se-merge.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/se-merge.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 663 bytes

@@ -203,8 +203,8 @@
     <listitem>
       <para>
         Underlying table must have at least the same amount of keys that
-        merge table has. The underlying table may have morekeys than the
-        <literal>MERGE</literal> table, but cannot have less.
+        merge table has. The underlying table may have more keys than
+        the <literal>MERGE</literal> table, but cannot have less.
       </para>
 
       <note>


Modified: trunk/refman-5.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-definition.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/sql-syntax-data-definition.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 957 bytes

@@ -6976,8 +6976,8 @@
     <para>
       The <literal>EXTENT_SIZE</literal> sets the size, in bytes, of the
       extents used by any files belonging to the tablespace. The default
-      value is 1M. The minimum size is 32K, and the theoretical maximum
-      is 2G, although the practical maximum size depends on a number of
+      value is 1M. The minimum size is 32K, and theoretical maximum is
+      2G, although the practical maximum size depends on a number of
       factors. In most cases, changing the extent size does not have any
       measurable effect on performance, and the default value is
       recommended for all but the most unusual situations.


Modified: trunk/refman-5.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-manipulation.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/sql-syntax-data-manipulation.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 701 bytes

@@ -1469,7 +1469,7 @@
 
         <listitem>
           <para>
-            To avoid ambigious column reference problems when the
+            To avoid ambiguous column reference problems when the
             <literal>SELECT</literal> and the <literal>INSERT</literal>
             refer to the same table, provide a unique alias for each
             table used in the <literal>SELECT</literal> part, and


Modified: trunk/refman-5.1/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-replication.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/sql-syntax-replication.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 516 bytes

@@ -471,7 +471,7 @@
       </note>
 
       <para>
-        Issuing <literal>RESET SLAVE</literal> resets the hearbeat
+        Issuing <literal>RESET SLAVE</literal> resets the heartbeat
         interval to the default.
       </para>
 


Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1494 bytes

@@ -1741,8 +1741,8 @@
       </para>
 
       <para>
-        For more information on how the analysis works
-        within<literal>InnoDB</literal>, see
+        For more information on how the analysis works within
+        <literal>InnoDB</literal>, see
         <xref linkend="innodb-restrictions"/>.
       </para>
 

@@ -7106,10 +7106,10 @@
           <para>
             The statement that the thread is executing, or
             <literal>NULL</literal> if it is not executing any
-            statement. The statment might be the one sent to the server,
-            or an innermost statement if the statement executes other
-            statements. For example, if a <literal>CALL p1()</literal>
-            statement executes a stored procedure
+            statement. The statement might be the one sent to the
+            server, or an innermost statement if the statement executes
+            other statements. For example, if a <literal>CALL
+            p1()</literal> statement executes a stored procedure
             <literal>p1()</literal>, and the procedure is executing a
             <literal>SELECT</literal> statement, the
             <literal>Info</literal> value shows the


Modified: trunk/refman-5.1/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-transactions.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/sql-syntax-transactions.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 656 bytes

@@ -1619,7 +1619,8 @@
         <para>
           For expert advice on XA Distributed Transaction Support
           subscribe to the MySQL Enterprise Monitor. For more
-          information, see <ulink url="&base-url-enterprise;advisors.html"/>.
+          information, see
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>


Modified: trunk/refman-5.1/sql-syntax-utility.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-utility.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/sql-syntax-utility.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1103 bytes

@@ -294,7 +294,7 @@
     <para>
       The following descriptions indicate the forms that the result set
       can take. Output for the example statements is shown using the
-      familar <quote>tabular</quote> or <quote>vertical</quote> format
+      familiar <quote>tabular</quote> or <quote>vertical</quote> format
       that you see when using the <command>mysql</command> client, but
       note that <command>mysql</command> itself reformats
       <literal>HELP</literal> result sets in a different way.

@@ -339,8 +339,8 @@
 
           <listitem>
             <para>
-              <literal>example</literal>: Usage example or exmples. This
-              column might be blank.
+              <literal>example</literal>: Usage example or examples.
+              This column might be blank.
             </para>
           </listitem>
 


Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/storage-engines.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 671 bytes

@@ -123,7 +123,8 @@
           <imagedata fileref="../refman-common/images/published/PSEArch.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
-          <phrase lang="en">MySQL Architecture with Pluggable Storage Engines</phrase>
+          <phrase lang="en">MySQL Architecture with Pluggable Storage
+          Engines</phrase>
         </textobject>
       </mediaobject>
     </figure>


Modified: trunk/refman-5.1/stored-programs-views.xml
===================================================================
--- trunk/refman-5.1/stored-programs-views.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1/stored-programs-views.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 737 bytes

@@ -530,7 +530,7 @@
           <literal>INSERT</literal> statements are written to the binary
           log, so the slave will execute them. Because the slave SQL
           thread has full privileges, it will execute the dangerous
-          statment. Thus, the function invocation has different effects
+          statement. Thus, the function invocation has different effects
           on the master and slave and is not replication-safe.
         </para>
 


Modified: trunk/refman-5.1-maria/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1-maria/sql-syntax-server-administration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-5.1-maria/sql-syntax-server-administration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1512 bytes

@@ -1741,8 +1741,8 @@
       </para>
 
       <para>
-        For more information on how the analysis works
-        within<literal>InnoDB</literal>, see
+        For more information on how the analysis works within
+        <literal>InnoDB</literal>, see
         <xref linkend="innodb-restrictions"/>.
       </para>
 

@@ -7178,10 +7178,10 @@
           <para>
             The statement that the thread is executing, or
             <literal>NULL</literal> if it is not executing any
-            statement. The statment might be the one sent to the server,
-            or an innermost statement if the statement executes other
-            statements. For example, if a <literal>CALL p1()</literal>
-            statement executes a stored procedure
+            statement. The statement might be the one sent to the
+            server, or an innermost statement if the statement executes
+            other statements. For example, if a <literal>CALL
+            p1()</literal> statement executes a stored procedure
             <literal>p1()</literal>, and the procedure is executing a
             <literal>SELECT</literal> statement, the
             <literal>Info</literal> value shows the


Modified: trunk/refman-6.0/backup.xml
===================================================================
--- trunk/refman-6.0/backup.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/backup.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1344 bytes

@@ -122,7 +122,7 @@
 
         <listitem>
           <para>
-            Output is larger than for physical backup, paticularly when
+            Output is larger than for physical backup, particularly when
             saved in text format.
           </para>
         </listitem>

@@ -1595,8 +1595,8 @@
       </itemizedlist>
 
       <para>
-        Currently, all instances of the the DDL statements in the list
-        are blocked, even for database or table objects that are not
+        Currently, all instances of the DDL statements in the list are
+        blocked, even for database or table objects that are not
         included in the backup. Eventually, the goal is to block only
         DDL statements for objects in the backup.
       </para>

@@ -3616,7 +3616,7 @@
             What percentage of the keyblocks are used. When a table has
             just been reorganized with <command>myisamchk</command>, as
             for the table in the examples, the values are very high
-            (very near the theoretical maximum).
+            (very near theoretical maximum).
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/collation-tmp.xml
===================================================================
--- trunk/refman-6.0/collation-tmp.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/collation-tmp.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 856 bytes

@@ -655,7 +655,7 @@
 </programlisting>
 
     <para>
-      For the ouput just shown, you could choose an ID higher than 210
+      For the output just shown, you could choose an ID higher than 210
       for the new collation.
     </para>
 

@@ -843,7 +843,7 @@
     </remark>
 
     <para>
-      UCA collations for Unicode character serts can be added to MySQL
+      UCA collations for Unicode character sets can be added to MySQL
       without recompiling by using a subset of the Locale Data Markup
       Language (LDML), which is available at
       <ulink url="http://www.unicode.org/reports/tr35/"/>. In


Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/data-types.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 659 bytes

@@ -3278,7 +3278,7 @@
               one, or neither. (For example, you can specify <literal>ON
               UPDATE</literal> to enable auto-update without also having
               the column auto-initialized.) The following column
-              definitions demonstrate each of the possiblities:
+              definitions demonstrate each of the possibilities:
             </para>
 
             <itemizedlist>


Modified: trunk/refman-6.0/faqs.xml
===================================================================
--- trunk/refman-6.0/faqs.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/faqs.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 480 bytes

@@ -62,7 +62,7 @@
         <question>
 
           <para>
-            Can MySQL &current-series; peform multiple-table inserts,
+            Can MySQL &current-series; perform multiple-table inserts,
             updates, and deletes?
           </para>
 


Modified: trunk/refman-6.0/installing-core.xml
===================================================================
--- trunk/refman-6.0/installing-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/installing-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 5; 2022 bytes

@@ -3877,7 +3877,7 @@
             different service name for each version that you install. If
             you do not choose a different service for each installed
             version then the service manager information will be
-            inconsitent and this will cause problems when you try to
+            inconsistent and this will cause problems when you try to
             uninstall a previous version.
           </para>
 

@@ -5982,7 +5982,7 @@
 
     <para>
       To see all files in an RPM package (for example, a
-      <literal>MySQL-server</literal> RPM), run a commnd like this:
+      <literal>MySQL-server</literal> RPM), run a command like this:
     </para>
 
 <programlisting>

@@ -9874,7 +9874,7 @@
         <para>
           You can build MySQL on Windows by using a combination of
           <command>cmake</command> and Microsoft Visual Studio .NET 2003
-          (7.1), Micrsofot Visual Studio 2005 (8.0) or Microsoft Visual
+          (7.1), Microsoft Visual Studio 2005 (8.0) or Microsoft Visual
           C++ 2005 Express Edition. You must have the appropriate
           Microsoft Platform SDK installed.
         </para>

@@ -10425,7 +10425,7 @@
         may not be able to view all databases. For example, if you have
         assigned the password <quote>secretpass</quote> to the MySQL
         <literal>root</literal> account, then you can invoke
-        <command>mysqlshow</command>and <command>mysql</command> as
+        <command>mysqlshow</command> and <command>mysql</command> as
         shown here:
 
 <programlisting>

@@ -16446,7 +16446,7 @@
         </para>
 
         <para>
-          The maximum file size on an OpenSever 5.0.x system is 2GB.
+          The maximum file size on an OpenServer 5.0.x system is 2GB.
         </para>
 
         <para>


Modified: trunk/refman-6.0/internationalization.xml
===================================================================
--- trunk/refman-6.0/internationalization.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/internationalization.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 6; 2321 bytes

@@ -1087,7 +1087,7 @@
           <literal>05</literal> and <literal>5C</literal>) is a valid
           multi-byte character. Hence, the first two bytes of the string
           are interpreted as a single <literal>sjis</literal> character,
-          and the <quote><literal>\</literal></quote> is not intrepreted
+          and the <quote><literal>\</literal></quote> is not interpreted
           as an escape character. The following
           <quote><literal>n</literal></quote> (hex value
           <literal>6E</literal>) is not interpreted as part of an escape

@@ -7782,8 +7782,8 @@
 </programlisting>
 
       <para>
-        For the ouput just shown, you could choose an ID higher than 210
-        for the new collation.
+        For the output just shown, you could choose an ID higher than
+        210 for the new collation.
       </para>
 
       <para>

@@ -7959,7 +7959,7 @@
       <title>Adding a UCA Collation to a Unicode Character Set</title>
 
       <para>
-        UCA collations for Unicode character serts can be added to MySQL
+        UCA collations for Unicode character sets can be added to MySQL
         without recompiling by using a subset of the Locale Data Markup
         Language (LDML), which is available at
         <ulink url="http://www.unicode.org/reports/tr35/"/>. In

@@ -8073,7 +8073,7 @@
 
         <listitem>
           <para>
-            Use secondary differences to distiguish accent variations.
+            Use secondary differences to distinguish accent variations.
           </para>
         </listitem>
 

@@ -8844,7 +8844,7 @@
       default value is <literal>'en_US'</literal> regardless of your
       system's locale setting, but you can set the value at server
       startup or set the <literal>GLOBAL</literal> value if you have the
-      <literal>SUPER</literal> privilge. Any client can examine the
+      <literal>SUPER</literal> privilege. Any client can examine the
       value of <literal>lc_time_names</literal> or set its
       <literal>SESSION</literal> value to affect the locale for its own
       connection.


Modified: trunk/refman-6.0/optimization.xml
===================================================================
--- trunk/refman-6.0/optimization.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/optimization.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 7, Lines Added: 12, Lines Deleted: 13; 3633 bytes

@@ -1687,9 +1687,8 @@
                 user-defined clustered index, that index can be used
                 even when <literal>Using index</literal> is absent from
                 the <literal>Extra</literal> column. This is the case if
-                if <literal>type</literal> is <literal>index</literal>
-                and <literal>key</literal> is
-                <literal>PRIMARY</literal>.
+                <literal>type</literal> is <literal>index</literal> and
+                <literal>key</literal> is <literal>PRIMARY</literal>.
               </para>
             </listitem>
 

@@ -3395,7 +3394,7 @@
         This optimization improves the efficiency of a direct comparison
         between a non-indexed column and a constant. In such cases, the
         condition is <quote>pushed down</quote> to the storage engine
-        for evaluation. In MySQL &current-series;, this optimzation can
+        for evaluation. In MySQL &current-series;, this optimization can
         be used only by the <literal>NDBCLUSTER</literal> and
         <literal>MyISAM</literal> storage engines; it may be implemented
         for additional storage engines in future versions of MySQL.

@@ -7772,11 +7771,11 @@
       <para>
         To delete all rows from a table, <literal>TRUNCATE TABLE
         <replaceable>tbl_name</replaceable></literal> is faster than
-        than <literal>DELETE FROM Truncate operations are not
-        transaction-safe; an error occurs when attempting one in the
-        course of an active transaction or active table lock.
-        <replaceable>tbl_name</replaceable></literal>. See
-        <xref linkend="truncate"/>.
+        than <literal>DELETE FROM
+        <replaceable>tbl_name</replaceable></literal>. Truncate
+        operations are not transaction-safe; an error occurs when
+        attempting one in the course of an active transaction or active
+        table lock. See <xref linkend="truncate"/>.
       </para>
 
     </section>

@@ -9076,7 +9075,7 @@
             You should not start the server with the
             <option>--delay-key-write=ALL</option> option or use the
             <literal>DELAY_KEY_WRITE=1</literal> table option for any
-            shared tables. Otherise, index corruption can occur.
+            shared tables. Otherwise, index corruption can occur.
           </para>
         </listitem>
 

@@ -12318,7 +12317,7 @@
         <note>
           <para>
             You can set the maximum size that can be specified for the
-            query cache during runtine with the <literal>SET</literal>
+            query cache at run time with the <literal>SET</literal>
             statement by using the
             <literal>--maximum-query_cache_size=<replaceable>32M</replaceable></literal>
             option on the command line or in the configuration file.

@@ -12556,7 +12555,7 @@
 
         <listitem>
           <para>
-            The <command>myqladmin processlist</command> command
+            The <command>mysqladmin processlist</command> command
             (<xref linkend="mysqladmin"/>)
           </para>
         </listitem>

@@ -14605,7 +14604,7 @@
             </para>
 
             <para>
-              A generic state in which the the thread is waiting for a
+              A generic state in which the thread is waiting for a
               condition to become true. No specific state information is
               available.
             </para>


Modified: trunk/refman-6.0/precision-math.xml
===================================================================
--- trunk/refman-6.0/precision-math.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/precision-math.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 486 bytes

@@ -892,7 +892,7 @@
 </programlisting>
 
     <para>
-      Howver, an overflow condition occurs if strict mode is in effect:
+      However, an overflow condition occurs if strict mode is in effect:
     </para>
 
 <programlisting>


Modified: trunk/refman-6.0/programs-client-core.xml
===================================================================
--- trunk/refman-6.0/programs-client-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/programs-client-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1284 bytes

@@ -1043,7 +1043,7 @@
 
           <para>
             For tabular output, the <quote>boxing</quote> around columns
-            enables one column value to be distinquished from another.
+            enables one column value to be distinguished from another.
             For non-tabular output (such as is produced in batch mode or
             when the <option>--batch</option> or
             <option>--silent</option> option is given), special

@@ -6428,7 +6428,7 @@
             One use for this option is to cause
             <command>mysqldump</command> to continue executing even when
             it encounters a view that has become invalid because the
-            defintion refers to a table that has been dropped. Without
+            definition refers to a table that has been dropped. Without
             <option>--force</option>, <command>mysqldump</command> exits
             with an error message. With <option>--force</option>,
             <command>mysqldump</command> prints the error message, but


Modified: trunk/refman-6.0/programs-installation.xml
===================================================================
--- trunk/refman-6.0/programs-installation.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/programs-installation.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 712 bytes

@@ -1220,7 +1220,7 @@
           <emphasis>before</emphasis> you upgrade your MySQL
           installation and run <command>mysql_upgrade</command>. See
           <xref linkend="upgrade"/>, for instructions on determining
-          whether any such incompatibilies apply to your installation
+          whether any such incompatibilities apply to your installation
           and how to handle them.
         </para>
       </caution>


Modified: trunk/refman-6.0/programs-using.xml
===================================================================
--- trunk/refman-6.0/programs-using.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/programs-using.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1725 bytes

@@ -725,7 +725,7 @@
     <para>
       Be aware that the use of option prefixes can cause problems in the
       event that new options are implemented for a program. A prefix
-      that is unambigious now might become ambiguous in the future.
+      that is unambiguous now might become ambiguous in the future.
     </para>
 
     <para>

@@ -1793,7 +1793,7 @@
       <para>
         A variable can be specified by writing it in full or as any
         unambiguous prefix. For example, the
-        <literal>max_buffer_length</literal> variable can be set for
+        <literal>max_allowed_packet</literal> variable can be set for
         <command>mysql</command> as <option>--max_a</option>, but not as
         <option>--max</option> because the latter is ambiguous:
       </para>

@@ -1806,7 +1806,7 @@
       <para>
         Be aware that the use of variable prefixes can cause problems in
         the event that new variables are implemented for a program. A
-        prefix that is unambigious now might become ambiguous in the
+        prefix that is unambiguous now might become ambiguous in the
         future.
       </para>
 

@@ -2036,7 +2036,7 @@
 <errortext>ERROR 2005 (HY000): Unknown MySQL server host '--user' (1)</errortext>
 </programlisting>
 
-        Howver, in option files, an equals sign is not assumed. Suppose
+        However, in option files, an equals sign is not assumed. Suppose
         the <filename>my.cnf</filename> file is as shown here:
 
 <programlisting>


Modified: trunk/refman-6.0/replication-configuration.xml
===================================================================
--- trunk/refman-6.0/replication-configuration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/replication-configuration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 820 bytes

@@ -1200,8 +1200,8 @@
                 <listitem>
                   <para>
                     Copy the contents of the existing slave&apos;s relay
-                    log index file into the the new slave&apos;s relay
-                    log index file, making sure to overwrite any content
+                    log index file into the new slave&apos;s relay log
+                    index file, making sure to overwrite any content
                     already in the file.
                   </para>
                 </listitem>


Modified: trunk/refman-6.0/replication-notes.xml
===================================================================
--- trunk/refman-6.0/replication-notes.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/replication-notes.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1520 bytes

@@ -209,8 +209,8 @@
             prevented from changing the <emphasis>global</emphasis>
             value of these variables; as stated previously, the master
             and slave must always have identical global character set
-            values. This is true wther you are using statement-based or
-            row-based replication.
+            values. This is true whether you are using statement-based
+            or row-based replication.
           </para>
         </listitem>
 

@@ -1621,10 +1621,10 @@
             <listitem>
               <para>
                 For columns holding numeric data types the sizes may
-                differ, as long as the size of the the slave&apos;s
-                version of the column is equal or greater to the size of
-                the master&apos;s version of the column. For example,
-                the following table definitions are allowed:
+                differ, as long as the size of the slave&apos;s version
+                of the column is equal or greater to the size of the
+                master&apos;s version of the column. For example, the
+                following table definitions are allowed:
 
 <programlisting>
 master&gt; <userinput>CREATE TABLE t1 (c1 TINYINT, c2 INT);</userinput>


Modified: trunk/refman-6.0/replication-solutions.xml
===================================================================
--- trunk/refman-6.0/replication-solutions.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/replication-solutions.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1201 bytes

@@ -1061,7 +1061,7 @@
       time, using the <literal>CHANGE MASTER TO</literal> statement. The
       slave will not check whether the databases on the master are
       compatible with the slave, it will just start executing events
-      from the specified log and postition on the new master. In a
+      from the specified log and position on the new master. In a
       failover situation all the servers in the group are probably
       executing the same events from the same binary log, so changing
       the source of the events should not affect the database structure

@@ -1260,7 +1260,7 @@
 
     <para>
       To enable SSL on the master you will need to create or obtain
-      suitable certficates and then add the following configuration
+      suitable certificates and then add the following configuration
       options to the master's configuration within the
       <literal>mysqld</literal> section:
     </para>


Modified: trunk/refman-6.0/restrictions.xml
===================================================================
--- trunk/refman-6.0/restrictions.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/restrictions.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 535 bytes

@@ -273,8 +273,7 @@
 
     <para>
       Use of stored routines can cause replication problems. This issue
-      is discussed further in
-      <xref linkend="stored-programs-logging"/>.
+      is discussed further in <xref linkend="stored-programs-logging"/>.
     </para>
 
     <para>


Modified: trunk/refman-6.0/se-federated.xml
===================================================================
--- trunk/refman-6.0/se-federated.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/se-federated.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 666 bytes

@@ -143,8 +143,8 @@
 
       <listitem>
         <para>
-          The remote server processes the statement and the the local
-          server retrieves any result that the statement produces (an
+          The remote server processes the statement and the local server
+          retrieves any result that the statement produces (an
           affected-rows count or a result set).
         </para>
       </listitem>


Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/se-innodb-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 751 bytes

@@ -2637,8 +2637,8 @@
               which in the worst case is in effect an
               <literal>INSERT</literal> followed by a
               <literal>UPDATE</literal>, where the allocated value for
-              the the <literal>AUTO_INCREMENT</literal> column may or
-              may not be used during the update phase.
+              the <literal>AUTO_INCREMENT</literal> column may or may
+              not be used during the update phase.
             </para>
           </listitem>
 


Modified: trunk/refman-6.0/se-merge.xml
===================================================================
--- trunk/refman-6.0/se-merge.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/se-merge.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 663 bytes

@@ -201,8 +201,8 @@
     <listitem>
       <para>
         Underlying table must have at least the same amount of keys that
-        merge table has. The underlying table may have morekeys than the
-        <literal>MERGE</literal> table, but cannot have less.
+        merge table has. The underlying table may have more keys than
+        the <literal>MERGE</literal> table, but cannot have less.
       </para>
 
       <note>


Modified: trunk/refman-6.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-manipulation.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/sql-syntax-data-manipulation.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 5, Lines Added: 101, Lines Deleted: 102; 11288 bytes

@@ -9,70 +9,70 @@
 
   <remark role="help-category" condition="Data Manipulation"/>
 
-    <section id="call">
+  <section id="call">
 
-      <title><literal>CALL</literal> Statement Syntax</title>
+    <title><literal>CALL</literal> Statement Syntax</title>
 
-      <indexterm>
-        <primary>CALL</primary>
-      </indexterm>
+    <indexterm>
+      <primary>CALL</primary>
+    </indexterm>
 
-      <remark role="help-topic" condition="CALL"/>
+    <remark role="help-topic" condition="CALL"/>
 
-      <remark role="help-keywords">
-        CALL
-      </remark>
+    <remark role="help-keywords">
+      CALL
+    </remark>
 
-      <remark role="help-syntax"/>
+    <remark role="help-syntax"/>
 
 <programlisting>
 CALL <replaceable>sp_name</replaceable>([<replaceable>parameter</replaceable>[,...]])
 CALL <replaceable>sp_name</replaceable>[()]
 </programlisting>
 
-      <remark role="help-description-begin"/>
+    <remark role="help-description-begin"/>
 
-      <para>
-        The <literal>CALL</literal> statement invokes a stored procedure
-        that was defined previously with <literal>CREATE
-        PROCEDURE</literal>.
-      </para>
+    <para>
+      The <literal>CALL</literal> statement invokes a stored procedure
+      that was defined previously with <literal>CREATE
+      PROCEDURE</literal>.
+    </para>
 
-      <para>
-        <literal>CALL</literal> can pass back values to its caller using
-        parameters that are declared as <literal>OUT</literal> or
-        <literal>INOUT</literal> parameters. When the procedure returns,
-        a client program can also obtain the number of rows affected for
-        the final statement executed within the routine: At the SQL
-        level, call the <function role="sql">ROW_COUNT()</function>
-        function; from C, call the
-        <function role="capi">mysql_affected_rows()</function> C API
-        function.
-      </para>
+    <para>
+      <literal>CALL</literal> can pass back values to its caller using
+      parameters that are declared as <literal>OUT</literal> or
+      <literal>INOUT</literal> parameters. When the procedure returns, a
+      client program can also obtain the number of rows affected for the
+      final statement executed within the routine: At the SQL level,
+      call the <function role="sql">ROW_COUNT()</function> function;
+      from C, call the
+      <function role="capi">mysql_affected_rows()</function> C API
+      function.
+    </para>
 
-      <para>
-        Stored procedures that take no arguments can be invoked without
-        parentheses. That is, <literal>CALL p()</literal> and
-        <literal>CALL p</literal> are equivalent.
-      </para>
+    <para>
+      Stored procedures that take no arguments can be invoked without
+      parentheses. That is, <literal>CALL p()</literal> and
+      <literal>CALL p</literal> are equivalent.
+    </para>
 
-      <remark role="help-description-end"/>
+    <remark role="help-description-end"/>
 
-      <para>
-        To get back a value from a procedure using an
-        <literal>OUT</literal> or <literal>INOUT</literal> parameter,
-        pass the parameter by means of a user variable, and then check
-        the value of the variable after the procedure returns. (If you
-        are calling the procedure from within another stored procedure
-        or function, you can also pass a routine parameter or local
-        routine variable as an <literal>IN</literal> or
-        <literal>INOUT</literal> parameter.) For an
-        <literal>INOUT</literal> parameter, initialize its value before
-        passing it to the procedure. The following procedure has an
-        <literal>OUT</literal> parameter that the procedure sets to the
-        current server version, and an <literal>INOUT</literal> value
-        that the procedure increments by one from its current value:
-      </para>
+    <para>
+      To get back a value from a procedure using an
+      <literal>OUT</literal> or <literal>INOUT</literal> parameter, pass
+      the parameter by means of a user variable, and then check the
+      value of the variable after the procedure returns. (If you are
+      calling the procedure from within another stored procedure or
+      function, you can also pass a routine parameter or local routine
+      variable as an <literal>IN</literal> or <literal>INOUT</literal>
+      parameter.) For an <literal>INOUT</literal> parameter, initialize
+      its value before passing it to the procedure. The following
+      procedure has an <literal>OUT</literal> parameter that the
+      procedure sets to the current server version, and an
+      <literal>INOUT</literal> value that the procedure increments by
+      one from its current value:
+    </para>
 
 <programlisting>
 CREATE PROCEDURE p (OUT ver_param VARCHAR(25), INOUT incr_param INT)

@@ -84,12 +84,12 @@
 END;
 </programlisting>
 
-      <para>
-        Before calling the procedure, initialize the variable to be
-        passed as the <literal>INOUT</literal> parameter. After calling
-        the procedure, the values of the two variables will have been
-        set or modified:
-      </para>
+    <para>
+      Before calling the procedure, initialize the variable to be passed
+      as the <literal>INOUT</literal> parameter. After calling the
+      procedure, the values of the two variables will have been set or
+      modified:
+    </para>
 
 <programlisting>
 mysql&gt; <userinput>SET @increment = 10;</userinput>

@@ -102,42 +102,41 @@
 +-----------------+------------+
 </programlisting>
 
-      <para>
-        If you write C programs that use the <literal>CALL</literal> SQL
-        statement to execute stored procedures that produce result sets,
-        you <emphasis>must</emphasis> set the
-        <literal>CLIENT_MULTI_RESULTS</literal> flag, either explicitly,
-        or implicitly by setting
-        <literal>CLIENT_MULTI_STATEMENTS</literal> when you call
-        <function role="capi">mysql_real_connect()</function>. This is
-        because each such stored procedure produces multiple results:
-        the result sets returned by statements executed within the
-        procedure, as well as a result to indicate the call status. To
-        process the result of a <literal>CALL</literal> statement, use a
-        loop that calls
-        <function role="capi">mysql_next_result()</function> to
-        determine whether there are more results. For an example, see
-        <xref linkend="c-api-multiple-queries"/>.
-        <literal>CLIENT_MULTI_RESULTS</literal> must also be set if
-        <literal>CALL</literal> is used to execute any stored procedure
-        that contains prepared statements. It cannot be determined when
-        such a procedure is loaded whether those statements will produce
-        result sets, so it is necessary to assume that they will.
-      </para>
+    <para>
+      If you write C programs that use the <literal>CALL</literal> SQL
+      statement to execute stored procedures that produce result sets,
+      you <emphasis>must</emphasis> set the
+      <literal>CLIENT_MULTI_RESULTS</literal> flag, either explicitly,
+      or implicitly by setting
+      <literal>CLIENT_MULTI_STATEMENTS</literal> when you call
+      <function role="capi">mysql_real_connect()</function>. This is
+      because each such stored procedure produces multiple results: the
+      result sets returned by statements executed within the procedure,
+      as well as a result to indicate the call status. To process the
+      result of a <literal>CALL</literal> statement, use a loop that
+      calls <function role="capi">mysql_next_result()</function> to
+      determine whether there are more results. For an example, see
+      <xref linkend="c-api-multiple-queries"/>.
+      <literal>CLIENT_MULTI_RESULTS</literal> must also be set if
+      <literal>CALL</literal> is used to execute any stored procedure
+      that contains prepared statements. It cannot be determined when
+      such a procedure is loaded whether those statements will produce
+      result sets, so it is necessary to assume that they will.
+    </para>
 
-      <para>
-        For programs written in a language that provides a MySQL
-        interface, there is no native method for directly retrieving the
-        results of <literal>OUT</literal> or <literal>INOUT</literal>
-        parameters from <literal>CALL</literal> statements. To get the
-        parameter values, pass user-defined variables to the procedure
-        in the <literal>CALL</literal> statement and then execute a
-        <literal>SELECT</literal> statement to produce a result set
-        containing the variable values. The following example
-        illustrates the technique (without error checking) for a stored
-        procedure <literal>p1</literal> that has two
-        <literal>OUT</literal> parameters.
-      </para>
+    <para>
+      For programs written in a language that provides a MySQL
+      interface, there is no native method for directly retrieving the
+      results of <literal>OUT</literal> or <literal>INOUT</literal>
+      parameters from <literal>CALL</literal> statements. To get the
+      parameter values, pass user-defined variables to the procedure in
+      the <literal>CALL</literal> statement and then execute a
+      <literal>SELECT</literal> statement to produce a result set
+      containing the variable values. The following example illustrates
+      the technique (without error checking) for a stored procedure
+      <literal>p1</literal> that has two <literal>OUT</literal>
+      parameters.
+    </para>
 
 <programlisting>
 mysql_query(mysql, "CALL p1(@param1, @param2)");

@@ -147,20 +146,20 @@
 mysql_free_result(result);
 </programlisting>
 
-      <para>
-        After the preceding code executes, <literal>row[0]</literal> and
-        <literal>row[1]</literal> contain the values of
-        <literal>@param1</literal> and <literal>@param2</literal>,
-        respectively.
-      </para>
+    <para>
+      After the preceding code executes, <literal>row[0]</literal> and
+      <literal>row[1]</literal> contain the values of
+      <literal>@param1</literal> and <literal>@param2</literal>,
+      respectively.
+    </para>
 
-      <para>
-        To handle <literal>INOUT</literal> parameters, execute a
-        statement prior to the <literal>CALL</literal> that sets the
-        user variables to the values to be passed to the procedure.
-      </para>
+    <para>
+      To handle <literal>INOUT</literal> parameters, execute a statement
+      prior to the <literal>CALL</literal> that sets the user variables
+      to the values to be passed to the procedure.
+    </para>
 
-    </section>
+  </section>
 
   <section id="delete">
 

@@ -1469,7 +1468,7 @@
 
         <listitem>
           <para>
-            To avoid ambigious column reference problems when the
+            To avoid ambiguous column reference problems when the
             <literal>SELECT</literal> and the <literal>INSERT</literal>
             refer to the same table, provide a unique alias for each
             table used in the <literal>SELECT</literal> part, and


Modified: trunk/refman-6.0/sql-syntax-replication.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-replication.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/sql-syntax-replication.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 516 bytes

@@ -468,7 +468,7 @@
       </note>
 
       <para>
-        Issuing <literal>RESET SLAVE</literal> resets the hearbeat
+        Issuing <literal>RESET SLAVE</literal> resets the heartbeat
         interval to the default.
       </para>
 


Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1494 bytes

@@ -1738,8 +1738,8 @@
       </para>
 
       <para>
-        For more information on how the analysis works
-        within<literal>InnoDB</literal>, see
+        For more information on how the analysis works within
+        <literal>InnoDB</literal>, see
         <xref linkend="innodb-restrictions"/>.
       </para>
 

@@ -7083,10 +7083,10 @@
           <para>
             The statement that the thread is executing, or
             <literal>NULL</literal> if it is not executing any
-            statement. The statment might be the one sent to the server,
-            or an innermost statement if the statement executes other
-            statements. For example, if a <literal>CALL p1()</literal>
-            statement executes a stored procedure
+            statement. The statement might be the one sent to the
+            server, or an innermost statement if the statement executes
+            other statements. For example, if a <literal>CALL
+            p1()</literal> statement executes a stored procedure
             <literal>p1()</literal>, and the procedure is executing a
             <literal>SELECT</literal> statement, the
             <literal>Info</literal> value shows the


Modified: trunk/refman-6.0/sql-syntax-utility.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-utility.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/sql-syntax-utility.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1103 bytes

@@ -286,7 +286,7 @@
     <para>
       The following descriptions indicate the forms that the result set
       can take. Output for the example statements is shown using the
-      familar <quote>tabular</quote> or <quote>vertical</quote> format
+      familiar <quote>tabular</quote> or <quote>vertical</quote> format
       that you see when using the <command>mysql</command> client, but
       note that <command>mysql</command> itself reformats
       <literal>HELP</literal> result sets in a different way.

@@ -331,8 +331,8 @@
 
           <listitem>
             <para>
-              <literal>example</literal>: Usage example or exmples. This
-              column might be blank.
+              <literal>example</literal>: Usage example or examples.
+              This column might be blank.
             </para>
           </listitem>
 


Modified: trunk/refman-6.0/stored-programs-views.xml
===================================================================
--- trunk/refman-6.0/stored-programs-views.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-6.0/stored-programs-views.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 737 bytes

@@ -520,7 +520,7 @@
           <literal>INSERT</literal> statements are written to the binary
           log, so the slave will execute them. Because the slave SQL
           thread has full privileges, it will execute the dangerous
-          statment. Thus, the function invocation has different effects
+          statement. Thus, the function invocation has different effects
           on the master and slave and is not replication-safe.
         </para>
 


Modified: trunk/refman-common/bug-reports.xml
===================================================================
--- trunk/refman-common/bug-reports.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-common/bug-reports.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 864 bytes

@@ -583,8 +583,8 @@
       <para>
         If possible, download and install the most recent version of
         MySQL Server and check whether it solves your problem. All
-        versions of the MySQL software are thoroughly tested and should
-        work without problems. We believe in making everything as
+        versions of the MySQL software thoroughly tested and should work
+        without problems. We believe in making everything as
         backward-compatible as possible, and you should be able to
         switch MySQL versions without difficulty. See
         <xref linkend="which-version"/>.


Modified: trunk/refman-common/gpl-license.xml
===================================================================
--- trunk/refman-common/gpl-license.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-common/gpl-license.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1207 bytes

@@ -35,11 +35,11 @@
   </para>
 
   <para>
-    The licenses for most software are designed to take away your
-    freedom to share and change it. By contrast, the GNU General Public
-    License is intended to guarantee your freedom to share and change
-    free software---to make sure the software is free for all its users.
-    This General Public License applies to most of the Free Software
+    The licenses for most software designed to take away your freedom to
+    share and change it. By contrast, the GNU General Public License is
+    intended to guarantee your freedom to share and change free
+    software---to make sure the software is free for all its users. This
+    General Public License applies to most of the Free Software
     Foundation's software and to any other program whose authors commit
     to using it. (Some other Free Software Foundation software is
     covered by the GNU Library General Public License instead.) You can


Modified: trunk/refman-common/ha-drbd.xml
===================================================================
--- trunk/refman-common/ha-drbd.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-common/ha-drbd.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 645 bytes

@@ -1291,7 +1291,8 @@
           <imagedata fileref="images/published/drbd-sepinterface.png" format="PNG"/>
         </imageobject>
         <textobject>
-          <phrase lang="en">DRBD Architecture Using Separate Network Interfaces</phrase>
+          <phrase lang="en">DRBD Architecture Using Separate Network
+          Interfaces</phrase>
         </textobject>
       </mediaobject>
     </figure>


Modified: trunk/refman-common/ha-heartbeat.xml
===================================================================
--- trunk/refman-common/ha-heartbeat.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-common/ha-heartbeat.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 762 bytes

@@ -451,7 +451,7 @@
     <para>
       In this situation, with <command>dopd</command> enabled, the
       connectivity failure between the master and slave would be
-      identified and the metadata on the slave wold be set to
+      identified and the metadata on the slave would be set to
       <literal>Outdated</literal>. Heartbeat will then refuse to switch
       over to the slave even if the master failed. In a dual-host
       solution this would effectively render the cluster out of action,


Modified: trunk/refman-common/ha-memcached-core.xml
===================================================================
--- trunk/refman-common/ha-memcached-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-common/ha-memcached-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 4; 1561 bytes

@@ -58,7 +58,8 @@
         <imagedata fileref="../refman-common/images/published/memcached-overview.png" format="PNG" lang="en"/>
       </imageobject>
       <textobject>
-        <phrase lang="en"><command>memcached</command> Architecture Overview</phrase>
+        <phrase lang="en"><command>memcached</command> Architecture
+        Overview</phrase>
       </textobject>
     </mediaobject>
   </figure>

@@ -636,8 +637,8 @@
             <imagedata fileref="../refman-common/images/published/memcached-memalloc.png" format="PNG" lang="en"/>
           </imageobject>
           <textobject>
-            <phrase lang="en">Memory Allocation in <command>memcached</command>
-            </phrase>
+            <phrase lang="en">Memory Allocation in
+            <command>memcached</command> </phrase>
           </textobject>
         </mediaobject>
       </figure>

@@ -1004,7 +1005,8 @@
           <imagedata fileref="../refman-common/images/published/memcached-flow.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
-          <phrase lang="en">Typical <command>memcached</command> Application Flowchart</phrase>
+          <phrase lang="en">Typical <command>memcached</command>
+          Application Flowchart</phrase>
         </textobject>
       </mediaobject>
     </figure>


Modified: trunk/refman-common/licenses.xml
===================================================================
--- trunk/refman-common/licenses.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-common/licenses.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1201 bytes

@@ -39,11 +39,11 @@
     </para>
 
     <para>
-      The licenses for most software are designed to take away your
-      freedom to share and change it. By contrast, the GNU General
-      Public License is intended to guarantee your freedom to share and
-      change free software---to make sure the software is free for all
-      its users. This General Public License applies to most of the Free
+      The licenses for most software designed to take away your freedom
+      to share and change it. By contrast, the GNU General Public
+      License is intended to guarantee your freedom to share and change
+      free software---to make sure the software is free for all its
+      users. This General Public License applies to most of the Free
       Software Foundation's software and to any other program whose
       authors commit to using it. (Some other Free Software Foundation
       software is covered by the GNU Library General Public License


Modified: trunk/refman-common/load-balancer.xml
===================================================================
--- trunk/refman-common/load-balancer.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-common/load-balancer.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1856 bytes

@@ -152,7 +152,7 @@
 
     <para>
       You can run MySQL Load Balancer directly from this directory, or
-      you can copy the contents to a a global directory, such as
+      you can copy the contents to a global directory, such as
       <filename>/usr/local</filename>:
     </para>
 

@@ -332,7 +332,7 @@
           Balancer can monitor the status of the server and replication
           and use this to compare against the status of the slave
           servers. In the event of a problem, the information gained
-          will be used to prioritse connections to the slaves according
+          will be used to prioritize connections to the slaves according
           to which slave is the most up to date.
         </para>
       </listitem>

@@ -528,7 +528,7 @@
             No. Currently, the MySQL Load Balancer doesn't prevent you
             from making modifications on the slaves. The read-only
             description is being used to indicate that you should only
-            use this solution for sending quries to existing slave
+            use this solution for sending queries to existing slave
             hosts.
           </para>
 

@@ -552,7 +552,7 @@
 
           <para>
             Yes. the monitor module runs <literal>SHOW SLAVE
-            STATUS</literal> and checkes the status of the replication
+            STATUS</literal> and checks the status of the replication
             process. If there is a problem, either because the slave has
             lagged too far behind the master, or because the query
             thread has stopped, then the slave will be taken out of the


Modified: trunk/refman-common/mysql-proxy-core.xml
===================================================================
--- trunk/refman-common/mysql-proxy-core.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/refman-common/mysql-proxy-core.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 827 bytes

@@ -1206,8 +1206,8 @@
                 dictionary structure with the <literal>type</literal>
                 specifying the MySQL data type, and the
                 <literal>name</literal> specifying the column name.
-                Columns should be listed in the the order of the column
-                data that will be returned.</entry>
+                Columns should be listed in the order of the column data
+                that will be returned.</entry>
             </row>
             <row>
               <entry><literal>flags</literal></entry>


Modified: trunk/ro/administrator/service-control.xml
===================================================================
--- trunk/ro/administrator/service-control.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/ro/administrator/service-control.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 715 bytes

@@ -314,7 +314,7 @@
               of the MySQL server binary file as it is listed in the
               Windows service manager (for example
               <literal>C:\mysql\bin\mysqld-max-nt</literal>). Note that
-              the the Windows service manager does not display the
+              the Windows service manager does not display the
               <literal>.exe</literal> extension.
             </para>
           </listitem>


Modified: trunk/th/administrator/service-control.xml
===================================================================
--- trunk/th/administrator/service-control.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/th/administrator/service-control.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 715 bytes

@@ -313,7 +313,7 @@
               of the MySQL server binary file as it is listed in the
               Windows service manager (for example
               <literal>C:\mysql\bin\mysqld-max-nt</literal>). Note that
-              the the Windows service manager does not display the
+              the Windows service manager does not display the
               <literal>.exe</literal> extension.
             </para>
           </listitem>


Modified: trunk/th/refman-common/bug-reports.xml
===================================================================
--- trunk/th/refman-common/bug-reports.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/th/refman-common/bug-reports.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 766 bytes

@@ -583,7 +583,7 @@
       <para>
         If possible, download and install the most recent version of
         MySQL Server and check whether it solves your problem. All
-        versions of the MySQL software are thoroughly tested and should
+        versions of the MySQL software thoroughly tested and should
         work without problems. We believe in making everything as
         backward-compatible as possible, and you should be able to
         switch MySQL versions without difficulty. See


Modified: trunk/th/refman-common/gpl-license.xml
===================================================================
--- trunk/th/refman-common/gpl-license.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/th/refman-common/gpl-license.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 651 bytes

@@ -35,7 +35,7 @@
   </para>
 
   <para>
-    The licenses for most software are designed to take away your
+    The licenses for most software designed to take away your
     freedom to share and change it. By contrast, the GNU General Public
     License is intended to guarantee your freedom to share and change
     free software---to make sure the software is free for all its users.


Modified: trunk/th/refman-common/licenses.xml
===================================================================
--- trunk/th/refman-common/licenses.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/th/refman-common/licenses.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 645 bytes

@@ -39,7 +39,7 @@
     </para>
 
     <para>
-      The licenses for most software are designed to take away your
+      The licenses for most software designed to take away your
       freedom to share and change it. By contrast, the GNU General
       Public License is intended to guarantee your freedom to share and
       change free software---to make sure the software is free for all


Modified: trunk/workbench/plugins.xml
===================================================================
--- trunk/workbench/plugins.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/workbench/plugins.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 746 bytes

@@ -139,7 +139,7 @@
         <literal>getPluginInfo</literal> functions of the
         <filename>catalog_utils.grt.lua</filename> module. A
         <literal>structName</literal> is the first parameter for the
-        <literal>grtV.newObj</literal> function. In the case of the the
+        <literal>grtV.newObj</literal> function. In the case of the
         <literal>objectPluginInput</literal> function in
         <filename>catalog_utils.grt.lua</filename> module, the
         <literal>structName</literal> is


Modified: trunk/workbench/reference.xml
===================================================================
--- trunk/workbench/reference.xml	2008-09-17 12:16:58 UTC (rev 11843)
+++ trunk/workbench/reference.xml	2008-09-17 12:26:21 UTC (rev 11844)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1157 bytes

@@ -295,7 +295,7 @@
 
       <para>
         Under this menu item find the options for cutting, copying, and
-        pasting. These actions can also be performed using the the
+        pasting. These actions can also be performed using the
         <keycap>Ctrl</keycap> <keycap>X</keycap>, <keycap>Ctrl</keycap>
         <keycap>C</keycap>, and <keycap>Ctrl</keycap> <keycap>V</keycap>
         key combinations. Undo a deletion using the <guimenu>Undo Delete

@@ -394,7 +394,7 @@
       <para>
         Selecting items changes some of the <guimenu>Edit</guimenu> menu
         options. If only one object is selected, that object's name
-        appears after the the <guimenu>Cut</guimenu>,
+        appears after the <guimenu>Cut</guimenu>,
         <guimenu>Copy</guimenu> and <guimenu>Delete</guimenu> menu
         options. If more than one object is selected, these menu items
         show the number of objects selected.


Thread
svn commit - mysqldoc@docsrva: r11844 - in trunk: administrator dynamic-docs/build-configure dynamic-docs/changelog dynamic-docs/command-optvars migra...jon17 Sep