diff --git a/en/Makefile b/en/Makefile
index 7341305bc6..42c53e4dc3 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,111 +1,111 @@
-# $FreeBSD: www/en/Makefile,v 1.98 2003/08/11 20:50:57 simon Exp $
+# $FreeBSD: www/en/Makefile,v 1.99 2003/10/29 20:42:50 simon Exp $
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  applications.sgml
 DOCS+= auditors.sgml
 DOCS+= availability.sgml
 DOCS+= docs.sgml 
 DOCS+= features.sgml
 DOCS+= register.sgml
 DOCS+= internet.sgml 
 DOCS+= mailto.sgml 
 DOCS+= publish.sgml
 DOCS+= relnotes.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml 
 DOCS+= y2kbug.sgml 
 
 # These will be directly installed.
 
 DATA=	favicon.ico
 DATA+=	robots.txt
 DATA+=	freebsd.css
 DATA+=  vendors.html
 
 # Subdirectories
 # SGML
 SUBDIR=	 security
 SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 SUBDIR+= advocacy
 
 SUBDIR+= events
 SUBDIR+= FAQ
 SUBDIR+= handbook
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
 SUBDIR+= gallery
 SUBDIR+= projects
 SUBDIR+= prstats
 SUBDIR+= platforms
 SUBDIR+= releases
 SUBDIR+= releng
 SUBDIR+= smp
 SUBDIR+= kse
 SUBDIR+= gnome
 SUBDIR+= donations
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= ports
 SUBDIR+= doc
 .endif
 .if defined(BUILD_RELNOTES)
 SUBDIR+= relnotes
 .endif
 
 # These *must* be listed after the "doc" subdir, as they create symlinks
 # in to it.
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= tutorials
 .endif
 
 # Non-SGML
 SUBDIR+= gifs
 SUBDIR+= cgi
 
 WEB_LANG?=	da it ja es ru zh de pt_BR
 
 COOKIE=	FAQ handbook
 
 # Non-English
 
 .if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
 .for DIR in ${WEB_LANG}
 SUBDIR+=	../${DIR}
 .endfor
 .endif
 
 WEBDIR?=	data
 
 # index.html is special, and generated from index.xsl and news/news.xml
 DATA+=		index.html
 CLEANFILES+=	index.html
 
-index.html: index.xsl news/news.xml news/press.xml includes.xsl news/includes.xsl security/advisories.xml
+index.html: index.xsl news/news.xml news/press.xml includes.xsl news/includes.xsl security/advisories.xml ../../doc/share/sgml/mirrors.xml
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		${.CURDIR}/index.xsl ${.CURDIR}/news/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
 WEBCHECK?=	${PREFIX}/bin/webcheck
 WEBCHECKOPTS?=	-ab ${WEBCHECKFLAGS}
 WEBCHECKDIR?=	/webcheck
 WEBCHECKINSTALLDIR?= ${DESTDIR}${WEBCHECKDIR}
 WEBCHECKURL?=	http://www.FreeBSD.org/
 
 webcheck:
 	@[ -d ${WEBCHECKINSTALLDIR} ] || ${MKDIR} ${WEBCHECKINSTALLDIR}
 	${WEBCHECK} ${WEBCHECKOPTS} -o ${WEBCHECKINSTALLDIR} ${WEBCHECKURL}
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/includes.xsl b/en/includes.xsl
index ab230e24c8..6c9f708c6b 100644
--- a/en/includes.xsl
+++ b/en/includes.xsl
@@ -1,113 +1,115 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/en/includes.xsl,v 1.16 2003/10/03 22:42:03 simon Exp $ -->
+<!-- $FreeBSD: www/en/includes.xsl,v 1.17 2003/10/29 07:35:52 murray Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
+  <xsl:variable name="mirrors" select="'../../doc/share/sgml/mirrors.xml'" />
+
   <xsl:variable name="i.daemon">
     <img src="{$base}/gifs/daemon.gif" alt="" align="left" width="80" height="76"/>
   </xsl:variable>
 
   <xsl:variable name="i.new">
     <img src="{$base}/gifs/new.gif" alt="[New!]" width="28" height="11"/>
   </xsl:variable>
 
   <xsl:variable name="copyright">
     <a href="{$base}/copyright/index.html">Copyright</a> &#169; 1995-2003 the FreeBSD Project.  All rights reserved.
   </xsl:variable>
 
   <!-- 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;'"/>
 
   <xsl:variable name="email" select="'freebsd-questions'"/>
   <xsl:variable name="author">
     <a>
       <xsl:attribute name="href">
 	<xsl:value-of select="concat($base, '/mailto.html')"/>
       </xsl:attribute>
       <xsl:value-of select="$email"/>@FreeBSD.org</a><br/><xsl:copy-of select="$copyright"/>
   </xsl:variable>
 
   <xsl:variable name="home">
     <a href="{$base}/index.html"><img src="{$base}/gifs/home.gif" alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"/></a>
   </xsl:variable>
 
   <xsl:variable name="header1">
     <head>
       <title><xsl:value-of select="$title"/></title>
 
       <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
       <meta name="MSSmartTagsPreventParsing" content="TRUE"/>
     </head>
   </xsl:variable>
 
   <xsl:attribute-set name="att.body">
     <xsl:attribute name="text">#000000</xsl:attribute>
     <xsl:attribute name="bgcolor">#FFFFFF</xsl:attribute>
     <xsl:attribute name="alink">#FFCC33</xsl:attribute>
   </xsl:attribute-set>
 
   <xsl:variable name="header2">
     <img src="{$base}/gifs/bar.gif" alt="Navigation Bar" width="565" 
 	 height="33" border="0" usemap="#bar"/>
       
     <h1 align="left"><font color="#660000"><xsl:value-of select="$title"/></font></h1>
 
     <br clear="all"/>
 
     <map name="bar">
       <area shape="rect" coords="1,1,111,31" 
 	    href="{$base}/index.html" alt="Top"/>
       <area shape="rect" coords="112,11,196,31" 
 	    href="{$base}/ports/index.html" alt="Applications"/>
       <area shape="rect" coords="196,12,257,33" 
 	      href="{$base}/support.html" alt="Support"/>
       <area shape="rect" coords="256,12,365,33" 
 	    href="{$base}/docs.html" alt="Documentation"/> 
       <area shape="rect" coords="366,13,424,32" 
 	    href="{$base}/commercial/commercial.html" alt="Vendors"/>
       <area shape="rect" coords="425,16,475,32" 
 	      href="{$base}/search/search.html" alt="Search"/>
       <area shape="rect" coords="477,16,516,33" 
 	    href="{$base}/search/index-site.html" alt="Index"/>
       <area shape="rect" coords="516,15,562,33" 
 	    href="{$base}/index.html" alt="Top"/>
 	<area shape="rect" coords="0,0,564,32" 
 	      href="{$base}/index.html" alt="Top"/>
     </map>
   </xsl:variable>
 
   <xsl:variable name="footer">
     <hr noshade="noshade"/>
     <address><xsl:copy-of select="$author"/><br/>
       <xsl:copy-of select="$date"/></address>
   </xsl:variable>
   
   <xsl:variable name="rel.current" select='"5.1"'/>
   <xsl:variable name="u.rel.notes">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/relnotes.html</xsl:variable>
 
   <xsl:variable name="u.rel.announce">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/announce.html</xsl:variable>
   <xsl:variable name="u.rel.errata">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/errata.html</xsl:variable>
   <xsl:variable name="u.rel.hardware">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/hardware.html</xsl:variable>
   <xsl:variable name="u.rel.early">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/early-adopter.html</xsl:variable>
   
   <xsl:variable name="rel2.current" select='"4.9"'/>
   <xsl:variable name="u.rel2.notes">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/relnotes.html</xsl:variable>
 
   <xsl:variable name="u.rel2.announce">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/announce.html</xsl:variable>
   <xsl:variable name="u.rel2.errata">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/errata.html</xsl:variable>
   <xsl:variable name="u.rel2.hardware">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/hardware.html</xsl:variable>
   
 </xsl:stylesheet>
