diff --git a/en/security/Makefile b/en/security/Makefile
index 9e894c0462..3b37b9049b 100644
--- a/en/security/Makefile
+++ b/en/security/Makefile
@@ -1,25 +1,24 @@
-# $FreeBSD: www/en/security/Makefile,v 1.9 2003/11/24 18:26:33 hrs Exp $
+# $FreeBSD: www/en/security/Makefile,v 1.10 2004/01/13 22:44:07 hrs Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 DOCS=  
 DOCS+=	security.sgml
 
 INDEXLINK= security.html
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 CLEANFILES+= advisories.html.inc
 
 security.html: advisories.html.inc
 
 advisories.html.inc: mkindex.xsl ${XML_ADVISORIES} ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param "ftpbase" "'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/'" \
-		--param "ftpbaseold" "'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/old/'" \
+		--param "advisories.xml" "'${XML_ADVISORIES}'" \
 		${.CURDIR}/mkindex.xsl ${XML_ADVISORIES}
diff --git a/en/security/mkindex.xsl b/en/security/mkindex.xsl
index ff0b6510c9..e0ee478248 100644
--- a/en/security/mkindex.xsl
+++ b/en/security/mkindex.xsl
@@ -1,63 +1,27 @@
 <?xml version="1.0"?>
 
-<!-- $FreeBSD: www/en/security/mkindex.xsl,v 1.2 2003/10/11 07:12:58 hrs Exp $ -->
+<!-- $FreeBSD: www/en/security/mkindex.xsl,v 1.3 2004/01/13 22:44:07 hrs Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
   <xsl:import href="../includes.xsl"/>
 
   <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/en/security/mkindex.xsl,v 1.2 2003/10/11 07:12:58 hrs Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/en/security/mkindex.xsl,v 1.3 2004/01/13 22:44:07 hrs Exp $'"/>
   <xsl:variable name="title" select="'untitled'"/>
 
-  <xsl:param name="ftpbase" select="''" />
-  <xsl:param name="ftpbaseold" select="''" />
-
   <xsl:output type="xml" encoding="iso-8859-1"
               omit-xml-declaration="yes" />
 
   <xsl:template match="/">
-    <xsl:for-each select="descendant::release">
-
-      <xsl:param name="relname" select="string(name)" />
-      <xsl:param name="items" select="//advisory[$relname = string(following::release/name[1])]" />
-
-      <xsl:call-template name="putitems">
-	<xsl:with-param name="items" select="$items" />
-      </xsl:call-template>
-
-      <p><xsl:value-of select="name" /> released.</p>
-    </xsl:for-each>
-
-    <xsl:call-template name="putitems">
-      <xsl:with-param name="items" select="//advisory[not(following::release/name[1])]" />
+    <xsl:call-template name="html-list-advisories">
+       <xsl:with-param name="advisories.xml" select="$advisories.xml" />
     </xsl:call-template>
   </xsl:template>
 
-  <xsl:template name="putitems">
-    <xsl:param name="items" select="''" />
-
-    <xsl:if test="$items">
-      <ul>
-	<xsl:for-each select="$items">
-	  <li>
-	    <xsl:choose>
-	      <xsl:when test="name/@role='old'">
-		<a><xsl:attribute name="href">
-		    <xsl:value-of select="concat($ftpbaseold, name, '.asc')" />
-		  </xsl:attribute>
-		  <xsl:value-of select="concat(name, '.asc')" /></a>
-	      </xsl:when>
-	      <xsl:otherwise>
-		<a><xsl:attribute name="href">
-		    <xsl:value-of select="concat($ftpbase, name, '.asc')" />
-		  </xsl:attribute>
-		  <xsl:value-of select="concat(name, '.asc')" /></a>
-	      </xsl:otherwise>
-	    </xsl:choose>
-	  </li>
-	</xsl:for-each>
-      </ul>
-    </xsl:if>
+  <xsl:template name="html-list-advisories-release-label">
+    <xsl:param name="relname" select="'none'" />
+
+    <p><xsl:value-of select="$relname" /> released.</p>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/share/sgml/includes.misc.xsl b/share/sgml/includes.misc.xsl
index 0b51c9378d..0f7fe7917c 100644
--- a/share/sgml/includes.misc.xsl
+++ b/share/sgml/includes.misc.xsl
@@ -1,173 +1,261 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/share/sgml/includes.misc.xsl,v 1.3 2004/01/06 23:47:08 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.misc.xsl,v 1.4 2004/01/12 21:27:00 hrs Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
   <xsl:param name="leadingmark" select="'&#183; '"/>
 
   <!-- Often used trademarks -->
   <xsl:variable name="unix" select="'UNIX&#174;'"/>
   <xsl:variable name="java" select="'Java&#8482;'"/>
   <xsl:variable name="jdk" select="'JDK&#8482;'"/>
   <xsl:variable name="posix" select="'POSIX&#174;'"/>
 
