diff --git a/data/search.sgml b/data/search.sgml
index 9f82886656..099f6edee8 100644
--- a/data/search.sgml
+++ b/data/search.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$Date: 1997-11-21 18:25:57 $">
+<!ENTITY date "$Date: 1998-01-08 18:08:57 $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $Id: search.sgml,v 1.21 1997-11-21 18:25:57 jfieber Exp $ -->
+<!-- $Id: search.sgml,v 1.22 1998-01-08 18:08:57 jfieber Exp $ -->
 
 <html>
 &header;
@@ -67,91 +67,216 @@ sort by
 
 <input type="submit"> <input type="reset"></p>
 
-      <h3>In archive(s):</h3>
+<h3>In archive(s):</h3>
 
 <p><em>Note: Searching more than three or four archives at once may
 yield inaccurate results.</em></p>
 
-<p>
-<h3>Basic Archives</h3>
-<input type="checkbox" name="source" value="freebsd-announce"> 
-	<b>Announce:</b> Important events / milestones<br>
+<h3>General Archives</h3>
 
-<input type="checkbox" name="source" value="freebsd-install"> 
-	<b>Install:</b> Discussions concerning the installation
-	process<br>
+<table>
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-announce"> <strong>Announce</strong></td>
+  <td>Important events / milestones</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-questions" checked="checked"> 
-	<b>Questions:</b> General questions<br>
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-chat"> <strong>Chat</strong></td>
+  <td>Random topics (sometimes) related to FreeBSD</td>
+</tr>
 
-<h3>System Administration</h3>
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-jobs"> <strong>Jobs</strong></td>
+  <td>FreeBSD related job announcements and resumes</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-bugs"> 
-	<b>Bugs:</b> Reports and discussion of bugs<br>
+<tr>
+  <td><input type="checkbox" name="source" checked="checked"
+	value="freebsd-questions"> <strong>Questions</strong></td>
+  <td>General questions</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-hardware"> 
-	<b>Hardware:</b> Discussions concerning hardware as it
-	 relates to FreeBSD<br>
+<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>
 
-<input type="checkbox" name="source" value="freebsd-isp"> 
-	<b>ISP:</b> Discussions for ISPs using FreeBSD<br>
+<h3>System Use and Administration</h3>
 
-<input type="checkbox" name="source" value="freebsd-mobile"> 
-	<b>Mobile:</b> Using FreeBSD in a mobile environment<br>
+<table>
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-bugs"> <strong>Bugs</strong></td>
+  <td>Reports and discussion of bugs</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-stable"> 
-	<b>Stable:</b> Discussion of the FreeBSD-stable branch
-         of the development tree.<br>
+<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-mobile"> <strong>Mobile</strong></td>
+  <td>Using FreeBSD in a mobile environment</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>
-<input type="checkbox" name="source" value="freebsd-chat"> 
-	<b>Chat:</b> Random topics (sometimes) related to FreeBSD<br>
 
-<input type="checkbox" name="source" value="freebsd-commit"> 
-	<b>Commit:</b> Changes made to the FreeBSD source tree<br>
+<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>
 
