diff --git a/en/community/irc.sgml b/en/community/irc.sgml
index 26b624ace7..abfb107737 100644
--- a/en/community/irc.sgml
+++ b/en/community/irc.sgml
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/community/irc.sgml,v 1.40 2004/12/08 23:17:18 brueffer Exp $">
-<!ENTITY title "IRC">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-]>
-
-<html>
-&header;
-
-	<p>While #freebsd channels exist on various IRC networks, the FreeBSD
-		project does not control them or endorse IRC as a support medium.
-	 	You may be ignored, insulted, or kicked out if you ask questions on
-		any channel in IRC, though you may have slightly better luck
-		in channels named #freebsdhelp where such exist.  If you
-	  	want to try these or any other channels on IRC, it is nonetheless
-	        at your own risk and any complaints about conduct on those channels
-		should not be directed to the FreeBSD project.  See also
-		<a href="&base;/doc/en_US.ISO8859-1/books/faq/support.html#IRC">the FAQ entry</a> for
-	more information.</p>
-
-&footer;
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!ENTITY base CDATA "..">
+<!ENTITY date "$FreeBSD: www/en/community/irc.sgml,v 1.1 2005/10/04 05:44:55 murray Exp $">
+<!ENTITY title "IRC">
+<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
+<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+]>
+
+<html>
+&header;
+
+	<p>While #freebsd channels exist on various IRC networks, the FreeBSD
+		project does not control them or endorse IRC as a support medium.
+	 	You may be ignored, insulted, or kicked out if you ask questions on
+		any channel in IRC, though you may have slightly better luck
+		in channels named #freebsdhelp where such exist.  If you
+	  	want to try these or any other channels on IRC, it is nonetheless
+	        at your own risk and any complaints about conduct on those channels
+		should not be directed to the FreeBSD project.  See also
+		<a href="&base;/doc/en_US.ISO8859-1/books/faq/support.html#IRC">the FAQ entry</a> for
+	more information.</p>
+
+&footer;
+
+</body>
 </html>
\ No newline at end of file
diff --git a/en/community/mailinglists.sgml b/en/community/mailinglists.sgml
index 245779fd43..13b4bb408a 100644
--- a/en/community/mailinglists.sgml
+++ b/en/community/mailinglists.sgml
@@ -1,109 +1,109 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/community/mailinglists.sgml,v 1.40 2004/12/08 23:17:18 brueffer Exp $">
-<!ENTITY title "Mailing Lists">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-]>
-
-<html>
-&header;
-
-    <h2><a href="&base;/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">
-      Mailing lists</a></h2>
-
-    <p>Mailing lists are the primary communication channels for the FreeBSD
-      community, and cover many topic areas.</p>
-
-    <h3>Mailing list archives</h3>
-
-    <p>You can
-      <a href="&base;/search/search.html#mailinglists">search</a>
-      or <a href="http://www.FreeBSD.org/mail/">browse</a>
-      the mailing list archives at
-      <a href="http://www.FreeBSD.org/">www.FreeBSD.org.</a>
-      It is also possible to
-      <a href="http://lists.FreeBSD.org/mailman/listinfo">browse</a>
-      the mailing lists via Mailman webinterface.</p>
-
-    <h3>Non-English Mailing lists</h3>
-
-    <p>Several non-English mailing lists are also available:</p>
-
-    <ul>
-      <li><strong>Brazilian Portuguese</strong> -- <a
-	  href="mailto:listproc@br.FreeBSD.org">listproc@br.FreeBSD.org</a></li>
-
-      <li><strong>Simplified Chinese</strong> -- <a
-	  href="mailto:majordomo@cn.FreeBSD.org">majordomo@cn.FreeBSD.org</a>,
-	GB2312 encoding.</li>
-
-      <li><strong>Traditional Chinese</strong> -- <a
-	  href="http://freebsd.sinica.edu.tw/mailman/listinfo">WWW</a>, Big5 encoding.</li>
-
-      <li><strong>Czech</strong> -- <a
-	href="mailto:users-l-request@FreeBSD.cz">users-l-request@FreeBSD.cz</a>
-	or <a href="http://www.cz.FreeBSD.org/listserv/listinfo/users-l/">WWW</a>.</li>
-
-      <li><strong>German</strong> -- <a
-	  href="mailto:majordomo@de.FreeBSD.org">majordomo@de.FreeBSD.org</a>
-	or <a href="http://www.de.FreeBSD.org/de/mailinglists.html">WWW</a>.</li>
-
-      <li><strong>French</strong> -- <a
-	  href="mailto:listserver@FreeBSD-fr.org">listserver@FreeBSD-fr.org</a>
-	or <a href="http://www.FreeBSD-fr.org/">WWW</a>.</li>
-
-      <li><strong>Hungarian</strong> -- <a
-	  href="http://www.hu.FreeBSD.org/hu/mailman/listinfo/bsd">WWW</a></li>
-
-      <li><strong>Indonesian</strong> -- <a
-	  href="mailto:id-freebsd-subscribe@egroups.com">id-freebsd-subscribe@egroups.com</a></li>
-
-       <li><strong>Italian</strong> -- <a
-	  href="mailto:mailman-owner@gufi.org">mailman-owner@gufi.org</a>
-	  or <a href="http://liste.gufi.org/">WWW</a>.</li>
-
-      <li><strong>Japanese</strong> -- <a
-	  href="mailto:majordomo@jp.FreeBSD.org">majordomo@jp.FreeBSD.org</a>
-	or <a href="http://www.jp.FreeBSD.org/ml.html">WWW</a>.</li>
-
-      <li><strong>Korean</strong> -- <a
-	  href="mailto:majordomo@kr.FreeBSD.org">majordomo@kr.FreeBSD.org</a>
-	or <a
-	  href="http://www.kr.FreeBSD.org/support.shtml#mailing-list">WWW</a>.</li>
-
-      <li><strong>Netherlands</strong> -- <a
-	  href="mailto:majordomo@nl.FreeBSD.org">majordomo@nl.FreeBSD.org</a>.</li>
-
-      <li><strong>Polish</strong> -- <a
-	  href="mailto:majordomo@bsdguru.org">majordomo@bsdguru.org</a>
-	or <a href="http://www.bsdguru.org/indeX.php?f=1080001">WWW</a>.</li>
-
-      <li><strong>Portuguese</strong> -- <a
-	  href="mailto:freebsd@npf.pt.freebsd.org">
-	  freebsd@npf.pt.freebsd.org</a> or <a
-	  href="http://npf.pt.freebsd.org/mailman/listinfo/freebsd">
-	  http://npf.pt.freebsd.org/mailman/listinfo/freebsd</a>.</li>
-
-      <li><strong>Russian</strong> -- <a
-	  href="mailto:maillist@opennet.ru">maillist@opennet.ru</a></li>
-
-      <li><strong>Slovakian</strong> -- <a
-	  href="mailto:majordomo@sk.FreeBSD.org">majordomo@sk.FreeBSD.org</a></li>
-
-      <li><strong>Spanish</strong> -- <a
-	  href="https://listas.es.FreeBSD.org/mailman/listinfo">WWW</a>.</li>
-
-      <li><strong>Turkish</strong> -- <a
-	  href="mailto:freebsd@lists.enderunix.org">freebsd@lists.enderunix.org</a>
-	or <a
-	  href="http://lists.enderunix.org">WWW</a>.</li>
-    </ul>
-
-    <p>If you create other FreeBSD mailing lists, <a
-	href="&base;/mailto.html">let us know about them</a>.</p>
-
-&footer;
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!ENTITY base CDATA "..">
+<!ENTITY date "$FreeBSD: www/en/community/mailinglists.sgml,v 1.1 2005/10/04 05:44:55 murray Exp $">
+<!ENTITY title "Mailing Lists">
+<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
+<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+]>
+
+<html>
+&header;
+
+    <h2><a href="&base;/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">
+      Mailing lists</a></h2>
+
+    <p>Mailing lists are the primary communication channels for the FreeBSD
+      community, and cover many topic areas.</p>
+
+    <h3>Mailing list archives</h3>
+
+    <p>You can
+      <a href="&base;/search/search.html#mailinglists">search</a>
+      or <a href="http://www.FreeBSD.org/mail/">browse</a>
+      the mailing list archives at
+      <a href="http://www.FreeBSD.org/">www.FreeBSD.org.</a>
+      It is also possible to
+      <a href="http://lists.FreeBSD.org/mailman/listinfo">browse</a>
+      the mailing lists via Mailman webinterface.</p>
+
+    <h3>Non-English Mailing lists</h3>
+
+    <p>Several non-English mailing lists are also available:</p>
+
+    <ul>
+      <li><strong>Brazilian Portuguese</strong> -- <a
+	  href="mailto:listproc@br.FreeBSD.org">listproc@br.FreeBSD.org</a></li>
+
+      <li><strong>Simplified Chinese</strong> -- <a
+	  href="mailto:majordomo@cn.FreeBSD.org">majordomo@cn.FreeBSD.org</a>,
+	GB2312 encoding.</li>
+
+      <li><strong>Traditional Chinese</strong> -- <a
+	  href="http://freebsd.sinica.edu.tw/mailman/listinfo">WWW</a>, Big5 encoding.</li>
+
+      <li><strong>Czech</strong> -- <a
+	href="mailto:users-l-request@FreeBSD.cz">users-l-request@FreeBSD.cz</a>
+	or <a href="http://www.cz.FreeBSD.org/listserv/listinfo/users-l/">WWW</a>.</li>
+
+      <li><strong>German</strong> -- <a
+	  href="mailto:majordomo@de.FreeBSD.org">majordomo@de.FreeBSD.org</a>
+	or <a href="http://www.de.FreeBSD.org/de/mailinglists.html">WWW</a>.</li>
+
+      <li><strong>French</strong> -- <a
+	  href="mailto:listserver@FreeBSD-fr.org">listserver@FreeBSD-fr.org</a>
+	or <a href="http://www.FreeBSD-fr.org/">WWW</a>.</li>
+
+      <li><strong>Hungarian</strong> -- <a
+	  href="http://www.hu.FreeBSD.org/hu/mailman/listinfo/bsd">WWW</a></li>
+
+      <li><strong>Indonesian</strong> -- <a
+	  href="mailto:id-freebsd-subscribe@egroups.com">id-freebsd-subscribe@egroups.com</a></li>
+
+       <li><strong>Italian</strong> -- <a
+	  href="mailto:mailman-owner@gufi.org">mailman-owner@gufi.org</a>
+	  or <a href="http://liste.gufi.org/">WWW</a>.</li>
+
+      <li><strong>Japanese</strong> -- <a
+	  href="mailto:majordomo@jp.FreeBSD.org">majordomo@jp.FreeBSD.org</a>
+	or <a href="http://www.jp.FreeBSD.org/ml.html">WWW</a>.</li>
+
+      <li><strong>Korean</strong> -- <a
+	  href="mailto:majordomo@kr.FreeBSD.org">majordomo@kr.FreeBSD.org</a>
+	or <a
+	  href="http://www.kr.FreeBSD.org/support.shtml#mailing-list">WWW</a>.</li>
+
+      <li><strong>Netherlands</strong> -- <a
+	  href="mailto:majordomo@nl.FreeBSD.org">majordomo@nl.FreeBSD.org</a>.</li>
+
+      <li><strong>Polish</strong> -- <a
+	  href="mailto:majordomo@bsdguru.org">majordomo@bsdguru.org</a>
+	or <a href="http://www.bsdguru.org/indeX.php?f=1080001">WWW</a>.</li>
+
+      <li><strong>Portuguese</strong> -- <a
+	  href="mailto:freebsd@npf.pt.freebsd.org">
+	  freebsd@npf.pt.freebsd.org</a> or <a
+	  href="http://npf.pt.freebsd.org/mailman/listinfo/freebsd">
+	  http://npf.pt.freebsd.org/mailman/listinfo/freebsd</a>.</li>
+
+      <li><strong>Russian</strong> -- <a
+	  href="mailto:maillist@opennet.ru">maillist@opennet.ru</a></li>
+
+      <li><strong>Slovakian</strong> -- <a
+	  href="mailto:majordomo@sk.FreeBSD.org">majordomo@sk.FreeBSD.org</a></li>
+
+      <li><strong>Spanish</strong> -- <a
+	  href="https://listas.es.FreeBSD.org/mailman/listinfo">WWW</a>.</li>
+
+      <li><strong>Turkish</strong> -- <a
+	  href="mailto:freebsd@lists.enderunix.org">freebsd@lists.enderunix.org</a>
+	or <a
+	  href="http://lists.enderunix.org">WWW</a>.</li>
+    </ul>
+
+    <p>If you create other FreeBSD mailing lists, <a
+	href="&base;/mailto.html">let us know about them</a>.</p>
+
+&footer;
+
+</body>
 </html>
