svn commit - mysqldoc@docsrva: r3916 - in trunk: refman-5.1 refman-common

[jon]

Author: jstephens
Date: 2006-11-11 04:28:22 +0100 (Sat, 11 Nov 2006)
New Revision: 3916

Log:

Added item about Falcon to 5.1 FAQ (including the &falcon-warning;).

Fixed word order in &phrase;.



Modified:
   trunk/refman-5.1/faqs.xml
   trunk/refman-common/phrases.ent


Modified: trunk/refman-5.1/faqs.xml
===================================================================
--- trunk/refman-5.1/faqs.xml	2006-11-10 20:56:43 UTC (rev 3915)
+++ trunk/refman-5.1/faqs.xml	2006-11-11 03:28:22 UTC (rev 3916)
Changed blocks: 3, Lines Added: 22, Lines Deleted: 4; 2025 bytes

@@ -6,6 +6,8 @@
   %fixedchars.entities;
   <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
   %urls.entities;
+  <!ENTITY % phrases.entities     SYSTEM "../refman-common/phrases.ent">
+  %phrases.entities;
   <!ENTITY % versions.entities    SYSTEM "versions.ent">
   %versions.entities;
 ]>

@@ -80,12 +82,12 @@
             see <xref linkend="update"/>; for that required to perform
             multi-table deletes, see <xref linkend="delete"/>.
           </para>
-          
+
           <para>
             A multi-table insert can be accomplished using a trigger
             whose <literal>FOR EACH ROW</literal> clause contains
             multiple <literal>INSERT</literal> statements within a
-            <literal>BEGIN ... END</literal> block. See  
+            <literal>BEGIN ... END</literal> block. See
             <xref linkend="using-triggers"/>.
           </para>
 

@@ -326,9 +328,25 @@
 
         <answer>
 
+          <remark role="note">
+            [js] DON'T use the entity ref here - this version # needs to
+            stick out like a sore thumb, lest me forget. ;)
+          </remark>
+
           <para>
-            No. However, there have been significant improvements in
-            existing storage engines, in particular for the
+            MySQL 5.1 introduces an alpha version of the new Falcon
+            storage engine.
+          </para>
+          
+&falcon-warning;
+          
+          <para> 
+            For information about the Falcon storage engine, see <xref
linkend="se-falcon"/>.
+          </para>
+
+          <para>
+            There have also been significant improvements in existing
+            storage engines, in particular for the
             <literal>NDB</literal> storage engine that forms the basis
             for MySQL Cluster.
           </para>


Modified: trunk/refman-common/phrases.ent
===================================================================
--- trunk/refman-common/phrases.ent	2006-11-10 20:56:43 UTC (rev 3915)
+++ trunk/refman-common/phrases.ent	2006-11-11 03:28:22 UTC (rev 3916)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 1615 bytes

@@ -7,7 +7,7 @@
 <!ENTITY cs-only '<para role="cs">This section does not apply to MySQL
Enterprise Server users.</para>'>
 <!ENTITY deprecated-feature-warning '<para role="deprecated"><emphasis
role="bold">This feature is deprecated. We recommend not using it anymore. It is
subject to removal in a future version of MySQL.</emphasis></para>'>
 <!ENTITY es-only '<para role="es">This section does not apply to MySQL Community
Server users.</para>'>
-<!ENTITY falcon-warning '<para role="deprecated"><emphasis
role="bold">Falcon support is not available in the standard MySQL 5.1 release. Falcon
is only available in a specially forked release of MySQL 5.1. Information is provided
here for evaluation purposes only.</emphasis></para>'>
+<!ENTITY falcon-warning '<para role="deprecated"><emphasis
role="bold">Falcon support is not available in the standard MySQL 5.1 release. Falcon
is available only in a specially forked release of MySQL 5.1. Information is provided
here for evaluation purposes only.</emphasis></para>'>
 <!ENTITY questions 'Questions'>
 <!ENTITY questionsandanswers 'Questions and Answers'>
 <!ENTITY warning-5-1-12 '<para role="deprecated"><emphasis role="bold">Due
to a build slippage MySQL 5.1.12 contains neither NDB Cluster nor Partitioning. We
apologize for any inconvenience. Please upgrade to 5.1.13 as soon as it is
available.</emphasis></para>'>