-<input type="checkbox" name="source" value="freebsd-current"> 
-	<b>Current:</b> Discussions concerning the use of 
-         FreeBSD-current sources<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-alpha"> <strong>Alpha</strong></td>
+  <td>Porting FreeBSD to the DEC Alpha</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-doc"> 
-	<b>Doc:</b> Discussions concerning documentation<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-commit"> <strong>Commit</strong></td>
+  <td>Changes made to the FreeBSD source tree</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-emulation"> 
-	<b>Emulation:</b> Emulating other systems on FreeBSD<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-config"> <strong>Config</strong></td>
+  <td>Development of FreeBSD installation and configuration tools</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-fs"> 
-	<b>Fs:</b> Discussions concerning FreeBSD filesystems<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-current"> <strong>Current</strong></td>
+  <td>Use of FreeBSD-current sources</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-hackers"> 
-	<b>Hackers:</b> Technical discussions and suggestions<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-doc"> <strong>Doc</strong></td>
+  <td>Discussions concerning documentation</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-multimedia"> 
-	<b>Multimedia:</b> Discussions about FreeBSD as a
-	multimedia platform<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-emulation"> <strong>Emulation</strong></td>
+  <td>Emulating other systems on FreeBSD</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-platforms"> 
-	<b>Platforms:</b> Cross-platform FreeBSD issues
-         (non-Intel FreeBSD ports)<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-fs"> <strong>Fs</strong></td>
+  <td>Discussions concerning FreeBSD filesystems</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-ports"> 
-	<b>Ports:</b> Discussions concerning FreeBSD's ports collection<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-hackers"> <strong>Hackers</strong></td>
+  <td>General technical discussions</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-scsi"> 
-	<b>SCSI:</b> Discussions about FreeBSD's SCSI support<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-isdn"> <strong>ISDN</strong></td>
+  <td>Development of ISDN support for FreeBSD</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-security"> 
-	<b>Security:</b> FreeBSD computer security
-         issues (DES, Kerberos, etc.)<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-java"> <strong>Java</strong></td>
+  <td>JDK porting and application development</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-smp"> 
-	<b>SMP:</b> FreeBSD on multi-processor platforms<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-multimedia"> <strong>Multimedia</strong></td>
+  <td>Discussions about FreeBSD as a multimedia platform</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-user-groups"> 
-	<b>User-Groups:</b> A forum for FreeBSD user groups
+<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-scsi"> <strong>SCSI</strong></td>
+  <td>Discussions about FreeBSD's SCSI support</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>
+</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-atm"> 
+	<b>Atm:</b> <br>
+
+<input type="checkbox" name="source" value="freebsd-ircops"> 
+	<b>Ircops:</b> <br>
+
+<input type="checkbox" name="source" value="freebsd-realtime"> 
+	<b>Realtime:</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>
+</form>
 
 &footer;
 </body>
diff --git a/en/search/search.sgml b/en/search/search.sgml
index 9f82886656..099f6edee8 100644
--- a/en/search/search.sgml
+++ b/en/search/search.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$Date: 1997-11-21 18:25:57 $">
+<!ENTITY date "$Date: 1998-01-08 18:08:57 $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $Id: search.sgml,v 1.21 1997-11-21 18:25:57 jfieber Exp $ -->
+<!-- $Id: search.sgml,v 1.22 1998-01-08 18:08:57 jfieber Exp $ -->
 
 <html>
 &header;
@@ -67,91 +67,216 @@ sort by
 
 <input type="submit"> <input type="reset"></p>
 
-      <h3>In archive(s):</h3>
+<h3>In archive(s):</h3>
 
 <p><em>Note: Searching more than three or four archives at once may
 yield inaccurate results.</em></p>
 
-<p>
-<h3>Basic Archives</h3>
-<input type="checkbox" name="source" value="freebsd-announce"> 
-	<b>Announce:</b> Important events / milestones<br>
+<h3>General Archives</h3>
 
-<input type="checkbox" name="source" value="freebsd-install"> 
-	<b>Install:</b> Discussions concerning the installation
-	process<br>
+<table>
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-announce"> <strong>Announce</strong></td>
+  <td>Important events / milestones</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-questions" checked="checked"> 
-	<b>Questions:</b> General questions<br>
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-chat"> <strong>Chat</strong></td>
+  <td>Random topics (sometimes) related to FreeBSD</td>
+</tr>
 
-<h3>System Administration</h3>
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-jobs"> <strong>Jobs</strong></td>
+  <td>FreeBSD related job announcements and resumes</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-bugs"> 
-	<b>Bugs:</b> Reports and discussion of bugs<br>
+<tr>
+  <td><input type="checkbox" name="source" checked="checked"
+	value="freebsd-questions"> <strong>Questions</strong></td>
+  <td>General questions</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-hardware"> 
-	<b>Hardware:</b> Discussions concerning hardware as it
-	 relates to FreeBSD<br>
+<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>
 
-<input type="checkbox" name="source" value="freebsd-isp"> 
-	<b>ISP:</b> Discussions for ISPs using FreeBSD<br>
+<h3>System Use and Administration</h3>
 
-<input type="checkbox" name="source" value="freebsd-mobile"> 
-	<b>Mobile:</b> Using FreeBSD in a mobile environment<br>
+<table>
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-bugs"> <strong>Bugs</strong></td>
+  <td>Reports and discussion of bugs</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-stable"> 
-	<b>Stable:</b> Discussion of the FreeBSD-stable branch
-         of the development tree.<br>
+<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-mobile"> <strong>Mobile</strong></td>
+  <td>Using FreeBSD in a mobile environment</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>
-<input type="checkbox" name="source" value="freebsd-chat"> 
-	<b>Chat:</b> Random topics (sometimes) related to FreeBSD<br>
 
