diff --git a/en/search/search.sgml b/en/search/search.sgml
index 43177fe716..b66de74509 100644
--- a/en/search/search.sgml
+++ b/en/search/search.sgml
@@ -1,425 +1,425 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/search/search.sgml,v 1.59 2000/12/30 10:59:45 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/search/search.sgml,v 1.60 2000/12/30 11:02:09 wosch Exp $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/search/search.sgml,v 1.59 2000/12/30 10:59:45 wosch Exp $ -->
+<!-- $FreeBSD: www/en/search/search.sgml,v 1.60 2000/12/30 11:02:09 wosch Exp $ -->
 
 <html>
 &header;
 
 <h2>FreeBSD Search Services</h2>
 <ul>
+<li><a href="#web">Web pages</a>
+<li><a href="#mailinglists">Mailing list archives</a>
+<li><a href="search-mid.html">Message-ID</a>
 <li><a href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">
 GNATS Problem Reports (Bugs) database</a>
 <li><a href="http://www.FreeBSD.org/cgi/man.cgi">Manual Pages</a>
 <li><a href="http://www.FreeBSD.org/cgi/ports.cgi">
 Ports Changes</a>
 <li><a href="http://minnie.cs.adfa.edu.au/FreeBSD-srctree/FreeBSD.html">
 The Source Code</a>
 <li><a href="http://lxr.linux.no/freebsd/source">
 A cross reference of the FreeBSD kernel</a>
