===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.564
retrieving revision 1.565
diff -c -r1.564 -r1.565
*** www/events.html	2006/11/01 03:57:53	1.564
--- www/events.html	2006/11/07 15:37:43	1.565
***************
*** 42,54 ****
  
  <ul>
  
- <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>
- 4th edition of S&atilde;o Paulo's International Free Software Congress.
- Kenneth Westerback and Pedro Martelletto will give a talk.
- <p>
- 
  <li><strong><a name=linuxworldexpogermany2006></a>
  <a href="http://www.linuxworldexpo.de/">Linux World Expo Germany</a></strong>,
  Nov 14 - 16, 2006, Köln, Germany.<br>
--- 42,47 ----
***************
*** 81,86 ****
--- 74,80 ----
  Who can you trust? Well, us. OpenBSD will be there, of course, for our annual
  closing event.
  <p>
+ </ul>
  
  <hr>
  
***************
*** 89,94 ****
--- 83,95 ----
  <h3>2006</h3>
  <ul>
  
+ <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>
+ 4th edition of S&atilde;o Paulo's International Free Software Congress.
+ Ken Westerback and Pedro Martelletto gave a talk.
+ <p>
+ 
  <li><strong><a name=nycbsdcon2006></a>
  <a href="http://nycbsdcon.org/">NYCBSDCon 2006</a></strong>,
  Oct 28 - 29, 2006, New York City, USA<br>
***************
*** 2109,2115 ****
  <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.564 2006/11/01 03:57:53 jason 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.565 2006/11/07 15:37:43 krw Exp $</small>
  
  </body>
  </html>