-<input type="checkbox" name="source" value="freebsd-commit"> 
-	<b>Commit:</b> Changes made to the FreeBSD source tree<br>
+<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>
 
-<input type="checkbox" name="source" value="freebsd-current"> 
-	<b>Current:</b> Discussions concerning the use of 
-         FreeBSD-current sources<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-alpha"> <strong>Alpha</strong></td>
+  <td>Porting FreeBSD to the DEC Alpha</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-doc"> 
-	<b>Doc:</b> Discussions concerning documentation<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-commit"> <strong>Commit</strong></td>
+  <td>Changes made to the FreeBSD source tree</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-emulation"> 
-	<b>Emulation:</b> Emulating other systems on FreeBSD<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-config"> <strong>Config</strong></td>
+  <td>Development of FreeBSD installation and configuration tools</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-fs"> 
-	<b>Fs:</b> Discussions concerning FreeBSD filesystems<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-current"> <strong>Current</strong></td>
+  <td>Use of FreeBSD-current sources</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-hackers"> 
-	<b>Hackers:</b> Technical discussions and suggestions<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-doc"> <strong>Doc</strong></td>
+  <td>Discussions concerning documentation</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-multimedia"> 
-	<b>Multimedia:</b> Discussions about FreeBSD as a
-	multimedia platform<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-emulation"> <strong>Emulation</strong></td>
+  <td>Emulating other systems on FreeBSD</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-platforms"> 
-	<b>Platforms:</b> Cross-platform FreeBSD issues
-         (non-Intel FreeBSD ports)<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-fs"> <strong>Fs</strong></td>
+  <td>Discussions concerning FreeBSD filesystems</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-ports"> 
-	<b>Ports:</b> Discussions concerning FreeBSD's ports collection<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-hackers"> <strong>Hackers</strong></td>
+  <td>General technical discussions</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-scsi"> 
-	<b>SCSI:</b> Discussions about FreeBSD's SCSI support<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-isdn"> <strong>ISDN</strong></td>
+  <td>Development of ISDN support for FreeBSD</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-security"> 
-	<b>Security:</b> FreeBSD computer security
-         issues (DES, Kerberos, etc.)<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-java"> <strong>Java</strong></td>
+  <td>JDK porting and application development</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-smp"> 
-	<b>SMP:</b> FreeBSD on multi-processor platforms<br>
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-multimedia"> <strong>Multimedia</strong></td>
+  <td>Discussions about FreeBSD as a multimedia platform</td>
+</tr>
 
-<input type="checkbox" name="source" value="freebsd-user-groups"> 
-	<b>User-Groups:</b> A forum for FreeBSD user groups
+<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-scsi"> <strong>SCSI</strong></td>
+  <td>Discussions about FreeBSD's SCSI support</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>
+</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-atm"> 
+	<b>Atm:</b> <br>
+
+<input type="checkbox" name="source" value="freebsd-ircops"> 
+	<b>Ircops:</b> <br>
+
+<input type="checkbox" name="source" value="freebsd-realtime"> 
+	<b>Realtime:</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>
+</form>
 
 &footer;
 </body>

Announce	Important events / milestones
Chat	Random topics (sometimes) related to FreeBSD
Jobs	FreeBSD related job announcements and resumes
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
Mobile	Using FreeBSD in a mobile environment
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
Commit	Changes made to the FreeBSD source tree
Config	Development of FreeBSD installation and configuration tools
Current	Use of FreeBSD-current sources
Doc	Discussions concerning documentation
Emulation	Emulating other systems on FreeBSD
Fs	Discussions concerning FreeBSD filesystems
Hackers	General technical discussions
ISDN	Development of ISDN support for FreeBSD
Java	JDK porting and application development
Multimedia	Discussions about FreeBSD as a multimedia platform
Platforms	Cross-platform FreeBSD issues (non-Intel FreeBSD ports)
Ports	Discussions concerning FreeBSD's ports collection
SCSI	Discussions about FreeBSD's SCSI support
SMP	FreeBSD on multi-processor platforms
SPARC	Porting FreeBSD to the SPARC