-<li><a href="#web">Web pages</a>
-<li><a href="#mailinglists">Mailing list archives</a>
-<li><a href="search-mid.html">Message-ID</a>
 <li><a href="http://minnie.cs.adfa.edu.au/BSD-info/bsdnews_search.html">BSD Usenet News Searcher</a>
 <li><a href="http://www.google.com/bsd">Google Search BSD</a>
 <li><a href="http://www.greasydaemon.com/">GreasyDaemon</a>, a all-in-one BSD UNIX search engine
 </ul>
 
 <hr noshade>
 
 <a name="web"></a><h2>Web pages (including <a href="&base/FAQ/FAQ.html">FAQ</a>
 and <a href="&base/handbook/">Handbook</a>)</h2>
 
 <form action="http://www.FreeBSD.org/cgi/search.cgi" method="GET">
 <h3>Search for:</h3>
 
 <p><em>Note: Use the operators AND or NOT to limit your search.  <a
 href="searchhints.html">Look here for more hints</a>.</em></p>
 
 <p><input type="text" name="words" size="50"><br>
 Limit the number of results to <select  name="max"
 <OPTION VALUE="5">5</OPTION>
 <OPTION VALUE="10">10</OPTION>
 <OPTION VALUE="25" SELECTED>25</OPTION>
 <OPTION VALUE="50">50</OPTION>
 <OPTION VALUE="100">100</OPTION>
 <OPTION VALUE="250">250</OPTION>
 </SELECT>
 
 <select name="source">
 <OPTION VALUE="www" SELECTED>Web Pages</OPTION>
 <OPTION VALUE="pkgdescr">Ported Applications</OPTION>
 </SELECT>
 <br>
 <INPUT type="submit"> 
 <input type="reset">
 </p>
 </form>
 
 <hr noshade>
 
 <a name="mailinglists"></a><h2>Mailing list archives</h2>
 
 <p>The <a href="http://www.FreeBSD.org/mail/">mailing list archive</a>
 indexes are now updated weekly!</p>
 
 <p>The mailing lists (as well as many others) have also been archived by <a 
 href="http://www.geocrawler.com/">GeoCrawler</a>.</p>
 
     <form action="http://www.FreeBSD.org/cgi/search.cgi" method="GET">
 
       <h3>Search for:</h3>
 
       <p><em>Note: Use the operators AND or NOT to limit your
 	  search.  <a href="searchhints.html">Look here
 	  for more hints</a>.</em></p>
 
 <p><input type="text" name="words" size="50"><br>
 Limit the number of results to <select  name="max"
 <OPTION VALUE="5">5</OPTION>
 <OPTION VALUE="10">10</OPTION>
 <OPTION VALUE="25" SELECTED>25</OPTION>
 <OPTION VALUE="50">50</OPTION>
 <OPTION VALUE="100">100</OPTION>
 <OPTION VALUE="250">250</OPTION>
 </SELECT>
 
 sort by
 <SELECT NAME="sort">
 <OPTION VALUE="score">score</OPTION>
 <OPTION VALUE="date">score &amp; date</OPTION>
 <OPTION VALUE="subject">subject</OPTION>
 <OPTION VALUE="author">author</OPTION>
 </SELECT>
 Search  <select  name="index"
 <OPTION VALUE="recent" SELECTED>recent</OPTION>
 <OPTION VALUE="all">all</OPTION>
 </SELECT>
 <br>
 <input type="submit"> <input type="reset"></p>
 
 <h3>In archive(s):</h3>
 
 <p><em>Note: Searching more than three or four archives at once may
 yield inaccurate results.</em></p>
 
 <h3>General Archives</h3>
 
 <table>
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-advocacy"> <strong>Advocacy</strong></td>
   <td>FreeBSD Evangelism</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-announce"> <strong>Announce</strong></td>
   <td>Important events / milestones</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-chat"> <strong>Chat</strong></td>
   <td>Random topics (sometimes) related to FreeBSD</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-jobs"> <strong>Jobs</strong></td>
   <td>FreeBSD related job announcements and resumes</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-newbies"> <strong>Newbies</strong></td>
   <td>New FreeBSD users activities and discussion</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" checked="checked"
 	value="freebsd-questions"> <strong>Questions</strong></td>
   <td>General questions</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-user-groups"> <strong>User-Groups</strong></td>
   <td>A forum for FreeBSD user groups</td>
 </tr>
 </table>
 
 <h3>System Use and Administration</h3>
 
 <table>
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-bugs"> <strong>Bugs</strong></td>
   <td>Reports and discussion of bugs</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
   	value="freebsd-hardware"> <strong>Hardware</strong></td>
   <td>Discussions concerning hardware as it relates to FreeBSD</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-isp"> <strong>ISP</strong></td>
   <td>Discussions for ISPs using FreeBSD</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-security"> <strong>Security</strong></td>
   <td>FreeBSD computer security issues (DES, Kerberos, etc.)</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-stable"> <strong>Stable</strong></td>
   <td>Discussion of the FreeBSD-stable branch of the development tree</td>
 </tr>
 </table>
 
 <h3>Developer</h3>
 
 <table>
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-afs"> <strong>Afs</strong></td>
   <td>Porting and using AFS (the Andrew File System) from CMU/Transarc</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-alpha"> <strong>Alpha</strong></td>
   <td>Porting FreeBSD to the DEC Alpha</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-arch"> <strong>Arch</strong></td>
   <td>Architecture and design discussions</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-arm"> <strong>ARM</strong></td>
   <td>Porting FreeBSD to the StrongArm</td>
 </tr>
 
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-atm"> <strong>ATM</strong></td>
   <td>Using ATM networking with FreeBSD</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="cvs-all"> <strong>Commit</strong></td>
   <td>Changes made to the FreeBSD source tree</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-config"> <strong>Config</strong></td>
   <td>Development of FreeBSD installation and configuration tools</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-current"> <strong>Current</strong></td>
   <td>Use of FreeBSD-current sources</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
         value="freebsd-database"> <strong>Database</strong></td>
   <td>Discussing database use and developement under FreeBSD</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-doc"> <strong>Doc</strong></td>
   <td>Discussions concerning documentation</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-emulation"> <strong>Emulation</strong></td>
   <td>Emulating other systems on FreeBSD</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-fs"> <strong>Fs</strong></td>
   <td>Discussions concerning FreeBSD filesystems</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-hackers"> <strong>Hackers</strong></td>
   <td>General technical discussions</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-i18n"> <strong>I18n</strong></td>
   <td>FreeBSD Internationalization</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-ia64"> <strong>ia64</strong></td>
   <td>Porting FreeBSD to Intel's upcoming IA64 systems</td>
 </tr>
 
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-ipfw"> <strong>ipfw</strong></td>
   <td>Technical discussion concerning the redesign of the IP firewall code</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-isdn"> <strong>ISDN</strong></td>
   <td>Development of ISDN support for FreeBSD</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-java"> <strong>Java</strong></td>
   <td>JDK porting and application development</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-libh"> <strong>libh</strong></td>
   <td>The second generation installation and package system</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-multimedia"> <strong>Multimedia</strong></td>
   <td>Discussions about FreeBSD as a multimedia platform</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-mobile"> <strong>Mobile</strong></td>
   <td>Using FreeBSD in a mobile environment</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-mozilla"> <strong>Mozilla</strong></td>
   <td>Porting mozilla to FreeBSD</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-net"> <strong>Net</strong></td>
   <td>Networking discussion and TCP/IP source code</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-new-bus"> <strong>New Bus</strong></td>
   <td>Technical discussions on Bus Architecture</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-platforms"> <strong>Platforms</strong></td>
   <td>Cross-platform FreeBSD issues (non-Intel FreeBSD ports)</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-ports"> <strong>Ports</strong></td>
   <td>Discussions concerning FreeBSD's ports collection</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-ppc"> <strong>PPC</strong></td>
   <td>Porting FreeBSD to the PowerPC</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-realtime"> <strong>Realtime</strong></td>
   <td>Development of realtime extensions to FreeBSD</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-scsi"> <strong>SCSI</strong></td>
   <td>Discussions about FreeBSD's SCSI support</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-small"> <strong>Small</strong></td>
   <td>Using FreeBSD in embedded applications</td>
 </tr>
 
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-smp"> <strong>SMP</strong></td>
   <td>FreeBSD on multi-processor platforms</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-sparc"> <strong>SPARC</strong></td>
   <td>Porting FreeBSD to the SPARC</td>
 </tr>
 
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-tokenring"> <strong>Tokenring</strong></td>
   <td>Support Token Ring in FreeBSD</td>
 </tr>
 
 </table>
 
 <!--
 <input type="checkbox" name="source" value="freebsd-hubs"> 
 	<b>Hubs:</b> Managers of FreeBSD ftp/www mirrors and mail relays<br>
 
 <input type="checkbox" name="source" value="freebsd-install"> 
 	<b>Install:</b> Installation development<br>
 
 <input type="checkbox" name="source" value="freebsd-atm"> 
 	<b>Atm:</b> <br>
 
 <input type="checkbox" name="source" value="freebsd-ircops"> 
 	<b>Ircops:</b> <br>
 
 <input type="checkbox" name="source" value="freebsd-security-notifications"> 
 	<b>Security-notifications:</b> <br>
 
 <input type="checkbox" name="source" value="freebsd-stats"> 
 	<b>Stats:</b> <br>
 
 <input type="checkbox" name="source" value="freebsd-www"> 
 	<b>WWW:</b> <br>
 -->
 
 <p><input type="submit"></p>
 </form>
 
 &footer;
 </body>
 </html>
 
 