\ No newline at end of file
diff --git a/en/community/newsgroups.sgml b/en/community/newsgroups.sgml
index 7a8ceb2710..9f0de7be4d 100644
--- a/en/community/newsgroups.sgml
+++ b/en/community/newsgroups.sgml
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/community/newsgroups.sgml,v 1.40 2004/12/08 23:17:18 brueffer Exp $">
-<!ENTITY title "Newsgroups">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-]>
-
-<html>
-&header;
-
-	<p>There are a few FreeBSD specific <a
-		href="doc/en_US.ISO8859-1/books/handbook/eresources-news.html">newsgroups</a>, along with
-	      numerous other newsgroups on topics of interest to FreeBSD users, though
-	      the mailing lists remain the most reliable way to get in touch with the
-	      FreeBSD developers.  For miscellaneous FreeBSD discussion, see <a
-		href="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</a>.
-	      For important announcements, see <a
-		href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>.</p>
-
-	    <p><a href="http://minnie.tuhs.org/BSD-info/bsdnews_search.html">The
-		BSD Usenet News Searcher</a> have archives of all
-	      BSD-related Usenet newsgroups from June 1992 onwards.</p>
-
-&footer;
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!ENTITY base CDATA "..">
+<!ENTITY date "$FreeBSD: www/en/community/newsgroups.sgml,v 1.1 2005/10/04 05:44:55 murray Exp $">
+<!ENTITY title "Newsgroups">
+<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
+<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+]>
+
+<html>
+&header;
+
+	<p>There are a few FreeBSD specific <a
+		href="doc/en_US.ISO8859-1/books/handbook/eresources-news.html">newsgroups</a>, along with
+	      numerous other newsgroups on topics of interest to FreeBSD users, though
+	      the mailing lists remain the most reliable way to get in touch with the
+	      FreeBSD developers.  For miscellaneous FreeBSD discussion, see <a
+		href="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</a>.
+	      For important announcements, see <a
+		href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>.</p>
+
+	    <p><a href="http://minnie.tuhs.org/BSD-info/bsdnews_search.html">The
+		BSD Usenet News Searcher</a> have archives of all
+	      BSD-related Usenet newsgroups from June 1992 onwards.</p>
+
+&footer;
+
+</body>
 </html>
\ No newline at end of file
diff --git a/en/community/webresources.sgml b/en/community/webresources.sgml
index 049f089a3c..58be94e80a 100644
--- a/en/community/webresources.sgml
+++ b/en/community/webresources.sgml
@@ -1,58 +1,58 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/community/webresources.sgml,v 1.40 2004/12/08 23:17:18 brueffer Exp $">
-<!ENTITY title "Web Resources">
-<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-]>
-
-<html>
-&header;
-
-		<p>Our web pages remain one of the best sources of information, and
-		  are also mirrored at many sites around the world.  Try connecting to
-		  www.<b>yourcountry</b>.FreeBSD.org (e.g. <a
-		    href="http://www.de.FreeBSD.org/">www.de.FreeBSD.org</a> for
-		  Germany or <a
-		    href="http://www.au.FreeBSD.org/">www.au.FreeBSD.org</a> for
-		  Australia), or select a mirror from the drop-down list on the
-		  <a href="&base;/index.html">front page</a>.</p>
-
-		<p>The FreeBSD web pages are translated into several
-		  languages.  Links to the translated versions of these web
-		  pages can be found on the <a href="&base;/index.html">front
-		  page</a>.</p>
-
-	    <p>Several other non-English resources exist:</p>
-
-		<ul>
-		  <li><a href="&base;/doc/pt_BR.ISO8859-1/books/faq/index.html">Brazilian
-		      Portuguese FAQ</a></li>
-
-		  <li><a href="zh/FAQ/FAQ.html">Chinese FAQ</a></li>
-
-		  <li><a href="http://www.FreeBSD-fr.org/">French</a></li>
-
-		  <li><a href="http://www.hu.FreeBSD.org/hu/">Hungarian</a></li>
-
-		  <li><a href="http://www.FreeBSD.or.id">Indonesian</a></li>
-
-		  <li><a href="http://www.gufi.org/">Italian</a></li>
-
-		  <li><a href="http://www.jp.FreeBSD.org/">Japanese</a></li>
-
-		  <li><a href="http://www.kr.FreeBSD.org/">Korean</a></li>
-
-		  <li><a href="http://npf.pt.FreeBSD.org/">Portuguese</a></li>
-
-		  <li><a href="http://www.FreeBSD.org.ru/">Russian</a>, <a
-		      href="&base;/doc/ru_RU.KOI8-R/books/faq/index.html">FAQ</a></li>
-		</ul>
-
-	     <p>For information on recent FreeBSD progress and releases, see the
-		  <a href="&base;/news/newsflash.html">Newsflash</a> page.</p>
-
-&footer;
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!ENTITY base CDATA "..">
+<!ENTITY date "$FreeBSD: www/en/community/webresources.sgml,v 1.1 2005/10/04 05:44:55 murray Exp $">
+<!ENTITY title "Web Resources">
+<!ENTITY % navincludes SYSTEM "../includes.navcommunity.sgml"> %navincludes;
+<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+]>
+
+<html>
+&header;
+
+		<p>Our web pages remain one of the best sources of information, and
+		  are also mirrored at many sites around the world.  Try connecting to
+		  www.<b>yourcountry</b>.FreeBSD.org (e.g. <a
+		    href="http://www.de.FreeBSD.org/">www.de.FreeBSD.org</a> for
+		  Germany or <a
+		    href="http://www.au.FreeBSD.org/">www.au.FreeBSD.org</a> for
+		  Australia), or select a mirror from the drop-down list on the
+		  <a href="&base;/index.html">front page</a>.</p>
+
+		<p>The FreeBSD web pages are translated into several
+		  languages.  Links to the translated versions of these web
+		  pages can be found on the <a href="&base;/index.html">front
+		  page</a>.</p>
+
+	    <p>Several other non-English resources exist:</p>
+
+		<ul>
+		  <li><a href="&base;/doc/pt_BR.ISO8859-1/books/faq/index.html">Brazilian
+		      Portuguese FAQ</a></li>
+
+		  <li><a href="zh/FAQ/FAQ.html">Chinese FAQ</a></li>
+
+		  <li><a href="http://www.FreeBSD-fr.org/">French</a></li>
+
+		  <li><a href="http://www.hu.FreeBSD.org/hu/">Hungarian</a></li>
+
+		  <li><a href="http://www.FreeBSD.or.id">Indonesian</a></li>
+
+		  <li><a href="http://www.gufi.org/">Italian</a></li>
+
+		  <li><a href="http://www.jp.FreeBSD.org/">Japanese</a></li>
+
+		  <li><a href="http://www.kr.FreeBSD.org/">Korean</a></li>
+
+		  <li><a href="http://npf.pt.FreeBSD.org/">Portuguese</a></li>
+
+		  <li><a href="http://www.FreeBSD.org.ru/">Russian</a>, <a
+		      href="&base;/doc/ru_RU.KOI8-R/books/faq/index.html">FAQ</a></li>
+		</ul>
+
+	     <p>For information on recent FreeBSD progress and releases, see the
+		  <a href="&base;/news/newsflash.html">Newsflash</a> page.</p>
+
+&footer;
+
+</body>
 </html>
\ No newline at end of file
diff --git a/en/developers/cvs.sgml b/en/developers/cvs.sgml
index 18747752d3..aebba07f63 100644
--- a/en/developers/cvs.sgml
+++ b/en/developers/cvs.sgml
@@ -1,63 +1,63 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/developers/cvs.sgml,v 1.40 2004/12/08 23:17:18 brueffer Exp $">
-<!ENTITY title "CVS Repository">
-<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-]>
-
-<html>
-&header;
-
-    <p><a href="http://www.FreeBSD.org/cgi/man.cgi?cvs">CVS</a> (the
-      Concurrent Version System) is the tool we use for keeping our sources
-      under control.  Every change (with accompanying log message explaining
-      its purpose) from FreeBSD 2.0 to the present is stored here. It can be
-      easily viewed from the web interface mentioned below.  To obtain a complete copy
-      of the FreeBSD CVS repository or any of the development branches inside
-      it, you may choose any one of following options:</p>
-
-    <ul>
-      <li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/cvsup.html">cvsup</a> if you are looking
-	for on-demand, low overhead access using a custom utility (written in
-	Modula-3 no less).</li>
-
-      <li><a name="anoncvs" href="&base;/doc/en_US.ISO8859-1/books/handbook/anoncvs.html">anoncvs</a>
-	if you are looking for on-demand access that has higher overhead than
-	cvsup (in terms of wall time and bytes transferred) but is easier to use
-	for checking out small pieces of the tree and requires nothing more
-	than the cvs tools already bundled with FreeBSD.</li>
-
-      <li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/ctm.html">CTM</a> if you are looking for
-	very low overhead, batch-mode access (basically, patches through
-	email).</li>
-
-      <li>The <a href="http://cvsweb.FreeBSD.org/">web interface</a>
-	if you are looking to simply browse the repository in search of a
-	specific change or file revision.</li>
-
-      <li>Finally, if you have got bandwidth to burn or you prefer / are forced
-	to use FTP, you can simply mirror the CVS repository from <a
-	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/FreeBSD-CVS">ftp.FreeBSD.org</a>.
-      </li>
-    </ul>
-
-    <p>Mirrors of the CVS Repository cgi script are available in
-      <a href="http://cvsup3.de.FreeBSD.org/cgi-bin/cvsweb.cgi">Germany</a>,
-      <a href="http://www.jp.FreeBSD.org/cgi/cvsweb.cgi">Japan</a>,
-      <a href="http://cvsup.pt.FreeBSD.org/cgi-bin/cvsweb/cvsweb.cgi">Portugal</a>,
-      <a href="http://cvsweb.sm.FreeBSD.org/">San Marino</a>,
-      <a href="http://www.es.FreeBSD.org/cgi/cvsweb.cgi">Spain</a>,
-      <a href="http://cvsweb.FreeBSD.org/">USA/California</a> and
-      <a href="http://www.FreeBSD.org.ua/cgi/cvsweb.cgi?cvsroot=freebsd">Ukraine</a>.</p>
-
-    <p>A public Subversion mirror of the FreeBSD src/ CVS repository is
-      provided at svn://svn.clkao.org/freebsd/.  A <a
-      href="http://svn.clkao.org/svnweb/freebsd/">web interface</a> is
-      also available.  This is intended for people who would like to
-      try the svk distributed version control system.</p>
-
-&footer;
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!ENTITY base CDATA "..">
+<!ENTITY date "$FreeBSD: www/en/developers/cvs.sgml,v 1.1 2005/10/04 05:57:25 murray Exp $">
+<!ENTITY title "CVS Repository">
+<!ENTITY % navincludes SYSTEM "../includes.navdevelopers.sgml"> %navincludes;
+<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+]>
+
+<html>
+&header;
+
+    <p><a href="http://www.FreeBSD.org/cgi/man.cgi?cvs">CVS</a> (the
+      Concurrent Version System) is the tool we use for keeping our sources
+      under control.  Every change (with accompanying log message explaining
+      its purpose) from FreeBSD 2.0 to the present is stored here. It can be
+      easily viewed from the web interface mentioned below.  To obtain a complete copy
+      of the FreeBSD CVS repository or any of the development branches inside
+      it, you may choose any one of following options:</p>
+
+    <ul>
+      <li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/cvsup.html">cvsup</a> if you are looking
+	for on-demand, low overhead access using a custom utility (written in
+	Modula-3 no less).</li>
+
+      <li><a name="anoncvs" href="&base;/doc/en_US.ISO8859-1/books/handbook/anoncvs.html">anoncvs</a>
+	if you are looking for on-demand access that has higher overhead than
+	cvsup (in terms of wall time and bytes transferred) but is easier to use
+	for checking out small pieces of the tree and requires nothing more
+	than the cvs tools already bundled with FreeBSD.</li>
+
+      <li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/ctm.html">CTM</a> if you are looking for
+	very low overhead, batch-mode access (basically, patches through
+	email).</li>
+
+      <li>The <a href="http://cvsweb.FreeBSD.org/">web interface</a>
+	if you are looking to simply browse the repository in search of a
+	specific change or file revision.</li>
+
+      <li>Finally, if you have got bandwidth to burn or you prefer / are forced
+	to use FTP, you can simply mirror the CVS repository from <a
+	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/FreeBSD-CVS">ftp.FreeBSD.org</a>.
+      </li>
+    </ul>
+
+    <p>Mirrors of the CVS Repository cgi script are available in
+      <a href="http://cvsup3.de.FreeBSD.org/cgi-bin/cvsweb.cgi">Germany</a>,
+      <a href="http://www.jp.FreeBSD.org/cgi/cvsweb.cgi">Japan</a>,
+      <a href="http://cvsup.pt.FreeBSD.org/cgi-bin/cvsweb/cvsweb.cgi">Portugal</a>,
+      <a href="http://cvsweb.sm.FreeBSD.org/">San Marino</a>,
+      <a href="http://www.es.FreeBSD.org/cgi/cvsweb.cgi">Spain</a>,
+      <a href="http://cvsweb.FreeBSD.org/">USA/California</a> and
+      <a href="http://www.FreeBSD.org.ua/cgi/cvsweb.cgi?cvsroot=freebsd">Ukraine</a>.</p>
+
+    <p>A public Subversion mirror of the FreeBSD src/ CVS repository is
+      provided at svn://svn.clkao.org/freebsd/.  A <a
+      href="http://svn.clkao.org/svnweb/freebsd/">web interface</a> is
+      also available.  This is intended for people who would like to
+      try the svk distributed version control system.</p>
+
+&footer;
+
+</body>
 </html>
