svn commit - mysqldoc@docsrva: r290 - in trunk: . xsl.d

[paul]

Author: paul
Date: 2005-11-07 21:47:36 +0100 (Mon, 07 Nov 2005)
New Revision: 290

Log:
 r338@kite-hub:  paul | 2005-11-07 14:47:23 -0600
 Don't require a condition attribute for help-example remarks.
 (Context will have already been set by preceding help-topic remark.)


Removed:
   trunk/xsl.d/help-prep3.xsl
Modified:
   trunk/
   trunk/xsl.d/help-prep1.xsl
   trunk/xsl.d/help-prep2.xsl


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

Modified: trunk/xsl.d/help-prep1.xsl
===================================================================
--- trunk/xsl.d/help-prep1.xsl	2005-11-07 19:07:20 UTC (rev 289)
+++ trunk/xsl.d/help-prep1.xsl	2005-11-07 20:47:36 UTC (rev 290)
@@ -18,7 +18,7 @@
     <remark role="help-description-begin"/>
     <remark role="help-description-end"/>
 
-    <remark role="help-example-begin" condition="SELECT"/>
+    <remark role="help-example-begin"/>
     <remark role="help-example-end"/>
 
   Paired remarks are used when the help information might span multiple
@@ -31,7 +31,7 @@
 
     <help-description> ... </help-description>
 
-    <help-example name="LEFT()"> ... </help-example>
+    <help-example> ... </help-example>
 
   Some single-tag constructs are used:
 
@@ -239,11 +239,6 @@
     </xsl:message>
   </xsl:if>
   <help-example>
-    <xsl:if test="@condition">
-      <xsl:attribute name="name">
-        <xsl:value-of select="@condition"/>
-      </xsl:attribute>
-    </xsl:if>
     <xsl:copy-of select="following-sibling::*[1][self::programlisting]"/>
   </help-example>
   <xsl:value-of select="$newline"/>

Modified: trunk/xsl.d/help-prep2.xsl
===================================================================
--- trunk/xsl.d/help-prep2.xsl	2005-11-07 19:07:20 UTC (rev 289)
+++ trunk/xsl.d/help-prep2.xsl	2005-11-07 20:47:36 UTC (rev 290)
@@ -157,8 +157,7 @@
 <!-- For example, copy only programlisting subelements -->
 
 <xsl:template match="help-example">
-  <xsl:text>@HELP-EXAMPLE-BEGIN </xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:text>@HELP-EXAMPLE-BEGIN</xsl:text>
   <xsl:value-of select="$newline"/>
   <xsl:apply-templates select="programlisting" mode="extract.text"/>
   <xsl:text>@HELP-EXAMPLE-END</xsl:text>

Deleted: trunk/xsl.d/help-prep3.xsl