[gnomeweb-wml] killed some text and added GNOME Asia as well

[Andreas Nilsson <andreasn src gnome org>]

commit f7cf2c2c673cc6505fce08dd72d4b1aafdd320b1
Author: Andreas Nilsson <nisses mail home se>
Date:   Fri Jan 21 15:36:41 2011 +0100

    killed some text and added GNOME Asia as well

 www.gnome.org/index.wml |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/www.gnome.org/index.wml b/www.gnome.org/index.wml
index da1002f..a595049 100644
--- a/www.gnome.org/index.wml
+++ b/www.gnome.org/index.wml
@@ -41,20 +41,23 @@ ecosphere. For details, including roles and responsibilities and where to send r
 
 <h2>Upcoming Events</h2>
 
-<h3><a href="">GNOME 3.0 Bangalore Hackfest</a></h3>
+<h3><a href="http://live.gnome.org/Hackfests/GNOME.Asia2011";>GNOME 3.0 Bangalore Hackfest</a></h3>
 <i>March 28 - April 1 2011, Bangalore, India</i>
 
 <p>We are hosting a <strong>5 days hackfest</strong> for the release, documentation and marketing teams focusing on the <a
-href="http://www.gnome3.org";>GNOME 3.0</a> release. This will ensure some heavy testing of the code during the last week before the official release, as well as preparing the release to happen in an optimal way. And at the same time, it will help the marketing team to clarify messaging when needed and finalize the launch details.</p>
+href="http://www.gnome3.org";>GNOME 3.0</a> release. This will ensure some heavy testing of the code during the last week before the official release, as well as preparing the release to happen in an optimal way.</p>
 
-<p>It is not primarily aimed at users or new contributors but we may organize some training and hands on sessions during the last 3 days of the hackfest (March 30 to April 1). Apart from that, any contributor involved in the release process is strongly encouraged to join.<br/>
-Please let us know you are coming by <a href="http://live.gnome.org/Hackfests/GNOME.Asia2011";>registering on the hackfest page</a>.</p>
+<p>Please let us know you are coming by <a href="http://live.gnome.org/Hackfests/GNOME.Asia2011";>registering on the hackfest page</a>.</p>
 
-<h3><a href="http://www.desktopsummit.org/";>Desktop Summit 2011</a></h3>
+<h3><a href="http://www.gnome.asia";>GNOME Asia Summit 2011</a></h3>
 <i>August 6-12, 2011, Berlin, Germany</i>
-<p>TThe Desktop Summit is the get-together of the yearly free software conferences Akademy and GUADEC. This year, the Desktop Summit will take place at the Humboldt University in Berlin. The event will feature keynotes, talks, workshops and social activities.</p>
+<p>Right after the <a href="http://live.gnome.org/Hackfests/GNOME.Asia2011";>GNOME 3.0 Bangalore Hackfest</a>, we will jump on the opportunity of having a lot of the GNOME developers already on site to <strong>aim for the greatest <a href="http://www.gnome.asia";>GNOME.Asia Summit</a> of all time</strong>. Now in its forth year, <a href="http://www.gnome.asia";>GNOME.Asia Summit</a> will have the pleasure to continue to bring GNOME to users and developers in Asia and more specifically India this year, but also to celebrate the release of <a href="http://www.gnome3.org";>GNOME 3.0</a> with the people who actually write the software!</p>
+
+<p>Stay tuned and visit <a href="http://www.gnome.asia";>Gnome.Asia</a> regularly for the latest information!</p>
 
-<p>We expect well over a thousand participants, including core contributors, prominent open source technology leaders, representatives from government, education and corporate backgrounds, open source desktop engineers, usability experts and designers.</p>
+<h3><a href="http://www.desktopsummit.org/";>Desktop Summit 2011</a></h3>
+<i>August 6-12, 2011, Berlin, Germany</i>
+<p>The Desktop Summit is the get-together of the yearly free software conferences Akademy and GUADEC. This year, the Desktop Summit will take place at the Humboldt University in Berlin. The event will feature keynotes, talks, workshops and social activities. We expect well over a thousand participants. Registration is coming up soon.</p>
 
 </div>