\ No newline at end of file
diff --git a/en/docs/books.sgml b/en/docs/books.sgml
index b5353c6895..4242a596ac 100644
--- a/en/docs/books.sgml
+++ b/en/docs/books.sgml
@@ -1,445 +1,445 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/docs/books.sgml,v 1.40 2004/12/08 23:17:18 brueffer Exp $">
-<!ENTITY title "Books and Articles Online">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-
-<!ENTITY url.articles "../doc/en_US.ISO8859-1/articles">
-<!ENTITY url.books "../doc/en_US.ISO8859-1/books">
-]>
-
-<html>
-&header;
-
-	<h2>On this site</h2>
-
-	    <p>All the documentation on this site can be downloaded in a variety of
-	      different formats (HTML, Postscript, PDF, and more) and compression
-	      schemes (BZip2, Zip) from the <a
-	      href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP site</a>.</p>
-
-	    <p>This documentation is provided and maintained by the <a
-	      href="&base;/docproj/docproj.html">FreeBSD Documentation Project</a>, and we are
-	      always looking for people to contribute new documentation and maintain
-	      existing documentation.</p>
-
-	    <h3>Books</h3>
-
-	    <p><a href="&url.books;/faq/index.html">The FreeBSD FAQ</a>
-	        (faq)<br>
-	      Frequently Asked Questions, and answers, covering all
-		aspects of FreeBSD.</p>
-
-	    <p><a href="&url.books;/handbook/index.html">The FreeBSD Handbook</a>
-	        (handbook)<br>
-	      A constantly evolving, comprehensive resource for FreeBSD
-		users.</p>
-
-	    <p><a href="&url.books;/developers-handbook/index.html">The
-	        FreeBSD Developer's Handbook</a> (developers-handbook)<br>
-	      For people who want to develop software for FreeBSD (and not
-	        just people who are developing FreeBSD itself).</p>
-
-	    <p><a href="&url.books;/arch-handbook/index.html">The
-	        FreeBSD Architecture Handbook</a> (arch-handbook)<br>
-	      For FreeBSD system developers.  This book covers the
-		architectural details of many important FreeBSD kernel
-		subsystems.</p>
-
-	    <p><a href="&url.books;/porters-handbook/index.html">The Porter's
-	        Handbook</a> (porters-handbook)<br>
-	      Essential reading if you plan on providing a port of a third
-		party piece of software.</p>
-
-	    <p><a href="&url.books;/pmake/index.html">The PMake Tutorial</a>
-	        (pmake)<br>
-	      A tutorial for the <em>make</em> utility.  This book is essential
-		reading for anyone who wants to understand all the details of using
-		<em>make</em> of reading and writing makefiles.</p>
-
-	    <p><a href="&url.books;/design-44bsd/index.html">Chapter 2
-	        of "The Design and Implementation of the 4.4BSD Operating
-	        System"</a> (design-44bsd)<br>
-	      Donated by Addison-Wesley, provides a design overview of 4.4BSD,
-		from which FreeBSD was originally derived.</p>
-
-	    <p><a href="&url.books;/corp-net-guide/index.html">Chapter
-	        8 of "The FreeBSD Corporate Networker's Guide"</a>
-	        (corp-net-guide)<br>
-	      Donated by Addison-Wesley, provides an in-depth look at using
-	        FreeBSD to provide printing services to Windows, NT, and Novell
-	        hosts.</p>
-
-	    <p><a href="&url.books;/fdp-primer/index.html">The FreeBSD
-	        Documentation Project Primer for New Contributors</a>
-	        (fdp-primer)<br>
-	      Everything you need to know in order to start contributing to the
-		FreeBSD Documentation Project.</p>
-
-	    <h3>Articles</h3>
-
-	<!-- Articles are sorted by pathname -->
-
-	    <p><a href="&url.articles;/5-roadmap/index.html">The
-	        Roadmap for 5-STABLE</a> (5-roadmap)<br>
-	      Describes medium-term development and release engineering
-	        plans leading to the 5-STABLE branch point.</p>
-
-	    <p><a href="&url.articles;/checkpoint/index.html">Integration
-	        of Checkpoint VPN-1/Firewall-1 and FreeBSD IPsec</a>
-	        (checkpoint)<br>
-	      How to configure Checkpoint VPN-1/Firewall-1 and FreeBSD
-	        IPsec.</p>
-
-	    <p><a href="&url.articles;/committers-guide/index.html">The
-	        Committer's Guide</a> (committers-guide)<br>
-	      Introductory information for FreeBSD committers.</p>
-
-	    <p><a href="&url.articles;/console-server/index.html">Console
-	        Server Tutorial</a> (console-server)<br>
-	      How to setup a FreeBSD based console server with a cheap
-	        multi-port serial card.</p>
-
-	    <p><a href="&url.articles;/contributing/index.html">Contributing
-	        to FreeBSD</a> (contributing)<br>
-	      How to contribute to the FreeBSD Project.</p>
-
-	    <p><a href="&url.articles;/contributors/index.html">The
-	        List of FreeBSD Contributors</a> (contributors)<br>
-	      A list of organizations and individuals who have helped
-	        enhance FreeBSD.</p>
-
-	    <p><a href="&url.articles;/cvs-freebsd/index.html">Setting up a
-	        CVS repository - The FreeBSD way</a> (cvs-freebsd)<br>
-	      How to set up a CVS repository that uses the same CVSROOT
-	        infrastructure as the FreeBSD project.</p>
-
-	    <p><a href="&url.articles;/cvsup-advanced/index.html">CVSup
-	        Advanced Points</a> (cvsup-advanced)<br>
-	      An article with some tips about the subtleties of
-	        CVSup.</p>
-
-	    <p><a href="&url.articles;/dialup-firewall/index.html">Dialup
-		firewalling with FreeBSD</a> (dialup-firewall)<br>
-	      How to set up a firewall using PPP and ipfw over a dialup link
-		with dynamically assigned IP addresses.</p>
-
-	    <p><a href="&url.articles;/diskless-x/index.html">Creating
-	        a diskless X server</a> (diskless-x)<br>
-	      How to create a diskless X server.</p>
-
-	    <p><a href="&url.articles;/euro/article.html">The Euro symbol
-	        on FreeBSD</a> (euro)<br>
-	      How to configure FreeBSD and related applications to display the
-	        new Euro symbol.</p>
-
-	    <p><a href="&url.articles;/explaining-bsd/index.html">Explaining
-		BSD</a> (explaining-bsd)<br>
-	      An answer to the question ``What is BSD?''</p>
-
-	    <p><a href="&url.articles;/fbsd-from-scratch/index.html">FreeBSD
-		From Scratch</a> (fbsd-from-scratch)<br>
-	      How to automatically compile, install and configure a system from
-	        scratch (i.e. to an empty file system), including your favorite
-	        ports.</p>
-
-	    <p><a href="&url.articles;/filtering-bridges/index.html">Filtering
-		Bridges</a> (filtering-bridges)<br>
-	      Configuring firewalls and filtering on FreeBSD hosts acting as
-		bridges rather than routers.</p>
-
-	    <p><a href="&url.articles;/fonts/index.html">Fonts and
-	        FreeBSD</a> (fonts)<br>
-	      A description of the various font technologies in FreeBSD, and
-		how to use them with different programs.</p>
-
-	    <p><a href="&url.articles;/formatting-media/index.html">Formatting
-	        media on FreeBSD</a> (formatting-media)<br>
-	      How to slice, partition, and format fixed and removable media on
-		FreeBSD.</p>
-
-	    <p><a href="&url.articles;/freebsd-questions/index.html">How
-	        to get the best results from the FreeBSD-questions mailing list</a>
-	        (freebsd-questions)<br>
-	      Tips and tricks to help you maximize the chances of getting
-		useful information from the -questions mailing list.</p>
-
-	    <p><a href="&url.articles;/hats/index.html">Working with Hats</a>
-	        (hats)<br>
-	      A committer's guide to working with ``hats'' (other
-	        committers with authority over specific areas of
-		FreeBSD).</p>
-
-	    <p><a href="&url.articles;/hubs/index.html">Mirroring FreeBSD</a>
-	        (hubs)
-	      <br>The all in one guide for mirroring the FreeBSD website,
-	        CVSup servers, FTP servers, and more.</p>
-
-	    <p><a href="&url.articles;/ipsec-must/index.html">Independent
-		Verification of IPsec Functionality in FreeBSD</a>
-	        (ipsec-must)<br>
-	      A method for experimentally verifying IPsec
-		functionality.</p>
-
-	    <p><a href="&url.articles;/java-tomcat/index.html">Java, and
-	        Jakarta Tomcat</a> (java-tomcat)<br>
-	      Information on setting up Java and Jakarta Tomcat on a FreeBSD
-	        system.</p>
-
-	    <p><a href="&url.articles;/laptop/article.html">FreeBSD on Laptops</a>
-	        (laptop)<br>
-	      Information about running FreeBSD on a laptop.</p>
-
-	    <p><a href="&url.articles;/linux-comparison/article.html">FreeBSD: An Open Source Alternative to Linux</a>
-	        (linux-comparison)<br>
-	      A white paper explaining the differences between Linux
-	        and FreeBSD.</p>
-
-	    <p><a href="&url.articles;/mailing-list-faq/article.html">Frequently
-		Asked Questions About The FreeBSD Mailing Lists</a>
-		(mailing-list-faq)<br>
-	      How to best use the mailing lists, such as how to help
-		avoid frequently-repeated discussions.</p>
-
-	    <p><a href="&url.articles;/mh/index.html">An MH Primer</a>
-	        (mh)<br>
-	      An introduction to using the MH mail reader on
-		FreeBSD.</p>
-
-	    <p><a href="&url.articles;/multi-os/index.html">Using
-	        FreeBSD with other operating systems</a> (multi-os)<br>
-	      How to install FreeBSD alongside one or more different operating
-		systems on the same computer.</p>
-
-	    <p><a href="&url.articles;/new-users/index.html">FreeBSD
-	        First Steps</a> (new-users)<br>
-	      For people coming to FreeBSD and &unix; for the first
-		time.</p>
-
-	    <p><a href="&url.articles;/pam/index.html">Pluggable
-	        Authentication Modules</a> (pam)<br>
-	      A guide to the PAM system and modules under
-	        FreeBSD.</p>
-
-	    <p><a href="&url.articles;/portbuild/index.html">Package
-		building procedures</a> (portbuild)<br>
-	      Describes the approach used by the FreeBSD port
-	        manager team to regularly build ports into packages.
-	        It describes the portbuild cluster, as well as the tools
-	        needed to do incremental, experimental, and official release
-	        package builds.</p>
-
-	    <p><a href="&url.articles;/pr-guidelines/index.html">FreeBSD
-		Problem Report Handling Guidelines</a> (pr-guidelines)<br>
-	      Recommended practices for handling FreeBSD problem
-		reports.</p>
-
-	    <p><a href="&url.articles;/problem-reports/index.html">Writing
-	        FreeBSD Problem Reports</a> (problem-reports)<br>
-	      How to best formulate and submit a problem report to the
-	        FreeBSD Project.</p>
-
-	    <p><a href="&url.articles;/pxe/index.html">PXE booting
-		FreeBSD</a> (pxe)<br>
-	      How to create an Intel PXE server using FreeBSD, and how to
-		configure a FreeBSD client to boot from a PXE server.</p>
-
-	    <p><a href="&url.articles;/relaydelay/article.html">FreeBSD as
-		a greylist mail server</a> (relaydelay)<br>
-	       Implementing a greylist mail server on FreeBSD
-		using Sendmail, MySQL, Perl and the relaydelay
-		software.  This is an excellent method to use in the
-		fight against spam.</p>
-
-	    <p><a href="&url.articles;/releng/index.html">FreeBSD
-		Release Engineering</a> (releng)<br>
-	      Describes the approach used by the FreeBSD release
-		engineering team to make production quality releases of the
-		FreeBSD Operating System. It describes the tools available
-		for those interested in producing customized FreeBSD releases
-		for corporate rollouts or commercial productization.</p>
-
-	    <p><a href="&url.articles;/releng-packages/index.html">FreeBSD
-		Release Engineering for Third Party Packages</a>
-	        (releng-packages)<br>
-	      Describes the approach used by the FreeBSD
-	        release engineering team to produce a high quality package set
-	        suitable for official FreeBSD release media.  This document is
-	        a work in progress, but eventually it will cover the process
-	        used to build a clean package set on the FreeBSD.org "Ports
-	        Cluster", how to configure any other set of machines as a
-	        ports cluster, how to split up the packages for the release
-	        media, and how to verify that a package set is
-	        consistent.</p>
-
-	    <p><a href="&url.articles;/serial-uart/index.html">Serial
-		and UART devices</a> (serial-uart)<br>
-	      Detailed information about the use of serial ports on FreeBSD,
-		including several multi-port serial cards.</p>
-
-	    <p><a href="&url.articles;/solid-state/index.html">FreeBSD
-	        and Solid State Devices</a> (solid-state)<br>
-	      The use of solid state disk devices in FreeBSD.</p>
-
-	    <p><a href="&url.articles;/storage-devices/index.html">Storage Devices</a>
-	        (storage-devices)<br>
-	      Detailed information about using storage devices with FreeBSD,
-		including ESDI disks, and SCSI disks, tape drives, and CDROM
-		drives.</p>
-
-	    <p><a href="&url.articles;/version-guide/index.html">Choosing the
-		FreeBSD Version That Is Right For You</a> (version-guide)<br>
-	      How to decide which version of FreeBSD is right for your
-		needs.  Topics include the releases, branches, the difference
-		between -CURRENT and -STABLE, and the current scheduling goals
-		of the project.</p>
-
-	    <p><a href="&url.articles;/vinum/index.html">Bootstrapping
-	       Vinum: A Foundation for Reliable Servers</a> (vinum)<br>
-	       A gentle introduction to failure-resilient servers and
-		step-by-step instructions for building one with Vinum.</p>
-
-	    <p><a href="&url.articles;/vm-design/index.html">Design
-	      elements of the FreeBSD VM system</a> (vm-design)<br>
-	      An easy to follow description of the design of the FreeBSD
-	        virtual memory system.</p>
-
-	    <p><a href="&url.articles;/zip-drive/index.html">Zip-drives
-	        and FreeBSD</a> (zip-drive)<br>
-	      How to format, mount, and use an Iomega Zip (SCSI, IDE, or
-		parallel) Drive on FreeBSD.</p>
-
-
-    <h2>On other web sites</h2>
-
-    <p>Various independent efforts have also produced a great deal of useful
-      information about FreeBSD.</p>
-
-    <h3>Books</h3>
-
-    <ul>
-      <li>
-	<p><a href="http://www.vmunix.com/fbsd-book/">A Comprehensive Guide
-	    to FreeBSD</a> - an attempt at a more readable, "book-like"
-	  tutorial explaining the FreeBSD Operating System.  Intended for
-	  people new to both FreeBSD and UNIX. Currently a work in
-	  progress.</p>
-      </li>
-    </ul>
-
-    <h3>Articles</h3>
-
-    <ul>
-      <li>
-	<p>Niels Jorgensen has authored an academic study on the
-	  dynamics of the FreeBSD development process: <a
-	  href="http://www.ruc.dk/~nielsj/research/papers/freebsd.pdf">
-	  ``Putting it All in the Trunk, Incremental Software
-	  Development in the FreeBSD Open Source Project''</a>
-	  [Information Systems Journal (2001) 11, 321-336].</p>
-      </li>
-      <li>
-	<p><a href="http://www.computerbits.com/">Computer Bits</a>, an
-	  Internet online magazine, has, since March 1996, been running an
-	  excellent series of FreeBSD related articles in their column titled
-	  <strong>The Network Community</strong>, by
-	  <a href="mailto:tedm@agora.rdrop.com">Ted Mittelstaedt</a>.</p>
-
-	<p>Some of the more popular articles include: <em><a
-	  href="http://www.computerbits.com/archive/1996/0300/lan9603.html">
-	  Setting up a FreeBSD-based mail server</a></em>, <em><a
-	  href="http://www.computerbits.com/archive/1997/0800/lan9708.html">
-	  Network Address Translation</a></em>, and <em><a
-	  href="http://www.computerbits.com/archive/1996/1100/lan9611.html">
-          Building a fax server</a></em>.</p>
-      </li>
-    </ul>
-
-    <ul>
-      <li>
-	<p><a href="mailto:mckusick@mckusick.com">Kirk McKusick</a>, one
-	  of the original architects of BSD at U.C. Berkeley, teaches two <a
-	    href="http://www.mckusick.com/courses/">4.4BSD Kernel
-	    Internals</a> courses using FreeBSD.  For those unable to attend
-	  the courses in person, a video tape series is also now
-	  available.</p>
-      </li>
-
-      <li>
-	<p><a href="http://flag.blackened.net/freebsd/">FreeBSD How-To's for
-	    the Lazy and Hopeless</a> is another somewhat more light-hearted
-	  attempt to provide more readable "how-to" style information on
-	  setting up and configuring FreeBSD.</p>
-      </li>
-
-      <li>
-	<p><a href="http://www.tldp.org/HOWTO/Linux+FreeBSD.html">The
-	    Linux+FreeBSD mini-HOWTO</a> describes how to use
-	  Linux and FreeBSD on the same system.  It introduces FreeBSD and
-	  discusses how the two operating systems can cooperate, e.g. by
-	  sharing swap space.</p>
-      </li>
-
-      <li>
-	<p><a href="http://www.nber.org/amd.html">Getting started with AMD on
-	    FreeBSD</a></p>
-      </li>
-
-      <li>
-	<p><em>FreeBSD Installation Details for Newbies</em>.  This
-	  document has been imported into <a
-	  href="doc/en_US.ISO8859-1/books/handbook/install.html">The
-	  FreeBSD Handbook</a>.</p>
-      </li>
-
-      <li>
-	<p><a href="http://www.daemonnews.org/200010/blueprints.html">Dynamic
-	    Kernel Linker (KLD) Facility Programming Tutorial</a>.</p>
-      </li>
-
-      <li>
-	<p><a href="http://www.daemonnews.org/200007/newbus-intro.html">How to
-	    Write Kernel Drivers with Newbus</a>.</p>
-      </li>
-
-      <li>
-	<p><em>Writing an ISA device driver</em>.  This document has been
-	imported into <a
-	href="doc/en_US.ISO8859-1/books/developers-handbook">The
-	Developers Handbook</a>.</p>
-      </li>
-
-      <li>
-	<p><em>FreeBSD Assembly Language Programming Tutorial</em>.  This
-	document has been imported into <a
-	href="doc/en_US.ISO8859-1/books/developers-handbook">The
-	Developers Handbook</a>.</p>
-      </li>
-
-      <li>
-	<p><a href="http://www.cfcl.com/rdm/split_DNS.html">Setting up
-	    Split DNS on FreeBSD</a></p>
-      </li>
-
-      <li>
-        <p><a href="http://people.FreeBSD.org/~fsmp/SMP/SMP.html">The
-          SMP support page</a> contains information on the SMP support
-          in FreeBSD 4.X and earlier.</p>
-      </li>
-
-      <li>
-        <p>Appendix A from the college textbook
-          <i>Operating Systems Concepts</i> by Silberschatz, Galvin and
-          Gagne has been made available online in
-          <a href="http://www.wiley.com/college/silberschatz6e/0471417432/pdf/bsd.pdf">PDF format</a>.
-          The appendix is dedicated to FreeBSD and offers a good
-          introduction to FreeBSD's internals.</p>
-      </li>
-
-     </ul>
-
-&footer;
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!ENTITY base CDATA "..">
+<!ENTITY date "$FreeBSD: www/en/docs/books.sgml,v 1.1 2005/10/04 05:52:15 murray Exp $">
+<!ENTITY title "Books and Articles Online">
+<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
+<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+
+<!ENTITY url.articles "../doc/en_US.ISO8859-1/articles">
+<!ENTITY url.books "../doc/en_US.ISO8859-1/books">
+]>
+
+<html>
+&header;
+
+	<h2>On this site</h2>
+
+	    <p>All the documentation on this site can be downloaded in a variety of
+	      different formats (HTML, Postscript, PDF, and more) and compression
+	      schemes (BZip2, Zip) from the <a
+	      href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP site</a>.</p>
+
+	    <p>This documentation is provided and maintained by the <a
+	      href="&base;/docproj/docproj.html">FreeBSD Documentation Project</a>, and we are
+	      always looking for people to contribute new documentation and maintain
+	      existing documentation.</p>
+
+	    <h3>Books</h3>
+
+	    <p><a href="&url.books;/faq/index.html">The FreeBSD FAQ</a>
+	        (faq)<br>
+	      Frequently Asked Questions, and answers, covering all
+		aspects of FreeBSD.</p>
+
+	    <p><a href="&url.books;/handbook/index.html">The FreeBSD Handbook</a>
+	        (handbook)<br>
+	      A constantly evolving, comprehensive resource for FreeBSD
+		users.</p>
+
+	    <p><a href="&url.books;/developers-handbook/index.html">The
+	        FreeBSD Developer's Handbook</a> (developers-handbook)<br>
+	      For people who want to develop software for FreeBSD (and not
+	        just people who are developing FreeBSD itself).</p>
+
+	    <p><a href="&url.books;/arch-handbook/index.html">The
+	        FreeBSD Architecture Handbook</a> (arch-handbook)<br>
+	      For FreeBSD system developers.  This book covers the
+		architectural details of many important FreeBSD kernel
+		subsystems.</p>
+
+	    <p><a href="&url.books;/porters-handbook/index.html">The Porter's
+	        Handbook</a> (porters-handbook)<br>
+	      Essential reading if you plan on providing a port of a third
+		party piece of software.</p>
+
+	    <p><a href="&url.books;/pmake/index.html">The PMake Tutorial</a>
+	        (pmake)<br>
+	      A tutorial for the <em>make</em> utility.  This book is essential
+		reading for anyone who wants to understand all the details of using
+		<em>make</em> of reading and writing makefiles.</p>
+
+	    <p><a href="&url.books;/design-44bsd/index.html">Chapter 2
+	        of "The Design and Implementation of the 4.4BSD Operating
+	        System"</a> (design-44bsd)<br>
+	      Donated by Addison-Wesley, provides a design overview of 4.4BSD,
+		from which FreeBSD was originally derived.</p>
+
+	    <p><a href="&url.books;/corp-net-guide/index.html">Chapter
+	        8 of "The FreeBSD Corporate Networker's Guide"</a>
+	        (corp-net-guide)<br>
+	      Donated by Addison-Wesley, provides an in-depth look at using
+	        FreeBSD to provide printing services to Windows, NT, and Novell
+	        hosts.</p>
+
+	    <p><a href="&url.books;/fdp-primer/index.html">The FreeBSD
+	        Documentation Project Primer for New Contributors</a>
+	        (fdp-primer)<br>
+	      Everything you need to know in order to start contributing to the
+		FreeBSD Documentation Project.</p>
+
+	    <h3>Articles</h3>
+
+	<!-- Articles are sorted by pathname -->
+
+	    <p><a href="&url.articles;/5-roadmap/index.html">The
+	        Roadmap for 5-STABLE</a> (5-roadmap)<br>
+	      Describes medium-term development and release engineering
+	        plans leading to the 5-STABLE branch point.</p>
+
+	    <p><a href="&url.articles;/checkpoint/index.html">Integration
+	        of Checkpoint VPN-1/Firewall-1 and FreeBSD IPsec</a>
+	        (checkpoint)<br>
+	      How to configure Checkpoint VPN-1/Firewall-1 and FreeBSD
+	        IPsec.</p>
+
+	    <p><a href="&url.articles;/committers-guide/index.html">The
+	        Committer's Guide</a> (committers-guide)<br>
+	      Introductory information for FreeBSD committers.</p>
+
+	    <p><a href="&url.articles;/console-server/index.html">Console
+	        Server Tutorial</a> (console-server)<br>
+	      How to setup a FreeBSD based console server with a cheap
+	        multi-port serial card.</p>
+
+	    <p><a href="&url.articles;/contributing/index.html">Contributing
+	        to FreeBSD</a> (contributing)<br>
+	      How to contribute to the FreeBSD Project.</p>
+
+	    <p><a href="&url.articles;/contributors/index.html">The
+	        List of FreeBSD Contributors</a> (contributors)<br>
+	      A list of organizations and individuals who have helped
+	        enhance FreeBSD.</p>
+
+	    <p><a href="&url.articles;/cvs-freebsd/index.html">Setting up a
+	        CVS repository - The FreeBSD way</a> (cvs-freebsd)<br>
+	      How to set up a CVS repository that uses the same CVSROOT
+	        infrastructure as the FreeBSD project.</p>
+
+	    <p><a href="&url.articles;/cvsup-advanced/index.html">CVSup
+	        Advanced Points</a> (cvsup-advanced)<br>
+	      An article with some tips about the subtleties of
+	        CVSup.</p>
+
+	    <p><a href="&url.articles;/dialup-firewall/index.html">Dialup
+		firewalling with FreeBSD</a> (dialup-firewall)<br>
+	      How to set up a firewall using PPP and ipfw over a dialup link
+		with dynamically assigned IP addresses.</p>
+
+	    <p><a href="&url.articles;/diskless-x/index.html">Creating
+	        a diskless X server</a> (diskless-x)<br>
+	      How to create a diskless X server.</p>
+
+	    <p><a href="&url.articles;/euro/article.html">The Euro symbol
+	        on FreeBSD</a> (euro)<br>
+	      How to configure FreeBSD and related applications to display the
+	        new Euro symbol.</p>
+
+	    <p><a href="&url.articles;/explaining-bsd/index.html">Explaining
+		BSD</a> (explaining-bsd)<br>
+	      An answer to the question ``What is BSD?''</p>
+
+	    <p><a href="&url.articles;/fbsd-from-scratch/index.html">FreeBSD
+		From Scratch</a> (fbsd-from-scratch)<br>
+	      How to automatically compile, install and configure a system from
+	        scratch (i.e. to an empty file system), including your favorite
+	        ports.</p>
+
+	    <p><a href="&url.articles;/filtering-bridges/index.html">Filtering
+		Bridges</a> (filtering-bridges)<br>
+	      Configuring firewalls and filtering on FreeBSD hosts acting as
+		bridges rather than routers.</p>
+
+	    <p><a href="&url.articles;/fonts/index.html">Fonts and
+	        FreeBSD</a> (fonts)<br>
+	      A description of the various font technologies in FreeBSD, and
+		how to use them with different programs.</p>
+
+	    <p><a href="&url.articles;/formatting-media/index.html">Formatting
+	        media on FreeBSD</a> (formatting-media)<br>
+	      How to slice, partition, and format fixed and removable media on
+		FreeBSD.</p>
+
+	    <p><a href="&url.articles;/freebsd-questions/index.html">How
+	        to get the best results from the FreeBSD-questions mailing list</a>
+	        (freebsd-questions)<br>
+	      Tips and tricks to help you maximize the chances of getting
+		useful information from the -questions mailing list.</p>
+
+	    <p><a href="&url.articles;/hats/index.html">Working with Hats</a>
+	        (hats)<br>
+	      A committer's guide to working with ``hats'' (other
+	        committers with authority over specific areas of
+		FreeBSD).</p>
+
+	    <p><a href="&url.articles;/hubs/index.html">Mirroring FreeBSD</a>
+	        (hubs)
+	      <br>The all in one guide for mirroring the FreeBSD website,
+	        CVSup servers, FTP servers, and more.</p>
+
+	    <p><a href="&url.articles;/ipsec-must/index.html">Independent
+		Verification of IPsec Functionality in FreeBSD</a>
+	        (ipsec-must)<br>
+	      A method for experimentally verifying IPsec
+		functionality.</p>
+
+	    <p><a href="&url.articles;/java-tomcat/index.html">Java, and
+	        Jakarta Tomcat</a> (java-tomcat)<br>
+	      Information on setting up Java and Jakarta Tomcat on a FreeBSD
+	        system.</p>
+
+	    <p><a href="&url.articles;/laptop/article.html">FreeBSD on Laptops</a>
+	        (laptop)<br>
+	      Information about running FreeBSD on a laptop.</p>
+
+	    <p><a href="&url.articles;/linux-comparison/article.html">FreeBSD: An Open Source Alternative to Linux</a>
+	        (linux-comparison)<br>
+	      A white paper explaining the differences between Linux
+	        and FreeBSD.</p>
+
+	    <p><a href="&url.articles;/mailing-list-faq/article.html">Frequently
+		Asked Questions About The FreeBSD Mailing Lists</a>
+		(mailing-list-faq)<br>
+	      How to best use the mailing lists, such as how to help
+		avoid frequently-repeated discussions.</p>
+
+	    <p><a href="&url.articles;/mh/index.html">An MH Primer</a>
+	        (mh)<br>
+	      An introduction to using the MH mail reader on
+		FreeBSD.</p>
+
+	    <p><a href="&url.articles;/multi-os/index.html">Using
+	        FreeBSD with other operating systems</a> (multi-os)<br>
+	      How to install FreeBSD alongside one or more different operating
+		systems on the same computer.</p>
+
+	    <p><a href="&url.articles;/new-users/index.html">FreeBSD
+	        First Steps</a> (new-users)<br>
+	      For people coming to FreeBSD and &unix; for the first
+		time.</p>
+
+	    <p><a href="&url.articles;/pam/index.html">Pluggable
+	        Authentication Modules</a> (pam)<br>
+	      A guide to the PAM system and modules under
+	        FreeBSD.</p>
+
+	    <p><a href="&url.articles;/portbuild/index.html">Package
+		building procedures</a> (portbuild)<br>
+	      Describes the approach used by the FreeBSD port
+	        manager team to regularly build ports into packages.
+	        It describes the portbuild cluster, as well as the tools
+	        needed to do incremental, experimental, and official release
+	        package builds.</p>
+
+	    <p><a href="&url.articles;/pr-guidelines/index.html">FreeBSD
+		Problem Report Handling Guidelines</a> (pr-guidelines)<br>
+	      Recommended practices for handling FreeBSD problem
+		reports.</p>
+
+	    <p><a href="&url.articles;/problem-reports/index.html">Writing
+	        FreeBSD Problem Reports</a> (problem-reports)<br>
+	      How to best formulate and submit a problem report to the
+	        FreeBSD Project.</p>
+
+	    <p><a href="&url.articles;/pxe/index.html">PXE booting
+		FreeBSD</a> (pxe)<br>
+	      How to create an Intel PXE server using FreeBSD, and how to
+		configure a FreeBSD client to boot from a PXE server.</p>
+
+	    <p><a href="&url.articles;/relaydelay/article.html">FreeBSD as
+		a greylist mail server</a> (relaydelay)<br>
+	       Implementing a greylist mail server on FreeBSD
+		using Sendmail, MySQL, Perl and the relaydelay
+		software.  This is an excellent method to use in the
+		fight against spam.</p>
+
+	    <p><a href="&url.articles;/releng/index.html">FreeBSD
+		Release Engineering</a> (releng)<br>
+	      Describes the approach used by the FreeBSD release
+		engineering team to make production quality releases of the
+		FreeBSD Operating System. It describes the tools available
+		for those interested in producing customized FreeBSD releases
+		for corporate rollouts or commercial productization.</p>
+
+	    <p><a href="&url.articles;/releng-packages/index.html">FreeBSD
+		Release Engineering for Third Party Packages</a>
+	        (releng-packages)<br>
+	      Describes the approach used by the FreeBSD
+	        release engineering team to produce a high quality package set
+	        suitable for official FreeBSD release media.  This document is
+	        a work in progress, but eventually it will cover the process
+	        used to build a clean package set on the FreeBSD.org "Ports
+	        Cluster", how to configure any other set of machines as a
+	        ports cluster, how to split up the packages for the release
+	        media, and how to verify that a package set is
+	        consistent.</p>
+
+	    <p><a href="&url.articles;/serial-uart/index.html">Serial
+		and UART devices</a> (serial-uart)<br>
+	      Detailed information about the use of serial ports on FreeBSD,
+		including several multi-port serial cards.</p>
+
+	    <p><a href="&url.articles;/solid-state/index.html">FreeBSD
+	        and Solid State Devices</a> (solid-state)<br>
+	      The use of solid state disk devices in FreeBSD.</p>
+
+	    <p><a href="&url.articles;/storage-devices/index.html">Storage Devices</a>
+	        (storage-devices)<br>
+	      Detailed information about using storage devices with FreeBSD,
+		including ESDI disks, and SCSI disks, tape drives, and CDROM
+		drives.</p>
+
+	    <p><a href="&url.articles;/version-guide/index.html">Choosing the
+		FreeBSD Version That Is Right For You</a> (version-guide)<br>
+	      How to decide which version of FreeBSD is right for your
+		needs.  Topics include the releases, branches, the difference
+		between -CURRENT and -STABLE, and the current scheduling goals
+		of the project.</p>
+
+	    <p><a href="&url.articles;/vinum/index.html">Bootstrapping
+	       Vinum: A Foundation for Reliable Servers</a> (vinum)<br>
+	       A gentle introduction to failure-resilient servers and
+		step-by-step instructions for building one with Vinum.</p>
+
+	    <p><a href="&url.articles;/vm-design/index.html">Design
+	      elements of the FreeBSD VM system</a> (vm-design)<br>
+	      An easy to follow description of the design of the FreeBSD
+	        virtual memory system.</p>
+
+	    <p><a href="&url.articles;/zip-drive/index.html">Zip-drives
+	        and FreeBSD</a> (zip-drive)<br>
+	      How to format, mount, and use an Iomega Zip (SCSI, IDE, or
+		parallel) Drive on FreeBSD.</p>
+
+
+    <h2>On other web sites</h2>
+
+    <p>Various independent efforts have also produced a great deal of useful
+      information about FreeBSD.</p>
+
+    <h3>Books</h3>
+
+    <ul>
+      <li>
+	<p><a href="http://www.vmunix.com/fbsd-book/">A Comprehensive Guide
+	    to FreeBSD</a> - an attempt at a more readable, "book-like"
+	  tutorial explaining the FreeBSD Operating System.  Intended for
+	  people new to both FreeBSD and UNIX. Currently a work in
+	  progress.</p>
+      </li>
+    </ul>
+
+    <h3>Articles</h3>
+
+    <ul>
+      <li>
+	<p>Niels Jorgensen has authored an academic study on the
+	  dynamics of the FreeBSD development process: <a
+	  href="http://www.ruc.dk/~nielsj/research/papers/freebsd.pdf">
+	  ``Putting it All in the Trunk, Incremental Software
+	  Development in the FreeBSD Open Source Project''</a>
+	  [Information Systems Journal (2001) 11, 321-336].</p>
+      </li>
+      <li>
+	<p><a href="http://www.computerbits.com/">Computer Bits</a>, an
+	  Internet online magazine, has, since March 1996, been running an
+	  excellent series of FreeBSD related articles in their column titled
+	  <strong>The Network Community</strong>, by
+	  <a href="mailto:tedm@agora.rdrop.com">Ted Mittelstaedt</a>.</p>
+
+	<p>Some of the more popular articles include: <em><a
+	  href="http://www.computerbits.com/archive/1996/0300/lan9603.html">
+	  Setting up a FreeBSD-based mail server</a></em>, <em><a
+	  href="http://www.computerbits.com/archive/1997/0800/lan9708.html">
+	  Network Address Translation</a></em>, and <em><a
+	  href="http://www.computerbits.com/archive/1996/1100/lan9611.html">
+          Building a fax server</a></em>.</p>
+      </li>
+    </ul>
+
+    <ul>
+      <li>
+	<p><a href="mailto:mckusick@mckusick.com">Kirk McKusick</a>, one
+	  of the original architects of BSD at U.C. Berkeley, teaches two <a
+	    href="http://www.mckusick.com/courses/">4.4BSD Kernel
+	    Internals</a> courses using FreeBSD.  For those unable to attend
+	  the courses in person, a video tape series is also now
+	  available.</p>
+      </li>
+
+      <li>
+	<p><a href="http://flag.blackened.net/freebsd/">FreeBSD How-To's for
+	    the Lazy and Hopeless</a> is another somewhat more light-hearted
+	  attempt to provide more readable "how-to" style information on
+	  setting up and configuring FreeBSD.</p>
+      </li>
+
+      <li>
+	<p><a href="http://www.tldp.org/HOWTO/Linux+FreeBSD.html">The
+	    Linux+FreeBSD mini-HOWTO</a> describes how to use
+	  Linux and FreeBSD on the same system.  It introduces FreeBSD and
+	  discusses how the two operating systems can cooperate, e.g. by
+	  sharing swap space.</p>
+      </li>
+
+      <li>
+	<p><a href="http://www.nber.org/amd.html">Getting started with AMD on
+	    FreeBSD</a></p>
+      </li>
+
+      <li>
+	<p><em>FreeBSD Installation Details for Newbies</em>.  This
+	  document has been imported into <a
+	  href="doc/en_US.ISO8859-1/books/handbook/install.html">The
+	  FreeBSD Handbook</a>.</p>
+      </li>
+
+      <li>
+	<p><a href="http://www.daemonnews.org/200010/blueprints.html">Dynamic
+	    Kernel Linker (KLD) Facility Programming Tutorial</a>.</p>
+      </li>
+
+      <li>
+	<p><a href="http://www.daemonnews.org/200007/newbus-intro.html">How to
+	    Write Kernel Drivers with Newbus</a>.</p>
+      </li>
+
+      <li>
+	<p><em>Writing an ISA device driver</em>.  This document has been
+	imported into <a
+	href="doc/en_US.ISO8859-1/books/developers-handbook">The
+	Developers Handbook</a>.</p>
+      </li>
+
+      <li>
+	<p><em>FreeBSD Assembly Language Programming Tutorial</em>.  This
+	document has been imported into <a
+	href="doc/en_US.ISO8859-1/books/developers-handbook">The
+	Developers Handbook</a>.</p>
+      </li>
+
+      <li>
+	<p><a href="http://www.cfcl.com/rdm/split_DNS.html">Setting up
+	    Split DNS on FreeBSD</a></p>
+      </li>
+
+      <li>
+        <p><a href="http://people.FreeBSD.org/~fsmp/SMP/SMP.html">The
+          SMP support page</a> contains information on the SMP support
+          in FreeBSD 4.X and earlier.</p>
+      </li>
+
+      <li>
+        <p>Appendix A from the college textbook
+          <i>Operating Systems Concepts</i> by Silberschatz, Galvin and
+          Gagne has been made available online in
+          <a href="http://www.wiley.com/college/silberschatz6e/0471417432/pdf/bsd.pdf">PDF format</a>.
+          The appendix is dedicated to FreeBSD and offers a good
+          introduction to FreeBSD's internals.</p>
+      </li>
+
+     </ul>
+
+&footer;
+
+</body>
 </html>
