===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/33.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- www/33.html	2015/08/06 21:50:20	1.44
+++ www/33.html	2016/03/21 05:46:19	1.45
@@ -113,7 +113,7 @@
 
 <li>An incredible amount of enhancements and stability improvements to
 our packet filter, <a
-href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf&amp;sektion=4">pf</a>,
+href="http://man.openbsd.org?query=pf&amp;sektion=4">pf</a>,
 including:
 <ul>
 <li>Queue, a bandwidth management system (uses altq underneath)
@@ -125,7 +125,7 @@
 <li>Full CIDR support
 <li>Early checksum verification return on invalid packets
 <li>Performance boost: large rulesets load much faster now
-<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=spamd">spamd</a>,
+<li><a href="http://man.openbsd.org?query=spamd">spamd</a>,
     a spam deferral daemon, which SMTP connections can be redirected to.
     This daemon handles connections based on black lists and white lists,
     tar-pits the connections, and ensures that the spammer knows why their
@@ -222,7 +222,7 @@
 
 <p>
 To make a boot floppy under MS-DOS, use the &quot;rawrite&quot; utility located
-at <i>CD:/3.3/tools/rawrite.exe</i>. To make the boot floppy under a Unix OS, use the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=dd&amp;sektion=1">dd(1)</a> utility. The following is an example usage of <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=dd&amp;sektion=1">dd(1)</a>, where the device could be &quot;floppy&quot;, &quot;rfd0c&quot;, or &quot;rfd0a&quot;.
+at <i>CD:/3.3/tools/rawrite.exe</i>. To make the boot floppy under a Unix OS, use the <a href="http://man.openbsd.org?query=dd&amp;sektion=1">dd(1)</a> utility. The following is an example usage of <a href="http://man.openbsd.org?query=dd&amp;sektion=1">dd(1)</a>, where the device could be &quot;floppy&quot;, &quot;rfd0c&quot;, or &quot;rfd0a&quot;.
 
 <ul><pre>
 # <strong>dd if=&lt;file&gt; of=/dev/&lt;device&gt; bs=32k</strong>
@@ -405,7 +405,7 @@
 on most architectures (over 2000 packages build on i386, for instance).
 <p>
 The <i>ports/</i> directory represents a CVS (see the manpage for 
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cvs&amp;apropos=0&amp;sektion=1&amp;manpath=OpenBSD+Current&amp;arch=i386&amp;format=html">
+<a href="http://man.openbsd.org?query=cvs&amp;apropos=0&amp;sektion=1&amp;manpath=OpenBSD+Current&amp;arch=i386&amp;format=html">
 cvs(1)</a> if 
 you aren't familiar with CVS) checkout of our ports.  As with our complete 
 source tree, our ports tree is available via anoncvs.  So, in