===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/mail.html,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- www/mail.html	2016/02/23 17:30:03	1.141
+++ www/mail.html	2016/03/21 05:46:20	1.142
@@ -31,7 +31,7 @@
 <dl>
 <dt><b>Plain text, 72 characters per line</b>
 <dd>Many subscribers and developers read their mail on text-based mailers
-like <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=mail">mail(1)</a>,
+like <a href="http://man.openbsd.org?query=mail">mail(1)</a>,
 emacs or mutt, and they often find HTML-formatted messages (or lines that
 stretch beyond 72 characters) unreadable.
 Most OpenBSD mailing lists strip messages of MIME content before sending
@@ -47,7 +47,7 @@
 the relevant documents, such as the <tt>INSTALLi.*</tt> text files in the
 installation directories, the <a href="faq/index.html">FAQ</a> and the
 relevant man pages (start with
-<a href= "http://www.openbsd.org/cgi-bin/man.cgi?query=afterboot">
+<a href= "http://man.openbsd.org?query=afterboot">
 afterboot(8)</a>).
 Also check the mailing list <a href="#Archives">archives</a>.
 We want to help, but we wouldn't want to deprive you of a valuable
@@ -85,7 +85,7 @@
 version</a> of OpenBSD.
 Any hardware-related questions should mention the platform (i386, amd64,
 etc.) and provide a full
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=dmesg">dmesg(8)</a>.
+<a href="http://man.openbsd.org?query=dmesg">dmesg(8)</a>.
 Hardware model numbers, unfortunately, don't indicate much about the
 actual content of a particular machine or accessory, and are useless to
 anyone who doesn't have that exact machine sitting where they can easily
@@ -113,7 +113,7 @@
 <a name="spam"></a><h2><font color="#e00000">Spam</font></h2>
 
 The OpenBSD mailing lists use
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=spamd">spamd(8)</a>
+<a href="http://man.openbsd.org?query=spamd">spamd(8)</a>
 in greylisting mode as well as <a href="http://www.spamassassin.org">
 SpamAssassin</a> to keep down the spam volume, but things do sneak through
 from time to time -- deal with it.
@@ -133,7 +133,7 @@
 In this case, you should use a <em>smart host</em> mail configuration
 that utilizes your ISP's mail server.
 See the examples in
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=smtpd.conf">
+<a href="http://man.openbsd.org?query=smtpd.conf">
 smtpd.conf(5)</a> for how to do this.
 
 <a name="Lists"></a><h2><font color="#e00000">The Mailing Lists</font></h2>
@@ -176,7 +176,7 @@
 <dl>
 <dt><b>bugs</b>
 <dd><a href="report.html">Bug reports</a> as sent in via
-<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sendbug">sendbug(1)</a>
+<a href="http://man.openbsd.org?query=sendbug">sendbug(1)</a>
 and follow-up discussions.
 
 <dt><b>tech</b>