\ No newline at end of file
diff --git a/en/docs/man.sgml b/en/docs/man.sgml
index 6b9da60d41..f799bf0236 100644
--- a/en/docs/man.sgml
+++ b/en/docs/man.sgml
@@ -1,89 +1,89 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/docs/man.sgml,v 1.40 2004/12/08 23:17:18 brueffer Exp $">
-<!ENTITY title "Manual Pages">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-
-<!ENTITY url.mancgi "http://www.FreeBSD.org/cgi/man.cgi">
-]>
-
-<html>
-&header;
-
-	<dl>
-	      <dt><strong>FreeBSD</strong></dt>
-
-	      <dd>For release:
-		<a href="&url.mancgi;?manpath=FreeBSD+1.0-RELEASE">1.0</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+1.1-RELEASE">1.1</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+1.1.5.1-RELEASE">1.1.5.1</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.0-RELEASE">2.0</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.0.5-RELEASE">2.0.5</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.1.0-RELEASE">2.1.0</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.1.5-RELEASE">2.1.5</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.1.6.1-RELEASE">2.1.6.1</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.1.7.1-RELEASE">2.1.7.1</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.2.1-RELEASE">2.2.1</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.2.2-RELEASE">2.2.2</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.2.5-RELEASE">2.2.5</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.2.6-RELEASE">2.2.6</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.2.7-RELEASE">2.2.7</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+2.2.8-RELEASE">2.2.8</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+3.0-RELEASE">3.0</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+3.1-RELEASE">3.1</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+3.2-RELEASE">3.2</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+3.3-RELEASE">3.3</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+3.4-RELEASE">3.4</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+3.5.1-RELEASE">3.5.1</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.0-RELEASE">4.0</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.1-RELEASE">4.1</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.2-RELEASE">4.2</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.3-RELEASE">4.3</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.4-RELEASE">4.4</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.5-RELEASE">4.5</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.6-RELEASE">4.6</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.7-RELEASE">4.7</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.8-RELEASE">4.8</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.9-RELEASE">4.9</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.10-RELEASE">4.10</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+4.11-RELEASE">4.11</a>,
-		<a href="&url.mancgi;?manpath=freebsd-stable">4.X-STABLE</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+5.0-RELEASE">5.0</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+5.1-RELEASE">5.1</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+5.2-RELEASE">5.2</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+5.2.1-RELEASE">5.2.1</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+5.3-RELEASE">5.3</a>,
-		<a href="&url.mancgi;?manpath=freebsd-stable5">5.X-STABLE</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+6.0-current">6.0-CURRENT</a>,
-		<a href="&url.mancgi;?manpath=FreeBSD+Ports">Ports</a>.</dd>
-
-	      <dt><strong>Other Systems</strong></dt>
-
-	      <dd><a href="&url.mancgi;?manpath=v7">Unix Seventh Edition (V7)</a>,
-		<a href="&url.mancgi;?manpath=2.8BSD">2.8BSD</a>,
-		<a href="&url.mancgi;?manpath=2.9BSD">2.9.1BSD</a>,
-		<a href="&url.mancgi;?manpath=2.10BSD">2.10BSD</a>,
-		<a href="&url.mancgi;?manpath=2.11BSD">2.11BSD</a>,
-		<a href="&url.mancgi;?manpath=4.3BSD+Reno">4.3BSD Reno</a>,
-		<a href="&url.mancgi;?manpath=NET%2F2">NET/2</a>,
-		<a href="&url.mancgi;?manpath=386BSD+0.1">386BSD 0.1</a>,
-		<a href="&url.mancgi;?manpath=4.4BSD+Lite2">4.4BSD Lite2</a>,
-		<a href="&url.mancgi;?manpath=hpux">HP-UX</a>,
-		<a href="&url.mancgi;?manpath=linux">Linux</a>,
-		<a href="&url.mancgi;?manpath=NetBSD">NetBSD</a>,
-		<a href="&url.mancgi;?manpath=OpenBSD">OpenBSD</a>,
-		<a href="&url.mancgi;?manpath=darwin">Darwin</a>,
-		<a href="&url.mancgi;?manpath=plan9">Plan 9</a>,
-		<a href="&url.mancgi;?manpath=sunos4">SunOS 4.X</a>,
-		<a href="&url.mancgi;?manpath=sunos5">SunOS 5.X</a>,
-		<a href="&url.mancgi;?manpath=ultrix">ULTRIX 4.2</a>,
-		and <a
-		  href="&url.mancgi;?manpath=XFree86">XFree86</a>.
-	      </dd>
-    </dl>
-
-&footer;
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!ENTITY base CDATA "..">
+<!ENTITY date "$FreeBSD: www/en/docs/man.sgml,v 1.1 2005/10/04 05:52:15 murray Exp $">
+<!ENTITY title "Manual Pages">
+<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
+<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+
+<!ENTITY url.mancgi "http://www.FreeBSD.org/cgi/man.cgi">
+]>
+
+<html>
+&header;
+
+	<dl>
+	      <dt><strong>FreeBSD</strong></dt>
+
+	      <dd>For release:
+		<a href="&url.mancgi;?manpath=FreeBSD+1.0-RELEASE">1.0</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+1.1-RELEASE">1.1</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+1.1.5.1-RELEASE">1.1.5.1</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.0-RELEASE">2.0</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.0.5-RELEASE">2.0.5</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.1.0-RELEASE">2.1.0</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.1.5-RELEASE">2.1.5</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.1.6.1-RELEASE">2.1.6.1</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.1.7.1-RELEASE">2.1.7.1</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.2.1-RELEASE">2.2.1</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.2.2-RELEASE">2.2.2</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.2.5-RELEASE">2.2.5</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.2.6-RELEASE">2.2.6</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.2.7-RELEASE">2.2.7</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+2.2.8-RELEASE">2.2.8</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+3.0-RELEASE">3.0</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+3.1-RELEASE">3.1</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+3.2-RELEASE">3.2</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+3.3-RELEASE">3.3</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+3.4-RELEASE">3.4</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+3.5.1-RELEASE">3.5.1</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.0-RELEASE">4.0</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.1-RELEASE">4.1</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.2-RELEASE">4.2</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.3-RELEASE">4.3</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.4-RELEASE">4.4</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.5-RELEASE">4.5</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.6-RELEASE">4.6</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.7-RELEASE">4.7</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.8-RELEASE">4.8</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.9-RELEASE">4.9</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.10-RELEASE">4.10</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+4.11-RELEASE">4.11</a>,
+		<a href="&url.mancgi;?manpath=freebsd-stable">4.X-STABLE</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+5.0-RELEASE">5.0</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+5.1-RELEASE">5.1</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+5.2-RELEASE">5.2</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+5.2.1-RELEASE">5.2.1</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+5.3-RELEASE">5.3</a>,
+		<a href="&url.mancgi;?manpath=freebsd-stable5">5.X-STABLE</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+6.0-current">6.0-CURRENT</a>,
+		<a href="&url.mancgi;?manpath=FreeBSD+Ports">Ports</a>.</dd>
+
+	      <dt><strong>Other Systems</strong></dt>
+
+	      <dd><a href="&url.mancgi;?manpath=v7">Unix Seventh Edition (V7)</a>,
+		<a href="&url.mancgi;?manpath=2.8BSD">2.8BSD</a>,
+		<a href="&url.mancgi;?manpath=2.9BSD">2.9.1BSD</a>,
+		<a href="&url.mancgi;?manpath=2.10BSD">2.10BSD</a>,
+		<a href="&url.mancgi;?manpath=2.11BSD">2.11BSD</a>,
+		<a href="&url.mancgi;?manpath=4.3BSD+Reno">4.3BSD Reno</a>,
+		<a href="&url.mancgi;?manpath=NET%2F2">NET/2</a>,
+		<a href="&url.mancgi;?manpath=386BSD+0.1">386BSD 0.1</a>,
+		<a href="&url.mancgi;?manpath=4.4BSD+Lite2">4.4BSD Lite2</a>,
+		<a href="&url.mancgi;?manpath=hpux">HP-UX</a>,
+		<a href="&url.mancgi;?manpath=linux">Linux</a>,
+		<a href="&url.mancgi;?manpath=NetBSD">NetBSD</a>,
+		<a href="&url.mancgi;?manpath=OpenBSD">OpenBSD</a>,
+		<a href="&url.mancgi;?manpath=darwin">Darwin</a>,
+		<a href="&url.mancgi;?manpath=plan9">Plan 9</a>,
+		<a href="&url.mancgi;?manpath=sunos4">SunOS 4.X</a>,
+		<a href="&url.mancgi;?manpath=sunos5">SunOS 5.X</a>,
+		<a href="&url.mancgi;?manpath=ultrix">ULTRIX 4.2</a>,
+		and <a
+		  href="&url.mancgi;?manpath=XFree86">XFree86</a>.
+	      </dd>
+    </dl>
+
+&footer;
+
+</body>
 </html>