diff --git a/en/index.xsl b/en/index.xsl
index 4d5b57213d..dce1994537 100644
--- a/en/index.xsl
+++ b/en/index.xsl
@@ -1,578 +1,507 @@
-<!-- $FreeBSD: www/en/index.xsl,v 1.79 2003/10/17 16:51:08 ceri Exp $ -->
+<!-- $FreeBSD: www/en/index.xsl,v 1.80 2003/10/28 16:15:52 simon Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   
   <xsl:import href="includes.xsl"/>
   <xsl:import href="news/includes.xsl"/>
 
   <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.79 2003/10/17 16:51:08 ceri Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.80 2003/10/28 16:15:52 simon Exp $'"/>
   <xsl:variable name="title" select="'The FreeBSD Project'"/>
 
   <xsl:output type="html" encoding="iso-8859-1"
               doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
 
   <xsl:template match="/">
     <html>
       <head>
 	<title><xsl:value-of select="$title"/></title>
     
 	<meta name="description" content="The FreeBSD Project"/>
     
 	<meta name="keywords" content="FreeBSD, BSD, UNIX, Support, Gallery,
 	      Release, Application, Software, Handbook, FAQ, Tutorials, Bugs, 
 	      CVS, CVSup, News, Commercial Vendors, homepage, CTM, Unix"/>
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>
 	<link rel="icon" href="/favicon.ico" type="image/x-icon"/>
       </head>
   
       <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#840084"
 	    alink="#0000FF">
     
 	<table border="0" cellspacing="0" cellpadding="0" width="100%">
 	  <tr>
 	    <td><a href="http://www.FreeBSD.org/index.html">
 		<img src="gifs/freebsd_1.gif" height="94" width="306"
 		     alt="FreeBSD: The Power to Serve" border="0"/></a></td>
 	    
 	    <td align="right" valign="bottom">
 	      <form action="http://www.FreeBSD.org/cgi/mirror.cgi" 
 		    method="get">
 		
 		<br/>
 		
 		<font color="#990000"><b>Select a server near you:</b></font>
 		
 		<br/>
 	      
 		<select name="goto">
 		  <!--  Only list TRUE mirrors here! Native language pages 
 		        which are not mirrored should be listed in
 		        support.sgml.  -->
 
