diff --git a/data/search.sgml b/data/search.sgml
index f4c1ef8aa7..c694539dca 100644
--- a/data/search.sgml
+++ b/data/search.sgml
@@ -1,132 +1,130 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$Date: 1997-03-02 21:21:34 $">
+<!ENTITY date "$Date: 1997-04-08 00:28:33 $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 <html>
 &header;
 
 <h2>Web pages (including <a href="&base/FAQ/FAQ.html">FAQ</a>
 and <a href="&base/handbook/handbook.html">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">
-   <input type="submit">
-   <input type="hidden" name="source" value="www"></p>
-
-<p>Limit the number of results to <input type="text" name="max"
-value="25" size="5"></p>
+<p><input type="text" name="words" size="50"><br>
+Limit the number of results to <input type="text" name="max"
+value="25" size="5"> <input type="submit"> <input type="reset"></p>
+<input type="hidden" name="source" value="www">
 
 </form>
 
 <hr noshade>
 
 <h2>Mailing list archives</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"> <input type="submit"></p>
+<p><input type="text" name="words" size="50"><br>
+Limit the number of results to <input type="text" name="max"
+value="25" size="5"> <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>
 
 <p>
-<input type="checkbox" name="source" value="freebsd-questions" 
-       checked="checked"> 
-	<b>Questions:</b> General questions<br>
-
+<h3>Basic Archives</h3>
 <input type="checkbox" name="source" value="freebsd-announce"> 
 	<b>Announce:</b> Important events / milestones<br>
 
+<input type="checkbox" name="source" value="freebsd-install"> 
+	<b>Install:</b> Discussions concerning the installation
+	process<br>
+
+<input type="checkbox" name="source" value="freebsd-questions" checked="checked"> 
+	<b>Questions:</b> General questions<br>
+
+<h3>System Administration</h3>
+
 <input type="checkbox" name="source" value="freebsd-bugs"> 
 	<b>Bugs:</b> Reports and discussion of bugs<br>
 
+<input type="checkbox" name="source" value="freebsd-hardware"> 
+	<b>Hardware:</b> Discussions concerning hardware as it
+	 relates to FreeBSD<br>
+
+<input type="checkbox" name="source" value="freebsd-isp"> 
+	<b>ISP:</b> Discussions for ISPs using FreeBSD<br>
+
+<input type="checkbox" name="source" value="freebsd-mobile"> 
+	<b>Mobile:</b> Using FreeBSD in a mobile environment<br>
+
+<input type="checkbox" name="source" value="freebsd-stable"> 
+	<b>Stable:</b> Discussion of the FreeBSD-stable branch
+         of the development tree.<br>
+
+<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>
 
 <input type="checkbox" name="source" value="freebsd-current"> 
 	<b>Current:</b> Discussions concerning the use of 
          FreeBSD-current sources<br>
 
 <input type="checkbox" name="source" value="freebsd-doc"> 
 	<b>Doc:</b> Discussions concerning documentation<br>
 
 <input type="checkbox" name="source" value="freebsd-emulation"> 
 	<b>Emulation:</b> Emulating other systems on FreeBSD<br>
 
 <input type="checkbox" name="source" value="freebsd-fs"> 
 	<b>Fs:</b> Discussions concerning FreeBSD filesystems<br>
 
 <input type="checkbox" name="source" value="freebsd-hackers"> 
 	<b>Hackers:</b> Technical discussions and suggestions<br>
 
-<input type="checkbox" name="source" value="freebsd-hardware"> 
-	<b>Hardware:</b> Discussions concerning hardware as it
-	 relates to FreeBSD<br>
-
-<input type="checkbox" name="source" value="freebsd-install"> 
-	<b>Install:</b> Discussions concerning the installation
-	process<br>
-
-<input type="checkbox" name="source" value="freebsd-isp"> 
-	<b>ISP:</b> Discussions for ISPs using FreeBSD<br>
-
-<input type="checkbox" name="source" value="freebsd-mobile"> 
-	<b>Mobile:</b> Using FreeBSD in a mobile environment<br>
-
 <input type="checkbox" name="source" value="freebsd-multimedia"> 
 	<b>Multimedia:</b> Discussions about FreeBSD as a
 	multimedia platform<br>
 
 <input type="checkbox" name="source" value="freebsd-platforms"> 
 	<b>Platforms:</b> Cross-platform FreeBSD issues
          (non-Intel FreeBSD ports)<br>
 
 <input type="checkbox" name="source" value="freebsd-ports"> 
 	<b>Ports:</b> Discussions concerning FreeBSD's ports collection<br>
 
 <input type="checkbox" name="source" value="freebsd-scsi"> 
 	<b>SCSI:</b> Discussions about FreeBSD's SCSI support<br>
 
 <input type="checkbox" name="source" value="freebsd-security"> 
 	<b>Security:</b> FreeBSD computer security
          issues (DES, Kerberos, etc.)<br>
 
 <input type="checkbox" name="source" value="freebsd-smp"> 
 	<b>SMP:</b> FreeBSD on multi-processor platforms<br>
 
-<input type="checkbox" name="source" value="freebsd-stable"> 
-	<b>Stable:</b> Discussion of the FreeBSD-stable branch
-         of the development tree.<br>
-
 <input type="checkbox" name="source" value="freebsd-user-groups"> 
-	<b>User-Groups:</b> A forum for FreeBSD user groups</p>
-
-      <p>Limit the number of results to <input type="text"
-	  name="max" value="25" size="5"></p>
-
-      <p><input type="submit"> <input type="reset"></p>
+	<b>User-Groups:</b> A forum for FreeBSD user groups
 
     </form>
 
 &footer;
 </body>
 </html>
 
 
diff --git a/en/search/search.sgml b/en/search/search.sgml
index f4c1ef8aa7..c694539dca 100644
--- a/en/search/search.sgml
+++ b/en/search/search.sgml
@@ -1,132 +1,130 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$Date: 1997-03-02 21:21:34 $">
+<!ENTITY date "$Date: 1997-04-08 00:28:33 $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 <html>
 &header;
 
 <h2>Web pages (including <a href="&base/FAQ/FAQ.html">FAQ</a>
 and <a href="&base/handbook/handbook.html">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">
-   <input type="submit">
-   <input type="hidden" name="source" value="www"></p>
-
-<p>Limit the number of results to <input type="text" name="max"
-value="25" size="5"></p>
+<p><input type="text" name="words" size="50"><br>
+Limit the number of results to <input type="text" name="max"
+value="25" size="5"> <input type="submit"> <input type="reset"></p>
+<input type="hidden" name="source" value="www">
 
 </form>
 
 <hr noshade>
 
 <h2>Mailing list archives</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"> <input type="submit"></p>
+<p><input type="text" name="words" size="50"><br>
+Limit the number of results to <input type="text" name="max"
+value="25" size="5"> <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>
 
 <p>
-<input type="checkbox" name="source" value="freebsd-questions" 
-       checked="checked"> 
-	<b>Questions:</b> General questions<br>
-
+<h3>Basic Archives</h3>
 <input type="checkbox" name="source" value="freebsd-announce"> 
 	<b>Announce:</b> Important events / milestones<br>
 
+<input type="checkbox" name="source" value="freebsd-install"> 
+	<b>Install:</b> Discussions concerning the installation
+	process<br>
+
+<input type="checkbox" name="source" value="freebsd-questions" checked="checked"> 
+	<b>Questions:</b> General questions<br>
+
+<h3>System Administration</h3>
+
 <input type="checkbox" name="source" value="freebsd-bugs"> 
 	<b>Bugs:</b> Reports and discussion of bugs<br>
 
+<input type="checkbox" name="source" value="freebsd-hardware"> 
+	<b>Hardware:</b> Discussions concerning hardware as it
+	 relates to FreeBSD<br>
+
+<input type="checkbox" name="source" value="freebsd-isp"> 
+	<b>ISP:</b> Discussions for ISPs using FreeBSD<br>
+
+<input type="checkbox" name="source" value="freebsd-mobile"> 
+	<b>Mobile:</b> Using FreeBSD in a mobile environment<br>
+
+<input type="checkbox" name="source" value="freebsd-stable"> 
+	<b>Stable:</b> Discussion of the FreeBSD-stable branch
+         of the development tree.<br>
+
+<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>
 
 <input type="checkbox" name="source" value="freebsd-current"> 
 	<b>Current:</b> Discussions concerning the use of 
          FreeBSD-current sources<br>
 
 <input type="checkbox" name="source" value="freebsd-doc"> 
 	<b>Doc:</b> Discussions concerning documentation<br>
 
 <input type="checkbox" name="source" value="freebsd-emulation"> 
 	<b>Emulation:</b> Emulating other systems on FreeBSD<br>
 
 <input type="checkbox" name="source" value="freebsd-fs"> 
 	<b>Fs:</b> Discussions concerning FreeBSD filesystems<br>
 
 <input type="checkbox" name="source" value="freebsd-hackers"> 
 	<b>Hackers:</b> Technical discussions and suggestions<br>
 
-<input type="checkbox" name="source" value="freebsd-hardware"> 
-	<b>Hardware:</b> Discussions concerning hardware as it
-	 relates to FreeBSD<br>
-
-<input type="checkbox" name="source" value="freebsd-install"> 
-	<b>Install:</b> Discussions concerning the installation
-	process<br>
-
-<input type="checkbox" name="source" value="freebsd-isp"> 
-	<b>ISP:</b> Discussions for ISPs using FreeBSD<br>
-
-<input type="checkbox" name="source" value="freebsd-mobile"> 
-	<b>Mobile:</b> Using FreeBSD in a mobile environment<br>
-
 <input type="checkbox" name="source" value="freebsd-multimedia"> 
 	<b>Multimedia:</b> Discussions about FreeBSD as a
 	multimedia platform<br>
 
 <input type="checkbox" name="source" value="freebsd-platforms"> 
 	<b>Platforms:</b> Cross-platform FreeBSD issues
          (non-Intel FreeBSD ports)<br>
 
 <input type="checkbox" name="source" value="freebsd-ports"> 
 	<b>Ports:</b> Discussions concerning FreeBSD's ports collection<br>
 
 <input type="checkbox" name="source" value="freebsd-scsi"> 
 	<b>SCSI:</b> Discussions about FreeBSD's SCSI support<br>
 
 <input type="checkbox" name="source" value="freebsd-security"> 
 	<b>Security:</b> FreeBSD computer security
          issues (DES, Kerberos, etc.)<br>
 
 <input type="checkbox" name="source" value="freebsd-smp"> 
 	<b>SMP:</b> FreeBSD on multi-processor platforms<br>
 
-<input type="checkbox" name="source" value="freebsd-stable"> 
-	<b>Stable:</b> Discussion of the FreeBSD-stable branch
-         of the development tree.<br>
-
 <input type="checkbox" name="source" value="freebsd-user-groups"> 
-	<b>User-Groups:</b> A forum for FreeBSD user groups</p>
-
-      <p>Limit the number of results to <input type="text"
-	  name="max" value="25" size="5"></p>
-
-      <p><input type="submit"> <input type="reset"></p>
+	<b>User-Groups:</b> A forum for FreeBSD user groups
 
     </form>
 
 &footer;
 </body>
 </html>
 
 