\ No newline at end of file
diff --git a/en/docs/webresources.sgml b/en/docs/webresources.sgml
index d989b99ef5..ab7f055cab 100644
--- a/en/docs/webresources.sgml
+++ b/en/docs/webresources.sgml
@@ -1,106 +1,106 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/docs/webresources.sgml,v 1.40 2004/12/08 23:17:18 brueffer Exp $">
-<!ENTITY title "Web Resources">
-<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-]>
-
-<html>
-&header;
-
-	    <h2>Links</h2>
-
-	    <ul>
-	      <li>
-		<p>The
-		  <a href="http://dmoz.org/Computers/Software/Operating_Systems/Unix/BSD/FreeBSD/">Open
-		    Directory Project</a> offers an excellent selection of links for
-		  FreeBSD, including a list of
-		  <a href="http://dmoz.org/Computers/Software/Operating_Systems/Unix/BSD/FreeBSD/Prominent_Users/">prominent
-		    users</a> which can be helpful for marketing purposes.</p></li>
-	    </ul>
-
-	    <h2>In the real world...</h2>
-
-	    <h3><a name="press" href="../news/press.html">FreeBSD in the Press</a></h3>
-
-	    <p>Articles in the press about FreeBSD.</p>
-
-	    <h2>Newsgroups</h2>
-
-	    <p>The following newsgroups contain discussion pertinent to
-	      FreeBSD users:</p>
-
-	      <ul>
-	        <li>
-	          <p><a
-	            href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>
-	            (moderated)</p>
-	        </li>
-
-	        <li>
-	          <p><a
-	          href="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</a></p>
-	        </li>
-
-	        <li>
-	          <p><a
-	          href="news:comp.unix.bsd.misc">comp.unix.bsd.misc</a></p>
-	        </li>
-	      </ul>
-
-	    <h2>Additional resources</h2>
-
-	    <h3><a href="../y2kbug.html">Year 2000 Compatibility</a></h3>
-
-	    <p>The FreeBSD project's current statement about its Year 2000
-	      compatibility.</p>
-
-	    <h3><a href="http://minnie.tuhs.org/FreeBSD-srctree/FreeBSD.html">The
-		Source Code</a></h3>
-
-	    <p>If you like digging your fingers into source code, here is a hypertext
-	      version of the FreeBSD <em>kernel</em> source.  This is brought to you
-	      courtesy of <a href="http://minnie.tuhs.org/warren.html">Warren
-		Toomey</a>.</p>
-
-	    <h3><a href="http://www.daemonnews.org/">Daemon News</a></h3>
-
-	    <p>The industry leader in BSD news.</p>
-
-	    <p>Like FreeBSD itself, this documentation is the product of a volunteer
-	      effort.  The goals of the project are outlined here, as are the
-	      procedures for submitting corrections and new material.</p>
-
-	    <h3><a name="diary" href="http://www.freebsddiary.org/">The FreeBSD
-	      Diary</a></h3>
-
-	    <p>The FreeBSD Diary is a collection of how-to entries aimed at UNIX
-	      novices.  The aim is to provide a set of step-by-step guides to
-	      installing and configuring various ports.</p>
-
-	    <h3><a href="http://www.OnLamp.com/bsd/">The O'Reilly Network BSD
-	      Dev Center</a></h3>
-
-	    <p>The BSD Dev Center includes two regular columns on FreeBSD,
-      featuring tips and tutorials.</p>
-
-	<h2>Other documentation</h2>
-
-    <p><a href="http://docs.FreeBSD.org/44doc/">4.4BSD Documents</a>: This is a
-      hypertext version of the 4.4BSD documents from
-      <a href="file://localhost/usr/share/doc">/usr/share/doc</a>, where you will find the
-      documents on a FreeBSD machine (if you install the doc
-      distribution).</p>
-
-    <p><a href="http://docs.FreeBSD.org/info/">Info Documents</a>: This is a
-      hypertext version of the Info documents from
-      <a href="file://localhost/usr/share/info">/usr/share/info</a>, where you will find
-      the Info documents on a FreeBSD machine (if you install the info
-      distribution).</p>
-
-&footer;
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!ENTITY base CDATA "..">
+<!ENTITY date "$FreeBSD: www/en/docs/webresources.sgml,v 1.1 2005/10/04 05:52:15 murray Exp $">
+<!ENTITY title "Web Resources">
+<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
+<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+]>
+
+<html>
+&header;
+
+	    <h2>Links</h2>
+
+	    <ul>
+	      <li>
+		<p>The
+		  <a href="http://dmoz.org/Computers/Software/Operating_Systems/Unix/BSD/FreeBSD/">Open
+		    Directory Project</a> offers an excellent selection of links for
+		  FreeBSD, including a list of
+		  <a href="http://dmoz.org/Computers/Software/Operating_Systems/Unix/BSD/FreeBSD/Prominent_Users/">prominent
+		    users</a> which can be helpful for marketing purposes.</p></li>
+	    </ul>
+
+	    <h2>In the real world...</h2>
+
+	    <h3><a name="press" href="../news/press.html">FreeBSD in the Press</a></h3>
+
+	    <p>Articles in the press about FreeBSD.</p>
+
+	    <h2>Newsgroups</h2>
+
+	    <p>The following newsgroups contain discussion pertinent to
+	      FreeBSD users:</p>
+
+	      <ul>
+	        <li>
+	          <p><a
+	            href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>
+	            (moderated)</p>
+	        </li>
+
+	        <li>
+	          <p><a
+	          href="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</a></p>
+	        </li>
+
+	        <li>
+	          <p><a
+	          href="news:comp.unix.bsd.misc">comp.unix.bsd.misc</a></p>
+	        </li>
+	      </ul>
+
+	    <h2>Additional resources</h2>
+
+	    <h3><a href="../y2kbug.html">Year 2000 Compatibility</a></h3>
+
+	    <p>The FreeBSD project's current statement about its Year 2000
+	      compatibility.</p>
+
+	    <h3><a href="http://minnie.tuhs.org/FreeBSD-srctree/FreeBSD.html">The
+		Source Code</a></h3>
+
+	    <p>If you like digging your fingers into source code, here is a hypertext
+	      version of the FreeBSD <em>kernel</em> source.  This is brought to you
+	      courtesy of <a href="http://minnie.tuhs.org/warren.html">Warren
+		Toomey</a>.</p>
+
+	    <h3><a href="http://www.daemonnews.org/">Daemon News</a></h3>
+
+	    <p>The industry leader in BSD news.</p>
+
+	    <p>Like FreeBSD itself, this documentation is the product of a volunteer
+	      effort.  The goals of the project are outlined here, as are the
+	      procedures for submitting corrections and new material.</p>
+
+	    <h3><a name="diary" href="http://www.freebsddiary.org/">The FreeBSD
+	      Diary</a></h3>
+
+	    <p>The FreeBSD Diary is a collection of how-to entries aimed at UNIX
+	      novices.  The aim is to provide a set of step-by-step guides to
+	      installing and configuring various ports.</p>
+
+	    <h3><a href="http://www.OnLamp.com/bsd/">The O'Reilly Network BSD
+	      Dev Center</a></h3>
+
+	    <p>The BSD Dev Center includes two regular columns on FreeBSD,
+      featuring tips and tutorials.</p>
+
+	<h2>Other documentation</h2>
+
+    <p><a href="http://docs.FreeBSD.org/44doc/">4.4BSD Documents</a>: This is a
+      hypertext version of the 4.4BSD documents from
+      <a href="file://localhost/usr/share/doc">/usr/share/doc</a>, where you will find the
+      documents on a FreeBSD machine (if you install the doc
+      distribution).</p>
+
+    <p><a href="http://docs.FreeBSD.org/info/">Info Documents</a>: This is a
+      hypertext version of the Info documents from
+      <a href="file://localhost/usr/share/info">/usr/share/info</a>, where you will find
+      the Info documents on a FreeBSD machine (if you install the info
+      distribution).</p>
+
+&footer;
+
+</body>
 </html>
