From e4354d4d08d41485e8f0c662cd221a3a95b4afaf Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Sun, 29 Nov 2009 23:38:34 +0100
Subject: [PATCH] Add news about GUADEC 2010 location

---
 foundation.gnome.org/index.wml      | 41 +++++++++++------------------
 foundation.gnome.org/news/index.wml | 16 +++++++++++
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/foundation.gnome.org/index.wml b/foundation.gnome.org/index.wml
index bd50b9b..9a4efe9 100644
--- a/foundation.gnome.org/index.wml
+++ b/foundation.gnome.org/index.wml
@@ -40,6 +40,22 @@
     <h2>News</h2>
     <ul>
 
+      <li>
+        <strong>GUADEC 2010 to be held in The Hague, Netherlands</strong>
+        <small>(30/11/2009)</small>
+        <blockquote>
+	  The GNOME Foundation is excited to announce that GUADEC 2010 will be
+	  held in The Hague, Netherlands July 24th-30th, 2010. The conference
+	  is expected to draw more than 500 attendees to discuss and direct the
+	  future of the GNOME Project. The Hague was one of several locations
+	  proposed for GUADEC in 2010. It was chosen in part due to the
+	  excellent facilities at the bid site, as well as easily accessible
+	  site for those traveling to GUADEC. Read the <a
+	  href="http://www.gnome.org/press/releases/2009-11-guadec2010.html">press
+	  release</a>.
+        </blockquote>
+      </li>
+
       <li>
         <strong>GNOME Quarterly Report Q3 2009 released</strong>
         <small>(30/10/2009)</small>
@@ -78,31 +94,6 @@
 	  desktop accessible for everyone!
         </blockquote>
       </li>
-      <li>
-        <strong>Success of the Gran Canaria Desktop Summit</strong>
-        <small>(05/08/2009)</small>
-        <blockquote>
-	  This year's Gran Canaria Desktop Summit represented the first time
-	  the GNOME and KDE communities have co-located their annual
-	  conferences in the same location. The summit accomplished its goal of
-	  increasing co-operation between GNOME and KDE to improve the Free
-	  Desktop experience. Read the <a
-	  href="http://www.gnome.org/press/releases/2009-08-desktop-summit-conclusion.html">press
-	  release</a>.
-        </blockquote>
-      </li>
-      <li>
-        <strong>GNOME Foundation Annual Report 2008 released</strong>
-        <small>(09/07/2009)</small>
-        <blockquote>
-          The third annual report of the GNOME Foundation is available for
-          <a href="./reports/gnome-annual-report-2008.pdf">download (18680 KB, PDF)</a> now.<br/>
-          The report aims to bring a summary of GNOME community activities in 2008.
-          It includes a review of the year, accounts of various community
-          activities and events around the world, and foundation development
-          actions during the year.
-        </blockquote>
-      </li>
 
     </ul>
 
diff --git a/foundation.gnome.org/news/index.wml b/foundation.gnome.org/news/index.wml
index 98674bb..fe0c01e 100644
--- a/foundation.gnome.org/news/index.wml
+++ b/foundation.gnome.org/news/index.wml
@@ -15,6 +15,22 @@
 
     <ul>
 
+      <li>
+        <strong>GUADEC 2010 to be held in The Hague, Netherlands</strong>
+        <small>(30/11/2009)</small>
+        <blockquote>
+	  The GNOME Foundation is excited to announce that GUADEC 2010 will be
+	  held in The Hague, Netherlands July 24th-30th, 2010. The conference
+	  is expected to draw more than 500 attendees to discuss and direct the
+	  future of the GNOME Project. The Hague was one of several locations
+	  proposed for GUADEC in 2010. It was chosen in part due to the
+	  excellent facilities at the bid site, as well as easily accessible
+	  site for those traveling to GUADEC. Read the <a
+	  href="http://www.gnome.org/press/releases/2009-11-guadec2010.html">press
+	  release</a>.
+        </blockquote>
+      </li>
+
       <li>
         <strong>GNOME Quarterly Report Q3 2009 released</strong>
         <small>(30/10/2009)</small>