List:Commits« Previous MessageNext Message »
From:paul Date:January 7 2006 9:27pm
Subject:svn commit - mysqldoc@docsrva: r715 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-07 22:27:25 +0100 (Sat, 07 Jan 2006)
New Revision: 715

Log:
 r5944@frost:  paul | 2006-01-07 15:27:04 -0600
 Kill "(s)".


Modified:
   trunk/
   trunk/refman-4.1/connector-j.xml
   trunk/refman-4.1/connector-odbc.xml
   trunk/refman-4.1/innodb.xml
   trunk/refman-4.1/ndbcluster.xml
   trunk/refman-5.0/connector-j.xml
   trunk/refman-5.0/connector-odbc.xml
   trunk/refman-5.0/innodb.xml
   trunk/refman-5.0/ndbcluster.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/connector-j.xml
   trunk/refman-5.1/connector-odbc.xml
   trunk/refman-5.1/innodb.xml
   trunk/refman-5.1/ndbcluster.xml
   trunk/refman-5.1/replication.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-common/news-3.21.xml
   trunk/refman-common/news-innodb.xml


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

Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-4.1/connector-j.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -4573,8 +4573,8 @@
               Because MySQL does not have row identifiers, MySQL
               Connector/J can only update result sets that have come
               from queries on tables that have at least one primary key,
-              the query must select all of the primary key(s) and the
-              query can only span one table (i.e. no joins). This is
+              the query must select every primary key and the
+              query can only span one table (that is, no joins). This is
               outlined in the JDBC specification.
             </para>
 

Modified: trunk/refman-4.1/connector-odbc.xml
===================================================================
--- trunk/refman-4.1/connector-odbc.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-4.1/connector-odbc.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -663,7 +663,7 @@
 
       <para>
         An ODBC Driver Manager is a library that manages communication
-        between the ODBC aware application and driver(s). Its main
+        between the ODBC-aware application and any drivers. Its main
         functionality includes:
       </para>
 
@@ -4455,7 +4455,7 @@
       </para>
 
       <para>
-        <emphasis role="bold">To import or link a table(s) from MySQL to
+        <emphasis role="bold">To import or link a table or tables from MySQL to
         Access, follow the instructions:</emphasis>
       </para>
 

Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-4.1/innodb.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -2019,7 +2019,7 @@
         <listitem>
           <para>
             <literal>SET NULL</literal>: Delete or update the row from
-            the parent table and set the foreign key column(s) in the
+            the parent table and set the foreign key column or columns in the
             child table to <literal>NULL</literal>. This is only valid
             if the foreign key columns do not have the <literal>NOT
             NULL</literal> qualifier specified. <literal>ON DELETE SET
@@ -2071,10 +2071,10 @@
       <para>
         <literal>InnoDB</literal> supports the same options when the
         candidate key in the parent table is updated. With
-        <literal>CASCADE</literal>, the foreign key column(s) in the
-        child table are set to new value(s) of the candidate key in the
+        <literal>CASCADE</literal>, the foreign key column or columns in the
+        child table are set to the new values of the candidate key in the
         parent table. In the same way, the updates cascade if updated
-        column(s) in the child table reference foreign keys in another
+        columns in the child table reference foreign keys in another
         table.
       </para>
 

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-4.1/ndbcluster.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -1147,10 +1147,10 @@
             CLuster storage engine in order to have them replicated in
             the cluster. If you are importing tables from an existing
             database using the output of <command>mysqldump</command>,
-            you can open the SQL script(s) in a text editor and add this
+            you can open the SQL script or scripts in a text editor and add this
             option to any table creation statements, or replace any
             existing <literal>ENGINE</literal> (or
-            <literal>TYPE</literal>) option(s) with one of these. For
+            <literal>TYPE</literal>) option with one of these. For
             example, suppose that you have the sample
             <literal>world</literal> database on another MySQL server
             (that does not support MySQL Cluster), and you wish to
@@ -6305,7 +6305,7 @@
 
                 <listitem>
                   <para>
-                    Read schema(s).
+                    Read schema or schemas.
                   </para>
                 </listitem>
 
@@ -9586,7 +9586,7 @@
 
       <listitem>
         <para>
-          <emphasis>Which version(s) of the MySQL software support
+          <emphasis>Which versions of the MySQL software support
           Cluster? Do I have to compile from source?</emphasis>
         </para>
 

Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.0/connector-j.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -4573,8 +4573,8 @@
               Because MySQL does not have row identifiers, MySQL
               Connector/J can only update result sets that have come
               from queries on tables that have at least one primary key,
