svn commit: r1643581 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/tomcat-docs.xsl

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 18:18:36 2014
New Revision: 1643581

URL: http://svn.apache.org/r1643581
Log:
Simplify XPath expression. Not a functional change (no changes in the output).
Merged r1643045 from tomcat/trunk.

Modified:
    tomcat/tc8.0.x/trunk/   (props changed)
    tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl

Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 18:18:36 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570

Modified: tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1643581&r1=1643580&r2=1643581&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl Sat Dec  6 18:18:36 2014
@@ -292,7 +292,7 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:if test="
-              count(//*[(local-name()='section' or local-name()='subsection') 
and @name=current()/@name]) &gt; 1
+              count(//*[self::section or 
self::subsection][@name=current()/@name]) &gt; 1
               ">
             <xsl:value-of select="concat(ancestor::section/@name, '/')"/>
           </xsl:if>
@@ -333,7 +333,7 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:if test="local-name()='subsection' and
-              count(//*[(local-name()='section' or local-name()='subsection') 
and @name=current()/@name]) &gt; 1
+              count(//*[self::section or 
self::subsection][@name=current()/@name]) &gt; 1
               ">
             <xsl:value-of select="concat(ancestor::section/@name, '/')"/>
           </xsl:if>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org