List:Commits« Previous MessageNext Message »
From:paul Date:January 5 2006 3:27pm
Subject:svn commit - mysqldoc@docsrva: r686 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-05 16:26:56 +0100 (Thu, 05 Jan 2006)
New Revision: 686

Log:
 r5866@frost:  paul | 2006-01-05 09:25:33 -0600
 Remove duplicate words. (Bug#16109)


Modified:
   trunk/
   trunk/refman-4.1/charset.xml
   trunk/refman-4.1/connector-j.xml
   trunk/refman-4.1/connector-mxj.xml
   trunk/refman-4.1/data-types.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/functions.xml
   trunk/refman-4.1/innodb.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/ndbcluster.xml
   trunk/refman-4.1/optimization.xml
   trunk/refman-4.1/spatial-extensions.xml
   trunk/refman-5.0/charset.xml
   trunk/refman-5.0/client-side-scripts.xml
   trunk/refman-5.0/connector-j.xml
   trunk/refman-5.0/connector-mxj.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/functions.xml
   trunk/refman-5.0/innodb.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.0/ndbcluster.xml
   trunk/refman-5.0/optimization.xml
   trunk/refman-5.0/precision-math.xml
   trunk/refman-5.0/restrictions.xml
   trunk/refman-5.0/spatial-extensions.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.0/storage-engines.xml
   trunk/refman-5.0/stored-procedures.xml
   trunk/refman-5.0/triggers.xml
   trunk/refman-5.0/views.xml
   trunk/refman-5.1/charset.xml
   trunk/refman-5.1/client-side-scripts.xml
   trunk/refman-5.1/connector-j.xml
   trunk/refman-5.1/connector-mxj.xml
   trunk/refman-5.1/data-types.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-5.1/innodb.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/ndbcluster.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.1/precision-math.xml
   trunk/refman-5.1/restrictions.xml
   trunk/refman-5.1/spatial-extensions.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-5.1/storage-engines.xml
   trunk/refman-5.1/stored-procedures.xml
   trunk/refman-5.1/triggers.xml
   trunk/refman-5.1/views.xml


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

Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/charset.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -386,7 +386,7 @@
 
       <para>
         The MySQL Server has a server character set and a server
-        collation, neither of which which may be null.
+        collation, neither of which may be null.
       </para>
 
       <para>

Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/connector-j.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -21,7 +21,7 @@
 
   <para>
     MySQL Connector/J is a JDBC-3.0 <quote>Type 4</quote> driver, which
-    means that is is pure Java, implements version 3.0 of the JDBC
+    means that is pure Java, implements version 3.0 of the JDBC
     specification, and communicates directly with the MySQL server using
     the MySQL protocol.
   </para>

Modified: trunk/refman-4.1/connector-mxj.xml
===================================================================
--- trunk/refman-4.1/connector-mxj.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/connector-mxj.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -605,7 +605,7 @@
         </para>
 
         <para>
-          Returns true once the database reports that is is ready for
+          Returns true once the database reports that is ready for
           connections.
         </para>
       </listitem>

Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/data-types.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -4509,7 +4509,7 @@
         when you assign values to an <literal>ENUM</literal> column. As
         of 4.1.1, <literal>ENUM</literal> columns can be assigned a
         character set and collation. For binary or case-sensitive
-        collations, lettercase does matter when you assign values to to
+        collations, lettercase does matter when you assign values to
         the column.
       </para>
 
@@ -4626,7 +4626,7 @@
         when you assign values to an <literal>SET</literal> column. As
         of 4.1.1, <literal>SET</literal> columns can be assigned a
         character set and collation. For binary or case-sensitive
-        collations, lettercase does matter when you assign values to to
+        collations, lettercase does matter when you assign values to
         the column.
       </para>
 

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/database-administration.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -16694,7 +16694,7 @@
 </programlisting>
 
         <para>
-          After executing this command, the the data directory contains
+          After executing this command, the data directory contains
           a new binary log file,
           <filename>gbichot2-bin.000007</filename>. The resulting
           <filename>.sql</filename> file contains these lines:

Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/functions.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -3568,7 +3568,7 @@
         </para>
 
         <para>
-          Note that if you use a value less than than 1 for
+          Note that if you use a value less than 1 for
           <replaceable>len</replaceable>, the result is always an empty
           string.
         </para>

Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/innodb.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -4723,7 +4723,7 @@
           (Verified using MySQL 4.1, assumed for other MySQL versions,
           given that this is a platform architecture issue.) When using
           the InnoDB storage engine on Solaris 10 for x86_64
-          architecture (AMD Opteron), it is important to to mount any
+          architecture (AMD Opteron), it is important to mount any
           filesystems used for storing InnoDB-related files using the
           <literal>forcedirectio</literal> option. (The default on
           Solaris 10/x86_64 is <emphasis>not</emphasis> to use this

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/installing.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -12392,7 +12392,7 @@
             <literal>FLOAT(3,1)</literal> stores a maximum value of
             99.9. Before 4.1.2, the server allowed larger numbers to be
             stored. That is, it stored a value such as 100.0 as 100.0.
-            As of 4.1.2, the server clips clips 100.0 to the maximum
+            As of 4.1.2, the server clips 100.0 to the maximum
             allowable value of 99.9. If you have tables that were
             created before MySQL 4.1.2 and that contain floating-point
             data not strictly legal for the column type, you should

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/ndbcluster.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -2074,7 +2074,7 @@
 
           <listitem>
             <para>
-              <literal>[COMPUTER]</literal>: Defines the the cluster
+              <literal>[COMPUTER]</literal>: Defines the cluster
               hosts.
             </para>
           </listitem>
@@ -2588,7 +2588,7 @@
         </para>
 
         <para>
-          The <literal>Id</literal> value (that is, the the data node
+          The <literal>Id</literal> value (that is, the data node
           identifier) can be allocated on the command line when the node
           is started or in the configuration file.
         </para>
@@ -2784,7 +2784,7 @@
 
             <para>
               The memory allocated by <literal>DataMemory</literal> is
-              used to store both the the actual records and indexes.
+              used to store both the actual records and indexes.
               Each record is currently of fixed size. (Even
               <literal>VARCHAR</literal> columns are stored as
               fixed-width columns.) There is a 16-byte overhead on each
@@ -4275,7 +4275,7 @@
             </para>
 
             <para>
-              The UNDO index buffer buffer is used for the updates on
+              The UNDO index buffer is used for the updates on
               the primary key hash index. Inserts and deletes rearrange
               the hash index; the NDB storage engine writes UNDO log
               records that map all physical changes to an index page so
@@ -4539,7 +4539,7 @@
 
             <para>
               In creating a backup, there are two buffers used for
-              sending data to the disk. The backup data buffer buffer is
+              sending data to the disk. The backup data buffer is
               used to fill in data recorded by scanning a node's tables.
               Once this buffer has been filled to the level specified as
               <literal>BackupWriteSize</literal> (see below), the pages
@@ -5409,7 +5409,7 @@
         process should be started in a separate directory, the reason
         for this being that <command>ndbd</command> generated a set of
         log files in its starting directory. In MySQL 4.1.5, this
-        behavior was changed such that the these files are placed in the
+        behavior was changed such that these files are placed in the
         directory specified by <literal>DataDir</literal> in the
         configuration file. Thus <command>ndbd</command> can be started
         from anywhere.
@@ -5970,7 +5970,7 @@
                 <para>
                   As a measure of last resort when for some reason the
                   node restart or system restart repeatedly fails. In
-                  this case be aware that that this node can no longer
+                  this case be aware that this node can no longer
                   be used to restore data due to the destruction of the
                   datafiles.
                 </para>
@@ -7870,7 +7870,7 @@
 
           <listitem>
             <para>
-              Once the the backup has been aborted, the management
+              Once the backup has been aborted, the management
               server will report <literal>Backup
               <replaceable>backup_id</replaceable> has been aborted for
               reason <replaceable>XYZ</replaceable></literal>. This
@@ -8300,7 +8300,7 @@
       <para>
         The next possibility uses SCI switches. An SCI switch has 8
         ports, each of which can support a ring. It is necessary to make
-        sure that that different rings use different node ID spaces. In
+        sure that different rings use different node ID spaces. In
         a typical configuration, the first port uses node IDs below 64
         (4 - 60), the next 64 node IDs (68 - 124) are assigned to the
         next port, and so on, with node IDs 452 - 508 being assigned to
@@ -10045,7 +10045,7 @@
           &current-series;, Cluster tables (that is, tables created with
           <literal>ENGINE=NDBCLUSTER</literal>) have only fixed-width
           rows. This means that (for example) each record containing a
-          <literal>VARCHAR(255)</literal> column will will require 256
+          <literal>VARCHAR(255)</literal> column will require 256
           bytes of storage for that column, regardless of the size of
           the data stored therein. This issue is expected to be fixed in
           a future MySQL release series.
@@ -10094,7 +10094,7 @@
 
         <para>
           Each of these commands must be run from a system shell on the
-          machine housing the affected node. You can verify the the
+          machine housing the affected node. You can verify the
           cluster is running by starting the MGM management client
           <command>ndb_mgm</command> on the machine housing the MGM
           node.

Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/optimization.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -6499,7 +6499,7 @@
       </para>
 
       <para>
-        MySQL uses the average value group size in the the following
+        MySQL uses the average value group size in the following
         ways:
       </para>
 

Modified: trunk/refman-4.1/spatial-extensions.xml
===================================================================
--- trunk/refman-4.1/spatial-extensions.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-4.1/spatial-extensions.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -65,7 +65,7 @@
   </itemizedlist>
 
   <para>
-    If you have questions or concerns about about the use of the spatial
+    If you have questions or concerns about the use of the spatial
     extensions to MySQL, you can discuss these in the
     <ulink url="http://forums.mysql.com/list.php?23">GIS forums</ulink>
     on our website.

Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/charset.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -382,7 +382,7 @@
 
       <para>
         The MySQL Server has a server character set and a server
-        collation, neither of which which may be null.
+        collation, neither of which may be null.
       </para>
 
       <para>

Modified: trunk/refman-5.0/client-side-scripts.xml
===================================================================
--- trunk/refman-5.0/client-side-scripts.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/client-side-scripts.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -6216,7 +6216,7 @@
               zones. (Without this option, <literal>TIMESTAMP</literal>
               columns are dumped and reloaded in the local time zones of
               the source and destination servers.)
-              <option>--tz-utc</option> also also protects against
+              <option>--tz-utc</option> also protects against
               changes due to daylight saving time.
               <option>--tz-utc</option> is enabled by default. To
               disable it, use <option>--skip-tz-utc</option>. This

Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/connector-j.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -21,7 +21,7 @@
 
   <para>
     MySQL Connector/J is a JDBC-3.0 <quote>Type 4</quote> driver, which
-    means that is is pure Java, implements version 3.0 of the JDBC
+    means that is pure Java, implements version 3.0 of the JDBC
     specification, and communicates directly with the MySQL server using
     the MySQL protocol.
   </para>

Modified: trunk/refman-5.0/connector-mxj.xml
===================================================================
--- trunk/refman-5.0/connector-mxj.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/connector-mxj.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -605,7 +605,7 @@
         </para>
 
         <para>
-          Returns true once the database reports that is is ready for
+          Returns true once the database reports that is ready for
           connections.
         </para>
       </listitem>

Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/data-types.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -4421,7 +4421,7 @@
         definition. Note that <literal>SET</literal> columns can be
         assigned a character set and collation. For binary or
         case-sensitive collations, lettercase is taken into account when
-        assigning values to to the column.
+        assigning values to the column.
       </para>
 
       <para>
@@ -5143,7 +5143,7 @@
     </para>
 
     <para>
-      Tables created in MySQL 5.0.3 and above uses a a new storage
+      Tables created in MySQL 5.0.3 and above uses a new storage
       format for <literal>DECIMAL</literal> columns. All basic
       calculation (<literal>+,-,*,/</literal>) with
       <literal>DECIMAL</literal> columns are done with precision of 65

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/database-administration.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -640,7 +640,7 @@
         started with the <option>--skip-innodb</option> or
         <option>--skip-bdb</option> options at runtime. For the
         <literal>NDB Cluster</literal> storage engine,
-        <literal>DISABLED</literal> means the the server was compiled
+        <literal>DISABLED</literal> means the server was compiled
         with support for MySQL Cluster, but was not started with the
         <option>--ndb-cluster</option> option.
       </para>
@@ -18901,7 +18901,7 @@
 </programlisting>
 
         <para>
-          After executing this command, the the data directory contains
+          After executing this command, the data directory contains
           a new binary log file,
           <filename>gbichot2-bin.000007</filename>. The resulting
           <filename>.sql</filename> file contains these lines:

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/functions.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -3617,7 +3617,7 @@
         </para>
 
         <para>
-          Note that if you use a value less than than 1 for
+          Note that if you use a value less than 1 for
           <replaceable>len</replaceable>, the result is always an empty
           string.
         </para>

Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/innodb.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -4683,7 +4683,7 @@
       <listitem>
         <para>
           When using the InnoDB storage engine on Solaris 10 for x86_64
-          architecture (AMD Opteron), it is important to to mount any
+          architecture (AMD Opteron), it is important to mount any
           filesystems used for storing InnoDB-related files using the
           <literal>forcedirectio</literal> option. (The default on
           Solaris 10/x86_64 is <emphasis>not</emphasis> to use this

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/installing.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -585,7 +585,7 @@
 
         <para>
           We do not believe in a complete freeze, as this also leaves
-          out bugfixes and and other fixes that must be done. By
+          out bugfixes and other fixes that must be done. By
           <quote>somewhat frozen</quote> we mean that we may add small
           things that should not affect anything that currently works in
           a production release. Naturally, relevant bugfixes from an
@@ -12079,7 +12079,7 @@
             <literal>DECIMAL(3,1)</literal> stores a maximum value of
             99.9. Before MySQL 5.0.3, the server allowed larger numbers
             to be stored. That is, it stored a value such as 100.0 as
-            100.0. As of MySQL 5.0.3, the server clips clips 100.0 to
+            100.0. As of MySQL 5.0.3, the server clips 100.0 to
             the maximum allowable value of 99.9. If you have tables that
             were created before MySQL 5.0.3 and that contain
             floating-point data not strictly legal for the column type,

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/ndbcluster.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -2071,7 +2071,7 @@
 
           <listitem>
             <para>
-              <literal>[COMPUTER]</literal>: Defines the the cluster
+              <literal>[COMPUTER]</literal>: Defines the cluster
               hosts.
             </para>
           </listitem>
@@ -2586,7 +2586,7 @@
         </para>
 
         <para>
-          The <literal>Id</literal> value (that is, the the data node
+          The <literal>Id</literal> value (that is, the data node
           identifier) can be allocated on the command line when the node
           is started or in the configuration file.
         </para>
@@ -2786,7 +2786,7 @@
 
             <para>
               The memory allocated by <literal>DataMemory</literal> is
-              used to store both the the actual records and indexes.
+              used to store both the actual records and indexes.
               Each record is currently of fixed size. (Even
               <literal>VARCHAR</literal> columns are stored as
               fixed-width columns.) There is a 16-byte overhead on each
@@ -4288,7 +4288,7 @@
             </para>
 
             <para>
-              The UNDO index buffer buffer is used for the updates on
+              The UNDO index buffer is used for the updates on
               the primary key hash index. Inserts and deletes rearrange
               the hash index; the NDB storage engine writes UNDO log
               records that map all physical changes to an index page so
@@ -4552,7 +4552,7 @@
 
             <para>
               In creating a backup, there are two buffers used for
-              sending data to the disk. The backup data buffer buffer is
+              sending data to the disk. The backup data buffer is
               used to fill in data recorded by scanning a node's tables.
               Once this buffer has been filled to the level specified as
               <literal>BackupWriteSize</literal> (see below), the pages
@@ -5948,7 +5948,7 @@
                 <para>
                   As a measure of last resort when for some reason the
                   node restart or system restart repeatedly fails. In
-                  this case be aware that that this node can no longer
+                  this case be aware that this node can no longer
                   be used to restore data due to the destruction of the
                   datafiles.
                 </para>
@@ -7844,7 +7844,7 @@
 
           <listitem>
             <para>
-              Once the the backup has been aborted, the management
+              Once the backup has been aborted, the management
               server will report <literal>Backup
               <replaceable>backup_id</replaceable> has been aborted for
               reason <replaceable>XYZ</replaceable></literal>. This
@@ -8273,7 +8273,7 @@
       <para>
         The next possibility uses SCI switches. An SCI switch has 8
         ports, each of which can support a ring. It is necessary to make
-        sure that that different rings use different node ID spaces. In
+        sure that different rings use different node ID spaces. In
         a typical configuration, the first port uses node IDs below 64
         (4 - 60), the next 64 node IDs (68 - 124) are assigned to the
         next port, and so on, with node IDs 452 - 508 being assigned to
@@ -10331,7 +10331,7 @@
           (that is, tables created with
           <literal>ENGINE=NDBCLUSTER</literal>) have only fixed-width
           rows. This means that (for example) each record containing a
-          <literal>VARCHAR(255)</literal> column will will require 256
+          <literal>VARCHAR(255)</literal> column will require 256
           bytes of storage for that column, regardless of the size of
           the data stored therein. This issue is expected to be fixed in
           a future MySQL release series.
@@ -10380,7 +10380,7 @@
 
         <para>
           Each of these commands must be run from a system shell on the
-          machine housing the affected node. You can verify the the
+          machine housing the affected node. You can verify the
           cluster is running by starting the MGM management client
           <command>ndb_mgm</command> on the machine housing the MGM
           node.

Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/optimization.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -7969,7 +7969,7 @@
       </para>
 
       <para>
-        MySQL uses the average value group size in the the following
+        MySQL uses the average value group size in the following
         ways:
       </para>
 

Modified: trunk/refman-5.0/precision-math.xml
===================================================================
--- trunk/refman-5.0/precision-math.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/precision-math.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -547,7 +547,7 @@
 
     <para>
       Inserts into numeric columns are affected by the SQL mode, which
-      is controlled by the sql_mode system variable. (See see
+      is controlled by the sql_mode system variable. (See
       <xref linkend="sql-mode"/>.) The following discussion mentions
       strict mode (selected by the <literal>STRICT_ALL_TABLES</literal>
       or <literal>STRICT_TRANS_TABLES</literal> mode values) and

Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/restrictions.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -736,7 +736,7 @@
       <listitem>
         <para>
           If a statement prepared by <literal>PREPARE</literal> refers
-          to a view, the view contents seen each time the the statement
+          to a view, the view contents seen each time the statement
           is executed later will be the contents of the view at the time
           it was prepared. This is true even if the view definition is
           changed after the statement is prepared and before it is

Modified: trunk/refman-5.0/spatial-extensions.xml
===================================================================
--- trunk/refman-5.0/spatial-extensions.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/spatial-extensions.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -77,7 +77,7 @@
 
       <listitem>
         <para>
-          If you have questions or concerns about about the use of the
+          If you have questions or concerns about the use of the
           spatial extensions to MySQL, you can discuss these in the GIS
           forums: <ulink url="http://forums.mysql.com/list.php?23"/>.
         </para>

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -1686,7 +1686,7 @@
                 If strict mode is enabled, an error occurs for
                 transactional tables and the statement is rolled back.
                 For non-transactional tables, an error occurs, but if
-                this happens for the the second or subsequent row of a
+                this happens for the second or subsequent row of a
                 multiple-row statement, the preceding rows will have
                 been inserted.
               </para>

Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/storage-engines.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -3455,7 +3455,7 @@
 
       <remark role="todo">
         Stuff we could cover: - If federated table is replicated, the
-        the slave hosts must be able to use the account in the
+        slave hosts must be able to use the account in the
         CONNECTION to connect to the remote server.
       </remark>
 
@@ -3617,7 +3617,7 @@
           <para>
             In the first version, the remote server must be a MySQL
             server. Support by <literal>FEDERATED</literal> for other
-            database engines may be be added in the future.
+            database engines may be added in the future.
           </para>
         </listitem>
 

Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/stored-procedures.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -409,7 +409,7 @@
         Several characteristics provide information about the nature of
         data use by the routine. <literal>CONTAINS SQL</literal>
         indicates that the routine does not contain statements that read
-        or write data. <literal>NO SQL</literal> indicates the the
+        or write data. <literal>NO SQL</literal> indicates that the
         routine contains no SQL statements. <literal>READS SQL
         DATA</literal> indicates that the routine contains statements
         that read data, but not statements that write data.

Modified: trunk/refman-5.0/triggers.xml
===================================================================
--- trunk/refman-5.0/triggers.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/triggers.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -325,7 +325,7 @@
       <replaceable>host_name</replaceable> values both are required.
       <literal>CURRENT_USER</literal> also can be given as
       <literal>CURRENT_USER()</literal>. The default
-      <literal>DEFINER</literal> value is the the user who executes the
+      <literal>DEFINER</literal> value is the user who executes the
       <literal>CREATE TRIGGER</literal> statement. (This is the same as
       <literal>DEFINER = CURRENT_USER</literal>.)
     </para>

Modified: trunk/refman-5.0/views.xml
===================================================================
--- trunk/refman-5.0/views.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.0/views.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -375,7 +375,7 @@
     </para>
 
     <para>
-      The default <literal>DEFINER</literal> value is the the user who
+      The default <literal>DEFINER</literal> value is the user who
       executes the <literal>CREATE VIEW</literal> statement. (This is
       the same as <literal>DEFINER = CURRENT_USER</literal>.) If a
       <replaceable>user</replaceable> value is given, it should be a

Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/charset.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -382,7 +382,7 @@
 
       <para>
         The MySQL Server has a server character set and a server
-        collation, neither of which which may be null.
+        collation, neither of which may be null.
       </para>
 
       <para>

Modified: trunk/refman-5.1/client-side-scripts.xml
===================================================================
--- trunk/refman-5.1/client-side-scripts.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/client-side-scripts.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -6249,7 +6249,7 @@
               zones. (Without this option, <literal>TIMESTAMP</literal>
               columns are dumped and reloaded in the local time zones of
               the source and destination servers.)
-              <option>--tz-utc</option> also also protects against
+              <option>--tz-utc</option> also protects against
               changes due to daylight saving time.
               <option>--tz-utc</option> is enabled by default. To
               disable it, use <option>--skip-tz-utc</option>. This

Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/connector-j.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -21,7 +21,7 @@
 
   <para>
     MySQL Connector/J is a JDBC-3.0 <quote>Type 4</quote> driver, which
-    means that is is pure Java, implements version 3.0 of the JDBC
+    means that is pure Java, implements version 3.0 of the JDBC
     specification, and communicates directly with the MySQL server using
     the MySQL protocol.
   </para>

Modified: trunk/refman-5.1/connector-mxj.xml
===================================================================
--- trunk/refman-5.1/connector-mxj.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/connector-mxj.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -605,7 +605,7 @@
         </para>
 
         <para>
-          Returns true once the database reports that is is ready for
+          Returns true once the database reports that is ready for
           connections.
         </para>
       </listitem>

Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/data-types.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -4262,7 +4262,7 @@
         definition. Note that <literal>SET</literal> columns can be
         assigned a character set and collation. For binary or
         case-sensitive collations, lettercase is taken into account when
-        assigning values to to the column.
+        assigning values to the column.
       </para>
 
       <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/database-administration.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -640,7 +640,7 @@
         started with the <option>--skip-innodb</option> or
         <option>--skip-bdb</option> options at runtime. For the
         <literal>NDB Cluster</literal> storage engine,
-        <literal>DISABLED</literal> means the the server was compiled
+        <literal>DISABLED</literal> means the server was compiled
         with support for MySQL Cluster, but was not started with the
         <option>--ndb-cluster</option> option.
       </para>
@@ -18850,7 +18850,7 @@
 </programlisting>
 
         <para>
-          After executing this command, the the data directory contains
+          After executing this command, the data directory contains
           a new binary log file,
           <filename>gbichot2-bin.000007</filename>. The resulting
           <filename>.sql</filename> file contains these lines:

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/functions.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -3589,7 +3589,7 @@
         </para>
 
         <para>
-          Note that if you use a value less than than 1 for
+          Note that if you use a value less than 1 for
           <replaceable>len</replaceable>, the result is always an empty
           string.
         </para>

Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/innodb.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -4643,7 +4643,7 @@
       <listitem>
         <para>
           When using the InnoDB storage engine on Solaris 10 for x86_64
-          architecture (AMD Opteron), it is important to to mount any
+          architecture (AMD Opteron), it is important to mount any
           filesystems used for storing InnoDB-related files using the
           <literal>forcedirectio</literal> option. (The default on
           Solaris 10/x86_64 is <emphasis>not</emphasis> to use this

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/installing.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -585,7 +585,7 @@
 
         <para>
           We do not believe in a complete freeze, as this also leaves
-          out bugfixes and and other fixes that must be done. By
+          out bugfixes and other fixes that must be done. By
           <quote>somewhat frozen</quote> we mean that we may add small
           things that should not affect anything that currently works in
           a production release. Naturally, relevant bugfixes from an

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -2071,7 +2071,7 @@
 
           <listitem>
             <para>
-              <literal>[COMPUTER]</literal>: Defines the the cluster
+              <literal>[COMPUTER]</literal>: Defines the cluster
               hosts.
             </para>
           </listitem>
@@ -2586,7 +2586,7 @@
         </para>
 
         <para>
-          The <literal>Id</literal> value (that is, the the data node
+          The <literal>Id</literal> value (that is, the data node
           identifier) can be allocated on the command line when the node
           is started or in the configuration file.
         </para>
@@ -2786,7 +2786,7 @@
 
             <para>
               The memory allocated by <literal>DataMemory</literal> is
-              used to store both the the actual records and indexes.
+              used to store both the actual records and indexes.
               Each record is currently of fixed size. (Even
               <literal>VARCHAR</literal> columns are stored as
               fixed-width columns.) There is a 16-byte overhead on each
@@ -4288,7 +4288,7 @@
             </para>
 
             <para>
-              The UNDO index buffer buffer is used for the updates on
+              The UNDO index buffer is used for the updates on
               the primary key hash index. Inserts and deletes rearrange
               the hash index; the NDB storage engine writes UNDO log
               records that map all physical changes to an index page so
@@ -4552,7 +4552,7 @@
 
             <para>
               In creating a backup, there are two buffers used for
-              sending data to the disk. The backup data buffer buffer is
+              sending data to the disk. The backup data buffer is
               used to fill in data recorded by scanning a node's tables.
               Once this buffer has been filled to the level specified as
               <literal>BackupWriteSize</literal> (see below), the pages
@@ -5948,7 +5948,7 @@
                 <para>
                   As a measure of last resort when for some reason the
                   node restart or system restart repeatedly fails. In
-                  this case be aware that that this node can no longer
+                  this case be aware that this node can no longer
                   be used to restore data due to the destruction of the
                   datafiles.
                 </para>
@@ -7844,7 +7844,7 @@
 
           <listitem>
             <para>
-              Once the the backup has been aborted, the management
+              Once the backup has been aborted, the management
               server will report <literal>Backup
               <replaceable>backup_id</replaceable> has been aborted for
               reason <replaceable>XYZ</replaceable></literal>. This
@@ -9885,7 +9885,7 @@
       <para>
         The next possibility uses SCI switches. An SCI switch has 8
         ports, each of which can support a ring. It is necessary to make
-        sure that that different rings use different node ID spaces. In
+        sure that different rings use different node ID spaces. In
         a typical configuration, the first port uses node IDs below 64
         (4 - 60), the next 64 node IDs (68 - 124) are assigned to the
         next port, and so on, with node IDs 452 - 508 being assigned to
@@ -11911,7 +11911,7 @@
           (that is, tables created with
           <literal>ENGINE=NDBCLUSTER</literal>) have only fixed-width
           rows. This means that (for example) each record containing a
-          <literal>VARCHAR(255)</literal> column will will require 256
+          <literal>VARCHAR(255)</literal> column will require 256
           bytes of storage for that column, regardless of the size of
           the data stored therein. This issue is expected to be fixed in
           a future MySQL release series.
@@ -11960,7 +11960,7 @@
 
         <para>
           Each of these commands must be run from a system shell on the
-          machine housing the affected node. You can verify the the
+          machine housing the affected node. You can verify the
           cluster is running by starting the MGM management client
           <command>ndb_mgm</command> on the machine housing the MGM
           node.

Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/optimization.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -7938,7 +7938,7 @@
       </para>
 
       <para>
-        MySQL uses the average value group size in the the following
+        MySQL uses the average value group size in the following
         ways:
       </para>
 

Modified: trunk/refman-5.1/precision-math.xml
===================================================================
--- trunk/refman-5.1/precision-math.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/precision-math.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -480,7 +480,7 @@
 
     <para>
       Inserts into numeric columns are affected by the SQL mode, which
-      is controlled by the sql_mode system variable. (See see
+      is controlled by the sql_mode system variable. (See
       <xref linkend="sql-mode"/>.) The following discussion mentions
       strict mode (selected by the <literal>STRICT_ALL_TABLES</literal>
       or <literal>STRICT_TRANS_TABLES</literal> mode values) and

Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/restrictions.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -712,7 +712,7 @@
       <listitem>
         <para>
           If a statement prepared by <literal>PREPARE</literal> refers
-          to a view, the view contents seen each time the the statement
+          to a view, the view contents seen each time the statement
           is executed later will be the contents of the view at the time
           it was prepared. This is true even if the view definition is
           changed after the statement is prepared and before it is

Modified: trunk/refman-5.1/spatial-extensions.xml
===================================================================
--- trunk/refman-5.1/spatial-extensions.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/spatial-extensions.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -77,7 +77,7 @@
 
       <listitem>
         <para>
-          If you have questions or concerns about about the use of the
+          If you have questions or concerns about the use of the
           spatial extensions to MySQL, you can discuss these in the GIS
           forums: <ulink url="http://forums.mysql.com/list.php?23"/>.
         </para>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -1901,7 +1901,7 @@
                 If strict mode is enabled, an error occurs for
                 transactional tables and the statement is rolled back.
                 For non-transactional tables, an error occurs, but if
-                this happens for the the second or subsequent row of a
+                this happens for the second or subsequent row of a
                 multiple-row statement, the preceding rows will have
                 been inserted.
               </para>

Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/storage-engines.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -3478,7 +3478,7 @@
 
       <remark role="todo">
         Stuff we could cover: - If federated table is replicated, the
-        the slave hosts must be able to use the account in the
+        slave hosts must be able to use the account in the
         CONNECTION to connect to the remote server.
       </remark>
 
@@ -3642,7 +3642,7 @@
           <para>
             In the first version, the remote server must be a MySQL
             server. Support by <literal>FEDERATED</literal> for other
-            database engines may be be added in the future.
+            database engines may be added in the future.
           </para>
         </listitem>
 

Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/stored-procedures.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -401,7 +401,7 @@
         Several characteristics provide information about the nature of
         data use by the routine. <literal>CONTAINS SQL</literal>
         indicates that the routine does not contain statements that read
-        or write data. <literal>NO SQL</literal> indicates the the
+        or write data. <literal>NO SQL</literal> indicates that the
         routine contains no SQL statements. <literal>READS SQL
         DATA</literal> indicates that the routine contains statements
         that read data, but not statements that write data.

Modified: trunk/refman-5.1/triggers.xml
===================================================================
--- trunk/refman-5.1/triggers.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/triggers.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -323,7 +323,7 @@
       <replaceable>host_name</replaceable> values both are required.
       <literal>CURRENT_USER</literal> also can be given as
       <literal>CURRENT_USER()</literal>. The default
-      <literal>DEFINER</literal> value is the the user who executes the
+      <literal>DEFINER</literal> value is the user who executes the
       <literal>CREATE TRIGGER</literal> statement. (This is the same as
       <literal>DEFINER = CURRENT_USER</literal>.)
     </para>

Modified: trunk/refman-5.1/views.xml
===================================================================
--- trunk/refman-5.1/views.xml	2006-01-05 15:26:37 UTC (rev 685)
+++ trunk/refman-5.1/views.xml	2006-01-05 15:26:56 UTC (rev 686)
@@ -366,7 +366,7 @@
     </para>
 
     <para>
-      The default <literal>DEFINER</literal> value is the the user who
+      The default <literal>DEFINER</literal> value is the user who
       executes the <literal>CREATE VIEW</literal> statement. (This is
       the same as <literal>DEFINER = CURRENT_USER</literal>.) If a
       <replaceable>user</replaceable> value is given, it should be a

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