===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/53.html,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- www/53.html	2015/08/06 21:50:20	1.82
+++ www/53.html	2016/03/21 05:46:19	1.83
@@ -57,77 +57,77 @@
 <ul>
 <li>Improved hardware support, including:
     <ul>
-    <li>New driver <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=oce&amp;sektion=4">oce(4)</a> for Emulex OneConnect 10Gb Ethernet adapters.
-    <li>New driver <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=rtsx&amp;sektion=4">rtsx(4)</a> for the Realtek RTS5209 card reader.
-    <li>New driver <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=mfii&amp;sektion=4">mfii(4)</a> for the LSI Logic MegaRAID SAS Fusion controllers.
-    <li>New driver <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=smsc&amp;sektion=4">smsc(4)</a> for SMSC LAN95xx 10/100 USB Ethernet adapters.
-    <li>New drivers for Toradex OAK USB sensors: <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uoaklux&amp;sektion=4">uoaklux(4)</a> (illuminance), <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uoakrh&amp;sektion=4">uoakrh(4)</a> (temperature and relative humidity) and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uoakv&amp;sektion=4">uoakv(4)</a> (+/- 10V 8channel ADC).
-    <li>New drivers for <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=virtio&amp;sektion=4">virtio(4)</a> devices: <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=vio&amp;sektion=4">vio(4)</a> (network), <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=vioblk&amp;sektion=4">vioblk(4)</a> (block devices, attaching as SCSI disks) and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=viomb&amp;sektion=4">viomb(4)</a> (memory ballooning).
-    <li>Support for Adaptec 39320LPE added to <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ahd&amp;sektion=4">ahd(4)</a>.
-    <li>Broadcom 5718/5719/5720 Gigabit Ethernet devices supported in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bge&amp;sektion=4">bge(4)</a>.
-    <li>Intel X540-based 10Gb Ethernet devices supported in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ix&amp;sektion=4">ix(4)</a>.
-    <li>Support for SFP+ hot-plug (82599) and various other improvements in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ix&amp;sektion=4">ix(4)</a>.
-    <li>TX interrupt mitigation, hardware VLAN tagging and checksum offload reduce CPU use in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=vr&amp;sektion=4">vr(4)</a>.
-    <li>Baby jumbo frames supported in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=vr&amp;sektion=4">vr(4)</a> and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sis&amp;sektion=4">sis(4)</a> useful for e.g. MPLS, <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=vlan&amp;sektion=4">vlan(4)</a> tag stacking (QinQ) and RFC4638 <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pppoe&amp;sektion=4">pppoe(4)</a>.
-    <li>TCP RX Checksum offload in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=gem&amp;sektion=4">gem(4)</a>.
-    <li>Improvements for NICs using 82579/pch2 in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=em&amp;sektion=4">em(4)</a>.
-    <li>Flow control is now supported on <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bnx&amp;sektion=4">bnx(4)</a> 5708S/5709S adapters, <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=gem&amp;sektion=4">gem(4)</a> and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=jme&amp;sektion=4">jme(4)</a>.
+    <li>New driver <a href="http://man.openbsd.org?query=oce&amp;sektion=4">oce(4)</a> for Emulex OneConnect 10Gb Ethernet adapters.
+    <li>New driver <a href="http://man.openbsd.org?query=rtsx&amp;sektion=4">rtsx(4)</a> for the Realtek RTS5209 card reader.
+    <li>New driver <a href="http://man.openbsd.org?query=mfii&amp;sektion=4">mfii(4)</a> for the LSI Logic MegaRAID SAS Fusion controllers.
+    <li>New driver <a href="http://man.openbsd.org?query=smsc&amp;sektion=4">smsc(4)</a> for SMSC LAN95xx 10/100 USB Ethernet adapters.
+    <li>New drivers for Toradex OAK USB sensors: <a href="http://man.openbsd.org?query=uoaklux&amp;sektion=4">uoaklux(4)</a> (illuminance), <a href="http://man.openbsd.org?query=uoakrh&amp;sektion=4">uoakrh(4)</a> (temperature and relative humidity) and <a href="http://man.openbsd.org?query=uoakv&amp;sektion=4">uoakv(4)</a> (+/- 10V 8channel ADC).
+    <li>New drivers for <a href="http://man.openbsd.org?query=virtio&amp;sektion=4">virtio(4)</a> devices: <a href="http://man.openbsd.org?query=vio&amp;sektion=4">vio(4)</a> (network), <a href="http://man.openbsd.org?query=vioblk&amp;sektion=4">vioblk(4)</a> (block devices, attaching as SCSI disks) and <a href="http://man.openbsd.org?query=viomb&amp;sektion=4">viomb(4)</a> (memory ballooning).
+    <li>Support for Adaptec 39320LPE added to <a href="http://man.openbsd.org?query=ahd&amp;sektion=4">ahd(4)</a>.
+    <li>Broadcom 5718/5719/5720 Gigabit Ethernet devices supported in <a href="http://man.openbsd.org?query=bge&amp;sektion=4">bge(4)</a>.
+    <li>Intel X540-based 10Gb Ethernet devices supported in <a href="http://man.openbsd.org?query=ix&amp;sektion=4">ix(4)</a>.
+    <li>Support for SFP+ hot-plug (82599) and various other improvements in <a href="http://man.openbsd.org?query=ix&amp;sektion=4">ix(4)</a>.
+    <li>TX interrupt mitigation, hardware VLAN tagging and checksum offload reduce CPU use in <a href="http://man.openbsd.org?query=vr&amp;sektion=4">vr(4)</a>.
+    <li>Baby jumbo frames supported in <a href="http://man.openbsd.org?query=vr&amp;sektion=4">vr(4)</a> and <a href="http://man.openbsd.org?query=sis&amp;sektion=4">sis(4)</a> useful for e.g. MPLS, <a href="http://man.openbsd.org?query=vlan&amp;sektion=4">vlan(4)</a> tag stacking (QinQ) and RFC4638 <a href="http://man.openbsd.org?query=pppoe&amp;sektion=4">pppoe(4)</a>.
+    <li>TCP RX Checksum offload in <a href="http://man.openbsd.org?query=gem&amp;sektion=4">gem(4)</a>.
+    <li>Improvements for NICs using 82579/pch2 in <a href="http://man.openbsd.org?query=em&amp;sektion=4">em(4)</a>.
+    <li>Flow control is now supported on <a href="http://man.openbsd.org?query=bnx&amp;sektion=4">bnx(4)</a> 5708S/5709S adapters, <a href="http://man.openbsd.org?query=gem&amp;sektion=4">gem(4)</a> and <a href="http://man.openbsd.org?query=jme&amp;sektion=4">jme(4)</a>.
 
