diff --git a/en/search/site.map b/en/search/site.map
index 79b5336b57..054a388d92 100644
--- a/en/search/site.map
+++ b/en/search/site.map
@@ -6,7 +6,20 @@
 # Format: <url> | <description>
 # An empty url begin a new section
 #
-# $FreeBSD: www/en/search/site.map,v 1.27 2007/02/12 20:50:30 joel Exp $
+# $FreeBSD: www/en/search/site.map,v 1.28 2007/02/22 20:07:22 gabor Exp $
+# 
+# NOTE: the entries in the main sections should be the same as the entries
+# in the navibar on the frontpage and should be listed in the same
+# order. Entries in deeper levels of the hierarchy of our website
+# (e.g. Platforms) should be added into the submenu section listed
+# alphabetically. Please always respect these guidelines to keep this file
+# easy to maintain.
+#
+
+
+#
+#		Main section
+#
 
 |About
 &base;/features.html|Features
@@ -26,6 +39,18 @@
 &base;/snapshots/index.html|Snapshot Releases
 &base;/ports/index.html|Ported Applications
 
+|Documentation
+&base;/docs/books.html|Books
+&base;/doc/en_US.ISO8859-1/books/handbook/index.html|Handbook
+&base;/doc/en_US.ISO8859-1/books/faq/index.html|FAQ
+&base;/docs/books.html#ARTICLES|Articles
+&base;/docs/man.html|Manual Pages
+http://docs.freebsd.org/|Other Documentation
+&base;/publish.html|Publications
+&base;/docproj/translations.html|Translations
+&base;/doc/en_US.ISO8859-1/books/handbook/bibliography.html|Bibliography
+&base;/y2kbug.html|Year2000
+
 |Community
 &base;/community/mailinglists.html|Mailing Lists
 &base;/community/irc.html|IRC
@@ -48,16 +73,20 @@
 &base;/support/bugreports.html|Bug Reports
 &base;/support/webresources.html|Web Resources
 
-|Projects
-&base;/projects/acpi/index.html|ACPI
-&base;/projects/bigdisk/index.html|Bigdisk
-&base;/projects/busdma/index.html|Busdma and SMPng driver conversion
-&base;/projects/c99/index.html|C99 &amp; POSIX&reg; Conformance
-&base;/projects/cvsweb.html|CVSweb
-&base;/projects/gnats4/index.html|FreeBSD GNATS Upgrade
-&base;/projects/ideas/index.html|FreeBSD Project Ideas
-&base;/projects/mips/index.html|FreeBSD/MIPS
-&base;/projects/netperf/index.html|Network Performance (netperf)
+|Foundation
+http://www.freebsdfoundation.org/|The FreeBSD Foundation
+
+
+#
+#		Submenu section
+#
+
+|News
+&base;/news/newsflash.html|Newsflash
+&base;/news/pressreleases.html|Official Press Releases
+&base;/news/press.html|FreeBSD in the press
+&base;/events/events.html|Events
+&base;/news/status/status.html|Status Reports
 
 |Platforms
 &base;/platforms/alpha.html|FreeBSD/alpha
@@ -72,21 +101,13 @@
 &base;/platforms/sun4v.html|FreeBSD/sunv4
 &base;/platforms/xbox.html|FreeBSD/xbox
 
