svn commit - mysqldoc@docsrva: r9720 - in trunk: . dynamic-docs/changelog

[paul]

Author: paul
Date: 2008-02-06 19:14:18 +0100 (Wed, 06 Feb 2008)
New Revision: 9720

Log:
 r28971@frost:  paul | 2008-02-06 12:12:26 -0600
 Fix typos, add bug number. (Joerg)


Modified:
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/dynamic-docs/changelog/mysqld.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34985
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:28969
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:28967
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34985
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:28971
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:28967


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2008-02-06 18:08:11 UTC (rev 9719)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2008-02-06 18:14:18 UTC (rev 9720)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 826 bytes

@@ -3957,7 +3957,7 @@
             <literal>MERGE</literal> table, nor as a non-temporary
             <literal>MERGE</literal> table. For example:
 <programlisting>CREATE TABLE m1 ... ENGINE=MRG_MYISAM ... SELECT
...;</programlisting>
-            Gives error message: table is not <literal>BASE
+            gives error message: table is not <literal>BASE
             TABLE</literal>.
           </para>
         </listitem>

@@ -7342,7 +7342,7 @@
     </tags>
 
     <bugs>
-      <fixes bugid="XXX"/>
+      <fixes bugid="32270"/>
     </bugs>
 
     <versions>


Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml	2008-02-06 18:08:11 UTC (rev 9719)
+++ trunk/dynamic-docs/changelog/mysqld.xml	2008-02-06 18:14:18 UTC (rev 9720)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 567 bytes

@@ -137606,7 +137606,7 @@
     <message>
 
       <para>
-        On WIndows, writes to the debug log were using
+        On Windows, writes to the debug log were using
         <literal>freopen()</literal> instead of
         <literal>fflush()</literal>, resulting in slower performance.
       </para>