-    <li>Power-saving clients supported in hostap mode with <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=acx&amp;sektion=4">acx(4)</a> and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=athn&amp;sektion=4">athn(4)</a>.
-    <li>A cause of RT2661 <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ral&amp;sektion=4">ral(4)</a> wedging in hostap mode was fixed.
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=iwn&amp;sektion=4">iwn(4)</a> supports additional devices (Centrino Advanced-N 6235 and initial support for Centrino Wireless-N 1030).
+    <li>Power-saving clients supported in hostap mode with <a href="http://man.openbsd.org?query=acx&amp;sektion=4">acx(4)</a> and <a href="http://man.openbsd.org?query=athn&amp;sektion=4">athn(4)</a>.
+    <li>A cause of RT2661 <a href="http://man.openbsd.org?query=ral&amp;sektion=4">ral(4)</a> wedging in hostap mode was fixed.
+    <li><a href="http://man.openbsd.org?query=iwn&amp;sektion=4">iwn(4)</a> supports additional devices (Centrino Advanced-N 6235 and initial support for Centrino Wireless-N 1030).
 
-    <li>Improvements to <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ahci&amp;sektion=4">ahci(4)</a>.
+    <li>Improvements to <a href="http://man.openbsd.org?query=ahci&amp;sektion=4">ahci(4)</a>.
     <li>Support for the fixed-function performance counter on newer x86 chips with constant time stamp counters.
-    <li>Elantech touchpads supported in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pms&amp;sektion=4">pms(4)</a> and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=synaptics&amp;sektion=4">synaptics(4)</a>.
-    <li>Support for "physical devices" on skinny <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=mfi&amp;sektion=4">mfi(4)</a> controllers.
-    <li>VMware emulated SAS adapters supported by <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=mpi&amp;sektion=4">mpi(4)</a>.
+    <li>Elantech touchpads supported in <a href="http://man.openbsd.org?query=pms&amp;sektion=4">pms(4)</a> and <a href="http://man.openbsd.org?query=synaptics&amp;sektion=4">synaptics(4)</a>.
+    <li>Support for "physical devices" on skinny <a href="http://man.openbsd.org?query=mfi&amp;sektion=4">mfi(4)</a> controllers.
+    <li>VMware emulated SAS adapters supported by <a href="http://man.openbsd.org?query=mpi&amp;sektion=4">mpi(4)</a>.
     <li>Support for Intel's Supervisor Mode Execution Protection (SMEP) and Supervisor Mode Access Prevention (SMAP) features on i386 and amd64.
     <li>Support for the RDRAND instruction to read the hardware random number generator on recent Intel processors.
     <li>amd64 PCI memory extent changed to cover the whole 64-bit memory space; fixes erroneous extent allocation panic on IBM x3100.
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ulpt&amp;sektion=4">ulpt(4)</a> can now upload firmware to certain HP LaserJet printers.
+    <li><a href="http://man.openbsd.org?query=ulpt&amp;sektion=4">ulpt(4)</a> can now upload firmware to certain HP LaserJet printers.
     <li>Added stat clock to Loongson machines, improving accuracy of CPU usage statistics.
     <li>CPU throttling supported on Loongson 2F.