-|News
-&base;/news/newsflash.html|Newsflash
-&base;/news/pressreleases.html|Official Press Releases
-&base;/news/press.html|FreeBSD in the press
-&base;/events/events.html|Events
-&base;/news/status/status.html|Status Reports
-
-|Documentation
-&base;/docs/books.html|Books
-&base;/doc/en_US.ISO8859-1/books/handbook/index.html|Handbook
-&base;/doc/en_US.ISO8859-1/books/faq/index.html|FAQ
-&base;/docs/books.html#ARTICLES|Articles
-&base;/docs/man.html|Manual Pages
-http://docs.freebsd.org/|Other Documentation
-&base;/publish.html|Publications
-&base;/docproj/translations.html|Translations
-&base;/doc/en_US.ISO8859-1/books/handbook/bibliography.html|Bibliography
-&base;/y2kbug.html|Year2000
+|Projects
+&base;/projects/acpi/index.html|ACPI
+&base;/projects/bigdisk/index.html|Bigdisk
+&base;/projects/busdma/index.html|Busdma and SMPng driver conversion
+&base;/projects/c99/index.html|C99 &amp; POSIX&reg; Conformance
+&base;/projects/cvsweb.html|CVSweb
+&base;/projects/gnats4/index.html|FreeBSD GNATS Upgrade
+&base;/projects/ideas/index.html|FreeBSD Project Ideas
+&base;/projects/mips/index.html|FreeBSD/MIPS
+&base;/projects/netperf/index.html|Network Performance (netperf)
diff --git a/en/search/web.atoz b/en/search/web.atoz
index 9182a7a7e8..713b671e6a 100644
--- a/en/search/web.atoz
+++ b/en/search/web.atoz
@@ -4,34 +4,20 @@
 # With the format `<title>|<url>'. 
 # Empty lines or comments are ignored. 
 #
-# $FreeBSD: www/en/search/web.atoz,v 1.86 2006/10/08 10:56:56 ceri Exp $
+# $FreeBSD: www/en/search/web.atoz,v 1.87 2007/02/22 20:07:22 gabor Exp $
+#
+# NOTE: the entries should be sorted alphabetically by their relative
+# path to www/en. E.g. docs/man.sgml comes after docs/books.sgml,
+# which comes before send-pr.sgml. Entries that does not belong strictly
+# to our repository (e.g. docs on docs.FreeBSD.org) should be put into
+# the misc section after the www/en section. Please always respect these
+# guidelines to keep this file easy to maintain.
+#
 
-# &base;/ru/index.htmlplatforms/alpha.sgml
-Alpha|&base;/platforms/alpha.html
-Compaq Alpha|&base;/platforms/alpha.html
-DEC Alpha|&base;/platforms/alpha.html
-DIGITAL Alpha|&base;/platforms/alpha.html
-FreeBSD/alpha|&base;/platforms/alpha.html
-HP Alpha|&base;/platforms/alpha.html
 
-# platforms/amd64.sgml
-AMD64|&base;/platforms/amd64.html
-Athlon64|&base;/platforms/amd64.html
-FreeBSD/amd64|&base;/platforms/amd64.html
-Opteron|&base;/platforms/amd64.html
-x86-64|&base;/platforms/amd64.html
-
-# internal/about.sgml
-Usage statistics for this server|&base;/internal/about.html
-Statistics for this server|&base;/internal/about.html
-WWW statistics for this server|&base;/internal/about.html
-Fieber, John|&base;/internal/about.html
-Apache http server|&base;/internal/about.html
-http server|&base;/internal/about.html
-WWW server www.FreeBSD.org|&base;/internal/about.html
-hub.FreeBSD.org|&base;/internal/about.html
-BSDi, network connection|&base;/internal/about.html
-Network connection, BSDi|&base;/internal/about.html
+#
+#		www/en section
+#
 
 # applications.sgml
 Applications|&base;/applications.html
@@ -50,22 +36,6 @@ Education and research|&base;/applications.html
 FreeBSD Art|&base;/art.html
 Art, FreeBSD|&base;/art.html
 
-# internal/bylaws.sgml
-Core Bylaws|&base;/internal/bylaws.html
-Bylaws, Core|&base;/internal/bylaws.html
-
-# projects/busdma/index.sgml
-busdma and SMPng driver conversion project|&base;/projects/busdma/index.html
-SMPng driver conversion|&base;/projects/busdma/index.html
-
-# projects/c99/index.sgml
-C99 & POSIX Conformance Project|&base;/projects/c99/index.html
-POSIX Conformance|&base;/projects/c99/index.html
-
-# releng/charter.sgml
-Charter, Release Engineering Team|&base;/releng/charter.html
-Release Engineering Team Charter|&base;/releng/charter.html
-
 # commercial/commercial.sgml
 Commercial Vendors|&base;/commercial/commercial.html
 Vendors, commercial|&base;/commercial/commercial.html