-		  <option value="http://www2.at.FreeBSD.org/">IPv6 Austria</option>
-		  <option value="http://www.dk.FreeBSD.org/">IPv6 Denmark</option>
-		  <option value="http://www2.de.FreeBSD.org">IPv6 Germany</option>
-		  <option value="http://www.jp.FreeBSD.org/www.FreeBSD.org/">IPv6 (6Bone) Japan</option>
-		  <option value="http://www2.no.FreeBSD.org/">IPv6 Norway</option>
-		  <option value="http://www1.uk.FreeBSD.org/">IPv6 UK</option>
-		  <option value="http://www4.us.FreeBSD.org/">IPv6 USA/1</option>
-		  <option value="http://www5.us.FreeBSD.org/">IPv6 USA/2</option>
-		  <option value="http://www.ar.FreeBSD.org/">Argentina</option>
-		  <option value="http://www.au.FreeBSD.org/">Australia/1</option>
-		  <option value="http://www2.au.FreeBSD.org/">Australia/2</option>
-		  <option value="http://www.at.FreeBSD.org/">Austria/1</option>
-		  <option value="http://www2.at.FreeBSD.org/">Austria/2</option>
-		  <option value="http://freebsd.unixtech.be/">Belgium</option>
-		  <option value="http://www.br.FreeBSD.org/">Brazil/1</option>
-		  <option value="http://www2.br.FreeBSD.org/www.freebsd.org/">Brazil/2</option>
-		  <option value="http://www3.br.FreeBSD.org/">Brazil/3</option>
-		  <option value="http://www.bg.FreeBSD.org/">Bulgaria</option>
-		  <option value="http://www.ca.FreeBSD.org/">Canada/1</option>
-		  <option value="http://www2.ca.FreeBSD.org/">Canada/2</option>
-		  <option value="http://www.cn.FreeBSD.org/">China</option>
-		  <option value="http://www.cz.FreeBSD.org/">Czech Republic</option>
-		  <option value="http://www.dk.FreeBSD.org/">Denmark/1</option>
-		  <option value="http://www3.dk.FreeBSD.org/">Denmark/2</option>
-		  <option value="http://www.ee.FreeBSD.org/">Estonia</option>
-		  <option value="http://www.fi.FreeBSD.org/">Finland/1</option>
-		  <option value="http://www2.fi.FreeBSD.org/">Finland/2</option>
-		  <option value="http://www.fr.FreeBSD.org/">France</option>
-		  <option value="http://www.de.FreeBSD.org/">Germany/1</option>
-		  <option value="http://www1.de.FreeBSD.org/">Germany/2</option>
-		  <option value="http://www2.de.FreeBSD.org/">Germany/3</option>
-		  <option value="http://www.gr.FreeBSD.org/">Greece/1</option>
-		  <option value="http://www.FreeBSD.gr/">Greece/2</option>
-		  <option value="http://www.hk.FreeBSD.org/">Hong Kong</option>
-		  <option value="http://www.hu.FreeBSD.org/">Hungary/1</option>
-		  <option value="http://www2.hu.FreeBSD.org/">Hungary/2</option>
-		  <option value="http://www.is.FreeBSD.org/">Iceland</option>
-		  <option value="http://www.ie.FreeBSD.org/">Ireland/1</option>
-		  <option value="http://www2.ie.FreeBSD.org/">Ireland/2</option>
-		  <option value="http://www.it.FreeBSD.org/">Italy/1</option>
-		  <option value="http://www.gufi.org/mirrors/www.freebsd.org/data/">Italy/2</option>
-		  <option value="http://www.jp.FreeBSD.org/www.FreeBSD.org/">Japan</option>
-		  <option value="http://www.kr.FreeBSD.org/">Korea/1</option>
-		  <option value="http://www2.kr.FreeBSD.org/">Korea/2</option>
-		  <option value="http://www.kw.FreeBSD.org/">Kuwait</option>
-		  <option value="http://www.lv.FreeBSD.org/">Latvia</option>
-		  <option value="http://www.lt.FreeBSD.org/">Lithuania</option>
-		  <option value="http://www.nl.FreeBSD.org/">Netherlands/1</option>
-		  <option value="http://www2.nl.FreeBSD.org/">Netherlands/2</option>
-		  <option value="http://www.nz.FreeBSD.org/">New Zealand</option>
-		  <option value="http://www.no.FreeBSD.org/">Norway/1</option>
-		  <option value="http://www2.no.FreeBSD.org/">Norway/2</option>
-		  <option value="http://www.FreeBSD.org.ph/">Philippines</option>
-		  <option value="http://www.pl.FreeBSD.org/">Poland/1</option>
-		  <option value="http://www2.pl.FreeBSD.org/">Poland/2</option>
-		  <option value="http://www.pt.FreeBSD.org/">Portugal/1</option>
-		  <option value="http://www4.pt.FreeBSD.org/">Portugal/2</option>
-		  <option value="http://www5.pt.FreeBSD.org/">Portugal/3</option>
-		  <option value="http://www.ro.FreeBSD.org/">Romania/1</option>
-		  <option value="http://www2.ro.FreeBSD.org/">Romania/2</option>
-		  <option value="http://www3.ro.FreeBSD.org/">Romania/3</option>
-		  <option value="http://www4.ro.FreeBSD.org/">Romania/4</option>
-		  <option value="http://www.ru.FreeBSD.org/">Russia/1</option>
-		  <option value="http://www2.ru.FreeBSD.org/">Russia/2</option>
-		  <option value="http://www3.ru.FreeBSD.org/">Russia/3</option>
-		  <option value="http://www4.ru.FreeBSD.org/">Russia/4</option>
-		  <option value="http://www.sm.FreeBSD.org/">San Marino</option>
-		  <option value="http://www2.sg.FreeBSD.org/">Singapore</option>
-		  <option value="http://www.sk.FreeBSD.org/">Slovak Republic/1</option>
-		  <option value="http://www2.sk.FreeBSD.org/">Slovak Republic/2</option>
-		  <option value="http://www.si.FreeBSD.org/">Slovenia/1</option>
-		  <option value="http://www2.si.FreeBSD.org/">Slovenia/2</option>
-		  <option value="http://www.es.FreeBSD.org/">Spain/1</option>
-		  <option value="http://www2.es.FreeBSD.org/">Spain/2</option>
-		  <option value="http://www3.es.FreeBSD.org/">Spain/3</option>
-		  <option value="http://www.za.FreeBSD.org/">South Africa/1</option>
-		  <option value="http://www2.za.FreeBSD.org/">South Africa/2</option>
-		  <option value="http://www.se.FreeBSD.org/">Sweden/1</option>
-		  <option value="http://www2.se.FreeBSD.org/">Sweden/2</option>
-		  <option value="http://www.ch.FreeBSD.org/">Switzerland/1</option>
-		  <option value="http://www2.ch.FreeBSD.org/">Switzerland/2</option>
-		  <option value="http://www.tw.FreeBSD.org/">Taiwan/1</option>
-		  <option value="http://www2.tw.FreeBSD.org/">Taiwan/2</option>
-		  <option value="http://www3.tw.FreeBSD.org/">Taiwan/3</option>
-		  <option value="http://www4.tw.FreeBSD.org/">Taiwan/4</option>
-		  <option value="http://www.tr.FreeBSD.org/">Turkey/1</option>
-		  <option value="http://www2.tr.FreeBSD.org/">Turkey/2</option>
-		  <option value="http://www.enderunix.org/freebsd/">Turkey/3</option>
-		  <option value="http://www.ua.FreeBSD.org/">Ukraine/1</option>
-		  <option value="http://www2.ua.FreeBSD.org/">Ukraine/2</option> 
-		  <option value="http://www5.ua.FreeBSD.org/">Ukraine/3</option> 
-		  <option value="http://www4.ua.FreeBSD.org/">Ukraine/Crimea</option> 
-		  <option value="http://www.uk.FreeBSD.org/">United Kingdom/1</option>
-		  <option value="http://www2.uk.FreeBSD.org/">United Kingdom/2</option>
-		  <option value="http://www3.uk.FreeBSD.org/">United Kingdom/3</option>
-		  <option value="http://www4.uk.FreeBSD.org/">United Kingdom/4</option>
-		  <option value="http://www1.uk.FreeBSD.org/">United Kingdom/5</option>
-		  <option value="http://www2.us.FreeBSD.org/">USA/1</option>
-		  <option value="http://www4.us.FreeBSD.org/">USA/2</option>
-		  <option value="http://www5.us.FreeBSD.org/">USA/3</option>
+		  <xsl:for-each select="document($mirrors)/mirrors/entry[url[contains(@proto, 'httpv6')]]">
+		    <xsl:for-each select="url[contains(@proto, 'httpv6') and contains(@type, 'www')]">
+		     <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)/mirrors/entry[url[contains(@proto, 'http')]]">
+		    <xsl:for-each select="url[contains(@proto, 'http') and contains(@type, 'www')]">
+		     <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>
 		</select>
 		
 		<input type="submit" value=" Go "/>
 		
 		<br/>
 		
 		<font color="#990000"><b>Language: </b></font> 
 		<a href="{$base}/de/index.html" title="German">[de]</a>
 		<xsl:text>&#160;</xsl:text>
 		<span title="English">[en]</span>
 		<xsl:text>&#160;</xsl:text>
 		<a href="{$base}/es/index.html" title="Spanish">[es]</a>
 		<xsl:text>&#160;</xsl:text>
 		<a href="http://www.freebsd-fr.org/index-trad.html" title="French">[fr]</a>
 		<xsl:text>&#160;</xsl:text>
 		<a href="{$base}/it/index.html" title="Italian">[it]</a>
 		<xsl:text>&#160;</xsl:text>
 		<a href="{$base}/ja/index.html" title="Japanese">[ja]</a>
 		<xsl:text>&#160;</xsl:text>
 		<a href="{$base}/ru/index.html" title="Russian">[ru]</a>
 	      </form>
 	    </td>
 	  </tr>
 	</table>
 	
 	<br/>
 	
 	<hr size="1" noshade="noshade"/>
 
 	<!-- Main layout table -->
 	<table border="0" cellspacing="0" cellpadding="2">
 	  <tr>
 	    <td valign="top">
 	      <table border="0" cellspacing="0" cellpadding="1"
 		     bgcolor="#000000" width="100%">
 		<tr>
 		  <td>
 		    <table cellpadding="4" cellspacing="0" border="0"
 			   bgcolor="#ffcc66" width="100%">
 		      <tr>
 			<td>
 			  <p><font size="+1" color="#990000"><b>News</b></font>
 
 	      
 			    <small><br/>
 			      &#183; <a href="news/newsflash.html">Announcements</a><br/>
 			      &#183; <a href="news/press.html">In the Press</a><br/>
 			      &#183; <a href="news/index.html">More ...</a>
 			    </small></p>
 
 			  <p><font size="+1" color="#990000"><b>Software</b></font>
 			    <small><br/>
 			      &#183; <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/mirrors.html">Getting FreeBSD</a><br/>
 			      &#183; <a href="releases/index.html">Release Information</a><br/>
 			      &#183; <a href="{$base}/ports/index.html">Ported Applications</a><br/>
 			    </small></p>
 	    
 			  <p><font size="+1" color="#990000"><b>Documentation</b></font>
 		
 			    <small><br/>
 			      &#183; <a href="projects/newbies.html">For Newbies</a><br/>
 			      &#183; <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook</a><br/>
 			      &#183; <a href="{$base}/doc/en_US.ISO8859-1/books/faq/index.html">FAQ</a><br/>
 			      &#183; <a href="http://www.FreeBSD.org/cgi/man.cgi">Manual pages</a><br/>
 			      &#183; <a href="{$base}/docproj/index.html">Doc. Project</a><br/>
 			      &#183; <a href="docs.html">More...</a><br/>
 			    </small></p>
 			  
 			  <p><font size="+1" color="#990000"><b>Support</b></font>
 	      
 			    <small><br/>
 			      &#183; <a href="{$base}/support.html#mailing-list">Mailing lists</a><br/>
 			      &#183; <a href="{$base}/support.html#newsgroups">Newsgroups</a><br/>
 			      &#183; <a href="{$base}/support.html#user">User Groups</a><br/>
 			      &#183; <a href="{$base}/support.html#web">Web Resources</a><br/>
 			      &#183; <a href="security/index.html">Security</a><br/>
 			      &#183; <a href="{$base}/events/events.html">Events</a><br/>
 			      &#183; <a href="{$base}/support.html">More...</a>
 			    </small></p>
 
 			  <p><font size="+1" color="#990000"><b>Bug Reports</b></font>
 			    <small><br/>
 			      &#183; <a href="send-pr.html">Send a bug report</a><br/>
 			      &#183; <a href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">View open reports</a><br/>
 			      &#183; <a href="http://www.FreeBSD.org/cgi/query-pr.cgi">Search by bug ID</a><br/>
 			      &#183; <a href="{$base}/support.html#gnats">More...</a><br/>
 			    </small></p>
 
 	      
 			  <p><font size="+1" color="#990000"><b>Development</b></font>
 		
 			    <small><br/>
 			      &#183; <a href="projects/index.html">Projects</a><br/>
 			      &#183; <a href="releng/index.html">Release Engineering</a><br/>
 			      &#183; <a href="{$base}/support.html#cvs">CVS Repository</a><br/>
 			    </small></p>
 	      
 			  <p><font size="+1" color="#990000"><b>Vendors</b></font>
 			    
 			    <small><br/>
 			      &#183; <a href="{$base}/commercial/software_bycat.html">Software</a><br/>
 			      &#183; <a href="{$base}/commercial/hardware.html">Hardware</a><br/>
 			      &#183; <a href="{$base}/commercial/consulting_bycat.html">Consulting</a><br/>
 			      &#183; <a href="{$base}/commercial/misc.html">Misc</a><br/>
 			    </small></p>
 
 			  <p><font size="+1" color="#990000"><b>Donations</b></font>
 			    <small><br/>
 			      &#183; <a href="{$base}/donations/index.html">Donations Liaison</a><br/>
 			      &#183; <a href="{$base}/donations/donors.html">Current Donations</a><br/>
 			      &#183; <a href="{$base}/donations/wantlist.html">List of needs</a><br/>
 			    </small></p>
 	      
 			  <p><font size="+1" color="#990000"><b>This Site</b></font>
 		
 			    <small><br/>
 			      &#183; <a href="{$base}/search/index-site.html">Site Map</a><br/>
 			      &#183; <a href="{$base}/search/search.html">Search</a><br/>
 			      &#183; <a href="internal/index.html">More ...</a><br/>
 			    </small></p>
 	      
 			  <form action="http://www.FreeBSD.org/cgi/search.cgi" method="get">
 			    <small>Search for:<br/>
 			      <input type="text" name="words" size="10"/>
 			      <input type="hidden" name="max" value="25"/>
 			      <input type="hidden" name="source" value="www"/>
 			      <input type="submit" value="Go"/></small>
 			  </form></td>
 		      </tr>
 		    </table>
 		  </td>
 		</tr>
 	      </table>
 	    </td>
 	    
 	    <td></td>
 	    
 	    <!-- Main body column -->
 
 	    <td align="left" valign="top" rowspan="2">
 	      <h2><font color="#990000">What is FreeBSD?</font></h2>
 	
 	      <p>FreeBSD is an advanced operating system for
 		x86 compatible, DEC Alpha, IA-64, PC-98 and UltraSPARC&#174; architectures.
 		It is derived from BSD, the version of <xsl:value-of select="$unix"/>
 	        developed at 
 		the University of California, Berkeley.
 		It is developed and maintained by 
 		<a
 		href="{$base}/doc/en_US.ISO8859-1/articles/contributors/index.html">a
 		large team of individuals</a>. Additional
 		<a href="{$base}/platforms/index.html">platforms</a> are in
 		various stages of development.</p>
 	      
 	      <h2><font color="#990000">Cutting edge features</font></h2>
 	      
 	      <p>FreeBSD offers advanced networking, performance, security
 		and compatibility 
 		<a href="{$base}/features.html">features</a>
 		today which are still missing in other operating systems,
 		even some of the best commercial ones.</p>
 	      
 	      <h2><font color="#990000">Powerful Internet solutions</font></h2>
 	      
 	      <p>FreeBSD makes an ideal 
 		<a href="{$base}/internet.html">Internet or Intranet</a> 
 		server. It provides robust network services under the heaviest
 		loads and uses memory efficiently to maintain good response
 		times for thousands of simultaneous user processes. Visit our
 		<a href="gallery/gallery.html">gallery</a> for examples of
 		FreeBSD powered applications and services.</p>
 	    
 	      <h2><font color="#990000">Run a huge number of
 		  applications</font></h2>
 	    
 	      <p>The quality of FreeBSD combined with today's low-cost,
 		high-speed PC hardware makes FreeBSD a very economical
 		alternative to commercial  <xsl:value-of select="$unix"/>
 	        workstations.  It is well-suited
 		for a great number of both desktop and server 
 		<a href="{$base}/applications.html">applications</a>.</p>
 	    
 	      <h2><font color="#990000">Easy to install</font></h2>
 	    
 	      <p>FreeBSD can be installed from a variety of media including
 		CD-ROM, DVD-ROM, floppy disk, magnetic tape, an MS-DOS&#174; partition, or if
 		you have a network connection, you can install it
 		<i>directly</i> over anonymous FTP or NFS. All you need is a 
 		pair of blank, 1.44MB floppies and 
 		<a href="{$base}/doc/en_US.ISO8859-1/books/handbook/install.html">these 
 		  directions</a>.</p>
 
 	      <h2><font color="#990000">FreeBSD is <i>free</i></font></h2>
 	    
 	      <a href="copyright/daemon.html"><img src="gifs/dae_up3.gif" 
 						   alt=""
 						   height="81" width="72" 
 						   align="right" 
 						   border="0"/></a>
 	      
 	      <p>While you might expect an operating system with these 
 		features to sell for a high price, FreeBSD is available 
 		<a href="{$base}/copyright/index.html">free of charge</a>
 		and comes with full source code. If you would like to try it
 		out, 
 		<a href="{$base}/doc/en_US.ISO8859-1/books/handbook/mirrors.html">more 
 		  information is available</a>.</p>
 	      
 	      <h2><font color="#990000">Contributing to FreeBSD</font></h2>
 	      
 	      <p>It is easy to contribute to FreeBSD. All you need to do
 		is find a part of FreeBSD which you think could be
 		improved and make those changes (carefully and cleanly)
 		and submit that back to the Project by means of send-pr
 		or a committer, if you know one.  This could be anything
 		from documentation to artwork to source code. See the 
 		<a href="{$base}/doc/en_US.ISO8859-1/articles/contributing/index.html">Contributing
 		to FreeBSD</a> article for more information.</p>
 
 		<p>Even if you are not a programmer, there are other ways to
  		contribute to FreeBSD. The FreeBSD Foundation is a
 		non-profit organization for which direct contributions
 		are fully tax deductible.  Please contact
 		<a href="mailto:bod@FreeBSDFoundation.org">bod@FreeBSDFoundation.org</a>
 		for more information or write to: The FreeBSD Foundation,
 		7321 Brockway Dr.  Boulder, CO 80303.  USA</p>
 
 		<p>Silicon Breeze has also sculpted and cast the BSD Daemon
 		in metal and is now donating 15% of all proceeds from
 		these statuettes back to the FreeBSD Foundation. The complete
 		story and information on how to order a BSD Daemon is
 		available from
  		<a href="http://www.linuxjewellery.com/beastie/">this page.</a>
 		</p>
 
 	    </td>
 
 	    <td></td>
 
 	    <!-- Right-most column -->
 	    <td valign="top">
 	      <!-- News / release info table -->
 	      <table border="0" cellspacing="0" cellpadding="1"
 		     bgcolor="#000000" width="100%">
 		<tr>
 		  <td>
 		    <table cellpadding="4" cellspacing="0" border="0"
 			   bgcolor="#ffcc66" width="100%">
 		      <tr>
 			<td valign="top"><p><font size="+1" color="#990000"><b>New Technology Release:
 			    <xsl:value-of select="$rel.current"/></b></font><br/>
 			
 			    <small>&#183; <a href="{$u.rel.announce}">Announcement</a><br/>
 			      &#183; <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/install.html">Installation Guide</a><br/>
 			      &#183; <a href="{$u.rel.notes}">Release Notes</a><br/>
 			      &#183; <a href="{$u.rel.hardware}">Hardware Notes</a><br/>
 			      &#183; <a href="{$u.rel.errata}">Errata</a><br/>
 			      &#183; <a href="{$u.rel.early}">Early Adopter's Guide</a></small></p>
 
 			  <p><font size="+1" color="#990000"><b>Production Release:
 			    <xsl:value-of select="$rel2.current"/></b></font><br/>
 			
 			    <small>&#183; <a href="{$u.rel2.announce}">Announcement</a><br/>
 			      &#183; <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/install.html">Installation Guide</a><br/>
 			      &#183; <a href="{$u.rel2.notes}">Release Notes</a><br/>
 			      &#183; <a href="{$u.rel2.hardware}">Hardware Notes</a><br/>
 			      &#183; <a href="{$u.rel2.errata}">Errata</a></small></p>
 
 			  <p><font size="+1" color="#990000"><b>Project News</b></font><br/>
 			    <font size="-1">
 			      Latest update: 
 			      <xsl:value-of
 				select="descendant::month[position() = 1]/name"/>
 			      <xsl:text> </xsl:text>
 			      <xsl:value-of
 				select="descendant::day[position() = 1]/name"/>,
 			      <xsl:text> </xsl:text>
 			      <xsl:value-of
 				select="descendant::year[position() = 1]/name"/>
 			      <br/>
 			      <!-- Pull in the 10 most recent news items -->
 			      <xsl:for-each select="descendant::event[position() &lt;= 10]">
 				&#183;  <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>
 			      <a href="news/newsflash.html">More...</a>
 			    </font></p>
 			  
 			  <p><font size="+1" color="#990000"><b>FreeBSD Press</b></font><br/>
 
 			    <font size="-1">
 			      Latest update: 
 			      <xsl:value-of
 				select="document('news/press.xml')/descendant::month[position() = 1]/name"/>
 			      <xsl:text> </xsl:text>
 			      <xsl:value-of
 				select="document('news/press.xml')/descendant::year[position() = 1]/name"/>
 			      <br/>
 			      <!-- Pull in the 10 most recent press items -->
 			      <xsl:for-each select="document('news/press.xml')/descendant::story[position() &lt; 10]">
 				&#183; <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>
 			      <a href="news/press.html">More...</a>
 			    </font>
 			  </p>
 
 			  <p><font size="+1" color="#990000"><b>Security Advisories</b></font><br/>
 
 			    <font size="-1">
 			      Latest update: 
 			      <xsl:value-of
 				select="document('security/advisories.xml')/descendant::month[position() = 1]/name"/>
 			      <xsl:text> </xsl:text>
 			      <xsl:value-of
 				select="document('security/advisories.xml')/descendant::day[position() = 1]/name"/>
 			      <xsl:text>, </xsl:text>
 			      <xsl:value-of
 				select="document('security/advisories.xml')/descendant::year[position() = 1]/name"/>
 			      <br/>
 			      <!-- Pull in the 10 most recent security advisories -->
 			      <xsl:for-each select="document('security/advisories.xml')/descendant::advisory[position() &lt; 10]">
 				&#183; <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>
 			      <a href="security/">More...</a>
 			    </font>
 			  </p>
 			</td>
 		      </tr>
 		    </table>
 		  </td>
 		</tr>
 	      </table>
 
 	      <p>&#xa0;</p>
 
 	      <table border="0" cellspacing="0" cellpadding="1"
 		     bgcolor="#000000" width="100%">
 		<tr>
 		  <td>
 		    <table cellpadding="4" cellspacing="0" border="0"
 			   bgcolor="#FFFFFF" width="100%"><tr>
 			<td>To learn more about FreeBSD, visit our gallery of 
 			  FreeBSD related 
 			  <a href="{$base}/publish.html">publications</a> or 
 			  <a href="news/press.html">FreeBSD in the press</a>,
 			  and browse through this website!</td>
 		      </tr>
 		    </table>
 		  </td>
 		</tr>
 	      </table>
 	    </td>
 	  </tr>
 	</table>
 
 	<hr noshade="noshade" size="1" />
 
 	<table width="100%" border="0" cellspacing="0" cellpadding="3">
 	  <tr>
 	    <td><a href="http://www.freebsdmall.com/"><img
 							   src="gifs/mall_title_medium.gif" alt="[FreeBSD Mall]"
 							   height="65" width="165" border="0"/></a></td>
 	    
 	    <td><a href="http://www.ugu.com/"><img src="gifs/ugu_icon.gif"
 						   alt="[Sponsor of Unix Guru Universe]" 
 						   height="64" width="76"
 						   border="0"/></a></td>
 	  
 	    <td><a href="http://www.daemonnews.org/"><img src="gifs/darbylogo.gif"
 		alt="[Daemon News]" height="45" width="130"
 		border="0"/></a></td>
 	  
 	    <td><a href="{$base}/copyright/daemon.html"><img
 							     src="gifs/powerlogo.gif" 
 							     alt="[Powered by FreeBSD]"
 							     height="64" 
 							     width="160" 
 							     border="0"/></a></td>
 	  </tr>
 	</table>
 
 	<table width="100%" cellpadding="0" border="0" cellspacing="0">
 	  <tr>
 	    <td align="left" 
 		valign="top"><small><a href="{$base}/mailto.html">Contact 
 		  us</a><br/>
 		<xsl:value-of select="$date"/></small></td>
 
 	    <td align="right" 
 		valign="top"><small><a href="copyright/index.html">Legal</a><br/> &#169; 1995-2003
 		The FreeBSD Project.<br/>
 		All rights reserved.</small></td>
 	  </tr>
 	</table>	    
       </body>
     </html>  
   </xsl:template>    
 </xsl:stylesheet>
 
 <!-- 
      Local Variables:
      mode: xml
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      End:
 -->
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index f60961335a..7f75457e37 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -1,293 +1,293 @@
 # bsd.web.mk
