===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.267
retrieving revision 1.268
diff -c -r1.267 -r1.268
*** www/events.html	2004/10/02 02:16:18	1.267
--- www/events.html	2004/10/21 02:48:48	1.268
***************
*** 26,52 ****
  
  <ul>
  
- <li><strong><a name=SANE2004></a>
- <a href="http://www.nluug.nl/events/sane2004/bazaar.html">SANE 2004</a></strong>
- , Sept 29, 2004, Amsterdam, Netherlands.<br>
- There is an OpenBSD and OpenSSH booth, contact 
- <a href="mailto:wim@openbsd.org">Wim</a>.
- <p>
- 
- <li><strong><a name=Hack in the Box Security Conference 2004></a>
- <a href="http://conference.hackinthebox.org">Hack in the Box Security Conference 2004</a></strong>,
- Oct 4 - 7, 2004, Kuala Lumpur, Malaysia.<br>
- Theo de Raadt is presenting an updated version of his
- "Exploit Mitigation Techniques" talk.
- <p>
- 
- <li><strong><a name=linuxexpo2004oct></a>
- <a href="http://www.linuxexpo.org.uk/">Linux Expo</a></strong>, 
- Oct 6 - 7, 2004, London, UK.<br>
- There is an OpenBSD and OpenSSH booth, contact
- <a href="mailto:wim@openbsd.org">Wim</a>.
- <p>
- 
  <li><strong><a name=systems2004></a>
  <a href="http://www.systems.de/">Systems</a></strong>, 
  Oct 18 - 22, 2004, Munich, Germany <br>
--- 26,31 ----
***************
*** 110,115 ****
--- 89,115 ----
  
  <ul>
  
+ <li><strong><a name=linuxexpo2004oct></a>
+ <a href="http://www.linuxexpo.org.uk/">Linux Expo</a></strong>, 
+ Oct 6 - 7, 2004, London, UK.<br>
+ There was an OpenBSD and OpenSSH booth, run by
+ <a href="mailto:wim@openbsd.org">Wim</a>.
+ <p>
+ 
+ <li><strong><a name=Hack in the Box Security Conference 2004></a>
+ <a href="http://conference.hackinthebox.org">Hack in the Box Security Conference 2004</a></strong>,
+ Oct 4 - 7, 2004, Kuala Lumpur, Malaysia.<br>
+ Theo de Raadt presented an updated version of his
+ "Exploit Mitigation Techniques" talk.
+ <p>
+ 
+ <li><strong><a name=SANE2004></a>
+ <a href="http://www.nluug.nl/events/sane2004/bazaar.html">SANE 2004</a></strong>
+ , Sept 29, 2004, Amsterdam, Netherlands.<br>
+ There was an OpenBSD and OpenSSH booth, run by
+ <a href="mailto:wim@openbsd.org">Wim</a>.
+ <p>
+ 
  <li><strong><a name=LinuxKongress2004></a>
  <a href="http://www.linux-kongress.org/2004">Linux Kongress 2004</a></strong>,
  Sept 7 - 10, 2004, Erlangen, Germany.<br>
***************
*** 1189,1195 ****
  <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.267 2004/10/02 02:16:18 deraadt Exp $</small>
  
  </body>
  </html>
--- 1189,1195 ----
  <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.268 2004/10/21 02:48:48 krw Exp $</small>
  
  </body>
  </html>