@@ -78,137 +48,7 @@ Software, Commercial Vendors|&base;/commercial/software.html
 Commercial Vendors, Miscellaneous|&base;/commercial/misc.html
 Miscellaneous, Commercial Vendors|&base;/commercial/misc.html
 
-# developers/cvs.html
-CVS Repository|&base;/developers/cvs.html
-CTM|&base;/developers/cvs.html
-CVSup|&base;/developers/cvs.html
-anoncvs|&base;/developers/cvs.html
-
-# donations/index.sgml
-Charter, Donations Liaison|&base;/donations/index.html#charter
-Donations Liaison Charter|&base;/donations/index.html#charter
-Donations|&base;/donations/index.html
-
-# daemon.sgml
-BSD Daemon|&base;/copyright/daemon.html
-Daemon, BSD|&base;/copyright/daemon.html
-Nemeth, Evi|&base;/copyright/daemon.html 
-Lassiter, John|&base;/copyright/daemon.html
-Hosokawa, Tatsumi|&base;/copyright/daemon.html 
-McKusick, Marshall Kirk|&base;/copyright/daemon.html 
-
-# internal/doceng.sgml
-Charter, Doceng Team|&base;/internal/doceng.html
-Doceng Team Charter|&base;/internal/doceng.html
-Documentation Project, doceng|&base;/internal/doceng.html
-
-# docproj.sgml
-Documentation Project|&base;/docproj/docproj.html
-Project, Documentation|&base;/docproj/docproj.html
-Goals, documentation|&base;/docproj/docproj.html
-FAQ, Documentation Project|&base;/docproj/docproj.html
-Handbook, Documentation Project|&base;/docproj/docproj.html
-Contributing, Documentation Project|&base;/docproj/docproj.html
-Submitting corrections, Documentation Project|&base;/docproj/docproj.html
-Submitting new material, Documentation Project|&base;/docproj/docproj.html
-SGML, Documentation Project|&base;/docproj/docproj.html
-Linuxdoc, Documentation Project|&base;/docproj/docproj.html
-Docbook, Documentation Project|&base;/docproj/docproj.html
-Guidelines, Documentation Project|&base;/docproj/docproj.html
-
-# doc/*
-Japanese Handbook|&base;/doc/ja_JP.eucJP/books/handbook/index.html
-Handbook, Japanese|&base;/doc/ja_JP.eucJP/books/handbook/index.html
-Frequently Asked Questions (FAQ)|&base;/doc/en_US.ISO8859-1/books/faq/index.html
-FAQ|&base;/doc/en_US.ISO8859-1/books/faq/index.html
-
-# docs.sgml
-Documentation|&base;/docs.html
-Handbook|&base;/docs.html
-4.4BSD Documents|http://docs.freebsd.org/44doc/
-BSD Documents|http://docs.freebsd.org/44doc/
-Documents, 4.4BSD|http://docs.freebsd.org/44doc/
-Info Documents|http://docs.freebsd.org/info/
-GNU Info Documents|http://docs.freebsd.org/info/
-Source Code|http://fxr.watson.org/
-
-# docs/books.sgml
-Books|&base;/docs/books.html
-
-# docs/man.sgml
-Manual Pages|&base;/docs/man.html
-
-# events/events.xsl
-Events|&base;/events/events.html
-Past Events|&base;/events/events.html#past
-Upcoming Events|&base;/events/events.html#upcoming
-
-# features.sgml
-Features|&base;/features.html
-4.4BSD, A complete operating system|&base;/features.html
-Berkeley, University of California|&base;/features.html
-UCB|&base;/features.html
-Computer Systems Research Group|&base;/features.html
-CSRG|&base;/features.html
-Merged virtual memory and filesystem buffer cache|&base;/features.html
-virtual memory|&base;/features.html
-buffer cache|&base;/features.html
-Compatibility, SCO|&base;/features.html
-Compatibility, Linux|&base;/features.html
-Compatibility, NetBSD|&base;/features.html
-Compatibility, BSDI|&base;/features.html
-SCO, Compatibility|&base;/features.html
-Linux, Compatibility|&base;/features.html
-NetBSD, Compatibility|&base;/features.html
-BSDI, Compatibility|&base;/features.html
-
-# platforms/ia64/index.sgml
-FreeBSD/ia64|&base;/platforms/ia64/index.html
-IA-64|&base;/platforms/ia64/index.html
-Itanium|&base;/platforms/ia64/index.html
-
-# internet.sgml
-Internet|&base;/internet.html
-TCP/IP protocols|&base;/internet.html
-NFS|&base;/internet.html
-NIS|&base;/internet.html
-SNMP|&base;/internet.html
-FTP|&base;/internet.html
-DNS/BIND|&base;/internet.html
-SLIP|&base;/internet.html
-MBONE|&base;/internet.html
-SAMBA|&base;/internet.html
-PCNFS|&base;/internet.html
-Appletalk|&base;/internet.html
-Novell|&base;/internet.html
-TCP extensions|&base;/internet.html
-RFC-1323|&base;/internet.html
-RFC-1644|&base;/internet.html
-networking|&base;/internet.html
-FTP Server ftp.FreeBSD.org, configuration|&base;/internet.html
-Yahoo|&base;/internet.html
-High performance and security|&base;/internet.html
-Encryption software|&base;/internet.html
-secure shells|&base;/internet.html
-Kerberos|&base;/internet.html
-end-to-end encryption|&base;/internet.html
-secure RPC facilities|&base;/internet.html
-O'Brien, Michael|&base;/internet.html
-SunExpert|&base;/internet.html
-
-# kse/index.sgml
-KSE|&base;/kse/index.html
-Threads, KSE|&base;/kse/index.html
-POSIX threads|&base;/kse/index.html
-
-# license.sgml
-Copyright|&base;/copyright/license.html
-License|&base;/copyright/license.html
-
-# http://logo-contest.FreeBSD.org/
-Logo design competition|http://logo-contest.FreeBSD.org/
-
-# community/mailinglists.html
+# community/mailinglists.sgml
 Mailing lists|&base;/community/mailinglists.html
 non-English mailing lists|&base;/community/mailinglists.html
 Mailing lists, Brazilian Portuguese|&base;/community/mailinglists.html
