diff --git a/en/navigation.xml b/en/navigation.xml
index e90f4c9f16..2cbd89ff13 100644
--- a/en/navigation.xml
+++ b/en/navigation.xml
@@ -1,77 +1,77 @@
 <?xml version="1.0"?>
 <navigation>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD$
+      $FreeBSD: www/en/navigation.xml,v 1.1 2004/02/01 00:02:58 josef Exp $
     </cvs:keyword>
   </cvs:keywords>
 
   <category src="platforms/index.html" name="Platforms">
     <link src="smp/index.html" name="i386"/>
     <link src="platforms/alpha.html" name="Alpha"/>
     <link src="platforms/ia64/index.html" name="IA-64"/>
     <link src="platforms/amd64.html" name="AMD64"/>
     <link src="platforms/sparc.html" name="Sparc64"/>
     <link src="platforms/index.html" name="More?"/>
   </category>
 
-  <category src="" name="Software">
+  <category name="Software">
     <link src="doc/en_US.ISO8859-1/books/handbook/mirrors.html" name="Getting FreeBSD"/>
     <link src="releases/index.html" name="Release Information"/>
     <link src="ports/index.html" name="Ported Applications"/>
   </category>
 
   <category src="docs.html" name="Documentation">
     <link src="doc/en_US.ISO8859-1/books/faq/index.html" name="FAQ"/>
     <link src="doc/en_US.ISO8859-1/books/handbook/index.html" name="Handbook"/>
     <link src="http://www.freebsd.org/cgi/man.cgi" name="Manual pages"/>
     <link src="projects/newbies.html" name="For Newbies"/>
     <link src="docproj/index.html" name="Doc. Project"/>
   </category>
 
   <category src="support.html" name="Support">
     <link src="support.html#mailing-list" name="Mailing lists"/>
     <link src="support.html#newsgroups" name="Newsgroups"/>
     <link src="support.html#user" name="User Groups"/>
     <link src="support.html#web" name="Web Resources"/>
     <link src="security/index.html" name="Security"/>
   </category>
 
   <category src="support.html#gnats" name="Bug Reports">
     <link src="http://www.freebsd.org/cgi/query-pr-summary.cgi?query" name="Search"/>
     <link src="http://www.freebsd.org/cgi/query-pr.cgi" name="View one bug report"/>
     <link src="http://www.freebsd.org/cgi/query-pr-summary.cgi" name="View all bug reports"/>
     <link src="send-pr.html" name="Send a bug report"/>
     <link src="doc/en_US.ISO8859-1/articles/problem-reports/article.html" name="Writing Bug Reports"/> 
   </category>
 
   <category src="projects/index.html" name="Development">
     <link src="doc/en_US.ISO8859-1/books/developers-handbook" name="Developer's Handbook"/>
     <link src="doc/en_US.ISO8859-1/books/porters-handbook" name="Porter's Handbook"/>
     <link src="support.html#cvs" name="CVS Repository"/>
     <link src="releng/index.html" name="Release Engineering"/>
     <link src="doc/en_US.ISO8859-1/articles/contributing/index.html" name="Contributing to FreeBSD"/>
   </category>
 
-  <category src="" name="Vendors">
+  <category name="Vendors">
     <link src="commercial/software_bycat.html" name="Software"/>
     <link src="commercial/hardware.html" name="Hardware"/>
     <link src="commercial/consulting_bycat.html" name="Consulting"/>
     <link src="commercial/misc.html" name="Misc"/>
   </category>
 
-  <category src="" name="Donations">
+  <category name="Donations">
     <link src="donations/index.html" name="Donations Liaison"/>
     <link src="donations/donors.html" name="Current Donations"/>
     <link src="donations/wantlist.html" name="List of needs"/>
   </category>
 
   <category src="search/index-site.html" name="This Site">
     <link src="search/search.html#web" name="Search Website"/>
     <link src="search/search.html#mailinglists" name="Search Mailing Lists"/>
     <link src="search/search.html" name="Search All"/>
   </category>  
 
   <category src="mailto.html" name="Contacting FreeBSD"/>
   <category src="copyright/index.html" name="The BSD Copyright"/>
 </navigation>
diff --git a/share/sgml/includes.misc.xsl b/share/sgml/includes.misc.xsl
index 485de3b6a0..27bcd79ae9 100644
--- a/share/sgml/includes.misc.xsl
+++ b/share/sgml/includes.misc.xsl
@@ -1,312 +1,318 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/share/sgml/includes.misc.xsl,v 1.7 2004/02/01 00:02:58 josef Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.misc.xsl,v 1.8 2004/02/01 22:56:56 ale 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="@omithref='yes'">
 		<xsl:value-of select="name" />
 	      </xsl:when>
 	      <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" />
       <xsl:choose>
 	<xsl:when test="@omithref = 'yes'">
 	  <xsl:value-of select="name"/>
 	</xsl:when>
 	<xsl:otherwise>
 	  <a><xsl:attribute name="href"><xsl:value-of select="concat($ftpbase, name, '.asc')"/></xsl:attribute>
 	    <xsl:value-of select="name"/></a>
 	</xsl:otherwise>
       </xsl:choose>
       <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-navigation-link-list"
        generates navigation bar in index.html -->
 
   <xsl:template name="html-index-navigation-link-list">
     <xsl:param name="navigation.xml" select="''" />
     <xsl:for-each select="document($navigation.xml)/navigation/category">
       <p>
-	<xsl:if test="@src != ''">
-	<a>
+	<xsl:choose>
+	  <xsl:when test="boolean(@src)">
+	  <a>
 	    <xsl:attribute name="href">
+	      <xsl:choose>
+		<xsl:when test="@path = 'base'"><xsl:value-of select="$base"/>/</xsl:when>
+		<xsl:when test="@path = 'enbase'"><xsl:value-of select="$enbase"/>/</xsl:when>
+	      </xsl:choose>
 	      <xsl:value-of select="@src"/>
 	    </xsl:attribute>
 	    <font size="+1" color="#990000"><b><xsl:value-of select="@name"/></b></font>
-	</a>
-	</xsl:if>
+	  </a>
+	  </xsl:when>
 
-	<xsl:if test="not(@src != '')">
-	  <font size="+1" color="#990000"><b><xsl:value-of select="@name"/></b></font>
-	</xsl:if>
+	  <xsl:otherwise>
+	    <font size="+1" color="#990000"><b><xsl:value-of select="@name"/></b></font>
+	  </xsl:otherwise>
+	</xsl:choose>
 	<br/>
 	<small>
 	  <xsl:apply-templates select="link"/>
 	</small>
       </p>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "link" generates links inside of category -->
   <xsl:template match="link">
     &#183;
     <a>
       <xsl:attribute name="href">
 	<xsl:choose>
 	  <xsl:when test="@path = 'base'"><xsl:value-of select="$base"/>/</xsl:when>
 	  <xsl:when test="@path = 'enbase'"><xsl:value-of select="$enbase"/>/</xsl:when>
 	</xsl:choose>
 	<xsl:value-of select="@src"/>
       </xsl:attribute>
       <xsl:value-of select="@name"/></a><br/>
   </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>