diff --git a/de_DE.ISO8859-1/share/sgml/libcommon.xsl b/de_DE.ISO8859-1/share/sgml/libcommon.xsl
index f3e2248276..e62df71cf1 100644
--- a/de_DE.ISO8859-1/share/sgml/libcommon.xsl
+++ b/de_DE.ISO8859-1/share/sgml/libcommon.xsl
@@ -6,7 +6,10 @@
basiert auf: r38826
-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns="http://www.w3.org/1999/xhtml">
+
<xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
<xsl:template name="html-news-list-newsflash-preface">
diff --git a/en_US.ISO8859-1/htdocs/gnome/index.xsl b/en_US.ISO8859-1/htdocs/gnome/index.xsl
index f4e7f2b304..0ed925963a 100644
--- a/en_US.ISO8859-1/htdocs/gnome/index.xsl
+++ b/en_US.ISO8859-1/htdocs/gnome/index.xsl
@@ -9,6 +9,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdf1="http://my.netscape.com/rdf/simple/0.9/"
+ xmlns="http://www.w3.org/1999/xhtml"
exclude-result-prefixes="rdf rdf1" version="1.0">
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
@@ -49,7 +50,7 @@
<xsl:value-of select="title"/><br/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="p"/><br/>
+ <xsl:apply-templates select="p" mode="copy.html"/><br/>
</xsl:otherwise>
</xsl:choose>
</a></li>
diff --git a/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl b/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl
index 1222efadae..115ba7fcd7 100644
--- a/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl
+++ b/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl
@@ -86,7 +86,7 @@
<xsl:text> </xsl:text>
<xsl:value-of select="ancestor::month/name"/>,
<xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
- <xsl:copy-of select="p"/>
+ <xsl:apply-templates select="p" mode="copy.html"/>
</p>
</li>
diff --git a/en_US.ISO8859-1/htdocs/java/newsflash.xsl b/en_US.ISO8859-1/htdocs/java/newsflash.xsl
index 9a1c5f0242..4acc68e3c7 100644
--- a/en_US.ISO8859-1/htdocs/java/newsflash.xsl
+++ b/en_US.ISO8859-1/htdocs/java/newsflash.xsl
@@ -83,9 +83,8 @@
<xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
<xsl:value-of select="title"/>
</p>
- <xsl:copy-of select="p"/>
+
+ <xsl:apply-templates select="p" mode="copy.html"/>
</li>
</xsl:template>
-
- <xsl:template match="date"/> <!-- Deliberately left blank -->
</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/htdocs/news/status/report.xsl b/en_US.ISO8859-1/htdocs/news/status/report.xsl
index 56ce32e89d..a77dc5e874 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report.xsl
+++ b/en_US.ISO8859-1/htdocs/news/status/report.xsl
@@ -76,7 +76,7 @@
<xsl:template match="section">
<h1><xsl:value-of select="title"/></h1>
- <xsl:copy-of select="p"/>
+ <xsl:apply-templates select="p" mode="copy.html"/>
</xsl:template>
<!-- A project creates a header, and then process the three components of
@@ -129,14 +129,14 @@
<!-- Body is a doddle. Since it contains HTML we just copy in all the
child elements. -->
<xsl:template match="body">
- <xsl:copy-of select="child::node()"/>
+ <xsl:apply-templates select="child::node()" mode="copy.html"/>
</xsl:template>
<xsl:template match="help">
<h3>Open tasks:</h3>
<ol>
<xsl:for-each select="task">
- <li><xsl:copy-of select="child::node()"/></li>
+ <li><xsl:apply-templates select="child::node()" mode="copy.html"/></li>
</xsl:for-each>
</ol>
</xsl:template>
diff --git a/en_US.ISO8859-1/htdocs/releases/6.0R/stress.xsl b/en_US.ISO8859-1/htdocs/releases/6.0R/stress.xsl
index 7ba433e210..aa89681763 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.0R/stress.xsl
+++ b/en_US.ISO8859-1/htdocs/releases/6.0R/stress.xsl
@@ -2,8 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-exclude-result-prefixes="rdf cvs"
+xmlns="http://www.w3.org/1999/xhtml"
+exclude-result-prefixes="rdf"
version="1.0">
<xsl:output
diff --git a/en_US.ISO8859-1/htdocs/releases/6.1R/stress.xsl b/en_US.ISO8859-1/htdocs/releases/6.1R/stress.xsl
index 7ba433e210..aa89681763 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.1R/stress.xsl
+++ b/en_US.ISO8859-1/htdocs/releases/6.1R/stress.xsl
@@ -2,8 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-exclude-result-prefixes="rdf cvs"
+xmlns="http://www.w3.org/1999/xhtml"
+exclude-result-prefixes="rdf"
version="1.0">
<xsl:output
diff --git a/en_US.ISO8859-1/htdocs/releases/6.2R/stress.xsl b/en_US.ISO8859-1/htdocs/releases/6.2R/stress.xsl
index 7ba433e210..aa89681763 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.2R/stress.xsl
+++ b/en_US.ISO8859-1/htdocs/releases/6.2R/stress.xsl
@@ -2,8 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-exclude-result-prefixes="rdf cvs"
+xmlns="http://www.w3.org/1999/xhtml"
+exclude-result-prefixes="rdf"
version="1.0">
<xsl:output
diff --git a/en_US.ISO8859-1/htdocs/releases/7.0R/stress.xsl b/en_US.ISO8859-1/htdocs/releases/7.0R/stress.xsl
index 13fc573ad8..6cd842a659 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.0R/stress.xsl
+++ b/en_US.ISO8859-1/htdocs/releases/7.0R/stress.xsl
@@ -2,8 +2,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-exclude-result-prefixes="rdf cvs"
+xmlns="http://www.w3.org/1999/xhtml"
+exclude-result-prefixes="rdf"
version="1.0">
<xsl:output
diff --git a/fr_FR.ISO8859-1/share/sgml/libcommon.xsl b/fr_FR.ISO8859-1/share/sgml/libcommon.xsl
index 11bd514d18..aa0caa8880 100644
--- a/fr_FR.ISO8859-1/share/sgml/libcommon.xsl
+++ b/fr_FR.ISO8859-1/share/sgml/libcommon.xsl
@@ -3,7 +3,10 @@
"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
<!-- $FreeBSD$ -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns="http://www.w3.org/1999/xhtml">
+
<xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
<xsl:template name="html-news-list-newsflash-preface">
diff --git a/hu_HU.ISO8859-2/share/sgml/templates.events.xsl b/hu_HU.ISO8859-2/share/sgml/templates.events.xsl
index b32b52ce34..d3f2ae2391 100644
--- a/hu_HU.ISO8859-2/share/sgml/templates.events.xsl
+++ b/hu_HU.ISO8859-2/share/sgml/templates.events.xsl
@@ -261,7 +261,7 @@
<xsl:with-param name="enddate" select="enddate" />
</xsl:call-template>
</em><br/>
- <xsl:copy-of select="description/child::node()"/>
+ <xsl:apply-templates select="description/child::node()" mode="copy.html"/>
</p>
<xsl:if test="link">
<p><xsl:apply-templates select="link"/></p>
diff --git a/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl b/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl
index 9b16835d39..789e35d63a 100644
--- a/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl
+++ b/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl
@@ -19,6 +19,9 @@
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
<xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+ <!-- Do not add last modified date for old news/press -->
+ <xsl:variable name="date"/>
+
<xsl:variable name="title">&title;</xsl:variable>
<xsl:variable name="year">
@@ -26,7 +29,7 @@
</xsl:variable>
<xsl:template match="p">
- <xsl:copy-of select="." />
+ <xsl:apply-templates select="." mode="copy.html"/>
</xsl:template>
<xsl:template name="process.sidewrap">
@@ -98,7 +101,7 @@
<xsl:value-of select="ancestor::day/name"/>:</b><xsl:text> </xsl:text>
<xsl:for-each select="p">
<xsl:if test="position() > 1"><br /><br /></xsl:if>
- <xsl:copy-of select="child::node()" />
+ <xsl:apply-templates select="child::node()" mode="copy.html"/>
</xsl:for-each>
</p>
diff --git a/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl b/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl
index d1aac0624f..40ea2237b8 100644
--- a/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl
+++ b/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl
@@ -19,6 +19,9 @@
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
<xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+ <!-- Do not add last modified date for old news/press -->
+ <xsl:variable name="date"/>
+
<xsl:variable name="title">&title;</xsl:variable>
<xsl:variable name="year">
@@ -82,7 +85,7 @@
<a href="{$site-url}"><xsl:value-of
select="site-name"/></a>, <xsl:value-of select="author"/><br/>
- <xsl:copy-of select="p/child::node()"/>
+ <xsl:apply-templates select="p/child::node()" mode="copy.html"/>
</p>
</li>
</xsl:template>
diff --git a/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl b/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl
index 083e8ff84c..96267550c0 100644
--- a/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl
+++ b/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl
@@ -48,6 +48,9 @@
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
<xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+ <!-- Do not add last modified date for old news/press -->
+ <xsl:variable name="date"/>
+
<xsl:param name="pastyears">2008 2007 2006 2005 2004 2003</xsl:param>
<xsl:key name="event-by-month" match="event"
@@ -217,7 +220,7 @@
<xsl:with-param name="enddate" select="enddate" />
</xsl:call-template>
</em><br/>
- <xsl:copy-of select="description/child::node()"/>
+ <xsl:apply-templates select="description/child::node()" mode="copy.html"/>
</p>
<xsl:if test="link">
<p><xsl:apply-templates select="link"/></p>
diff --git a/ja_JP.eucJP/share/sgml/templates.events.xsl b/ja_JP.eucJP/share/sgml/templates.events.xsl
index 48df3a64fc..5ff0587baf 100644
--- a/ja_JP.eucJP/share/sgml/templates.events.xsl
+++ b/ja_JP.eucJP/share/sgml/templates.events.xsl
@@ -255,7 +255,7 @@
<xsl:with-param name="enddate" select="enddate" />
</xsl:call-template>
</em><br/>
- <xsl:copy-of select="description/child::node()"/>
+ <xsl:apply-templates select="description/child::node()" mode="copy.html"/>
</p>
<xsl:if test="link">
<p><xsl:apply-templates select="link"/></p>
diff --git a/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl b/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl
index 6fc6dd66a4..97a23c2fff 100644
--- a/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl
+++ b/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl
@@ -15,6 +15,9 @@
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
<xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+ <!-- Do not add last modified date for old news/press -->
+ <xsl:variable name="date"/>
+
<xsl:variable name="title">&title;</xsl:variable>
<xsl:variable name="year">
@@ -22,7 +25,7 @@
</xsl:variable>
<xsl:template match="p">
- <xsl:copy-of select="." />
+ <xsl:apply-templates select="." mode="copy.html"/>
</xsl:template>
<xsl:template name="process.sidewrap">
@@ -95,13 +98,10 @@
<xsl:text> ��</xsl:text>:</b><xsl:text> </xsl:text>
<xsl:for-each select="p">
<xsl:if test="position() > 1"><br /><br /></xsl:if>
- <xsl:copy-of select="child::node()" />
+ <xsl:apply-templates select="child::node()" mode="copy.html"/>
</xsl:for-each>
</p>
</li>
</xsl:template>
-
- <xsl:template match="date"/> <!-- Deliberately left blank -->
-
</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/sgml/templates.oldpress.xsl b/ja_JP.eucJP/share/sgml/templates.oldpress.xsl
index 732e928a80..dbbd3be45b 100644
--- a/ja_JP.eucJP/share/sgml/templates.oldpress.xsl
+++ b/ja_JP.eucJP/share/sgml/templates.oldpress.xsl
@@ -15,6 +15,9 @@
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
<xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+ <!-- Do not add last modified date for old news/press -->
+ <xsl:variable name="date"/>
+
<xsl:variable name="title">&title;</xsl:variable>
<xsl:variable name="year">
@@ -82,7 +85,7 @@
<a href="{$site-url}"><xsl:value-of
select="site-name"/></a>, <xsl:value-of select="author"/><br/>
- <xsl:copy-of select="p/child::node()"/>
+ <xsl:apply-templates select="p/child::node()" mode="copy.html"/>
</p>
</li>
</xsl:template>
diff --git a/ru_RU.KOI8-R/share/sgml/templates.events.xsl b/ru_RU.KOI8-R/share/sgml/templates.events.xsl
index 0e149aabb8..c7ec43be26 100644
--- a/ru_RU.KOI8-R/share/sgml/templates.events.xsl
+++ b/ru_RU.KOI8-R/share/sgml/templates.events.xsl
@@ -261,7 +261,7 @@
<xsl:with-param name="enddate" select="enddate" />
</xsl:call-template>
</em><br/>
- <xsl:copy-of select="description/child::node()"/>
+ <xsl:apply-templates select="description/child::node()" mode="copy.html"/>
</p>
<xsl:if test="link">
<p><xsl:apply-templates select="link"/></p>
diff --git a/share/sgml/libcommon.xsl b/share/sgml/libcommon.xsl
index 357aba231b..ddba544325 100644
--- a/share/sgml/libcommon.xsl
+++ b/share/sgml/libcommon.xsl
@@ -15,7 +15,7 @@
<xsl:import href="./transtable-common.xsl" />
<xsl:variable name="svnKeyword">
- <xsl:value-of select="//cvs:keyword[1]"/>
+ <xsl:value-of select="normalize-space(//cvs:keyword[1])"/>
</xsl:variable>
<xsl:variable name="date">
@@ -36,6 +36,16 @@
<xsl:variable name="curdate.month" select="date:month-in-year()"/>
<xsl:variable name="curdate.day" select="date:day-in-month()"/>
+ <!--
+ Used to copy HTML chunks to the output.
+ -->
+ <xsl:template match="*" mode="copy.html">
+ <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">
+ <xsl:copy-of select="attribute::*"/>
+ <xsl:apply-templates select="child::node()" mode="copy.html"/>
+ </xsl:element>
+ </xsl:template>
+
<!--
template name used in
@@ -203,15 +213,15 @@
[count(.|key('html-usergroups-id-key', string($id)))
= count(key('html-usergroups-id-key', string($id)))]
">
- <xsl:copy-of select="
+ <xsl:apply-templates select="
key('html-usergroups-regions-key', string($continent))
[count(.|key('html-usergroups-id-key', string($id)))
= count(key('html-usergroups-id-key', string($id)))]/description/node()
- " />
+ " mode="copy.html"/>
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="document($usergroups.xml)">
- <xsl:copy-of select="key('html-usergroups-id-key', string($id))/description/node()" />
+ <xsl:apply-templates select="key('html-usergroups-id-key', string($id))/description/node()" mode="copy.html"/>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
@@ -576,7 +586,7 @@
<xsl:text> </xsl:text>
<xsl:for-each select="p">
<xsl:if test="position() > 1"><br /><br /></xsl:if>
- <xsl:copy-of select="child::node()" />
+ <xsl:apply-templates select="child::node()" mode="copy.html"/>
</xsl:for-each>
</p>
</li>
@@ -612,7 +622,7 @@
<xsl:text> </xsl:text>
<xsl:for-each select="p">
<xsl:if test="position() > 1"><br /><br /></xsl:if>
- <xsl:copy-of select="child::node()" />
+ <xsl:apply-templates select="child::node()" mode="copy.html"/>
</xsl:for-each>
</p>
</li>
@@ -673,7 +683,7 @@
<a href="{$url}"><b><xsl:value-of select="name"/></b></a><br/>
<a href="{$site-url}"><xsl:value-of select="site-name"/></a>,
<xsl:value-of select="author"/><br/>
- <xsl:copy-of select="p/child::node()"/>
+ <xsl:apply-templates select="p/child::node()" mode="copy.html"/>
</p>
</li>
</xsl:for-each>
@@ -694,7 +704,7 @@
<a href="{$url}"><b><xsl:value-of select="name"/></b></a><br/>
<a href="{$site-url}"><xsl:value-of select="site-name"/></a>,
<xsl:value-of select="author"/><br/>
- <xsl:copy-of select="p/child::node()"/>
+ <xsl:apply-templates select="p/child::node()" mode="copy.html"/>
</p>
</li>
</xsl:for-each>
diff --git a/share/sgml/templates.entries.xsl b/share/sgml/templates.entries.xsl
index ad8640020f..a33ba8da8e 100644
--- a/share/sgml/templates.entries.xsl
+++ b/share/sgml/templates.entries.xsl
@@ -105,7 +105,7 @@
<xsl:value-of select="name"/>
</xsl:element></dt>
- <dd><xsl:copy-of select="description/child::node()" /></dd>
+ <dd><xsl:apply-templates select="description/child::node()" mode="copy.html"/></dd>
</xsl:for-each>
</dl>
</xsl:otherwise>
diff --git a/share/sgml/templates.oldnewsflash.xsl b/share/sgml/templates.oldnewsflash.xsl
index 616e188428..e4531dfe7c 100644
--- a/share/sgml/templates.oldnewsflash.xsl
+++ b/share/sgml/templates.oldnewsflash.xsl
@@ -13,6 +13,9 @@
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
<xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+ <!-- Do not add last modified date for old news/press -->
+ <xsl:variable name="date"/>
+
<xsl:variable name="year">
<xsl:value-of select="descendant::year/name"/>
</xsl:variable>
@@ -104,7 +107,7 @@
<xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
<xsl:for-each select="p">
<xsl:if test="position() > 1"><br /><br /></xsl:if>
- <xsl:copy-of select="child::node()" />
+ <xsl:apply-templates select="child::node()" mode="copy.html"/>
</xsl:for-each>
</p>
diff --git a/share/sgml/templates.oldpress.xsl b/share/sgml/templates.oldpress.xsl
index 664b1d59a6..9848cbd480 100644
--- a/share/sgml/templates.oldpress.xsl
+++ b/share/sgml/templates.oldpress.xsl
@@ -13,6 +13,9 @@
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
<xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+ <!-- Do not add last modified date for old news/press -->
+ <xsl:variable name="date"/>
+
<xsl:variable name="title">&title;</xsl:variable>
<xsl:variable name="year">
@@ -78,7 +81,7 @@
<a href="{$site-url}"><xsl:value-of
select="site-name"/></a>, <xsl:value-of select="author"/><br/>
- <xsl:copy-of select="p/child::node()"/>
+ <xsl:apply-templates select="p/child::node()" mode="copy.html"/>
</p>
</li>
</xsl:template>
diff --git a/share/sgml/templates.pastevents.xsl b/share/sgml/templates.pastevents.xsl
index 741b36b104..fda916a8cb 100644
--- a/share/sgml/templates.pastevents.xsl
+++ b/share/sgml/templates.pastevents.xsl
@@ -42,6 +42,9 @@
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
<xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
+ <!-- Do not add last modified date for old news/press -->
+ <xsl:variable name="date"/>
+
<xsl:param name="pastyears">2003 2004 2005 2006</xsl:param>
<xsl:key name="event-by-month" match="event"
@@ -214,7 +217,7 @@
<xsl:with-param name="enddate" select="enddate" />
</xsl:call-template>
</em><br/>
- <xsl:copy-of select="description/child::node()"/>
+ <xsl:apply-templates select="description/child::node()" mode="copy.html"/>
</p>
<xsl:if test="link">
<p><xsl:apply-templates select="link"/></p>
diff --git a/share/sgml/xhtml.xsl b/share/sgml/xhtml.xsl
index 5f5dcc7b86..9d9949c609 100644
--- a/share/sgml/xhtml.xsl
+++ b/share/sgml/xhtml.xsl
@@ -17,7 +17,7 @@
<xsl:variable name="rsstitle" select="''"/>
<xsl:variable name="svnKeyword">
- <xsl:value-of select="//cvs:keyword[1]"/>
+ <xsl:value-of select="normalize-space(//cvs:keyword[1])"/>
</xsl:variable>
<xsl:variable name="date">
@@ -170,6 +170,8 @@ parameters. Changing them will result in rendering errors.
<xsl:template name="process.footer">
©right;<br/>
- &lastmod; <xsl:value-of select="$date"/>
+ <xsl:if test="$date != ''">
+ &lastmod; <xsl:value-of select="$date"/>
+ </xsl:if>
</xsl:template>
</xsl:stylesheet>