@@ -256,48 +96,250 @@ Spanish mailing lists|&base;/community/mailinglists.html
 Swedish mailing lists|&base;/community/mailinglists.html
 Turkish mailing lists|&base;/community/mailinglists.html
 
+# community/newsgroups.sgml
+Newsgroups|&base;/community/newsgroups.html
+
+# community/webresources.sgml
+Web Resources, mirrors|&base;/community/webresources.html
+
+# copyright/daemon.sgml
+BSD Daemon|&base;/copyright/daemon.html
+Daemon, BSD|&base;/copyright/daemon.html
+Nemeth, Evi|&base;/copyright/daemon.html
+Lassiter, John|&base;/copyright/daemon.html
+Hosokawa, Tatsumi|&base;/copyright/daemon.html
+McKusick, Marshall Kirk|&base;/copyright/daemon.html
+
+# copyright/license.sgml
+Copyright|&base;/copyright/license.html
+License|&base;/copyright/license.html
+
+# copyright/trademarks.sgml
+Trademark legend|&base;/copyright/trademarks.html
+
+# developers/cvs.sgml
+CVS Repository|&base;/developers/cvs.html
+CTM|&base;/developers/cvs.html
+CVSup|&base;/developers/cvs.html
+anoncvs|&base;/developers/cvs.html
+
+# doc/*
+Japanese Handbook|&base;/doc/ja_JP.eucJP/books/handbook/index.html
+Handbook, Japanese|&base;/doc/ja_JP.eucJP/books/handbook/index.html
+Frequently Asked Questions (FAQ)|&base;/doc/en_US.ISO8859-1/books/faq/index.html
+FAQ|&base;/doc/en_US.ISO8859-1/books/faq/index.html
+
+# docproj.sgml
+Documentation Project|&base;/docproj/docproj.html
+Project, Documentation|&base;/docproj/docproj.html
+Goals, documentation|&base;/docproj/docproj.html
+FAQ, Documentation Project|&base;/docproj/docproj.html
+Handbook, Documentation Project|&base;/docproj/docproj.html
+Contributing, Documentation Project|&base;/docproj/docproj.html
+Submitting corrections, Documentation Project|&base;/docproj/docproj.html
+Submitting new material, Documentation Project|&base;/docproj/docproj.html
+SGML, Documentation Project|&base;/docproj/docproj.html
+Linuxdoc, Documentation Project|&base;/docproj/docproj.html
+Docbook, Documentation Project|&base;/docproj/docproj.html
+Guidelines, Documentation Project|&base;/docproj/docproj.html
+
+# docs.sgml
+Documentation|&base;/docs.html
+Handbook|&base;/docs.html
+
+# docs/books.sgml
+Books|&base;/docs/books.html
+
+# docs/man.sgml
+Manual Pages|&base;/docs/man.html
+
+# donations/index.sgml
+Charter, Donations Liaison|&base;/donations/index.html#charter
+Donations Liaison Charter|&base;/donations/index.html#charter
+Donations|&base;/donations/index.html
+
+# events/events.xsl
+Events|&base;/events/events.html
+Past Events|&base;/events/events.html#past
+Upcoming Events|&base;/events/events.html#upcoming
+
+# features.sgml
+Features|&base;/features.html
+4.4BSD, A complete operating system|&base;/features.html
+Berkeley, University of California|&base;/features.html
+UCB|&base;/features.html
+Computer Systems Research Group|&base;/features.html
+CSRG|&base;/features.html
+Merged virtual memory and filesystem buffer cache|&base;/features.html
+virtual memory|&base;/features.html
+buffer cache|&base;/features.html
+Compatibility, SCO|&base;/features.html
+Compatibility, Linux|&base;/features.html
+Compatibility, NetBSD|&base;/features.html
+Compatibility, BSDI|&base;/features.html
+SCO, Compatibility|&base;/features.html
+Linux, Compatibility|&base;/features.html
+NetBSD, Compatibility|&base;/features.html
+BSDI, Compatibility|&base;/features.html
+
+# internal/about.sgml
+Usage statistics for this server|&base;/internal/about.html
+Statistics for this server|&base;/internal/about.html
+WWW statistics for this server|&base;/internal/about.html
+Fieber, John|&base;/internal/about.html
+Apache http server|&base;/internal/about.html
+http server|&base;/internal/about.html
+WWW server www.FreeBSD.org|&base;/internal/about.html
+hub.FreeBSD.org|&base;/internal/about.html
+BSDi, network connection|&base;/internal/about.html
+Network connection, BSDi|&base;/internal/about.html
+
+# internal/bylaws.sgml
+Core Bylaws|&base;/internal/bylaws.html
+Bylaws, Core|&base;/internal/bylaws.html
+
+# internal/doceng.sgml
+Charter, Doceng Team|&base;/internal/doceng.html
+Doceng Team Charter|&base;/internal/doceng.html
+Documentation Project, doceng|&base;/internal/doceng.html
+
+# internal/mirror.sgml
+Mirroring the FreeBSD Web Pages|&base;/internal/mirror.html
+rsync|&base;/internal/mirror.html
+
+# internet.sgml
+Internet|&base;/internet.html
+TCP/IP protocols|&base;/internet.html
+NFS|&base;/internet.html
+NIS|&base;/internet.html
+SNMP|&base;/internet.html
+FTP|&base;/internet.html
+DNS/BIND|&base;/internet.html
+SLIP|&base;/internet.html
+MBONE|&base;/internet.html
+SAMBA|&base;/internet.html
+PCNFS|&base;/internet.html
+Appletalk|&base;/internet.html
+Novell|&base;/internet.html
+TCP extensions|&base;/internet.html
+RFC-1323|&base;/internet.html
+RFC-1644|&base;/internet.html
+networking|&base;/internet.html
+FTP Server ftp.FreeBSD.org, configuration|&base;/internet.html
+Yahoo|&base;/internet.html
+High performance and security|&base;/internet.html
+Encryption software|&base;/internet.html
+secure shells|&base;/internet.html
+Kerberos|&base;/internet.html
+end-to-end encryption|&base;/internet.html
+secure RPC facilities|&base;/internet.html
+O'Brien, Michael|&base;/internet.html
+SunExpert|&base;/internet.html
+
+# kse/index.sgml
+KSE|&base;/kse/index.html
+Threads, KSE|&base;/kse/index.html
+POSIX threads|&base;/kse/index.html
+
 # mailto.sgml
 Contact us|&base;/mailto.html
 Questions about this WWW server|&base;/mailto.html
 Questions about the contents of this WWW server|&base;/mailto.html
 Questions about FreeBSD|&base;/mailto.html
 
