From 0ca080b7a7e73f59ea403b2050a8f64eb7891963 Mon Sep 17 00:00:00 2001
From: Murray Stokely <murray@FreeBSD.org>
Date: Mon, 26 Jul 2004 06:39:19 +0000
Subject: [PATCH] Add entry for Linux Expo Shanghai in September.  I will man a
 freebsd.org/freebsdchina.org booth there with some members of the FreeBSD
 China group in Shanghai.

---
 en/events/events.xml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/en/events/events.xml b/en/events/events.xml
index a75d6292e9..570d82f124 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.28 2004/04/14 13:48:30 josef Exp $
+      $FreeBSD: www/en/events/events.xml,v 1.29 2004/07/04 22:29:50 simon Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -84,6 +84,31 @@
       FreeBSD.</description>
   </event>
 
+  <event id="linuxexpocn-2004">
+    <name>Linux Expo Shanghai</name>
+    <url>http://www.linuxexposhanghai.com/</url>
+    <startdate>
+      <year>2004</year>
+      <month>9</month>
+      <day>9</day>
+    </startdate>
+    <enddate>
+      <year>2004</year>
+      <month>9</month>
+      <day>10</day>
+    </enddate>
+    <location>
+      <country>China</country>
+      <city>Shanghai</city>
+    </location>
+
+    <description>Linux Expo Shanghai is the biggest Linux/Open Source
+      conference in Shanghai this summer.  <a
+      href="mailto:murray@FreeBSD.org">Murray Stokely</a> and members
+      of the <a href="http://www.freebsdchina.org">FreeBSD China</a>
+      group will have a booth there both days.</description>
+  </event>
+
   <event id="usenix-2004">
     <name>2004 USENIX Annual Technical Conference</name>
     <url>http://www.usenix.org/events/usenix04/</url>