-              the query must select all of the primary key(s) and the
-              query can only span one table (i.e. no joins). This is
+              the query must select every primary key and the
+              query can only span one table (that is, no joins). This is
               outlined in the JDBC specification.
             </para>
 

Modified: trunk/refman-5.0/connector-odbc.xml
===================================================================
--- trunk/refman-5.0/connector-odbc.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.0/connector-odbc.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -663,7 +663,7 @@
 
       <para>
         An ODBC Driver Manager is a library that manages communication
-        between the ODBC aware application and driver(s). Its main
+        between the ODBC-aware application and any drivers. Its main
         functionality includes:
       </para>
 
@@ -4455,7 +4455,7 @@
       </para>
 
       <para>
-        <emphasis role="bold">To import or link a table(s) from MySQL to
+        <emphasis role="bold">To import or link a table or tables from MySQL to
         Access, follow the instructions:</emphasis>
       </para>
 

Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.0/innodb.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -2073,7 +2073,7 @@
         <listitem>
           <para>
             <literal>SET NULL</literal>: Delete or update the row from
-            the parent table and set the foreign key column(s) in the
+            the parent table and set the foreign key column or columns in the
             child table to <literal>NULL</literal>. This is only valid
             if the foreign key columns do not have the <literal>NOT
             NULL</literal> qualifier specified. Both <literal>ON DELETE
@@ -2124,10 +2124,10 @@
       <para>
         <literal>InnoDB</literal> supports the same options when the
         candidate key in the parent table is updated. With
-        <literal>CASCADE</literal>, the foreign key column(s) in the
-        child table are set to new value(s) of the candidate key in the
+        <literal>CASCADE</literal>, the foreign key column or columns in the
+        child table are set to the new values of the candidate key in the
         parent table. In the same way, the updates cascade if updated
-        column(s) in the child table reference foreign keys in another
+        columns in the child table reference foreign keys in another
         table.
       </para>
 

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.0/ndbcluster.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -1153,10 +1153,10 @@
             CLuster storage engine in order to have them replicated in
             the cluster. If you are importing tables from an existing
             database using the output of <command>mysqldump</command>,
-            you can open the SQL script(s) in a text editor and add this
+            you can open the SQL script or scripts in a text editor and add this
             option to any table creation statements, or replace any
             existing <literal>ENGINE</literal> (or
-            <literal>TYPE</literal>) option(s) with one of these. For
+            <literal>TYPE</literal>) option with one of these. For
             example, suppose that you have the sample
             <literal>world</literal> database on another MySQL server
             (that does not support MySQL Cluster), and you wish to
@@ -6279,7 +6279,7 @@
 
                 <listitem>
                   <para>
-                    Read schema(s).
+                    Read schema or schemas.
                   </para>
                 </listitem>
 
@@ -9864,7 +9864,7 @@
 
       <listitem>
         <para>
-          <emphasis>Which version(s) of the MySQL software support
+          <emphasis>Which versions of the MySQL software support
           Cluster? Do I have to compile from source?</emphasis>
         </para>
 

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.0/replication.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -71,7 +71,7 @@
       <xref linkend="ndbcluster"/>.) The master server writes updates to
       its binary log files, and maintains an index of the files to keep
       track of log rotation. These logs serve as records of updates to
-      be sent to the slave server(s). When a slave connects to the
+      be sent to any slave servers. When a slave connects to the
       master, it informs the master of the position up to which the
       slave read in the logs at the last successful update. The slave
       receives any updates that have taken place since that time, and

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -11560,7 +11560,7 @@
         <para>
           To revoke all privileges, use the following syntax, which
           drops all global, database-, table-, and column-level
-          privileges for the named user(s):
+          privileges for the named user or users:
         </para>
 
 <programlisting>

Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.1/connector-j.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -4573,8 +4573,8 @@
               Because MySQL does not have row identifiers, MySQL
               Connector/J can only update result sets that have come
               from queries on tables that have at least one primary key,
-              the query must select all of the primary key(s) and the
-              query can only span one table (i.e. no joins). This is
+              the query must select every primary key and the
+              query can only span one table (that is, no joins). This is
               outlined in the JDBC specification.
             </para>
 

Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.1/connector-odbc.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -663,7 +663,7 @@
 
       <para>
         An ODBC Driver Manager is a library that manages communication
-        between the ODBC aware application and driver(s). Its main
+        between the ODBC-aware application and any drivers. Its main
         functionality includes:
       </para>
 
@@ -4455,7 +4455,7 @@
       </para>
 
       <para>