+# news/newsflash.sgml
+News flash|&base;/news/newsflash.html
+Press releases, News|&base;/news/newsflash.html
+#Changes at the FreeBSD Web Server|&base;/news/webchanges.html
+#Webchanges at the FreeBSD Web Server|&base;/news/webchanges.html
+
+# news/status/status.sgml
+Bi-monthly status reports|&base;/news/status/status.html
+FreeBSD Status Reports|&base;/news/status/status.html
+Status Reports|&base;/news/status/status.html
+
+# platforms/alpha.sgml
+Alpha|&base;/platforms/alpha.html
+Compaq Alpha|&base;/platforms/alpha.html
+DEC Alpha|&base;/platforms/alpha.html
+DIGITAL Alpha|&base;/platforms/alpha.html
+FreeBSD/alpha|&base;/platforms/alpha.html
+HP Alpha|&base;/platforms/alpha.html
+
+# platforms/amd64.sgml
+AMD64|&base;/platforms/amd64.html
+Athlon64|&base;/platforms/amd64.html
+FreeBSD/amd64|&base;/platforms/amd64.html
+Opteron|&base;/platforms/amd64.html
+x86-64|&base;/platforms/amd64.html
+
+# platforms/ia64/index.sgml
+FreeBSD/ia64|&base;/platforms/ia64/index.html
+IA-64|&base;/platforms/ia64/index.html
+Itanium|&base;/platforms/ia64/index.html
+
 # platforms/mips.sgml
 FreeBSD/MIPS|&base;/platforms/mips.html
 MIPS, FreeBSD|&base;/platforms/mips.html
 SGI MIPS, FreeBSD|&base;/platforms/mips.html
 