-# $FreeBSD: www/share/mk/web.site.mk,v 1.45 2003/05/11 21:24:42 phantom Exp $
+# $FreeBSD: www/share/mk/web.site.mk,v 1.46 2003/06/24 10:24:59 phantom Exp $
 
 #
 # Build and install a web site.
 #
 # Basic targets:
 #
 # all (default) -- performs batch mode processing necessary
 # install -- Installs everything
 # clean -- remove anything generated by processing
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
 WEBDIR?=	${.CURDIR:T}
 CGIDIR?=	${.CURDIR:T}
 DESTDIR?=	${HOME}/public_html
 
 WEBOWN?=	${USER}
 WEBGRP?=	www
 WEBMODE?=	664
 
 CGIOWN?=	${USER}
 CGIGRP?=	www
 CGIMODE?=	775
 
 CP?=		/bin/cp
 CVS?=		/usr/bin/cvs
 ECHO_CMD?=	echo
 SETENV?=	/usr/bin/env
 LN?=		/bin/ln
 MKDIR?=		/bin/mkdir
 MV?=		/bin/mv
 PERL?=		/usr/bin/perl5
 RM?=		/bin/rm
 SED?=		/usr/bin/sed
 SH?=		/bin/sh
 SORT?=		/usr/bin/sort
 TOUCH?=		/usr/bin/touch
 HTML2TXT?=	${PREFIX}/bin/w3m
 HTML2TXTOPTS?=	-dump ${HTML2TXTFLAGS}
 ISPELL?=	ispell
 ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
 
 XSLTPROC?=	${PREFIX}/bin/xsltproc
