Author: kkolinko
Date: Sat Dec 6 18:28:41 2014
New Revision: 1643582
URL: http://svn.apache.org/r1643582
Log:
Fix ambiguity of anchors on config/valve.html page.
Change algorithm for generation of unambiguous anchor names.
The issue was reported via documentation comments system.
Sample old and new anchors:
Access_Logging/Introduction
Access_Log_Valve/Introduction, Extended_Access_Log_Valve/Introduction
Merged revision 1643054 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
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:28:41 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,1643045,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,1643054-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/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1643582&r1=1643581&r2=1643582&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sat Dec 6 18:28:41 2014
@@ -192,6 +192,10 @@
the security configuration guide since that attribute has moved from
the
Context element to the nested Resources element. (markt)
</fix>
+ <fix>
+ Fix ambiguity of section links on Valves configuration reference page.
+ (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
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=1643582&r1=1643581&r2=1643582&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:28:41 2014
@@ -294,7 +294,7 @@
<xsl:if test="
count(//*[self::section or
self::subsection][@name=current()/@name]) > 1
">
- <xsl:value-of select="concat(ancestor::section/@name, '/')"/>
+ <xsl:value-of select="concat(parent::*[self::section or
self::subsection]/@name, '/')"/>
</xsl:if>
<xsl:value-of select="@name"/>
</xsl:otherwise>
@@ -335,7 +335,7 @@
<xsl:if test="local-name()='subsection' and
count(//*[self::section or
self::subsection][@name=current()/@name]) > 1
">
- <xsl:value-of select="concat(ancestor::section/@name, '/')"/>
+ <xsl:value-of select="concat(parent::*[self::section or
self::subsection]/@name, '/')"/>
</xsl:if>
<xsl:value-of select="@name"/>
</xsl:otherwise>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