\ No newline at end of file
diff --git a/en/includes.navabout.sgml b/en/includes.navabout.sgml
index 1abbd3f30a..357cf648be 100644
--- a/en/includes.navabout.sgml
+++ b/en/includes.navabout.sgml
@@ -1,26 +1,26 @@
-<!-- $FreeBSD: www/en/includes.navabout.sgml,v 1.62 2003/10/11 18:51:26 hrs Exp $ -->
-
-<!--
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below.
-
-  When making a  link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navabout.sgml">
-%includes.nav;
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
+<!-- $FreeBSD: www/en/includes.navabout.sgml,v 1.1 2005/10/04 07:35:59 murray Exp $ -->
+
+<!--
+  Base is the absolute URL for the given page, minus the actual page
+  part.  It should either be specified as a fully qualified URL, or
+  relative to the server root.  It should be defined in the prolog
+  <em>before</em> including this file if the page does not live at the
+  default location below.
+
+  When making a  link, use <a href="&base;/mypage.html">foo</a> and
+  &base; will be expanded appropriately.  Base is also used in the
+  definition of standard boilerplate entities in this file, so be sure
+  base is correct!
+-->
+
+<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navabout.sgml">
+%includes.nav;
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
 -->
\ No newline at end of file
diff --git a/en/includes.navcommunity.sgml b/en/includes.navcommunity.sgml
index d376dc934c..aaf825a705 100644
--- a/en/includes.navcommunity.sgml
+++ b/en/includes.navcommunity.sgml
@@ -1,26 +1,26 @@
-<!-- $FreeBSD: www/en/includes.navcommunity.sgml,v 1.62 2003/10/11 18:51:26 hrs Exp $ -->
-
-<!--
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below.
-
-  When making a  link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navcommunity.sgml">
-%includes.nav;
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
+<!-- $FreeBSD: www/en/includes.navcommunity.sgml,v 1.1 2005/10/04 07:35:59 murray Exp $ -->
+
+<!--
+  Base is the absolute URL for the given page, minus the actual page
+  part.  It should either be specified as a fully qualified URL, or
+  relative to the server root.  It should be defined in the prolog
+  <em>before</em> including this file if the page does not live at the
+  default location below.
+
+  When making a  link, use <a href="&base;/mypage.html">foo</a> and
+  &base; will be expanded appropriately.  Base is also used in the
+  definition of standard boilerplate entities in this file, so be sure
+  base is correct!
+-->
+
+<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navcommunity.sgml">
+%includes.nav;
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
 -->