-XSLTPROCOPTS?=	-nonet ${XSLTPROCFLAGS}
+XSLTPROCOPTS?=	--nonet ${XSLTPROCFLAGS}
 TIDY?=		${PREFIX}/bin/tidy
 TIDYOPTS?=	-i -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS}
 
 #
 # Install dirs derived from the above.
 #
 DOCINSTALLDIR=	${DESTDIR}${WEBBASE}/${WEBDIR}
 CGIINSTALLDIR=	${DESTDIR}${WEBBASE}/${CGIDIR}
 
 #
 # The orphan list contains sources specified in DOCS that there
 # is no transform rule for.  We start out with all of them, and
 # each rule below removes the ones it knows about.  If any are
 # left over at the end, the user is warned about them.
 #
 ORPHANS:=	${DOCS}
 
 COPY=	-C
 
 #
 # Where the ports live, if CVS isn't used (ie. NOPORTSCVS is defined)
 #
 PORTSBASE?=	/usr
 
 #
 # Instruction for bsd.subdir.mk to not to process SUBDIR directive.
 # It is not neccessary since web.site.mk do it too.
 #
 NO_SUBDIR=	YES
 
 ##################################################################
 # Transformation rules
 
 ###
 # file.sgml --> file.html
 #
 # Runs file.sgml through spam to validate and expand some entity
 # references are expanded.  file.html is added to the list of
 # things to install.
 
 .SUFFIXES:	.sgml .html
 .if defined(REVCHECK)
 PREHTML?=	${WEB_PREFIX}/ja/prehtml
 CANONPREFIX0!=	cd ${WEB_PREFIX}; ${ECHO_CMD} $${PWD};
 CANONPREFIX=	${PWD:S/^${CANONPREFIX0}//:S/^\///}
 LOCALTOP!=	${ECHO_CMD} ${CANONPREFIX} | \
 	${PERL} -pe 's@[^/]+@..@g; $$_.="/." if($$_ eq".."); s@^\.\./@@;'
 DIR_IN_LOCAL!=	${ECHO_CMD} ${CANONPREFIX} | ${PERL} -pe 's@^[^/]+/?@@;'
 PREHTMLOPTS?=	-revcheck "${LOCALTOP}" "${DIR_IN_LOCAL}" ${PREHTMLFLAGS}
 .else
 DATESUBST?=	's/<!ENTITY date[ \t]*"$$Free[B]SD. .* \(.* .*\) .* .* $$">/<!ENTITY date	"Last modified: \1">/'
 PREHTML?=	${SED} -e ${DATESUBST}
 .endif
 .if !defined(OPENJADE)
 SGMLNORM?=	${PREFIX}/bin/sgmlnorm
 .else
 SGMLNORM?=	${PREFIX}/bin/osgmlnorm
 .endif
 LOCALBASE?=	/usr/local
 PREFIX?=	${LOCALBASE}
 CATALOG?=	${PREFIX}/share/sgml/html/catalog
 SGMLNORMOPTS?=	-d ${SGMLNORMFLAGS} -c ${CATALOG} -D ${.CURDIR}
 GENDOCS+=	${DOCS:M*.sgml:S/.sgml$/.html/g}
 ORPHANS:=	${ORPHANS:N*.sgml}
 
 spellcheck:
 .for _entry in ${GENDOCS}
 	@echo "Spellcheck ${_entry}"
 	@${HTML2TXT} ${HTML2TXTOPTS} ${.CURDIR}/${_entry} | ${ISPELL} ${ISPELLOPTS}
 .endfor
 
 .sgml.html:
 	${PREHTML} ${PREHTMLOPTS} ${.IMPSRC} | \
 	${SETENV} SGML_CATALOG_FILES= \
 		${SGMLNORM} ${SGMLNORMOPTS} > ${.TARGET} || \
 			(${RM} -f ${.TARGET} && false)
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
 ###
 # file.docb --> file.html
 #
 # Generate HTML from docbook
 
 SGMLFMT?=	${PREFIX}/bin/sgmlfmt
 SGMLFMTOPTS?=	-d docbook -f html ${SGMLFMTFLAGS} ${SGMLFLAGS}
 .SUFFIXES:	.docb
 GENDOCS+=	${DOCS:M*.docb:S/.docb$/.html/g}
 ORPHANS:=	${ORPHANS:N*.docb}
 
 .docb.html:
 	${SGMLFMT} ${SGMLFMTOPTS} ${.IMPSRC}
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
 
 ##################################################################
 # Targets
 
 #
 # If no target is specified, .MAIN is made
 #
 .MAIN: all
 
 #
 # Build most everything
 #
 all: ${COOKIE} orphans ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR
 
 #
 # Warn about anything in DOCS that has no translation
 #
 .if !empty(ORPHANS)
 orphans:
 	@${ECHO} Warning!  I don\'t know what to do with: ${ORPHANS}
 .else
 orphans:
 .endif
 
 #
 # Clean things up
 #
 .if !target(clean)
 clean: _PROGSUBDIR
 .if defined(DIRS_TO_CLEAN) && !empty(DIRS_TO_CLEAN)
 .for dir in ${DIRS_TO_CLEAN}
 	cd ${.CURDIR}/${dir}; ${MAKE} clean
 .endfor
 .endif
 	${RM} -f Errs errs mklog ${GENDOCS} ${LOCAL} ${CLEANFILES}
 .endif
 
 #
 # Really clean things up
 #
 .if !target(cleandir)
 cleandir: clean _PROGSUBDIR
 	${RM} -f ${.CURDIR}/tags .depend
 	cd ${.CURDIR}; ${RM} -rf obj
 .endif
 
 #
 # Install targets: before, real, and after.
 #
 .if !target(install)
 .if !target(beforeinstall)
 beforeinstall:
 .endif
 .if !target(afterinstall)
 afterinstall:
 .endif
 
 INSTALL_WEB?=	\
 	${INSTALL} ${COPY} ${INSTALLFLAGS} -o ${WEBOWN} -g ${WEBGRP} -m ${WEBMODE}
 INSTALL_CGI?=	\
 	${INSTALL} ${COPY} ${INSTALLFLAGS} -o ${CGIOWN} -g ${CGIGRP} -m ${CGIMODE}
 _ALLINSTALL+=	${GENDOCS} ${DATA} ${LOCAL}
 
 realinstall: ${COOKIE} ${_ALLINSTALL} ${CGI} _PROGSUBDIR
 .if !empty(_ALLINSTALL)
 	@${MKDIR} -p ${DOCINSTALLDIR}
 .for entry in ${_ALLINSTALL}
 .if exists(${.CURDIR}/${entry})
 	${INSTALL_WEB} ${.CURDIR}/${entry} ${DOCINSTALLDIR}
 .else
 	${INSTALL_WEB} ${entry} ${DOCINSTALLDIR}
 .endif
 .endfor
 .if defined(INDEXLINK) && !empty(INDEXLINK)
 	cd ${DOCINSTALLDIR}; ${LN} -fs ${INDEXLINK} index.html
 .endif
 .endif
 .if defined(CGI) && !empty(CGI)
 	@${MKDIR} -p ${CGIINSTALLDIR}
 .for entry in ${CGI}
 	${INSTALL_CGI} ${.CURDIR}/${entry} ${CGIINSTALLDIR}
 .endfor
 .endif
 .if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
 .for entry in ${DOCSUBDIR}
 	@${MKDIR} -p ${DOCINSTALLDIR}/${entry}
 .endfor
 .endif
 
 # Set up install dependencies so they happen in the correct order.
 install: afterinstall
 afterinstall: realinstall2
 realinstall: beforeinstall
 realinstall2: realinstall
 .endif 
 
 #
 # This recursively calls make in subdirectories.
 #
 #SUBDIR+=${DOCSUBDIR}
 _PROGSUBDIR: .USE
 .if defined(SUBDIR) && !empty(SUBDIR)
 .for entry in ${SUBDIR}
 	@${ECHODIR} "===> ${DIRPRFX}${entry}"
 	@cd ${.CURDIR}/${entry}; \
 		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} \
 			DIRPRFX=${DIRPRFX}${entry}/
 .endfor
 .endif
 .if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
 .for entry in ${DOCSUBDIR}
 	@${ECHODIR} "===> ${DIRPRFX}${entry}"
 	@if [ \( "${WEBDIR}" = "data" -a "${entry}" = "handbook" \) -o "${entry}" = "docproj-primer" ]; then \
 		cd ${.CURDIR}/${entry}; \
 		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} \
 			DIRPRFX=${DIRPRFX}${entry}/ ${PARAMS} \
 			FORMATS="txt html html-split"; \
 	elif [ "${WEBDIR}" = "data/ja" -a "${entry}" = "handbook" ]; then \
 		cd ${.CURDIR}/${entry}; \
 		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} \
 			DIRPRFX=${DIRPRFX}${entry}/ ${PARAMS} \
 			FORMATS="html html-split"; \
 	else \
 		cd ${.CURDIR}/${entry}; \
 		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} \
 			DIRPRFX=${DIRPRFX}${entry}/ ${PARAMS}; \
 	fi
 .endfor
 .endif
 
 #
 # cruft for generating linuxdoc stuff
 #
 
 .if defined (DOCSUBDIR) && !empty(DOCSUBDIR)
 
 FORMATS?=	"html ps latin1 ascii"
 PARAMS=		DESTDIR=${DESTDIR} DOCDIR=${WEBBASE}/${WEBDIR}
 PARAMS+=	DOCOWN=${WEBOWN} DOCGRP=${WEBGRP}
 PARAMS+=	FORMATS=${FORMATS} COPY="${COPY}"
 PARAMS+=	SGMLOPTS="${SGMLOPTS}"
 
 .endif
 
 .include <bsd.obj.mk>
 
 # THE END