svn commit - mysqldoc@docsrva: r1396 - in trunk: . refman-5.1

[paul]

Author: paul
Date: 2006-02-19 05:22:57 +0100 (Sun, 19 Feb 2006)
New Revision: 1396

Log:
 r7867@frost:  paul | 2006-02-18 22:20:49 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/introduction.xml


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

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-02-19 04:22:32 UTC (rev 1395)
+++ trunk/refman-5.1/database-administration.xml	2006-02-19 04:22:57 UTC (rev 1396)
@@ -3705,9 +3705,10 @@
             <para>
               The binary logging format, either
               <literal>STATEMENT</literal> or <literal>ROW</literal>.
-              This variable is set by the
+              <literal>binlog_format</literal> is set by the
               <option>--binlog-format</option> option. See
-              <xref linkend="replication-row-based"/>.
+              <xref linkend="replication-row-based"/>. This variable was
+              added in MySQL 5.1.5.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-02-19 04:22:32 UTC (rev 1395)
+++ trunk/refman-5.1/installing.xml	2006-02-19 04:22:57 UTC (rev 1396)
@@ -11830,7 +11830,7 @@
       <para>
         The following lists describe changes that may affect
         applications and that you should watch out for when upgrading to
-        version &current-series;.
+        MySQL &current-series;.
       </para>
 
       <para>

Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2006-02-19 04:22:32 UTC (rev 1395)
+++ trunk/refman-5.1/introduction.xml	2006-02-19 04:22:57 UTC (rev 1396)
@@ -554,14 +554,11 @@
       <xref linkend="ndbcluster"/>.
     </para>
 
-    <remark role="todo">
-      [js] Add link to following para when one exists.
-    </remark>
-
     <para>
       We are implementing XML functionality beginning in MySQL 5.1,
       which supports most of the W3C XPath standard. We plan to increase
-      support for XML as part of future MySQL development.
+      support for XML as part of future MySQL development. See
+      <xref linkend="xml-functions"/>.
     </para>
 
     <section id="standards">