+  <!-- for security advisories -->
+  <xsl:variable name="ftpbase"
+                select="'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/'"/>
+  <xsl:variable name="ftpbaseold"
+                select="'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/old/'"/>
+
+  <!--
+     template name                               used in
+
+     html-list-advisories                        security/mkindex.xsl
+     html-list-advisories-putitems               security/mkindex.xsl
+     html-list-advisories-release-label          security/mkindex.xsl (for l10n)
+     html-index-advisories-items                 index.xsl
+     html-index-advisories-items-lastmodified    index.xsl (for i10n)
+     html-index-news-project-items               index.xsl
+     html-index-news-project-items-lastmodified  index.xsl (for i10n)
+     html-index-news-press-items                 index.xsl
+     html-index-news-press-items-lastmodified    index.xsl (for i10n)
+     html-index-mirrors-options-list             index.xsl
+  -->
+
+  <!-- template: "html-list-advisories"
+       generate a list of all security advisories -->
+
+  <xsl:template name="html-list-advisories">
+    <xsl:param name="advisories.xml" select="'none'" />
+
+    <xsl:for-each select="document($advisories.xml)
+                          /descendant::release">
+
+      <xsl:param name="relname" select="string(name)" />
+      <xsl:param name="items" select="document($advisories.xml)
+                                      //advisory[$relname = string(following::release/name[1])]" />
+
+      <xsl:call-template name="html-list-advisories-putitems">
+	<xsl:with-param name="items" select="$items" />
+      </xsl:call-template>
+
+      <xsl:call-template name="html-list-advisories-release-label">
+	<xsl:with-param name="relname" select="name" />
+      </xsl:call-template>
+    </xsl:for-each>
+
+    <xsl:call-template name="html-list-advisories-putitems">
+      <xsl:with-param name="items" select="document($advisories.xml)
+                                           //advisory[not(following::release/name[1])]" />
+    </xsl:call-template>
+  </xsl:template>
+
+  <!-- template: "html-list-advisories-putitems"
+       sub-routine to generate a list -->
+
+  <xsl:template name="html-list-advisories-putitems">
+    <xsl:param name="items" select="''" />
+
+    <xsl:if test="$items">
+      <ul>
+	<xsl:for-each select="$items">
+	  <li>
+	    <xsl:choose>
+	      <xsl:when test="name/@role='old'">
+		<a><xsl:attribute name="href">
+		    <xsl:value-of select="concat($ftpbaseold, name, '.asc')" />
+		  </xsl:attribute>
+		  <xsl:value-of select="concat(name, '.asc')" /></a>
+	      </xsl:when>
+	      <xsl:otherwise>
+		<a><xsl:attribute name="href">
+		    <xsl:value-of select="concat($ftpbase, name, '.asc')" />
+		  </xsl:attribute>
+		  <xsl:value-of select="concat(name, '.asc')" /></a>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </li>
+	</xsl:for-each>
+      </ul>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- template: "html-list-advisories-release-label"
+       put label for release -->
+
+  <xsl:template name="html-list-advisories-release-label">
+    <xsl:param name="relname" select="'none'" />
+
+    <p><xsl:value-of select="$relname" /> released.</p>
+  </xsl:template>
+
   <!-- template: "html-index-advisories-items"
        pulls in the 10 most recent security advisories -->
 
   <xsl:template name="html-index-advisories-items">
     <xsl:param name="advisories.xml" select="''" />
 
     <xsl:for-each select="document($advisories.xml)/descendant::advisory[position() &lt;= 10]">
       <xsl:value-of select="$leadingmark" /><a>
 	<xsl:attribute name="href">ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/<xsl:value-of select="name"/>.asc</xsl:attribute>
 	<xsl:value-of select="name"/>
       </a><br/>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-advisories-items-lastmodified" -->
 
   <xsl:template name="html-index-advisories-items-lastmodified">
     <xsl:param name="advisories.xml" select="''" />
 
     <xsl:call-template name="transtable-lookup">
       <xsl:with-param name="word-group" select="'number-month'" />
       <xsl:with-param name="word">
 	<xsl:value-of select="document($advisories.xml)/descendant::month[position() = 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
     <xsl:value-of select="document($advisories.xml)/descendant::day[position() = 1]/name"/>
     <xsl:text>, </xsl:text>
     <xsl:value-of select="document($advisories.xml)/descendant::year[position() = 1]/name"/>
   </xsl:template>
 
   <!-- template: "html-index-news-project-items"
        pulls in the 10 most recent project items -->
 
   <xsl:template name="html-index-news-project-items">
     <xsl:param name="news.project.xml" select="''" />
 
     <xsl:for-each select="document($news.project.xml)/descendant::event[position() &lt;= 10]">
       <xsl:value-of select="$leadingmark" /><a>
 	<xsl:attribute name="href">
 	  news/newsflash.html#<xsl:call-template name="generate-event-anchor"/>
 	</xsl:attribute>
 	<xsl:choose>
 	  <xsl:when test="count(child::title)">
 	    <xsl:value-of select="title"/><br/>
 	  </xsl:when>
 	  <xsl:otherwise>
 	    <xsl:value-of select="p"/><br/>
 	  </xsl:otherwise>
 	</xsl:choose>
       </a>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-news-project-items-lastmodified" -->
 
   <xsl:template name="html-index-news-project-items-lastmodified">
     <xsl:param name="news.project.xml" select="''" />
 
     <xsl:call-template name="transtable-lookup">
       <xsl:with-param name="word-group" select="'number-month'" />
       <xsl:with-param name="word">
 	<xsl:value-of select="document($news.project.xml)/descendant::month[position() = 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
     <xsl:value-of select="document($news.project.xml)/descendant::day[position() = 1]/name"/>
     <xsl:text>, </xsl:text>
     <xsl:value-of select="document($news.project.xml)/descendant::year[position() = 1]/name"/>
   </xsl:template>
 
   <!-- template: "html-index-news-press-items"
        pulls in the 10 most recent press items -->
 
   <xsl:template name="html-index-news-press-items">
     <xsl:param name="news.press.xml" select="''" />
 
     <xsl:for-each select="document($news.press.xml)/descendant::story[position() &lt; 10]">
       <xsl:value-of select="$leadingmark" /><a>
 	<xsl:attribute name="href">
 	  news/press.html#<xsl:call-template name="generate-story-anchor"/>
 	</xsl:attribute>
 	<xsl:value-of select="name"/>
       </a><br/>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-news-press-items-lastmodified" -->
 
   <xsl:template name="html-index-news-press-items-lastmodified">
     <xsl:param name="news.press.xml" select="''" />
 
     <xsl:call-template name="transtable-lookup">
       <xsl:with-param name="word-group" select="'number-month'" />
       <xsl:with-param name="word">
 	<xsl:value-of select="document($news.press.xml)/descendant::month[position() = 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
     <xsl:value-of select="document($news.press.xml)/descendant::year[position() = 1]/name"/>
   </xsl:template>
 
   <!-- template: "html-index-mirrors-options-list"
        generates mirror sites list in index.html -->
 
   <xsl:template name="html-index-mirrors-options-list">
     <xsl:param name="mirrors.xml" select="''" />
 
     <xsl:choose>
       <xsl:when test="$mirrors.xml = ''">
 	<option value="NONE">
 	  **No Data**
 	</option>
       </xsl:when>
 
       <xsl:otherwise>
 	<xsl:for-each select="document($mirrors.xml)/mirrors/entry[
                               (not(country/@role) or country/@role != 'primary') and
                               host[@type = 'www']/url[@proto = 'httpv6']]">
 	  <xsl:sort select="country/@sortkey" data-type="number" />
 	  <xsl:sort select="country" />
 
 	  <xsl:for-each select="host[@type = 'www']/url[@proto = 'httpv6']">
 	    <option><xsl:attribute name="value"><xsl:value-of select="." /></xsl:attribute>
 	      <xsl:choose>
 		<xsl:when test="last() = 1">
 		  <xsl:value-of select="concat('IPv6 ', ../../country)" />
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:value-of select="concat('IPv6 ', ../../country, '/', position())" />
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </option>
 	  </xsl:for-each>
 	</xsl:for-each>
 
 	<xsl:for-each select="document($mirrors.xml)/mirrors/entry[
                               (not(country/@role) or country/@role != 'primary') and
                               host[@type = 'www']/url[@proto = 'http']]">
 	  <xsl:sort select="country/@sortkey" data-type="number" />
 	  <xsl:sort select="country" />
 
 	  <xsl:for-each select="host[@type = 'www']/url[@proto = 'http']">
 	    <option><xsl:attribute name="value"><xsl:value-of select="." /></xsl:attribute>
 	      <xsl:choose>
 		<xsl:when test="last() = 1">
 		  <xsl:value-of select="../../country" />
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:value-of select="concat(../../country, '/', position())" />
 		</xsl:otherwise>
 	      </xsl:choose>
 	    </option>
 	  </xsl:for-each>
 	</xsl:for-each>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 </xsl:stylesheet>