===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.558
retrieving revision 1.559
diff -c -r1.558 -r1.559
*** www/events.html	2006/10/29 16:21:46	1.558
--- www/events.html	2006/10/29 21:53:37	1.559
***************
*** 42,62 ****
  
  <ul>
  
- <li><strong><a name=nycbsdcon2006></a>
- <a href="http://nycbsdcon.org/">NYCBSDCon 2006</a></strong>,
- Oct 28 - 29, 2006, New York City, USA<br>
- NYCBSDCon is the main conference on the East Coast for the
- BSD community to get together to share and gain knowledge,
- to network with like minded people.
- Several developers will be speaking, and more will be on hand:
-  <ul>
-   <li>Marco Peereboom: <a href="papers/bio.pdf">bio and sensors in OpenBSD</a>
-   <li>Jason Wright: <a href="http://www.thought.net/jason/sparc64-nycbsdcon06/">OpenBSD/sparc64</a>
-   <li>Bob Beck: <i>PF, it is not just for firewalls anymore</i>
-   <li>Ray Lai: <i>First time booth bunny</i>
-  </ul>
- <p>
- 
  <li><strong><a name=conisli2006></a>
  <a href="http://conisli.org/">CONISLI 2006</a></strong>,
  Nov 3 - 5, 2006, S&atilde;o Paulo, Brazil<br>
--- 42,47 ----
***************
*** 105,110 ****
--- 90,112 ----
  
  <h3>2006</h3>
  <ul>
+ 
+ <li><strong><a name=nycbsdcon2006></a>
+ <a href="http://nycbsdcon.org/">NYCBSDCon 2006</a></strong>,
+ Oct 28 - 29, 2006, New York City, USA<br>
+ NYCBSDCon is the main conference on the East Coast for the
+ BSD community to get together to share and gain knowledge,
+ to network with like minded people.
+ Several developers spoke, and more were on hand:
+  <ul>
+   <li>Marco Peereboom: <a href="papers/bio.pdf">bio and sensors in OpenBSD</a>
+   <li>Jason Wright: <a href="http://www.thought.net/jason/sparc64-nycbsdcon06/">OpenBSD/sparc64</a>
+   <li>Bob Beck: <a href="http://www.ualberta.ca/~beck/nycbug06/pf">PF, it is not just for firewalls anymore</a>
+   <li>Bob Beck: <a href="http://www.ualberta.ca/~beck/nycbug06/spamd">OpenBSD spamd - greylisting and beyond</a>
+   <li>Ray Lai: <i>First time booth bunny</i>
+  </ul>
+ <p>
+ 
  <li><strong><a name=linuxworlduk2006></a>
  <a href="http://www.linuxworldexpo.co.uk/">LinuxWorld Expo UK 2006</a></strong>,
  Oct 25 - 26, 2006, Olympia, London, UK.<br>
***************
*** 2108,2114 ****
  <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.558 2006/10/29 16:21:46 wvdputte Exp $</small>
  
  </body>
  </html>
--- 2110,2116 ----
  <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.559 2006/10/29 21:53:37 jason Exp $</small>
  
  </body>
  </html>