\ No newline at end of file
diff --git a/en/includes.navdevelopers.sgml b/en/includes.navdevelopers.sgml
index 8511ac0535..92b2e1c8fc 100644
--- a/en/includes.navdevelopers.sgml
+++ b/en/includes.navdevelopers.sgml
@@ -1,26 +1,26 @@
-<!-- $FreeBSD: www/en/includes.navdevelopers.sgml,v 1.62 2003/10/11 18:51:26 hrs Exp $ -->
-
-<!--
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below.
-
-  When making a  link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navdevelopers.sgml">
-%includes.nav;
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
+<!-- $FreeBSD: www/en/includes.navdevelopers.sgml,v 1.1 2005/10/04 07:35:59 murray Exp $ -->
+
+<!--
+  Base is the absolute URL for the given page, minus the actual page
+  part.  It should either be specified as a fully qualified URL, or
+  relative to the server root.  It should be defined in the prolog
+  <em>before</em> including this file if the page does not live at the
+  default location below.
+
+  When making a  link, use <a href="&base;/mypage.html">foo</a> and
+  &base; will be expanded appropriately.  Base is also used in the
+  definition of standard boilerplate entities in this file, so be sure
+  base is correct!
+-->
+
+<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navdevelopers.sgml">
+%includes.nav;
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
 -->