Advocacy	FreeBSD Evangelism
Announce	Important events / milestones
Chat	Random topics (sometimes) related to FreeBSD
Jobs	FreeBSD related job announcements and resumes
Newbies	New FreeBSD users activities and discussion
Questions	General questions
User-Groups	A forum for FreeBSD user groups
Bugs	Reports and discussion of bugs
Hardware	Discussions concerning hardware as it relates to FreeBSD
ISP	Discussions for ISPs using FreeBSD
Security	FreeBSD computer security issues (DES, Kerberos, etc.)
Stable	Discussion of the FreeBSD-stable branch of the development tree
Afs	Porting and using AFS (the Andrew File System) from CMU/Transarc
Alpha	Porting FreeBSD to the DEC Alpha
Arch	Architecture and design discussions
ARM	Porting FreeBSD to the StrongArm
ATM	Using ATM networking with FreeBSD
Commit	Changes made to the FreeBSD source tree
Config	Development of FreeBSD installation and configuration tools
Current	Use of FreeBSD-current sources
Database	Discussing database use and developement under FreeBSD
Doc	Discussions concerning documentation
Emulation	Emulating other systems on FreeBSD
Fs	Discussions concerning FreeBSD filesystems
Hackers	General technical discussions
I18n	FreeBSD Internationalization
ia64	Porting FreeBSD to Intel's upcoming IA64 systems
ipfw	Technical discussion concerning the redesign of the IP firewall code
ISDN	Development of ISDN support for FreeBSD
Java	JDK porting and application development
libh	The second generation installation and package system
Multimedia	Discussions about FreeBSD as a multimedia platform
Mobile	Using FreeBSD in a mobile environment
Mozilla	Porting mozilla to FreeBSD
Net	Networking discussion and TCP/IP source code
New Bus	Technical discussions on Bus Architecture
Platforms	Cross-platform FreeBSD issues (non-Intel FreeBSD ports)
Ports	Discussions concerning FreeBSD's ports collection
PPC	Porting FreeBSD to the PowerPC
Realtime	Development of realtime extensions to FreeBSD
SCSI	Discussions about FreeBSD's SCSI support
Small	Using FreeBSD in embedded applications
SMP	FreeBSD on multi-processor platforms
SPARC	Porting FreeBSD to the SPARC
Tokenring	Support Token Ring in FreeBSD