-    <li>Support for Apple UniNorth and U3 AGP added to <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=agp&amp;sektion=4">agp(4)</a>.
+    <li>Support for Apple UniNorth and U3 AGP added to <a href="http://man.openbsd.org?query=agp&amp;sektion=4">agp(4)</a>.
     <li>DRM support for macppc.
     </ul>
 <p>
 
 <li>Generic network stack improvements:
     <ul>
-    <li>Restriction on writing to <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=trunk&amp;sektion=4">trunk(4)</a> member interfaces relaxed; BPF can now write to interfaces directly (useful for LLDP).
-    <li>UDP support added to <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sosplice&amp;sektion=9">sosplice(9)</a> (zero-copy socket splicing).
-    <li>IPv6 autoconfprivacy is enabled by default (can be disabled per-interface with an <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ifconfig&amp;sektion=8">ifconfig(8)</a> flag).
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ifconfig&amp;sektion=8">ifconfig(8)</a> <tt>hwfeatures</tt> displays the maximum MTU supported by the driver (indicating support for jumbo/baby-jumbo frames).
+    <li>Restriction on writing to <a href="http://man.openbsd.org?query=trunk&amp;sektion=4">trunk(4)</a> member interfaces relaxed; BPF can now write to interfaces directly (useful for LLDP).
+    <li>UDP support added to <a href="http://man.openbsd.org?query=sosplice&amp;sektion=9">sosplice(9)</a> (zero-copy socket splicing).
+    <li>IPv6 autoconfprivacy is enabled by default (can be disabled per-interface with an <a href="http://man.openbsd.org?query=ifconfig&amp;sektion=8">ifconfig(8)</a> flag).
+    <li><a href="http://man.openbsd.org?query=ifconfig&amp;sektion=8">ifconfig(8)</a> <tt>hwfeatures</tt> displays the maximum MTU supported by the driver (indicating support for jumbo/baby-jumbo frames).
     <li>Vastly improved IPsec v3 compatibility, including support for Extended Sequence Numbers in the AES-NI driver for AES-GCM and other modes.
     </ul>
 <p>
 
 <li>Routing daemons and other userland network improvements:
     <ul>
-    <li>OpenBSD now includes <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=npppd&amp;sektion=8">npppd(8)</a>, a server-side daemon for L2TP, L2TP/IPsec, PPTP and PPPoE.
-    <li>New standalone <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=tftp-proxy&amp;sektion=8">tftp-proxy(8)</a> to replace the old <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=inetd&amp;sektion=8">inetd(8)</a>-based implementation.
-    <li>SNMPv3 supported in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=snmpd&amp;sektion=8">snmpd(8)</a>.
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bgpd&amp;sektion=8">bgpd(8)</a> is more tolerant of unknown capabilities when bringing up a session (logs a warning rather than fails).
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bgpd&amp;sektion=8">bgpd(8)</a> now handles client side of "graceful restart".
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bgpd&amp;sektion=8">bgpd(8)</a> can now filter based on the NEXTHOP attribute.
-    <li>A stratum can now be assigned to hardware sensors in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ntpd&amp;sektion=8">ntpd(8)</a>.
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=authpf&amp;sektion=8">authpf(8)</a> now supports the use of per-group rules files.
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&amp;sektion=1">ftp(1)</a> client now supports basic HTTP authentication as per RFC 2617 and 3986 like "ftp http[s]://user:pass@host/file".
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&amp;sektion=1">ftp(1)</a> client's mput command allows to upload a directory tree recursively using the -r switch.
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=relayd&amp;sektion=8">relayd(8)</a> has various improvements including additional scheduling algorithms (least-states, for redirections, and random/source-hash, for relays).
-    <li>The <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=iked&amp;sektion=8">iked(8)</a> IKEv2 daemon supports NAT-T. (The isakmpd daemon for IKEv1 has supported this for a long time).
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=iked&amp;sektion=8">iked(8)</a> blocks IPv6 traffic unless there are v6 VPN flows; this is to prevent leakages as described in <a href="http://tools.ietf.org/html/draft-gont-opsec-vpn-leakages">draft-gont-opsec-vpn-leakages</a>.
+    <li>OpenBSD now includes <a href="http://man.openbsd.org?query=npppd&amp;sektion=8">npppd(8)</a>, a server-side daemon for L2TP, L2TP/IPsec, PPTP and PPPoE.
+    <li>New standalone <a href="http://man.openbsd.org?query=tftp-proxy&amp;sektion=8">tftp-proxy(8)</a> to replace the old <a href="http://man.openbsd.org?query=inetd&amp;sektion=8">inetd(8)</a>-based implementation.
+    <li>SNMPv3 supported in <a href="http://man.openbsd.org?query=snmpd&amp;sektion=8">snmpd(8)</a>.
+    <li><a href="http://man.openbsd.org?query=bgpd&amp;sektion=8">bgpd(8)</a> is more tolerant of unknown capabilities when bringing up a session (logs a warning rather than fails).
+    <li><a href="http://man.openbsd.org?query=bgpd&amp;sektion=8">bgpd(8)</a> now handles client side of "graceful restart".
+    <li><a href="http://man.openbsd.org?query=bgpd&amp;sektion=8">bgpd(8)</a> can now filter based on the NEXTHOP attribute.
+    <li>A stratum can now be assigned to hardware sensors in <a href="http://man.openbsd.org?query=ntpd&amp;sektion=8">ntpd(8)</a>.
+    <li><a href="http://man.openbsd.org?query=authpf&amp;sektion=8">authpf(8)</a> now supports the use of per-group rules files.
+    <li><a href="http://man.openbsd.org?query=ftp&amp;sektion=1">ftp(1)</a> client now supports basic HTTP authentication as per RFC 2617 and 3986 like "ftp http[s]://user:pass@host/file".
+    <li><a href="http://man.openbsd.org?query=ftp&amp;sektion=1">ftp(1)</a> client's mput command allows to upload a directory tree recursively using the -r switch.
+    <li><a href="http://man.openbsd.org?query=relayd&amp;sektion=8">relayd(8)</a> has various improvements including additional scheduling algorithms (least-states, for redirections, and random/source-hash, for relays).
+    <li>The <a href="http://man.openbsd.org?query=iked&amp;sektion=8">iked(8)</a> IKEv2 daemon supports NAT-T. (The isakmpd daemon for IKEv1 has supported this for a long time).
+    <li><a href="http://man.openbsd.org?query=iked&amp;sektion=8">iked(8)</a> blocks IPv6 traffic unless there are v6 VPN flows; this is to prevent leakages as described in <a href="http://tools.ietf.org/html/draft-gont-opsec-vpn-leakages">draft-gont-opsec-vpn-leakages</a>.
     </ul>
 <p>
 
-<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=dhclient&amp;sektion=8">dhclient(8)</a> improvements:
+<li><a href="http://man.openbsd.org?query=dhclient&amp;sektion=8">dhclient(8)</a> improvements:
     <ul>
     <li>dhclient-script eliminated, all configuration is done with ioctl's and routing sockets.
     <li>interface configuration is much faster.
-    <li>HUP signals cause dhclient to restart; making it re-read the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=dhclient.conf&amp;sektion=5">dhclient.conf(5)</a> and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=resolv.conf.tail&amp;sektion=5">resolv.conf.tail(5)</a> files, and obtain a new lease.
+    <li>HUP signals cause dhclient to restart; making it re-read the <a href="http://man.openbsd.org?query=dhclient.conf&amp;sektion=5">dhclient.conf(5)</a> and <a href="http://man.openbsd.org?query=resolv.conf.tail&amp;sektion=5">resolv.conf.tail(5)</a> files, and obtain a new lease.
     <li>INIT, USR1, USR2 signals cause dhclient to exit after attempting to remove routes and addresses it configured.
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=resolv.conf&amp;sektion=5">resolv.conf(5)</a> is written only when the in-use default route was inserted by dhclient. Possible changes to the default route are detected and cause dhclient to write out resolv.conf when appropriate.
+    <li><a href="http://man.openbsd.org?query=resolv.conf&amp;sektion=5">resolv.conf(5)</a> is written only when the in-use default route was inserted by dhclient. Possible changes to the default route are detected and cause dhclient to write out resolv.conf when appropriate.
     <li>interface hardware address changes are detected and cause dhclient to restart.
     <li>dhclient.conf directive 'ignore' and command line option '-i' added, allowing the suppression of specific options offered by server.
     <li>'-L' command line option added, allowing the creation of a complete record of the most recent offer and what we modified it to when binding the lease.
@@ -147,17 +147,17 @@
     <li>premature and repeated DISCOVER and/or REQUEST messages at startup are avoided.
     <li>permanent ARP cache entries are no longer deleted during binding.
     <li>allow empty lists of option names for 'ignore', 'request', and 'require' dhclient.conf directives, so lists can be reset in interface declarations.
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=dhcpd&amp;sektion=8">dhcpd(8)</a> and dhclient recognize the same list of dhcp options.
-    <li>hand-rolled IMSG implementation replaced with <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=imsg_init&amp;sektion=3">imsg_init(3)</a> and related functions..
-    <li>hand-rolled date string construction replaced with <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=strftime&amp;sektion=3">strftime(3)</a> invocations.
-    <li>hand-rolled '%m' option replaced with <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=strerror&amp;sektion=3">strerror(3)</a> invocations.
+    <li><a href="http://man.openbsd.org?query=dhcpd&amp;sektion=8">dhcpd(8)</a> and dhclient recognize the same list of dhcp options.
+    <li>hand-rolled IMSG implementation replaced with <a href="http://man.openbsd.org?query=imsg_init&amp;sektion=3">imsg_init(3)</a> and related functions..
+    <li>hand-rolled date string construction replaced with <a href="http://man.openbsd.org?query=strftime&amp;sektion=3">strftime(3)</a> invocations.
+    <li>hand-rolled '%m' option replaced with <a href="http://man.openbsd.org?query=strerror&amp;sektion=3">strerror(3)</a> invocations.
     <li>many other internal code improvements.
     </ul>
 <p>
 
-<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf&amp;sektion=4">pf(4)</a> improvements:
+<li><a href="http://man.openbsd.org?query=pf&amp;sektion=4">pf(4)</a> improvements:
     <ul>
-    <li> The <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=divert&amp;sektion=4">divert(4)</a>
+    <li> The <a href="http://man.openbsd.org?query=divert&amp;sektion=4">divert(4)</a>
          socket now supports the new IP_DIVERTFL socket option to control whether both inbound and outbound packets are diverted (the default) or only packets travelling in one direction.
     <li>Sloppy state tracking (a special mode occasionally needed with asymmetric routing) now works correctly with ICMP.
     <li>PF now restricts the fragment limit to protect against a misconfiguration running the kernel out of mbuf clusters.
@@ -169,14 +169,14 @@
     <li>New features:
       <ul>
 	<li>code is now considered stable and suitable for use in production.
-	<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=smtpctl&amp;sektion=8">smtpctl(8)</a> <i>trace</i> supports runtime tracing of various components, including imsg exchanges, incoming and outgoing sessions, aliases expansion and much more.
-	<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=smtpctl&amp;sektion=8">smtpctl(8)</a> <i>monitor</i> can now be used to monitor in real-time an instance of <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=smtpd&amp;sektion=8">smtpd(8)</a>.
-	<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=smtpctl&amp;sektion=8">smtpctl(8)</a> <i>show queue</i> now supports an "online" mode where the scheduler is queried instead of the disk-based queue to provide more accurate information.
+	<li><a href="http://man.openbsd.org?query=smtpctl&amp;sektion=8">smtpctl(8)</a> <i>trace</i> supports runtime tracing of various components, including imsg exchanges, incoming and outgoing sessions, aliases expansion and much more.
+	<li><a href="http://man.openbsd.org?query=smtpctl&amp;sektion=8">smtpctl(8)</a> <i>monitor</i> can now be used to monitor in real-time an instance of <a href="http://man.openbsd.org?query=smtpd&amp;sektion=8">smtpd(8)</a>.
+	<li><a href="http://man.openbsd.org?query=smtpctl&amp;sektion=8">smtpctl(8)</a> <i>show queue</i> now supports an "online" mode where the scheduler is queried instead of the disk-based queue to provide more accurate information.
 	<li>virtual domain support has been reworked to simplify and bring support for new features like global catch-alls and shared user mappings.
 	<li>new table API replaces the map API: better handling of transient errors, improved performances and a much better interface.
 	<li>the transfer process may now select the source IP address to use as well as the HELO hostname to advertise from a table.
 	<li>each listener may advertise a different banner hostname.
-	<li>an alternate user database may be provided instead of relying on <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=getpwnam&amp;sektion=3">getpwnam(3)</a>.
+	<li>an alternate user database may be provided instead of relying on <a href="http://man.openbsd.org?query=getpwnam&amp;sektion=3">getpwnam(3)</a>.
 	<li>users may now be authenticated using credentials from a table.
 	<li>incoming sessions can be tagged, allowing for rules to only match envelopes that have been reinjected in the daemon after being passed to a proxy tool.
 	<li>intermediate bounces are now sent at configurable rates.
@@ -190,7 +190,7 @@
 	<li>improved memory use by scheduler, smtp, queue and transfer processes.
 	<li>more reliable and efficient disk-based queue.
 	<li>improved scheduler, dns and relaying logic that optimizes transfers.
-	<li>simplified grammar for <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=smtpd.conf&amp;sektion=5">smtpd.conf(5)</a>.
+	<li>simplified grammar for <a href="http://man.openbsd.org?query=smtpd.conf&amp;sektion=5">smtpd.conf(5)</a>.
 	<li>initial support for client and server SSL peer certificates validation.
 	<li>SSL certificate tree is now isolated and network-facing processes request SSL information on-demand by imsg.
 	<li>improved and simplified SMTP and MTA engines.
@@ -203,7 +203,7 @@
 <li>Security improvements:
     <ul>
     <li>Position-independent executables (PIE) are now used <b>by default</b> on alpha, amd64, hppa, landisk, loongson, sgi and sparc64.
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=gcc&amp;sektion=1">gcc(1)</a> stack smashing protector added for Alpha and MIPS (enabled by default).
+    <li><a href="http://man.openbsd.org?query=gcc&amp;sektion=1">gcc(1)</a> stack smashing protector added for Alpha and MIPS (enabled by default).
     <li>Shared libraries on GCC 4 platforms now each get their own stack protector cookies instead of sharing a single global cookie.
     </ul>
 <p>
@@ -213,7 +213,7 @@
     <li>Switch default disk I/O sort algorithm to NSCAN for improved fairness and response times.
     <li>Softdep speedup improvements by the revert of a previously necessary workaround to prevent kva starvation.
     <li>Large performance and reliability improvements in 
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=make&amp;sektion=1">make(1)</a>,
+<a href="http://man.openbsd.org?query=make&amp;sektion=1">make(1)</a>,
 especially in parallel mode. make no longer does any busy waiting, it handles
 concurrent targets correctly, and displays more accurate error messages.
     <li>Increased stack alignment in constructor functions and new threads on i386 to meet requirements for SSE.
@@ -224,8 +224,8 @@
 <li>Threading improvements:
     <ul>
     <li>Threaded programs and libraries can now be linked with the POSIX-standard -lpthread flag instead of the OpenBSD-specific -pthread flag
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=abort&amp;sektion=3">abort(3)</a> and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=raise&amp;sektion=3">raise(3)</a> now direct the signal to the calling thread, as specified by POSIX.
-    <li>Whether a thread is currently executing on an alternate signal stack (c.f.  <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sigaltstack&amp;sektion=2">sigaltstack(2)</a>) is now determined dynamically, so the stack can be reused if <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=siglongjmp&amp;sektion=3">siglongjmp(3)</a> is used to exit the signal handler.
+    <li><a href="http://man.openbsd.org?query=abort&amp;sektion=3">abort(3)</a> and <a href="http://man.openbsd.org?query=raise&amp;sektion=3">raise(3)</a> now direct the signal to the calling thread, as specified by POSIX.
+    <li>Whether a thread is currently executing on an alternate signal stack (c.f.  <a href="http://man.openbsd.org?query=sigaltstack&amp;sektion=2">sigaltstack(2)</a>) is now determined dynamically, so the stack can be reused if <a href="http://man.openbsd.org?query=siglongjmp&amp;sektion=3">siglongjmp(3)</a> is used to exit the signal handler.
     <li>libpthread now caches automatically allocated, default size thread stacks.
     <li>Improvements in the handling of profiling, tracing, and %cpu calculation of threaded processes.
     </ul>
@@ -233,24 +233,24 @@
 
 <li>Assorted improvements:
     <ul>
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ldomctl&amp;sektion=8&amp;arch=sparc64">ldomctl(8)</a>
+    <li><a href="http://man.openbsd.org?query=ldomctl&amp;sektion=8&amp;arch=sparc64">ldomctl(8)</a>
       was added to manage logical domains on sun4v systems through
-      <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ldomd&amp;sektion=8&amp;arch=sparc64">ldomd(8)</a>.
+      <a href="http://man.openbsd.org?query=ldomd&amp;sektion=8&amp;arch=sparc64">ldomd(8)</a>.
     <li>Support for WPA Enterprise was added to the wpa_supplicant package.
-    <li>OpenBSD/luna88k and OpenBSD/mvme88k have switched to GCC 3, <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=elf&amp;sektion=5">elf(5)</a> and gained shared library support.
-    <li>OpenBSD/hp300 and OpenBSD/mvme68k have switched to GCC 3 and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=elf&amp;sektion=5">elf(5)</a>.
-    <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=softraid&amp;sektion=4">softraid(4)</a> RAID1 and crypto volumes are now bootable on i386 and amd64 (full disk encryption).
-    <li>The <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=mg&amp;sektion=1">mg(1)</a>
+    <li>OpenBSD/luna88k and OpenBSD/mvme88k have switched to GCC 3, <a href="http://man.openbsd.org?query=elf&amp;sektion=5">elf(5)</a> and gained shared library support.
+    <li>OpenBSD/hp300 and OpenBSD/mvme68k have switched to GCC 3 and <a href="http://man.openbsd.org?query=elf&amp;sektion=5">elf(5)</a>.
+    <li><a href="http://man.openbsd.org?query=softraid&amp;sektion=4">softraid(4)</a> RAID1 and crypto volumes are now bootable on i386 and amd64 (full disk encryption).
+    <li>The <a href="http://man.openbsd.org?query=mg&amp;sektion=1">mg(1)</a>
       emacs-like editor now supports <tt>diff-buffer-with-file</tt>, <tt>make-directory</tt> and <tt>revert-buffer</tt>.
       Column numbers have been made configurable and locale is respected for ctype purposes, like displaying ISO Latin 1 characters.
-    <li>Improved our own <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pkg-config&amp;sektion=1">pkg-config(1)</a>
+    <li>Improved our own <a href="http://man.openbsd.org?query=pkg-config&amp;sektion=1">pkg-config(1)</a>
       implementation to make it compatible with freedesktop.org's 0.27.1 release.
     <li>A number of improvements to the buffer cache and page daemon interactions to avoid issues in low memory/low kva situations.
     <li>Various bug fixes in uvm to avoid potential races and deadlock issues.
     <li>Memory filesystem (mfs) switched to bufq, giving us queue limits and FIFO queueing (rather than the current LIFO queueing).
-    <li>Many improvements to the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cwm&amp;sektion=1">cwm(1)</a> window manager,
+    <li>Many improvements to the <a href="http://man.openbsd.org?query=cwm&amp;sektion=1">cwm(1)</a> window manager,
 including tab completion and Xft support for menus, improved Xinerama support, and per-group vertical/horizontal manual tiling support.
-    <li>Added <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=dprintf&amp;sektion=3">dprintf(3)</a>, <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=grantpt&amp;sektion=3">grantpt(3)</a>, <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=posix_openpt&amp;sektion=3">posix_openpt(3)</a>, <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ptsname&amp;sektion=3">ptsname(3)</a>, <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=unlockpt&amp;sektion=3">unlockpt(3)</a>, and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=vdprintf&amp;sektion=3">vdprintf(3)</a>.
+    <li>Added <a href="http://man.openbsd.org?query=dprintf&amp;sektion=3">dprintf(3)</a>, <a href="http://man.openbsd.org?query=grantpt&amp;sektion=3">grantpt(3)</a>, <a href="http://man.openbsd.org?query=posix_openpt&amp;sektion=3">posix_openpt(3)</a>, <a href="http://man.openbsd.org?query=ptsname&amp;sektion=3">ptsname(3)</a>, <a href="http://man.openbsd.org?query=unlockpt&amp;sektion=3">unlockpt(3)</a>, and <a href="http://man.openbsd.org?query=vdprintf&amp;sektion=3">vdprintf(3)</a>.
     <li>Corrected the order of invocation of constructor and destruction functions.
     <li>Improved compliance and/or cleanliness of header files, particularly
 	&lt;dlfcn.h&gt;, &lt;netdb.h&gt;, &lt;net/if.h&gt;,
@@ -263,28 +263,28 @@
     <ul>
     <li>New features:
       <ul>
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>
           and
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>:
+          <a href="http://man.openbsd.org?query=sshd&amp;sektion=8">sshd(8)</a>:
           Added support for AES-GCM authenticated encryption in SSH protocol 2.
           The new cipher is available as "aes128-gcm@openssh.com" and
           "aes256-gcm@openssh.com". It uses an identical packet format to the
           AES-GCM mode specified in RFC 5647, but uses simpler and different
           selection rules during key exchange.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>
           and
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>:
+          <a href="http://man.openbsd.org?query=sshd&amp;sektion=8">sshd(8)</a>:
           Added support for encrypt-then-mac (EtM) MAC modes for SSH protocol 2.
           These modes alter the packet format and compute the MAC over the
           packet length and encrypted packet rather than over the plaintext
           data. These modes are considered more secure and are used by default
           when available.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>
           and
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>:
+          <a href="http://man.openbsd.org?query=sshd&amp;sektion=8">sshd(8)</a>:
           Added support for the UMAC-128 MAC as "umac-128@openssh.com" and
           "umac-128-etm@openssh.com". The latter being an encrypt-then-mac mode.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>:
+      <li><a href="http://man.openbsd.org?query=sshd&amp;sektion=8">sshd(8)</a>:
           Added support for multiple required authentication in SSH protocol 2
           via an <tt>AuthenticationMethods</tt> option. This option lists one
           or more comma-separated lists of authentication method names.
@@ -292,88 +292,88 @@
           authentication to complete. This allows, for example, requiring a
           user having to authenticate via public key or GSSAPI before they are
           offered password authentication.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>
+      <li><a href="http://man.openbsd.org?query=sshd&amp;sektion=8">sshd(8)</a>
           and
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>:
+          <a href="http://man.openbsd.org?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>:
           Added support for Key Revocation Lists (KRLs), a compact binary
           format to represent lists of revoked keys and certificates that take
           as little as one bit per certificate when revoking by serial number.
           KRLs may be generated using
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>
+          <a href="http://man.openbsd.org?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>
           and are loaded into
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>
+          <a href="http://man.openbsd.org?query=sshd&amp;sektion=8">sshd(8)</a>
           via the existing <tt>RevokedKeys</tt>
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&amp;sektion=5">sshd_config(5)</a>
+          <a href="http://man.openbsd.org?query=sshd_config&amp;sektion=5">sshd_config(5)</a>
           option.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>:
           <tt>IdentitiesOnly</tt> now applies to keys obtained from a
           PKCS11Provider. This allows control of which keys are offered from
           tokens using <tt>IdentityFile</tt>.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>:
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&amp;sektion=5">sshd_config(5)</a>'s
+      <li><a href="http://man.openbsd.org?query=sshd&amp;sektion=8">sshd(8)</a>:
+          <a href="http://man.openbsd.org?query=sshd_config&amp;sektion=5">sshd_config(5)</a>'s
           AllowTcpForwarding now accepts "<tt>local</tt>" and "<tt>remote</tt>"
           in addition to its previous "<tt>yes</tt>"/"<tt>no</tt>" keywords to
           allow the server to specify whether just local or remote TCP
           forwarding is enabled.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>:
+      <li><a href="http://man.openbsd.org?query=sshd&amp;sektion=8">sshd(8)</a>:
           Added a
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&amp;sektion=5">sshd_config(5)</a>
+          <a href="http://man.openbsd.org?query=sshd_config&amp;sektion=5">sshd_config(5)</a>
           option <tt>AuthorizedKeysCommand</tt> to support fetching
           authorized_keys from a command in addition to (or instead of) from
           the filesystem. The command is run under an account specified by an
           <tt>AuthorizedKeysCommandUser</tt>
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&amp;sektion=5">sshd_config(5)</a>
+          <a href="http://man.openbsd.org?query=sshd_config&amp;sektion=5">sshd_config(5)</a>
           option.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp-server&amp;sektion=8">sftp-server(8)</a>:
+      <li><a href="http://man.openbsd.org?query=sftp-server&amp;sektion=8">sftp-server(8)</a>:
           Now supports a <tt>-d</tt> option to allow the starting directory to
           be something other than the user's home directory.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>:
           Now allows fingerprinting of keys hosted in PKCS#11 tokens using
           "ssh-keygen -lD pkcs11_provider".
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>:
           When SSH protocol 2 only is selected (the default),
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>
+          <a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>
           now immediately sends its SSH protocol banner to the server without
           waiting to receive the server's banner, saving time when connecting.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>
           Added <tt>~v</tt> and <tt>~V</tt> escape sequences to raise and lower
           the logging level respectively.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>
           Made the escape command help (<tt>~?</tt>) context sensitive so that
           only commands that will work in the current session are shown.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>:
           When deleting host lines from known_hosts using "ssh-keygen -R host",
-          <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>
+          <a href="http://man.openbsd.org?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>
           now prints details of which lines were removed.
       </ul>
     <li>The following significant bugs have been fixed in this release:
       <ul>
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>:
           Force a clean shutdown of ControlMaster client sessions when the
           <tt>~.</tt> escape sequence is used. This means that <tt>~.</tt>
           should now work in mux clients even if the server is no longer
           responding.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>:
           Correctly detect errors during local TCP forward setup in multiplexed
           clients. (bz#2055)
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-add&amp;sektion=1">ssh-add(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh-add&amp;sektion=1">ssh-add(1)</a>:
           Made deleting explicit keys "ssh-add -d" symmetric with adding keys
           with respect to certificates. It now tries to delete the
           corresponding certificate and respects the <tt>-k</tt> option to
           allow deleting of the key only.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp&amp;sektion=1">sftp(1)</a>:
+      <li><a href="http://man.openbsd.org?query=sftp&amp;sektion=1">sftp(1)</a>:
           Fix a number of parsing and command-editing bugs, including bz#1956.
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>:
           When muxmaster is run with <tt>-N</tt>, ensure that it shuts down
           gracefully when a client sends it "-O stop" rather than hanging
           around. (bz#1985)
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>:
           When screening moduli candidates, append to the file rather than
           overwriting to allow resumption. (bz#1957)
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>:
           Record "Received disconnect" messages at ERROR rather than INFO
           priority. (bz#2057)
-      <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>:
+      <li><a href="http://man.openbsd.org?query=ssh&amp;sektion=1">ssh(1)</a>:
           Loudly warn if explicitly-provided private key is unreadable.
           (bz#1981)
       </ul>
@@ -533,9 +533,9 @@
 To make a boot floppy under MS-DOS, use the &quot;rawrite&quot; utility located
 at <i>CD1:5.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>
+<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://www.openbsd.org/cgi-bin/man.cgi?query=dd&amp;sektion=1">dd(1)</a>,
+<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;.
 
@@ -827,7 +827,7 @@
 OpenBSD ports system.
 <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;sektion=1&amp;arch=i386">
+<a href="http://man.openbsd.org?query=cvs&amp;sektion=1&amp;arch=i386">
 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