===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.845
retrieving revision 1.846
diff -c -r1.845 -r1.846
*** www/events.html	2011/05/18 05:20:36	1.845
--- www/events.html	2011/05/21 15:04:12	1.846
***************
*** 60,66 ****
  May 11 - 14, 2011, Ottawa, Canada.<br>
  Peter N. M. Hansteen gave a tutorial on building networks with PF.<br>
  Kristaps Dzonsons gave a talk about the roff tradition and mandoc.<br>
! Ingo Schwarze gave a talk about mandoc in OpenBSD.<br>
  Claudio Jeker gave a talk about vscsi(4) and iscsid - iSCSI initiator
  the OpenBSD way.<br>
  Henning Brauer and Ryan McBride gave a talk to celebrate
--- 60,67 ----
  May 11 - 14, 2011, Ottawa, Canada.<br>
  Peter N. M. Hansteen gave a tutorial on building networks with PF.<br>
  Kristaps Dzonsons gave a talk about the roff tradition and mandoc.<br>
! Ingo Schwarze gave a talk about
! <a href="papers/bsdcan11-mandoc-openbsd.html">mandoc in OpenBSD</a>.<br>
  Claudio Jeker gave a talk about vscsi(4) and iscsid - iSCSI initiator
  the OpenBSD way.<br>
  Henning Brauer and Ryan McBride gave a talk to celebrate
***************
*** 2951,2957 ****
  <hr>
  <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt="OpenBSD"></a>
  <a href="mailto:www@openbsd.org">www@openbsd.org</a>
! <br><small>$OpenBSD: events.html,v 1.845 2011/05/18 05:20:36 djm Exp $</small>
  
  </body>
  </html>
--- 2952,2958 ----
  <hr>
  <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt="OpenBSD"></a>
  <a href="mailto:www@openbsd.org">www@openbsd.org</a>
! <br><small>$OpenBSD: events.html,v 1.846 2011/05/21 15:04:12 schwarze Exp $</small>
  
  </body>
  </html>