[gnomeweb-wml] Removed Marketing hackfest and added GNOME Asia to the upcoming events.

[Andreas Nilsson <andreasn src gnome org>]

commit 1970704c22c19870bfffbda5526a8b5a50939e28
Author: Andreas Nilsson <nisses mail home se>
Date:   Fri Jun 18 23:27:01 2010 +0200

    Removed Marketing hackfest and added GNOME Asia to the upcoming events.

 www.gnome.org/index.wml |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/www.gnome.org/index.wml b/www.gnome.org/index.wml
index 31bf754..73f4eed 100644
--- a/www.gnome.org/index.wml
+++ b/www.gnome.org/index.wml
@@ -35,10 +35,6 @@
 
 <h2>Upcoming Events</h2>
 
-<h3><a href="http://live.gnome.org/Hackfests/Marketing-2010-05";>Marketing Hackfest</a></h3>
-<i>May 5-7, Zaragoza, Spain</i>
-<p>The GNOME Marketing team will meet to define and launch the GNOME 3.0 launch plans.</p>
-
 <h3><a href="http://www.guadec.org/";>GUADEC 2010</a></h3>
 <i>July 24-30, 2010, The Hague, Netherlands</i>
 <p>At the annual European GNOME Conference, GNOME hackers from all across the
@@ -47,8 +43,11 @@ future direction of the project.</p>
 <p>The conference will lead up to the GNOME 3.0 release in September 2010.
 Keeping with the 3.0 theme, the three primary themes for GUADEC 2010
 will be Government, education, and end users.</p>
-<p>Registration details and information on the call for papers will be up
-by January 6th on the <a href="http://www.guadec.org/";>GUADEC website</a>.</p>
+
+<h3><a href="http://2010.gnome.asia/";>GNOME.Asia 2010</a></h3>
+<i>August 14-15 2010, Taipei, Taiwan</i>
+<p>For this third edition of the  GNOME.Asia Summit  we're delighted to partner with the organizers of COSCUP (Conference for Open Source Coders, Users and Promoters), the largest free and open source software (FLOSS) conference in Taiwan. The event will be held at the International Conference Hall, Research Center for Humanities and Social Sciences, Academia Sinica in Taipei (Taiwan).</p>
+<p>With a tagline of  â??Open Web and Mobile Technologiesâ?? , it emphasizes the exciting development in these two areas as well as the GNOME desktop environment, and leverages the world-leading hardware industry in Taiwan.</p>
 
 </div>