Merge commit '96611f76b833159bafeab3443229dfa690178d92' into master-news_next

Conflicts:
	news/2010-03-31.mdwn

1 files changed, 23 insertions, 32 deletions

diff --git a/community/gsoc.mdwn b/community/gsoc.mdwn
index ce3b26fb..c8b8f6a6 100644
--- a/community/gsoc.mdwn
+++ b/community/gsoc.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2008, 2009 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2008, 2009, 2010 Free Software Foundation,
+Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
 id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -10,44 +11,34 @@ is included in the section entitled
 
 [[!meta title="Google Summer of Code"]]
 
-# 2009
+# 2010
 
-The GNU Hurd project this year unfortunately is not in the list of accepted
-mentoring organizations.
+This year we are again participating in [Google Summer of Code](http://socghop.appspot.com)
+under the [GNU umbrella](http://socghop.appspot.com/gsoc/org/show/google/gsoc2010/gnuproject).
+Take a look at our [[project_ideas]] list.
+If you are a student and want to apply for one of these tasks,
+please mind the distinct [[student_application_form]] for the Hurd.
 
-However, don't despair!  This doesn't mean that you'd not be allowed to work on
-your favorite GNU Hurd project.  For one, there's the possibility that a slot
-for your project can be allocated under the [auspices of the GNU
-project](http://www.gnu.org/software/soc-projects/).  Second, we're of course
-always open to introducing newcomers to the world of the GNU Hurd outside of
-any Google Summer of whatever project.  Just pick a task from the list pointed
-to below on this page and get in touch with us!
-
-<!-- The GSoC 2009 student application time has come to an end -- we
-are now evaluating your applications. -->
-
-The applications have been evaluated and the following student has
-been accepted:
-
-  * [[Sergiu Ivanov|scolobb]]
+Note that there are also two [Hurd-related ideas for X.Org](http://wiki.x.org/wiki/Hurd_Porting),
+for which students should apply to [X.Org](http://socghop.appspot.com/gsoc/org/home/google/gsoc2010/xorg) as a mentoring organization;
+and the [[project_ideas/debian_installer]] task
+most likely will be handled by the [Debian organisation](http://socghop.appspot.com/gsoc/org/home/google/gsoc2010/debian).
 
+If you can't participate as a GSoC student,
+working on one of these projects is still a good opportunity to get started with Hurd development.
+Please read up about [[contributing]] in general;
+and feel free to ask any questions you might have at one of our [[regular_IRC_meetings|IRC#regular_meetings]].
+Generally it's a good idea to [[contact_us|communication]] when starting to work on some project.
 
 # History
 
-2006 and 2007 we participated in GSoC under the umbrella of the GNU project,
+In 2006 and [[2007]], we participated in GSoC under the umbrella of the GNU
+project,
 getting one slot each year.
 
-<!-- TODO.  Extend.  -->
-
-In 2008 we successfully participated on our own, no longer within the GNU
+In the following year, we successfully participated on our own, not only as a
+suborganization of the GNU
 project.  Read about our five students' success on the [[2008]] page.
 
-
-# Joining in
-
-If these successes got you interested in contributing some larger part yourself -
-in your free time or maybe in next years Google Summer of Code - 
-please have a look at our [[project_ideas]] and read up about [[contributing]].
-
-Also, feel free to ask your questions at one of our
-[[regular_IRC_meetings|IRC#regular_meetings]].
+The next year, we participated under the GNU umbrella with one slot again.
+Read about it on the [[2009]] page.