===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/30.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- www/30.html	2015/08/06 21:50:20	1.32
+++ www/30.html	2016/03/21 05:46:19	1.33
@@ -76,7 +76,7 @@
 <p>
 
 <li>A new packet filter, <a
-href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf&sektion=4">PF</a>,
+href="http://man.openbsd.org?query=pf&sektion=4">PF</a>,
 featuring NAT capabilities, with a mostly ipf-compatible syntax.
 <p>
 
@@ -156,7 +156,7 @@
 If you are planning on dual booting OpenBSD with another OS, you will need to read the included INSTALL.i386 document.
 
 <p>
-To make a boot floppy under MS-DOS, use the &quot;rawrite&quot; utility located at <i>CD:/3.0/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&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&sektion=1">dd(1)</a>, where the device could be &quot;floppy&quot;, &quot;rfd0c&quot;, or &quot;rfd0a&quot;.
+To make a boot floppy under MS-DOS, use the &quot;rawrite&quot; utility located at <i>CD:/3.0/tools/rawrite.exe</i>. To make the boot floppy under a Unix OS, use the <a href="http://man.openbsd.org?query=dd&sektion=1">dd(1)</a> utility. The following is an example usage of <a href="http://man.openbsd.org?query=dd&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>
@@ -361,7 +361,7 @@
 on most architectures (over 1200 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&apropos=0&sektion=1&manpath=OpenBSD+Current&arch=i386&format=html">
+<a href="http://man.openbsd.org?query=cvs&apropos=0&sektion=1&manpath=OpenBSD+Current&arch=i386&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