From 6f824a1b1c782692bdadf7b22393d2373511b9b0 Mon Sep 17 00:00:00 2001
From: Murray Stokely <murray@FreeBSD.org>
Date: Sat, 6 Aug 2005 14:49:51 +0000
Subject: [PATCH] Add a note about the O'Reilly Open Source Conference and link
 to a press release about the FreeBSD advocacy effort there.

Submitted by:	matt@
---
 en/events/events.xml | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/en/events/events.xml b/en/events/events.xml
index fe4a5e5209..ca7f85603b 100644
--- a/en/events/events.xml
+++ b/en/events/events.xml
@@ -9,7 +9,7 @@
 <events>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/events/events.xml,v 1.50 2005/06/06 22:39:05 murray Exp $
+      $FreeBSD: www/en/events/events.xml,v 1.51 2005/07/18 05:29:57 rushani Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -36,6 +36,33 @@
       FreeBSD of course.</description>
   </event>
 
+  <event id="oscon-2005">
+    <name>O'Reilly Open Source Conference 2005</name>
+    <url>http://conferences.oreillynet.com/os2005/</url>
+    <startdate>
+      <year>2005</year>
+      <month>8</month>
+      <day>1</day>
+    </startdate>
+    <enddate>
+      <year>2005</year>
+      <month>8</month>
+      <day>5</day>
+    </enddate>
+    <location>
+      <country>U.S.A.</country>
+      <city>Portland, Oregon</city>
+      <site>Oregon Convention Center</site>
+    </location>
+
+    <description>The annual O'Reilly Open Source Conference had a
+      larger BSD presence this year.  Matt Olander, Dru Lavigne, and
+      others helped spread the word about FreeBSD.  A press release
+      about the advocacy effort is available <a
+      href="http://www.offmyserver.com/cgi-bin/store/news/oscon_080505.html">here</a>.
+    </description>
+  </event>
+
   <event id="bsdcon-japan-2005">
     <name>BSDCon Japan 2005</name>
     <url>http://bsdcon.jp/</url>