community/gsoc: Update.

2 files changed, 44 insertions, 22 deletions

diff --git a/community/gsoc.mdwn b/community/gsoc.mdwn
index e22bda3d..6eece956 100644
--- a/community/gsoc.mdwn
+++ b/community/gsoc.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2008, 2009, 2010, 2011 Free Software Foundation,
-Inc."]]
+[[!meta copyright="Copyright © 2008, 2009, 2010, 2011, 2012 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
@@ -12,8 +12,10 @@ License|/fdl]]."]]"""]]
 [[!meta title="Google Summer of Code"]]
 
 We're in!  The GNU Hurd project is again participating in the [Google Summer of
-Code](http://www.google-melange.com/gsoc/homepage/google/gsoc2011) under the
-[GNU umbrella](http://www.gnu.org/software/soc-projects/).
+Code](http://www.google-melange.com/) under the [GNU
+umbrella](http://www.gnu.org/software/soc-projects/).
+
+<!--
 
 This year's *student application period* is over.  Thanks for sending in your
 applications!  We're now reviewing and discussing these, so please pay
@@ -52,24 +54,29 @@ to announce the number of slots that the whole GNU project gets, and we'll be
 discussing with our GNU peers about how to split these up among all the GNU
 subprojects.
 
+-->
+
 
 # Applying for a Task
 
+<!--
+
 Applications for 2011 are closed.
 
-We have a list of [[project_ideas]], and students are likewise encouraged to
-submit their own project proposals.
+-->
 
-We always ask students that want to apply for a task (in the course of the
-Google Summer of Code) to mind our distinct [[student_application_form]].
+We have a list of [[project_ideas]], and students are likewise encouraged to
+submit their own project proposals.  Please follow our
+[[student_application_form]].
 
-Then, don't forget to visit
-<http://www.google-melange.com/gsoc/org/google/gsoc2011/gnu>, and push the big
+Then, don't forget to visit <http://www.google-melange.com/>, and press the
 button for submitting your proposal.
 
-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.
+Please read up about [[contributing]] in general, and please ask any questions
+you might have, on the [[mailing_lists]], or on [[IRC]], for example at one of
+our [[regular_IRC_meetings|IRC#regular_meetings]].  Generally it's a good idea
+to [[get in contact with us|contact_us]] as soon as you're beginning to spend
+time on a project.
 
 
 ## Outside of the GSoC Scope
@@ -83,12 +90,8 @@ if you aren't a student anyway.
 # History
 
 In 2006 and [[2007]], we participated in GSoC under the umbrella of the GNU
-project,
-getting one slot each year.
-
-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.
-
-The next two year, we participated under the GNU umbrella with one slot in
-[[2009]], and three in [[2010]].
+project, getting one slot each year.  In the following year, we successfully
+participated on our own, instead of as a suborganization of the GNU project.
+Read about our five students' success on the [[2008]] page.  The next two year,
+we participated under the GNU umbrella with one slot in [[2009]], three in
+[[2010]], and one again in [[2011]].
diff --git a/community/gsoc/2011.mdwn b/community/gsoc/2011.mdwn
new file mode 100644
index 00000000..ba10a031
--- /dev/null
+++ b/community/gsoc/2011.mdwn
@@ -0,0 +1,19 @@
+[[!meta copyright="Copyright © 2012 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
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!meta title="Google Summer of Code 2011"]]
+
+In 2011 we have again been participating in the Google Summer of Code
+under the GNU umbrella, with one slot:
+
+  * [[Jérémie Koenig|jkoenig]], mentored by [[Thomas Schwinge|tschwinge]] and
+    Richard Braun, has been working on the project [*Java on Hurd (and vice
+    versa)*](http://www.google-melange.com/gsoc/project/google/gsoc2011/jkoenig/27001).
+    ([[Details|user/jkoenig/java]].)