Author: paul
Date: 2007-10-02 21:02:32 +0200 (Tue, 02 Oct 2007)
New Revision: 7945
Log:
r30603@polar: paul | 2007-10-02 12:32:55 -0500
Lump mnmas-kb paras with mnmas paras when excluding the latter.
Modified:
trunk/xsl.d/dbk-prep.xsl
trunk/xsl.d/help-prep1.xsl
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30581
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25178
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30603
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25178
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/xsl.d/dbk-prep.xsl
===================================================================
--- trunk/xsl.d/dbk-prep.xsl 2007-10-02 17:08:17 UTC (rev 7944)
+++ trunk/xsl.d/dbk-prep.xsl 2007-10-02 19:02:32 UTC (rev 7945)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 516 bytes
@@ -234,7 +234,7 @@
<xsl:param name="strip.ads" select="0"/>
- <xsl:template match="formalpara[@role='mnmas']">
+ <xsl:template match="formalpara[@role='mnmas' or @role='mnmas-kb']">
<xsl:if test="$strip.ads = 0">
<!-- pass formalpara through unchanged -->
<formalpara>
Modified: trunk/xsl.d/help-prep1.xsl
===================================================================
--- trunk/xsl.d/help-prep1.xsl 2007-10-02 17:08:17 UTC (rev 7944)
+++ trunk/xsl.d/help-prep1.xsl 2007-10-02 19:02:32 UTC (rev 7945)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 535 bytes
@@ -485,7 +485,7 @@
<xsl:template match="remark"/> <!-- strip remarks not otherwise matched -->
<!-- Strip advertisements -->
-<xsl:template match="formalpara[@role='mnmas']"/>
+<xsl:template match="formalpara[@role='mnmas' or @role='mnmas-kb']"/>
<!--
Identity transform, with the following exception:
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7945 - in trunk: . xsl.d | paul | 2 Oct |