-# mirror.sgml 
-Mirroring the FreeBSD Web Pages|&base;/internal/mirror.html
-rsync|&base;/internal/mirror.html
-
-# newsflash.sgml
-News flash|&base;/news/newsflash.html
-Press releases, News|&base;/news/newsflash.html
-Daemon News|http://www.daemonnews.org/
-#Changes at the FreeBSD Web Server|&base;/news/webchanges.html
-#Webchanges at the FreeBSD Web Server|&base;/news/webchanges.html
-
-# community/newsgroups.html
-Newsgroups|&base;/community/newsgroups.html
-
 # platforms/pc98.sgml
 FreeBSD/pc98|&base;/platforms/pc98.html
 NEC PC-98x1|&base;/platforms/pc98.html
 PC-98|&base;/platforms/pc98.html
 
-# ports/index.sgml
-Ports Collection|&base;/ports/index.html
-
 # platforms/ppc.sgml
 FreeBSD/PowerPC|&base;/platforms/ppc.html
 FreeBSD/ppc|&base;/platforms/ppc.html
 PowerPC|&base;/platforms/ppc.html
 
+# platforms/sparc.sgml
+FreeBSD/sparc64|&base;/platforms/sparc.html
+Sparc64|&base;/platforms/sparc.html
+Sparc|&base;/platforms/sparc.html
+UltraSparc|&base;/platforms/sparc.html
+
+# platforms/xbox.sgml
+xbox|&base;/platforms/xbox.html
+FreeBSD/xbox|&base;/platforms/xbox.html
+
+# ports/index.sgml
+Ports Collection|&base;/ports/index.html
+
 # press.sgml
 Press, in the|&base;/news/press.html
 Press Releases, Official|&base;/news/pressreleases.html
 
