diff --git a/en/index.xsl b/en/index.xsl
index 445be5a3cf..3f027409c2 100644
--- a/en/index.xsl
+++ b/en/index.xsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/en/index.xsl,v 1.128 2005/10/04 05:57:25 murray Exp $ -->
+<!-- $FreeBSD: www/en/index.xsl,v 1.129 2005/10/05 21:46:34 delphij Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -6,7 +6,7 @@
<xsl:import href="news/includes.xsl"/>
<xsl:variable name="base" select="'.'"/>
- <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.128 2005/10/04 05:57:25 murray Exp $'"/>
+ <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.129 2005/10/05 21:46:34 delphij Exp $'"/>
<xsl:variable name="title" select="'The FreeBSD Project'"/>
<!-- these params should be externally bound. The values
@@ -130,7 +130,7 @@
</div> <!-- languagenav -->
<div id="mirror">
- <form action="{$base}/cgi/mirror.cgi" method="get">
+ <form action="{$cgibase}/mirror.cgi" method="get">
<div>
<h2 class="blockhide"><label for="mirrorsel">Mirror</label></h2>
<select id="mirrorsel" name="goto">
diff --git a/en/projects/newbies.sgml b/en/projects/newbies.sgml
index b2ea9f456f..5365b13bc7 100644
--- a/en/projects/newbies.sgml
+++ b/en/projects/newbies.sgml
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.46 2005/09/24 15:05:22 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.47 2005/10/04 19:43:49 hrs Exp $">
<!ENTITY title 'Resources for Newbies'>
<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
@@ -110,7 +110,7 @@
href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>
as well.</p></li>
- <li><p><a href="&base;/cgi/man.cgi">Man pages</a> are good
+ <li><p><a href="&cgibase;/man.cgi">Man pages</a> are good
for reference but not always
the best introduction for a novice. The more you work with man pages
the more familiar they become. Some are very good for newbies, so
diff --git a/en/support.sgml b/en/support.sgml
index 757534490a..46a2fdd81b 100644
--- a/en/support.sgml
+++ b/en/support.sgml
@@ -1,5 +1,5 @@
<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.350 2005/04/27 18:10:16 remko Exp $">
+<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.352 2005/10/04 22:27:39 simon Exp $">
<!ENTITY title "FreeBSD Support">
<!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
@@ -22,8 +22,8 @@
our <a href="&base;/support/bugreports.html">problem reporting guidelines</a>
and then report the problem using our <a href="&base;/send-pr.html">problem report form</a>.</p>
- <p>You can also <a href="&base;/cgi/query-pr-summary.cgi">view the open problem reports</a> and
- <a href="&base;/cgi/query-pr-summary.cgi?query">search problem reports</a> on this website.</p>
+ <p>You can also <a href="&cgibase;/query-pr-summary.cgi">view the open problem reports</a> and
+ <a href="&cgibase;/query-pr-summary.cgi?query">search problem reports</a> on this website.</p>
&footer;
</body>
diff --git a/share/sgml/includes.header.sgml b/share/sgml/includes.header.sgml
index 1e4ab8d8e2..a35d6cd0b0 100644
--- a/share/sgml/includes.header.sgml
+++ b/share/sgml/includes.header.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/includes.header.sgml,v 1.5 2005/02/12 13:06:38 ceri Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.header.sgml,v 1.6 2005/10/04 06:13:33 murray Exp $ -->
<!-- Images -->
<!ENTITY i.daemon '<img src="&base;/gifs/daemon.gif" alt="" align="left" width="80" height="76">'>
@@ -57,7 +57,7 @@
</ul>
</div> <!-- searchnav -->
<div id="search">
- <form action="&base;/cgi/search.cgi" method="get">
+ <form action="&cgibase;/search.cgi" method="get">
<div>
<h2 class="blockhide"><label for="words">Search</label></h2>
<input type="hidden" name="max" value="25"> <input type="hidden" name="source" value="www"><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="Search"> <input id="submit" name="submit" type="submit" value="Search">
diff --git a/share/sgml/includes.header.xsl b/share/sgml/includes.header.xsl
index 4f2ab5ed74..cc90418713 100644
--- a/share/sgml/includes.header.xsl
+++ b/share/sgml/includes.header.xsl
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- $FreeBSD: www/share/sgml/includes.header.xsl,v 1.4 2005/02/12 13:06:38 ceri Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.header.xsl,v 1.5 2005/10/04 06:13:33 murray Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -70,7 +70,7 @@
</ul>
</div> <!-- searchnav -->
<div id="search">
- <form action="{$base}/cgi/search.cgi" method="get">
+ <form action="{$cgibase}/search.cgi" method="get">
<div>
<h2 class="blockhide"><label for="words">Search</label></h2>
<input type="hidden" name="max" value="25" /> <input type="hidden" name="source" value="www" /><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="Search" /> <input id="submit" name="submit" type="submit" value="Search" />
@@ -176,7 +176,7 @@
<li><a href="{$base}/doc/en_US.ISO8859-1/books/handbook/">Handbook</a></li>
<li><a href="{$base}/docs/man.html">Manual Pages</a>
<ul>
- <li><a href="{$base}/cgi/man.cgi">Man Online</a></li>
+ <li><a href="{$cgibase}/man.cgi">Man Online</a></li>
</ul>
</li>
<li><a href="{$base}/docs/books.html">Books and Articles Online</a></li>
@@ -235,4 +235,4 @@
</div> <!-- footer -->
</xsl:variable>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/share/sgml/includes.navdocs.sgml b/share/sgml/includes.navdocs.sgml
index b2d0239687..06ca24bca7 100644
--- a/share/sgml/includes.navdocs.sgml
+++ b/share/sgml/includes.navdocs.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/includes.navdocs.sgml,v 1.2 2005/10/06 15:27:30 simon Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.navdocs.sgml,v 1.3 2005/10/06 15:30:24 simon Exp $ -->
<!ENTITY nav '<div id="sidenav">
<h2 class="blockhide">Section Navigation</h2>
@@ -8,7 +8,7 @@
<li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/">Handbook</a></li>
<li><a href="&base;/docs/man.html">Manual Pages</a>
<ul>
- <li><a href="http://www.FreeBSD.org/cgi/man.cgi">Man Online</a></li>
+ <li><a href="&cgibase;/man.cgi">Man Online</a></li>
</ul>
</li>
<li><a href="&base;/docs/books.html">Books and Articles Online</a></li>
diff --git a/share/sgml/includes.sgml b/share/sgml/includes.sgml
index 617d446112..664902e019 100644
--- a/share/sgml/includes.sgml
+++ b/share/sgml/includes.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/share/sgml/includes.sgml,v 1.1 2003/10/11 18:51:26 hrs Exp $ -->
<!--
Base is the absolute URL for the given page, minus the actual page
@@ -17,6 +17,7 @@
-->
<!ENTITY base CDATA ".">
+<!ENTITY cgibase CDATA "http://www.FreeBSD.org/cgi">
<!ENTITY enbase CDATA ".">
<!ENTITY % includes.release SYSTEM "includes.release.sgml">
diff --git a/share/sgml/includes.xsl b/share/sgml/includes.xsl
index 706ec1f336..e1958d2c7a 100644
--- a/share/sgml/includes.xsl
+++ b/share/sgml/includes.xsl
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- $FreeBSD: www/share/sgml/includes.xsl,v 1.1 2003/11/24 18:26:34 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.xsl,v 1.2 2004/01/12 21:27:00 hrs Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -10,6 +10,7 @@
<xsl:import href="./transtable-common.xsl" />
<xsl:variable name="base" select="'.'" />
+ <xsl:variable name="cgibase" select="'http://www.FreeBSD.org/cgi'" />
<xsl:variable name="enbase" select="concat ($base, '/..')" />
</xsl:stylesheet>