svn commit - mysqldoc@docsrva: r2561 - in trunk: refman-4.1 refman-5.0 refman-5.1 xsl.d

[mcbrown]

Author: mcbrown
Date: 2006-06-30 16:36:57 +0200 (Fri, 30 Jun 2006)
New Revision: 2561

Log:
Rolling in changes so that Q&A sections use the newly developed format. 



Modified:
   trunk/refman-4.1/connector-odbc.xml
   trunk/refman-5.0/connector-odbc.xml
   trunk/refman-5.1/connector-odbc.xml
   trunk/xsl.d/dbk-prep.xsl

Modified: trunk/refman-4.1/connector-odbc.xml
===================================================================
--- trunk/refman-4.1/connector-odbc.xml	2006-06-30 12:53:41 UTC (rev 2560)
+++ trunk/refman-4.1/connector-odbc.xml	2006-06-30 14:36:57 UTC (rev 2561)
@@ -117,6 +117,19 @@
 
         <listitem>
           <para>
+            MyODBC 5.0, currently in beta status, has been designed to
+            extend the functionality of the MyODBC 3.51 driver and
+            incorporate full support for the functionality in the MySQL
+            5.0 server release, including stored procedures and views.
+            Applications using MyODBC 3.51 will be compatible with
+            MyODBC 5.0, while being able to take advantage of the new
+            features. Features and functionality of the MyODBC 5.0
+            driver are not currently included in this guide.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             MyODBC 3.51 is the current release of the 32-bit ODBC
             driver, also known as the MySQL ODBC 3.51 driver. This
             version is enhanced compared to the older MyODBC 2.50
@@ -656,8 +669,8 @@
                     format="PNG"/>
                 </imageobject>
                 <textobject>
-                  <phrase lang="en">MyODBC Windows Installer - Welcome
-                  </phrase>
+                  <phrase lang="en">MyODBC Windows Installer -
+                  Welcome</phrase>
                 </textobject>
               </mediaobject>
             </listitem>
@@ -7619,10 +7632,9 @@
 
             <para>
               The following error is reported when using transactions:
+              <literal>Transactions are not enabled</literal>
             </para>
 
-<programlisting>Transactions are not enabled</programlisting>
-
           </question>
 
           <answer>
@@ -7675,10 +7687,9 @@
 
             <para>
               The following error is reported when I submit a query:
+              <literal>Cursor not found</literal>
             </para>
 
-<programlisting>Cursor not found</programlisting>
-
           </question>
 
           <answer>

Modified: trunk/refman-5.0/connector-odbc.xml
===================================================================
--- trunk/refman-5.0/connector-odbc.xml	2006-06-30 12:53:41 UTC (rev 2560)
+++ trunk/refman-5.0/connector-odbc.xml	2006-06-30 14:36:57 UTC (rev 2561)
@@ -669,8 +669,8 @@
                     format="PNG"/>
                 </imageobject>
                 <textobject>
-                  <phrase lang="en">MyODBC Windows Installer - Welcome
-                  </phrase>
+                  <phrase lang="en">MyODBC Windows Installer -
+                  Welcome</phrase>
                 </textobject>
               </mediaobject>
             </listitem>
@@ -7632,10 +7632,9 @@
 
             <para>
               The following error is reported when using transactions:
+              <literal>Transactions are not enabled</literal>
             </para>
 
-<programlisting>Transactions are not enabled</programlisting>
-
           </question>
 
           <answer>
@@ -7688,10 +7687,9 @@
 
             <para>
               The following error is reported when I submit a query:
+              <literal>Cursor not found</literal>
             </para>
 
-<programlisting>Cursor not found</programlisting>
-
           </question>
 
           <answer>

Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml	2006-06-30 12:53:41 UTC (rev 2560)
+++ trunk/refman-5.1/connector-odbc.xml	2006-06-30 14:36:57 UTC (rev 2561)
@@ -7632,10 +7632,9 @@
 
             <para>
               The following error is reported when using transactions:
+              <literal>Transactions are not enabled</literal>
             </para>
 
-<programlisting>Transactions are not enabled</programlisting>
-
           </question>
 
           <answer>
@@ -7688,10 +7687,9 @@
 
             <para>
               The following error is reported when I submit a query:
+              <literal>Cursor not found</literal>
             </para>
 
-<programlisting>Cursor not found</programlisting>
-
           </question>
 
           <answer>

Modified: trunk/xsl.d/dbk-prep.xsl
===================================================================
--- trunk/xsl.d/dbk-prep.xsl	2006-06-30 12:53:41 UTC (rev 2560)
+++ trunk/xsl.d/dbk-prep.xsl	2006-06-30 14:36:57 UTC (rev 2561)
@@ -95,28 +95,61 @@
 -->
 
 <xsl:template match="qandaset">
+<para><emphasis role="bold">Questions</emphasis></para>
+<itemizedlist>
   <xsl:apply-templates select="qandadiv/qandaentry/question
+                              |qandaentry/question" mode="toc"/>
+</itemizedlist>
+<para><emphasis role="bold">Questions and
Answers</emphasis></para>
+  <xsl:apply-templates select="qandadiv/qandaentry/question
                               |qandaentry/question
                               |qandadiv/qandaentry/answer
                               |qandaentry/answer"/>
 </xsl:template>
 
+<xsl:template match="question" mode="toc">
+<listitem>
+<simpara>
+<link>
+<xsl:attribute name="linkend">
+<xsl:text>qanda-</xsl:text>
+<xsl:number
+            
count="chapter|appendix|preface|section|sect1[@id]|sect2[@id]|sect3[@id]|sect4[@id]|sect5[@id]|qandaentry"
+             level="multiple"
+             format="1-1-1-1-1-1"
+             />
+</xsl:attribute>
+      <xsl:number
+            
count="chapter|appendix|preface|section|sect1[@id]|sect2[@id]|sect3[@id]|sect4[@id]|sect5[@id]|qandaentry"
+             level="multiple"
+             format="1.1.1.1.1.1"
+             />:<xsl:text> </xsl:text><xsl:for-each
select="*"><xsl:choose><xsl:when test="name() =
'para'"><xsl:apply-templates/></xsl:when><xsl:otherwise><xsl:apply-templates
select="."/></xsl:otherwise></xsl:choose></xsl:for-each>
+</link>
+</simpara>
+</listitem>
+</xsl:template>
+
 <xsl:template match="question">
   <para>
+<xsl:attribute name="id">
+<xsl:text>qanda-</xsl:text>
+<xsl:number
+            
count="chapter|appendix|preface|section|sect1[@id]|sect2[@id]|sect3[@id]|sect4[@id]|sect5[@id]|qandaentry"
+             level="multiple"
+             format="1-1-1-1-1-1"
+             />
+</xsl:attribute>
     <emphasis role="bold">
       <xsl:number
             
count="chapter|appendix|preface|section|sect1[@id]|sect2[@id]|sect3[@id]|sect4[@id]|sect5[@id]|qandaentry"
              level="multiple"
              format="1.1.1.1.1.1"
-             />:
+             />:<xsl:text> </xsl:text><xsl:for-each
select="*"><xsl:choose><xsl:when test="name() =
'para'"><xsl:apply-templates/></xsl:when><xsl:otherwise><xsl:apply-templates
select="."/></xsl:otherwise></xsl:choose></xsl:for-each>
     </emphasis>
   </para>
-  <para>Question:</para>
-  <xsl:apply-templates/>
 </xsl:template>
 
 <xsl:template match="answer">
-  <para>Answer:</para>
   <xsl:apply-templates/>
 </xsl:template>