svn commit - mysqldoc@docsrva: r665 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common

[paul]

Author: paul
Date: 2006-01-04 05:14:43 +0100 (Wed, 04 Jan 2006)
New Revision: 665

Log:
 r5811@frost:  paul | 2006-01-03 22:10:54 -0600
 Cleanup revisions.


Modified:
   trunk/
   trunk/refman-4.1/introduction.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.1/introduction.xml
   trunk/refman-common/maxdb.en.xml
   trunk/refman-common/news-4.0.xml
   trunk/refman-common/news-4.1.xml


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

Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2006-01-04 04:14:25 UTC (rev 664)
+++ trunk/refman-4.1/introduction.xml	2006-01-04 04:14:43 UTC (rev 665)
@@ -2637,12 +2637,12 @@
         </indexterm>
 
         <para>
-          Some other SQL databases use &lsquo;<option>--</option>&rsquo;
-          to start comments. MySQL Server uses
-          &lsquo;<literal>#</literal>&rsquo; as the start comment
-          character. You can also use the C comment style <literal>/*
-          this is a comment */</literal> with MySQL Server. See
-          <xref linkend="comments"/>.
+          Some other SQL database systems use
+          &lsquo;<option>--</option>&rsquo; to start comments. MySQL
+          Server uses &lsquo;<literal>#</literal>&rsquo; as the start
+          comment character. You can also use the C comment style
+          <literal>/* this is a comment */</literal> with MySQL Server.
+          See <xref linkend="comments"/>.
         </para>
 
         <para>

Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2006-01-04 04:14:25 UTC (rev 664)
+++ trunk/refman-5.0/introduction.xml	2006-01-04 04:14:43 UTC (rev 665)
@@ -2266,12 +2266,12 @@
         </indexterm>
 
         <para>
-          Some other SQL databases use &lsquo;<option>--</option>&rsquo;
-          to start comments. MySQL Server uses
-          &lsquo;<literal>#</literal>&rsquo; as the start comment
-          character. You can also use the C comment style <literal>/*
-          this is a comment */</literal> with MySQL Server. See
-          <xref linkend="comments"/>.
+          Some other SQL database systems use
+          &lsquo;<option>--</option>&rsquo; to start comments. MySQL
+          Server uses &lsquo;<literal>#</literal>&rsquo; as the start
+          comment character. You can also use the C comment style
+          <literal>/* this is a comment */</literal> with MySQL Server.
+          See <xref linkend="comments"/>.
         </para>
 
         <para>

Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2006-01-04 04:14:25 UTC (rev 664)
+++ trunk/refman-5.1/introduction.xml	2006-01-04 04:14:43 UTC (rev 665)
@@ -2020,12 +2020,12 @@
         </indexterm>
 
         <para>
-          Some other SQL databases use &lsquo;<option>--</option>&rsquo;
-          to start comments. MySQL Server uses
-          &lsquo;<literal>#</literal>&rsquo; as the start comment
-          character. You can also use the C comment style <literal>/*
-          this is a comment */</literal> with MySQL Server. See
-          <xref linkend="comments"/>.
+          Some other SQL database systems use
+          &lsquo;<option>--</option>&rsquo; to start comments. MySQL
+          Server uses &lsquo;<literal>#</literal>&rsquo; as the start
+          comment character. You can also use the C comment style
+          <literal>/* this is a comment */</literal> with MySQL Server.
+          See <xref linkend="comments"/>.
         </para>
 
         <para>

Modified: trunk/refman-common/maxdb.en.xml
===================================================================
--- trunk/refman-common/maxdb.en.xml	2006-01-04 04:14:25 UTC (rev 664)
+++ trunk/refman-common/maxdb.en.xml	2006-01-04 04:14:43 UTC (rev 665)
@@ -313,7 +313,7 @@
           are supported by MySQL. For developing with MaxDB, the MaxDB
           ODBC Driver, SQL Database Connectivity (SQLDBC), JDBC Driver,
           Perl and Python modules and a MaxDB PHP extension, which
-          provides access to the MySQL MaxDB databases using PHP, are
+          provides access to MySQL MaxDB databases using PHP, are
           available. Third Party Programming Interfaces: Support for OLE
           DB, ADO, DAO, RDO and .NET through ODBC. MaxDB supports
           embedded SQL with C/C++.

Modified: trunk/refman-common/news-4.0.xml
===================================================================
--- trunk/refman-common/news-4.0.xml	2006-01-04 04:14:25 UTC (rev 664)
+++ trunk/refman-common/news-4.0.xml	2006-01-04 04:14:43 UTC (rev 665)
@@ -2333,7 +2333,7 @@
 
       <listitem>
         <para>
-          Fixed bugs with names of tables, databases and columns that
+          Fixed bugs with names of tables, databases, and columns that
           end to space (Bug #2985)
         </para>
       </listitem>

Modified: trunk/refman-common/news-4.1.xml
===================================================================
--- trunk/refman-common/news-4.1.xml	2006-01-04 04:14:25 UTC (rev 664)
+++ trunk/refman-common/news-4.1.xml	2006-01-04 04:14:43 UTC (rev 665)
@@ -10693,7 +10693,7 @@
         <para>
           <literal>SELECT ... FROM DUAL</literal> is an alias for
           <literal>SELECT ...</literal>. (To be compatible with some
-          other databases).
+          other database systems).
         </para>
       </listitem>