Author: markt
Date: Fri Jul 9 09:41:25 2010
New Revision: 962466
URL: http://svn.apache.org/viewvc?rev=962466&view=rev
Log:
Documentation improvements:
- Explicit version number in <title ../>
- Add version and date to every page
- Remove duplicate "Apache Tomcat 7" and promote real page title
- Automate copyright end date
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/architecture/project.xml
tomcat/trunk/webapps/docs/config/project.xml
tomcat/trunk/webapps/docs/project.xml
tomcat/trunk/webapps/docs/tomcat-docs.xsl
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=962466&r1=962465&r2=962466&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jul 9 09:41:25 2010
@@ -591,10 +591,10 @@
<include name="docs/appdev/*.txt"/>
<include name="docs/appdev/sample/**"/>
</fileset>
- <fileset dir="webapps">
- <include name="docs/architecture/**"/>
- <exclude name="docs/architecture/*.xml"/>
- </fileset>
+ <fileset dir="webapps">
+ <include name="docs/architecture/**"/>
+ <exclude name="docs/architecture/*.xml"/>
+ </fileset>
</copy>
<copy todir="${tomcat.build}/webapps/docs" encoding="ISO-8859-1">
<filterset refid="version.filters"/>
@@ -620,6 +620,9 @@
excludes="build.xml project.xml"
includes="*.xml">
<param name="relative-path" expression="."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<xslt basedir="webapps/docs/appdev"
destdir="${tomcat.build}/webapps/docs/appdev"
@@ -628,6 +631,9 @@
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<xslt basedir="webapps/docs/funcspecs"
destdir="${tomcat.build}/webapps/docs/funcspecs"
@@ -636,6 +642,9 @@
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<xslt basedir="webapps/docs/config"
destdir="${tomcat.build}/webapps/docs/config"
@@ -644,6 +653,9 @@
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<xslt basedir="webapps/docs/architecture"
destdir="${tomcat.build}/webapps/docs/architecture"
@@ -652,6 +664,9 @@
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<xslt basedir="webapps/docs/tribes"
@@ -660,7 +675,10 @@
style="webapps/docs/tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
- <param name="relative-path" expression=".."/>
+ <param name="relative-path" expression=".."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="year" expression="${year}"/>
</xslt>
</target>
Modified: tomcat/trunk/webapps/docs/architecture/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/project.xml?rev=962466&r1=962465&r2=962466&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/architecture/project.xml (original)
+++ tomcat/trunk/webapps/docs/architecture/project.xml Fri Jul 9 09:41:25 2010
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache Tomcat Architecture"
+<project name="Apache Tomcat 7 Architecture"
href="http://tomcat.apache.org/";>
- <title>Apache Tomcat Architecture</title>
+ <title>Apache Tomcat 7 Architecture</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
Modified: tomcat/trunk/webapps/docs/config/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/project.xml?rev=962466&r1=962465&r2=962466&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/project.xml (original)
+++ tomcat/trunk/webapps/docs/config/project.xml Fri Jul 9 09:41:25 2010
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache Tomcat Configuration Reference"
+<project name="Apache Tomcat 7 Configuration Reference"
href="http://tomcat.apache.org/";>
- <title>Apache Tomcat Configuration Reference</title>
+ <title>Apache Tomcat 7 Configuration Reference</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
Modified: tomcat/trunk/webapps/docs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=962466&r1=962465&r2=962466&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/project.xml (original)
+++ tomcat/trunk/webapps/docs/project.xml Fri Jul 9 09:41:25 2010
@@ -18,7 +18,7 @@
<project name="Apache Tomcat Documentation"
href="http://tomcat.apache.org/";>
- <title>Apache Tomcat 7.0</title>
+ <title>Apache Tomcat 7</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=962466&r1=962465&r2=962466&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Fri Jul 9 09:41:25 2010
@@ -36,6 +36,9 @@
<xsl:param name="printer-logo" select="'/images/printer.gif'"/>
<xsl:param name="apache-logo" select="'/images/asf-logo.gif'"/>
<xsl:param name="relative-path" select="'.'"/>
+ <xsl:param name="version" select="'7.0.x'"/>
+ <xsl:param name="build-date" select="'MMM d yyyy'"/>
+ <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="''"/>
@@ -61,7 +64,7 @@
select="document('project.xml')/project"/>
<html>
<head>
- <title><xsl:value-of select="project/title"/> - <xsl:value-of
select="properties/title"/></title>
+ <title><xsl:value-of select="project/title"/> (<xsl:value-of
select="$version"/>) - <xsl:value-of select="properties/title"/></title>
<xsl:for-each select="properties/author">
<xsl:variable name="name">
<xsl:value-of select="."/>
@@ -106,7 +109,10 @@
</xsl:if>
</td>
<td>
- <h1><font face="arial,helvetica,sanserif"><xsl:value-of
select="$project/title"/></font></h1>
+ <font face="arial,helvetica,sanserif">
+ <h1><xsl:value-of select="$project/title"/></h1>
+ Version <xsl:value-of select="$version"/>, <xsl:value-of
select="$build-date"/>
+ </font>
</td>
<td>
<xsl:comment>APACHE LOGO</xsl:comment>
@@ -138,8 +144,7 @@
<xsl:comment>RIGHT SIDE MAIN BODY</xsl:comment>
<td width="80%" valign="top" align="left" id="mainBody">
- <h1><xsl:value-of select="project/title"/></h1>
- <h2><xsl:value-of select="properties/title"/></h2>
+ <h1><xsl:value-of select="properties/title"/></h1>
<xsl:apply-templates select="body/section"/>
</td>
@@ -155,7 +160,7 @@
<xsl:comment>PAGE FOOTER</xsl:comment>
<tr><td colspan="2">
<div align="center"><font color="{$body-link}" size="-1"><em>
- Copyright © 1999-2010, Apache Software Foundation
+ Copyright © 1999-<xsl:value-of select="$year"/>, Apache Software
Foundation
</em></font></div>
</td></tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