-        <emphasis role="bold">To import or link a table(s) from MySQL to
+        <emphasis role="bold">To import or link a table or tables from MySQL to
         Access, follow the instructions:</emphasis>
       </para>
 

Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.1/innodb.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -2048,7 +2048,7 @@
         <listitem>
           <para>
             <literal>SET NULL</literal>: Delete or update the row from
-            the parent table and set the foreign key column(s) in the
+            the parent table and set the foreign key column or columns in the
             child table to <literal>NULL</literal>. This is only valid
             if the foreign key columns do not have the <literal>NOT
             NULL</literal> qualifier specified. Both <literal>ON DELETE
@@ -2099,10 +2099,10 @@
       <para>
         <literal>InnoDB</literal> supports the same options when the
         candidate key in the parent table is updated. With
-        <literal>CASCADE</literal>, the foreign key column(s) in the
-        child table are set to new value(s) of the candidate key in the
+        <literal>CASCADE</literal>, the foreign key column or columns in the
+        child table are set to the new values of the candidate key in the
         parent table. In the same way, the updates cascade if updated
-        column(s) in the child table reference foreign keys in another
+        columns in the child table reference foreign keys in another
         table.
       </para>
 

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -1153,10 +1153,10 @@
             CLuster storage engine in order to have them replicated in
             the cluster. If you are importing tables from an existing
             database using the output of <command>mysqldump</command>,
-            you can open the SQL script(s) in a text editor and add this
+            you can open the SQL script or scripts in a text editor and add this
             option to any table creation statements, or replace any
             existing <literal>ENGINE</literal> (or
-            <literal>TYPE</literal>) option(s) with one of these. For
+            <literal>TYPE</literal>) option with one of these. For
             example, suppose that you have the sample
             <literal>world</literal> database on another MySQL server
             (that does not support MySQL Cluster), and you wish to
@@ -6279,7 +6279,7 @@
 
                 <listitem>
                   <para>
-                    Read schema(s).
+                    Read schema or schemas.
                   </para>
                 </listitem>
 
@@ -11444,7 +11444,7 @@
 
       <listitem>
         <para>
-          <emphasis>Which version(s) of the MySQL software support
+          <emphasis>Which versions of the MySQL software support
           Cluster? Do I have to compile from source?</emphasis>
         </para>
 

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.1/replication.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -71,7 +71,7 @@
       <xref linkend="ndbcluster"/>.) The master server writes updates to
       its binary log files, and maintains an index of the files to keep
       track of log rotation. These logs serve as records of updates to
-      be sent to the slave server(s). When a slave connects to the
+      be sent to any slave servers. When a slave connects to the
       master, it informs the master of the position up to which the
       slave read in the logs at the last successful update. The slave
       receives any updates that have taken place since that time, and

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -12043,7 +12043,7 @@
         <para>
           To revoke all privileges, use the following syntax, which
           drops all global, database-, table-, and column-level
-          privileges for the named user(s):
+          privileges for the named user or users:
         </para>
 
 <programlisting>

Modified: trunk/refman-common/news-3.21.xml
===================================================================
--- trunk/refman-common/news-3.21.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-common/news-3.21.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -2470,7 +2470,7 @@
       <listitem>
         <para>
           Many small portability changes (from the AIX and alpha-digital
-          port) Better checking of pthread(s) library.
+          port) Better checking of pthreads library.
         </para>
       </listitem>
 

Modified: trunk/refman-common/news-innodb.xml
===================================================================
--- trunk/refman-common/news-innodb.xml	2006-01-07 01:05:13 UTC (rev 714)
+++ trunk/refman-common/news-innodb.xml	2006-01-07 21:27:25 UTC (rev 715)
@@ -920,7 +920,7 @@
           table is referenced by a <literal>FOREIGN KEY</literal>. The
           MySQL manual states that <literal>REPLACE</literal> must
           resolve a duplicate-key error semantically with
-          <literal>DELETE</literal>(s) + <literal>INSERT</literal>, and
+          <literal>DELETE</literal> + <literal>INSERT</literal>, and
           not by an <literal>UPDATE</literal>. In versions &lt; 4.0.18
           and &lt; 4.1.2, MySQL could resolve a duplicate key conflict
           in <literal>REPLACE</literal> by doing an
@@ -1327,9 +1327,9 @@
         <para>
           Fixed the checksum calculation of data pages. Previously most
           OS file system corruption went unnoticed. Note that if you
-          downgrade from version &gt;= 4.0.14 to an earlier version &lt;
-          4.0.14 then in the first startup(s) <literal>InnoDB</literal>
-          prints warnings:
+          downgrade from version 4.0.14 or up to a version earlier than
+          4.0.14, <literal>InnoDB</literal> prints warnings in the first
+          startup:
         </para>
 
 <programlisting>

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