[gnomeweb-wml] added the gnome3 hackfest and desktop summit under upcoming events

[Andreas Nilsson <andreasn src gnome org>]

commit 975699fa262be2a788c22a839d9773a3331d6be5
Author: Andreas Nilsson <nisses mail home se>
Date:   Fri Jan 21 14:18:33 2011 +0100

    added the gnome3 hackfest and desktop summit under upcoming events

 www.gnome.org/index.wml |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/www.gnome.org/index.wml b/www.gnome.org/index.wml
index a7d15cd..da1002f 100644
--- a/www.gnome.org/index.wml
+++ b/www.gnome.org/index.wml
@@ -41,10 +41,20 @@ ecosphere. For details, including roles and responsibilities and where to send r
 
 <h2>Upcoming Events</h2>
 
-<h3><a href="http://live.gnome.org/Boston2010";>Boston Summit 2010</a></h3>
-<i>November 6â??8 2010, MA, USA</i>
-<p>The Boston Summit is a three-day hackfest for GNOME developers and contributors. It is not primarily aimed at users or new contributors, but if you want to jump right into the deep end, it's a fantastic way to meet everyone and get involved. Unlike traditional conferences, the Boston Summit is all about getting developers together and getting things done. While there are some non-hacking sessions, they are geared heavily towards many-to-many, interactive discussion and planning, rather than one-to-many presentations.</p>
-<p>Please go to the <a href="http://live.gnome.org/Boston2010";>2010 Summit page</a> and tells us you are coming!</p>
+<h3><a href="">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>
+
+<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>
+
+<h3><a href="http://www.desktopsummit.org/";>Desktop 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>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>
 
 </div>