===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.1026
retrieving revision 1.1027
diff -u -r1.1026 -r1.1027
--- www/events.html	2016/03/15 09:15:29	1.1026
+++ www/events.html	2016/03/21 05:46:20	1.1027
@@ -187,17 +187,17 @@
 <ul>
 <li>Reyk Fl&ouml;ter:
 Introducing OpenBSD's new
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=httpd">httpd(8)</a>
+<a href="http://man.openbsd.org?query=httpd">httpd(8)</a>
 <li>Ingo Schwarze:
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=mandoc">mandoc(1)</a>:
+<a href="http://man.openbsd.org?query=mandoc">mandoc(1)</a>:
 Becoming the main BSD manual toolbox
 (<a href="papers/bsdcan15-mandoc.pdf">slides</a>,
 roff/mm/gpresent <a href="papers/bsdcan15-mandoc.roff">source code</a>)
 <li>Peter Hansteen:
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf">pf(4)</a>:
+<a href="http://man.openbsd.org?query=pf">pf(4)</a>:
 The OpenBSD Packet Filter: Building The Network You Need (tutorial)
 <li>Peter Hessler:
-Using <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=rdomain">routing
+Using <a href="http://man.openbsd.org?query=rdomain">routing
 domains</a> and routing tables in a production network
 <li>Ted Unangst:
 <a href="papers/bsdcan-signify.html">signify: Securing OpenBSD From Us To You</a>
@@ -2258,7 +2258,7 @@
 There was a separate OpenBSD track, featuring Henning Brauer (about
 signal handlers and OpenNTPD), Reyk Fl&ouml;ter (about wireless cards in
 OpenBSD), and the author of the OpenBSD PF book, Jacek Artymiak (about
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf">pf(4)</a>, of course).<br>
+<a href="http://man.openbsd.org?query=pf">pf(4)</a>, of course).<br>
 At the conference's Free Software Foundation Event, Theo de Raadt was
 awarded the Free Software Award 2004 for his efforts to make Firmware for
 wireless hardware and other devices freely available.
@@ -2307,7 +2307,7 @@
 <a href="http://soekris.kd85.com">Soekris</a> machines as access points,
 work done by Reyk Fl&ouml;ter, Tim Kornau and others.
 This installation was a very successful test of the new
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ath">ath(4)</a>
+<a href="http://man.openbsd.org?query=ath">ath(4)</a>
 driver.
 <p>
 
@@ -3194,7 +3194,7 @@
 Oct 21, 1999, Stockholm, Sweden. (in swedish)<br>
 Niklas Hallqvist spoke on the topic of how to use
 <a
-href="http://www.openbsd.org/cgi-bin/man.cgi?query=ipsec&amp;sektion=4">IPsec</a> for securing communications.
+href="http://man.openbsd.org?query=ipsec&amp;sektion=4">IPsec</a> for securing communications.
 <p>
 
 <li><strong>
@@ -3209,7 +3209,7 @@
 IPsec Interoperability tests</strong>,
 Sep 27 - 30, 1999, Stockholm, Sweden. (in swedish)<br>
 A dozen vendors, among them OpenBSD, tested more than 15
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ipsec&amp;sektion=4">IPsec</a>
+<a href="http://man.openbsd.org?query=ipsec&amp;sektion=4">IPsec</a>
 products, both gateways and hosts, for interoperability.  The tests
 were successful as far as general IPsec and pre-shared key
 authentication went, OpenBSD interoperated with everyone, but due to
@@ -3332,7 +3332,7 @@
 IPsec/VPN Interoperability tests &amp; seminar</strong>,
 Dec 14, 1998, Stockholm, Sweden.<br>
 OpenBSD was represented as one of about a dozen
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ipsec&amp;sektion=4">IPsec</a>
+<a href="http://man.openbsd.org?query=ipsec&amp;sektion=4">IPsec</a>
 implementations who were tested for interoperability.  The tests were
 successful, both for the technology in general, and for OpenBSD in
 specific.  We managed to communicate encrypted with every vendor present,