Author: kkolinko
Date: Sun Apr 27 21:10:33 2014
New Revision: 1590493
URL: http://svn.apache.org/r1590493
Log:
CTR: documentation
Fix processing of "target", "rel" attributes on links in Documentation.
The "<a>" template in the XSLT is not useful, as nowadays we do not generate
separate "printer" versions of the docs. It did not support those attributes on
<a> tags.
It is backport of r1590492 from tc7.0.x.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml
tomcat/tc6.0.x/trunk/webapps/docs/appdev/index.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/tc7.0.x/trunk:r1590492
Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml?rev=1590493&r1=1590492&r2=1590493&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml Sun Apr 27 21:10:33
2014
@@ -156,7 +156,7 @@ deployed).</p>
in Chapter 13 of the Servlet API Specification, version 2.3. Over time, it
is expected that development tools will be provided that create and edit the
deployment descriptor for you. In the meantime, to provide a starting point,
-a <a href="web.xml.txt" target="_new">basic web.xml file</a>
+a <a href="web.xml.txt" target="_blank">basic web.xml file</a>
is provided. This file includes comments that describe the purpose of each
included element.</p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/index.xml?rev=1590493&r1=1590492&r2=1590493&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/index.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/index.xml Sun Apr 27 21:10:33 2014
@@ -65,7 +65,7 @@ developer community. The following auth
<li><a href="processes.html"><strong>Development Processes</strong></a> -
Provides brief descriptions of typical development processes
utilizing the recommended deployment and source organizations.</li>
-<li><a href="sample/" target="_new"><strong>Example Application</strong></a> -
+<li><a href="sample/" target="_blank"><strong>Example Application</strong></a>
-
This directory contains a very simple, but functionally complete,
"Hello, World" application built according to the principles
described in this manual. You can use this application to
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1590493&r1=1590492&r2=1590493&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 27 21:10:33 2014
@@ -172,6 +172,10 @@
<code>version-major-minor</code> tags in documentation XSLT, to
simplify
documentation backports. (kkolinko)
</add>
+ <fix>
+ Fix target and rel attributes on links in documentation. They were
+ lost during XSLT transformation. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1590493&r1=1590492&r2=1590493&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl Sun Apr 27 21:10:33 2014
@@ -41,7 +41,6 @@
<xsl:param name="year" select="'yyyy'"/>
<xsl:param name="void-image" select="'/images/void.gif'"/>
<xsl:param name="project-menu" select="'menu'"/>
- <xsl:param name="standalone" select="''"/>
<xsl:param name="buglink"
select="'http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
<xsl:param name="revlink"
select="'http://svn.apache.org/viewvc?view=rev&rev='"/>
@@ -397,32 +396,6 @@
</table>
</xsl:template>
- <!-- Fix relative links in printer friendly versions of the docs -->
- <xsl:template match="a">
- <xsl:variable name="href" select="@href"/>
- <xsl:choose>
- <xsl:when test="$standalone = 'standalone'">
- <xsl:apply-templates/>
- </xsl:when>
- <xsl:when test="$project-menu != 'menu' and starts-with(@href,'../')">
- <a href="../{$href}"><xsl:apply-templates/></a>
- </xsl:when>
- <xsl:when test="$project-menu != 'menu' and starts-with(@href,'./') and
contains(substring(@href,3),'/')">
- <a href=".{$href}"><xsl:apply-templates/></a>
- </xsl:when>
- <xsl:when test="$project-menu != 'menu' and not(contains(@href,'//'))
and not(starts-with(@href,'/')) and not(starts-with(@href,'#')) and
contains(@href,'/')">
- <a href="../{$href}"><xsl:apply-templates/></a>
- </xsl:when>
- <xsl:when test="$href != ''">
- <a href="{$href}"><xsl:apply-templates/></a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable name="name" select="@name"/>
- <a name="{$name}"><xsl:apply-templates/></a>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
<!-- Changelog related tags -->
<xsl:template match="changelog">
<table border="0" cellpadding="2" cellspacing="2">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