+# projects/*
+Home Automation|&base;/projects/projects.html#homeauto
+Automation, Home|&base;/projects/projects.html#homeauto
+Java|&base;/java/index.html
+GNOME|&base;/gnome/index.html
+KDE|&base;/projects/projects.html#kde
+Newbies Project|&base;/projects/newbies.html
+KAME Project|&base;/projects/projects.html#kame
+IPv6/IPsec stack for BSD|&base;/projects/projects.html#kame
+Token-Ring Project|&base;/projects/projects.html#tokenring
+IPSec|&base;/projects/projects.html#kame
+vinum|&base;/projects/projects.html#vinum
+logical volume manager|&base;/projects/projects.html#vinum
+volume manager, logical|&base;/projects/projects.html#vinum
+ATM, BSD|&base;/projects/projects.html#atm
+BSD ATM|&base;/projects/projects.html#atm
+GLOBAL common source code tag system|&base;/projects/projects.html#global
+Retail Outlets for FreeBSD|&base;/doc/en_US.ISO8859-1/books/handbook/mirrors.html
+Tinderbox|&base;/projects/projects.html#tinderbox
+Laptop Compatibility List|&base;/projects/projects.html#flcl
+Project ideas|&base;/projects/ideas/index.html
+
+# projects/busdma/index.sgml
+busdma and SMPng driver conversion project|&base;/projects/busdma/index.html
+SMPng driver conversion|&base;/projects/busdma/index.html
+
+# projects/c99/index.sgml
+C99 & POSIX Conformance Project|&base;/projects/c99/index.html
+POSIX Conformance|&base;/projects/c99/index.html
+
 # publish.sgml
 Related Publications|&base;/publish.html
 Publications, Related|&base;/publish.html
@@ -366,10 +408,14 @@ Code-Freeze Status|&base;/releng/index.html#freeze
 Release Engineering Information|&base;/releng/index.html
 Upcoming Release Schedule|&base;/releng/index.html#schedule
 
+# releng/charter.sgml
+Charter, Release Engineering Team|&base;/releng/charter.html
+Release Engineering Team Charter|&base;/releng/charter.html
+
 # relnotes.sgml
 Release Documentation|&base;/relnotes.html
 
-# search.sgml
+# search/search.sgml
 Search Services|search.html
 Web pages, search|search.html#web
 Search, Web pages|search.html#web
@@ -386,7 +432,7 @@ Cross reference of the FreeBSD kernel|search.html
 XR, Cross reference of the FreeBSD kernel|search.html
 Kernel, Cross reference|search.html
 
-# searchhints.sgml
+# search/searchhints.sgml
 Searching Hints|searchhints.html
 
 # security/security.sgml
@@ -400,27 +446,65 @@ Bug report, submit|&base;/send-pr.html
 Symmetric MultiProcessing (SMP)|&base;/smp/index.html
 SMP|&base;/smp/index.html
 
-# platforms/sparc.sgml
-FreeBSD/sparc64|&base;/platforms/sparc.html
-Sparc64|&base;/platforms/sparc.html
-Sparc|&base;/platforms/sparc.html
-UltraSparc|&base;/platforms/sparc.html
-
-# news/status/status.sgml
-Bi-monthly status reports|&base;/news/status/status.html
-FreeBSD Status Reports|&base;/news/status/status.html
-Status Reports|&base;/news/status/status.html
-
 # support.sgml 
 Support|&base;/support.html 
 
-# support/bugreports.html
+# support/bugreports.sgml
 GNATS Problem Report Database|&base;/support/bugreports.html
 Bug reports, view|&base;/support/bugreports.html
 Bug reports, search|&base;/support/bugreports.html
 