\ No newline at end of file
diff --git a/en/includes.navdocs.sgml b/en/includes.navdocs.sgml
index d802cb0851..9f2c055c7c 100644
--- a/en/includes.navdocs.sgml
+++ b/en/includes.navdocs.sgml
@@ -1,26 +1,26 @@
-<!-- $FreeBSD: www/en/includes.navdocs.sgml,v 1.62 2003/10/11 18:51:26 hrs Exp $ -->
-
-<!--
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below.
-
-  When making a  link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navdocs.sgml">
-%includes.nav;
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
+<!-- $FreeBSD: www/en/includes.navdocs.sgml,v 1.1 2005/10/04 07:35:59 murray Exp $ -->
+
+<!--
+  Base is the absolute URL for the given page, minus the actual page
+  part.  It should either be specified as a fully qualified URL, or
+  relative to the server root.  It should be defined in the prolog
+  <em>before</em> including this file if the page does not live at the
+  default location below.
+
+  When making a  link, use <a href="&base;/mypage.html">foo</a> and
+  &base; will be expanded appropriately.  Base is also used in the
+  definition of standard boilerplate entities in this file, so be sure
+  base is correct!
+-->
+
+<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navdocs.sgml">
+%includes.nav;
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
 -->
\ No newline at end of file
diff --git a/en/includes.navdownload.sgml b/en/includes.navdownload.sgml
index 82397d8ce6..9242e3b8d8 100644
--- a/en/includes.navdownload.sgml
+++ b/en/includes.navdownload.sgml
@@ -1,26 +1,26 @@
-<!-- $FreeBSD: www/en/includes.navdownload.sgml,v 1.62 2003/10/11 18:51:26 hrs Exp $ -->
-
-<!--
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below.
-
-  When making a  link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navdownload.sgml">
-%includes.nav;
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
+<!-- $FreeBSD: www/en/includes.navdownload.sgml,v 1.1 2005/10/04 07:35:59 murray Exp $ -->
+
+<!--
+  Base is the absolute URL for the given page, minus the actual page
+  part.  It should either be specified as a fully qualified URL, or
+  relative to the server root.  It should be defined in the prolog
+  <em>before</em> including this file if the page does not live at the
+  default location below.
+
+  When making a  link, use <a href="&base;/mypage.html">foo</a> and
+  &base; will be expanded appropriately.  Base is also used in the
+  definition of standard boilerplate entities in this file, so be sure
+  base is correct!
+-->
+
+<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navdownload.sgml">
+%includes.nav;
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
 -->
\ No newline at end of file
diff --git a/en/includes.navsupport.sgml b/en/includes.navsupport.sgml
index 4074ba7db3..43670a8f0c 100644
--- a/en/includes.navsupport.sgml
+++ b/en/includes.navsupport.sgml
@@ -1,26 +1,26 @@
-<!-- $FreeBSD: www/en/includes.navsupport.sgml,v 1.62 2003/10/11 18:51:26 hrs Exp $ -->
-
-<!--
-  Base is the absolute URL for the given page, minus the actual page
-  part.  It should either be specified as a fully qualified URL, or
-  relative to the server root.  It should be defined in the prolog
-  <em>before</em> including this file if the page does not live at the
-  default location below.
-
-  When making a  link, use <a href="&base;/mypage.html">foo</a> and
-  &base; will be expanded appropriately.  Base is also used in the
-  definition of standard boilerplate entities in this file, so be sure
-  base is correct!
--->
-
-<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navsupport.sgml">
-%includes.nav;
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
+<!-- $FreeBSD: www/en/includes.navsupport.sgml,v 1.1 2005/10/04 07:35:59 murray Exp $ -->
+
+<!--
+  Base is the absolute URL for the given page, minus the actual page
+  part.  It should either be specified as a fully qualified URL, or
+  relative to the server root.  It should be defined in the prolog
+  <em>before</em> including this file if the page does not live at the
+  default location below.
+
+  When making a  link, use <a href="&base;/mypage.html">foo</a> and
+  &base; will be expanded appropriately.  Base is also used in the
+  definition of standard boilerplate entities in this file, so be sure
+  base is correct!
+-->
+
+<!ENTITY % includes.nav SYSTEM "../share/sgml/includes.navsupport.sgml">
+%includes.nav;
+
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
 -->
\ No newline at end of file
diff --git a/en/support/bugreports.sgml b/en/support/bugreports.sgml
index 0bd4d7f6d9..600e5d3d4a 100644
--- a/en/support/bugreports.sgml
+++ b/en/support/bugreports.sgml
@@ -1,67 +1,67 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/support/bugreports.sgml,v 1.40 2004/12/08 23:17:18 brueffer Exp $">
-<!ENTITY title "Bug Reports">
-<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
-<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-]>
-
-<html>
-&header;
-
-	<h2>Problem Report Database</h2>
-
-	    <p>Current FreeBSD problem reports are tracked using the <a
-	      href="http://www.gnu.org/software/gnats/">GNATS</a>
-	      database.</p>
-
-	    <p>A FreeBSD problem report (PR) is not necessarily a bug with FreeBSD
-	      itself.  In some cases it may be reporting a mistake in the
-	      documentation (which could be a simple typo).  In other cases it may
-	      be a 'wishlist' item that the submitter would like to see incorporated
-	      in to FreeBSD.  In many cases a PR contains a port which has been
-	      prepared for inclusion in the FreeBSD
-	      <a href="&base;/ports/index.html">Ports and Packages</a> collection.</p>
-
-	    <p>Problem reports start 'open', and are closed as the issue they report
-	      is resolved.  In addition, each PR is assigned a unique tracking ID
-	      to ensure that it is not lost.  Many FreeBSD changes include the
-	      tracking ID of the PR that prompted the change.</p>
-
-	    <ul>
-	      <li><a href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">View the
-		  open problem reports</a>.</li>
-
-	      <li><a href="http://www.FreeBSD.org/cgi/query-pr.cgi">View a problem
-		  report by tracker id</a>.</li>
-
-	      <li><a
-		  href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">Search
-		  problem reports</a>.</li>
-
-	      <li><a href="&base;/send-pr.html">Submit a Problem Report</a>.</li>
-	      <li><a href="&base;/prstats/index.html">View PR Statistics</a>.</li>
-	    </ul>
-
-	    <p>Problem reports may also be submitted to the development team using the
-	      <a href="&base;/send-pr.html">send-pr(1)</a> command on a FreeBSD system,
-	      or by sending an email message to <a
-		href="mailto:freebsd-bugs@FreeBSD.org">freebsd-bugs@FreeBSD.org</a>.
-	      Please note that <a href="&base;/send-pr.html">send-pr</a> is preferred
-	      since messages sent to the mailing list are <em>not</em> tracked as
-	      official problem reports, and may get lost in the noise!</p>
-
-	    <p>Before submitting a problem report, you might find it useful to
-	      read the <a
-	      href="&base;/doc/en_US.ISO8859-1/articles/problem-reports/">Writing
-	      FreeBSD Problem Reports</a> article.  This article describes
-	      when you should submit a problem report, what you are expected
-	      to include in one, and what the best way to submit your problem
-	      report is.  Some useful background information is also contained
-	      in the <a href="&base;/doc/en_US.ISO8859-1/articles/pr-guidelines/">Problem
-      Report Handling Guidelines</a> article.</p>
-
-&footer;
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!ENTITY base CDATA "..">
+<!ENTITY date "$FreeBSD: www/en/support/bugreports.sgml,v 1.1 2005/10/04 05:52:16 murray Exp $">
+<!ENTITY title "Bug Reports">
+<!ENTITY % navincludes SYSTEM "../includes.navsupport.sgml"> %navincludes;
+<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
+]>
+
+<html>
+&header;
+
+	<h2>Problem Report Database</h2>
+
+	    <p>Current FreeBSD problem reports are tracked using the <a
+	      href="http://www.gnu.org/software/gnats/">GNATS</a>
+	      database.</p>
+
+	    <p>A FreeBSD problem report (PR) is not necessarily a bug with FreeBSD
+	      itself.  In some cases it may be reporting a mistake in the
+	      documentation (which could be a simple typo).  In other cases it may
+	      be a 'wishlist' item that the submitter would like to see incorporated
+	      in to FreeBSD.  In many cases a PR contains a port which has been
+	      prepared for inclusion in the FreeBSD
+	      <a href="&base;/ports/index.html">Ports and Packages</a> collection.</p>
+
+	    <p>Problem reports start 'open', and are closed as the issue they report
+	      is resolved.  In addition, each PR is assigned a unique tracking ID
+	      to ensure that it is not lost.  Many FreeBSD changes include the
+	      tracking ID of the PR that prompted the change.</p>
+
+	    <ul>
+	      <li><a href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">View the
+		  open problem reports</a>.</li>
+
+	      <li><a href="http://www.FreeBSD.org/cgi/query-pr.cgi">View a problem
+		  report by tracker id</a>.</li>
+
+	      <li><a
+		  href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">Search
+		  problem reports</a>.</li>
+
+	      <li><a href="&base;/send-pr.html">Submit a Problem Report</a>.</li>
+	      <li><a href="&base;/prstats/index.html">View PR Statistics</a>.</li>
+	    </ul>
+
+	    <p>Problem reports may also be submitted to the development team using the
+	      <a href="&base;/send-pr.html">send-pr(1)</a> command on a FreeBSD system,
+	      or by sending an email message to <a
+		href="mailto:freebsd-bugs@FreeBSD.org">freebsd-bugs@FreeBSD.org</a>.
+	      Please note that <a href="&base;/send-pr.html">send-pr</a> is preferred
+	      since messages sent to the mailing list are <em>not</em> tracked as
+	      official problem reports, and may get lost in the noise!</p>
+
+	    <p>Before submitting a problem report, you might find it useful to
+	      read the <a
+	      href="&base;/doc/en_US.ISO8859-1/articles/problem-reports/">Writing
+	      FreeBSD Problem Reports</a> article.  This article describes
+	      when you should submit a problem report, what you are expected
+	      to include in one, and what the best way to submit your problem
+	      report is.  Some useful background information is also contained
+	      in the <a href="&base;/doc/en_US.ISO8859-1/articles/pr-guidelines/">Problem
+      Report Handling Guidelines</a> article.</p>
+
+&footer;
+
+</body>
 </html>
\ No newline at end of file