===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.971
retrieving revision 1.972
diff -u -r1.971 -r1.972
--- www/events.html	2015/06/12 23:02:51	1.971
+++ www/events.html	2015/06/14 15:00:33	1.972
@@ -43,11 +43,20 @@
 
 <li><strong><a name="nycbugjun2015"></a>
 <a href="http://www.nycbug.org/index.cgi?action=event&amp;do=view&amp;id=10359">NYC*BUG</a></strong>,
-June 18, 2015, New York, New York, USA.<br>
+June 18, 2015, New York, New York, USA and
+June 17, 2015, CDBUG Albany, New York, USA.<br>
 Ingo Schwarze will give a talk &quot;mandoc: from scratch
 to the standard BSD documenation toolkit in 6 years&quot;
-<p>
 
+</ul>
+
+<hr>
+
+<h2>Past events:</h2>
+
+<h3>2015</h3>
+<ul>
+
 <li><strong><a name="bsdcan2015"></a>
 <a href="http://www.bsdcan.org/2015/">BSDCan 2015</a></strong>,
 June 10 - 13, 2015, Ottawa, Canada.<br>
@@ -58,6 +67,7 @@
 <li>Ingo Schwarze:
 <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=mandoc">mandoc(1)</a>:
 Becoming the main BSD manual toolbox
+(<a href="papers/bsdcan15-mandoc.pdf">slides</a>)
 <li>Peter Hansteen:
 <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf">pf(4)</a>:
 The OpenBSD Packet Filter: Building The Network You Need (tutorial)
@@ -70,17 +80,8 @@
 Building BUGs: A Broad Overview of the
 <a href="http://www.nycbug.org/">New York City *BSD User Group</a>
 </ul>
-<p>
 
-</ul>
-
-<hr>
-
-<h2>Past events:</h2>
-
-<h3>2015</h3>
-<ul>
-
+<p>
 <li><strong><a name="yapcna2015"></a>
 <a href="http://www.yapcna.org/yn2015/">YAPC::NA 2015</a></strong>,
 Jun 8-10, 2015, Salt Lake City, UT, USA.<br>