-# copyright/trademarks.sgml
-Trademark legend|&base;/copyright/trademarks.html
+# support/webresources.sgml
+General UNIX Information|&base;/support/webresources.html#general
+X Window System|&base;/support/webresources.html#xwin
+Hardware, support|&base;/support/webresources.html#hardware
+
+# usergroups.sgml
+User Groups|&base;/usergroups.html
+
+# where.sgml
+Getting FreeBSD|&base;/where.html
+Installing FreeBSD|&base;/where.html#install
+Distribution Sites|&base;/where.html#distribution
+Applications and Utility Software|&base;/where.html#apps
+Commercial software|&base;/where.html
+
+# y2kbug.sgml
+y2k|&base;/y2kbug.html
+Year 2000 bug|&base;/y2kbug.html
+Millennium bug|&base;/y2kbug.html
+2000, year bug|&base;/y2kbug.html
+
+
+#
+#		Misc section
+#
+
+# Docs
+4.4BSD Documents|http://docs.freebsd.org/44doc/
+BSD Documents|http://docs.freebsd.org/44doc/
+Documents, 4.4BSD|http://docs.freebsd.org/44doc/
+Info Documents|http://docs.freebsd.org/info/
+GNU Info Documents|http://docs.freebsd.org/info/
+
+# Logo Contest
+Logo design competition|http://logo-contest.FreeBSD.org/
+
+# News
+BSD News|http://bsdnews.com
+Daemon News|http://www.daemonnews.org/
+
+# Security Advisories
+Security Advisories|ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/index.html
+Advisories, security|ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/index.html
+SA|ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/index.html
+
+# Source code
+Source Code|http://fxr.watson.org/
+
+# Statistics
+Release Usage Statistic|http://www.FreeBSD.org/statistic/release_usage/images/
+Statistic, Release Usage|http://www.FreeBSD.org/statistic/release_usage/images/
 
 # Translated webpages
 German web pages|&base;/de/index.html
@@ -430,67 +514,7 @@ French web pages|&base;/fr/index.html
 Italian web pages|&base;/it/index.html
 Japanese web pages|&base;/ja/index.html
 
-# /projects/
-Home Automation|&base;/projects/projects.html#homeauto
-Automation, Home|&base;/projects/projects.html#homeauto
-Java|&base;/java/index.html
-GNOME|&base;/gnome/index.html
-KDE|&base;/projects/projects.html#kde
-Newbies Project|&base;/projects/newbies.html
-KAME Project|&base;/projects/projects.html#kame
-IPv6/IPsec stack for BSD|&base;/projects/projects.html#kame
-Token-Ring Project|&base;/projects/projects.html#tokenring
-IPSec|&base;/projects/projects.html#kame
-vinum|&base;/projects/projects.html#vinum
-logical volume manager|&base;/projects/projects.html#vinum
-volume manager, logical|&base;/projects/projects.html#vinum
-ATM, BSD|&base;/projects/projects.html#atm
-BSD ATM|&base;/projects/projects.html#atm
-GLOBAL common source code tag system|&base;/projects/projects.html#global
-Retail Outlets for FreeBSD|&base;/doc/en_US.ISO8859-1/books/handbook/mirrors.html
-Tinderbox|&base;/projects/projects.html#tinderbox
-Laptop Compatibility List|&base;/projects/projects.html#flcl
-Project ideas|&base;/projects/ideas/index.html
-
-Security Advisories|ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/index.html
-Advisories, security|ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/index.html
-SA|ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/index.html
-
-# usergroups.html
-User Groups|&base;/usergroups.html
-
-# community/webresources.html
-Web Resources, mirrors|&base;/community/webresources.html
-
-# support/webresources.html
-General UNIX Information|&base;/support/webresources.html#general
-X Window System|&base;/support/webresources.html#xwin
-Hardware, support|&base;/support/webresources.html#hardware
-
-# where.sgml
-Getting FreeBSD|&base;/where.html
-Installing FreeBSD|&base;/where.html#install
-Distribution Sites|&base;/where.html#distribution
-Applications and Utility Software|&base;/where.html#apps
-Commercial software|&base;/where.html
-
-# platforms/xbox.sgml
-xbox|&base;/platforms/xbox.html
-FreeBSD/xbox|&base;/platforms/xbox.html
-
-# y2kbug.html
-y2k|&base;/y2kbug.html
-Year 2000 bug|&base;/y2kbug.html
-Millennium bug|&base;/y2kbug.html
-2000, year bug|&base;/y2kbug.html
-
-# news/
-BSD News|http://bsdnews.com
-
-Release Usage Statistic|http://www.FreeBSD.org/statistic/release_usage/images/
-Statistic, Release Usage|http://www.FreeBSD.org/statistic/release_usage/images/
-
-# who's who
+# Who's Who
 Project Staff|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html
 Staff, Project|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html
 Who's Who|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html