Merge commit '178c1c37ab90f9693785af0a876ca816d8b7733e'

4 files changed, 32 insertions, 56 deletions

diff --git a/community/gsoc.mdwn b/community/gsoc.mdwn
index aa5a7c5b..1d93b37c 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
@@ -27,7 +28,8 @@ getting one slot each year.
 In 2008 we successfully participated on our own, no longer within the GNU
 project.  Read about our five students' success on the [[2008]] page.
 
-In 2009 we participated under the GNU umbrella with one slot again.
+The next year, we participated under the GNU umbrella with one slot again.
+Read about it on the [[2009]] page.
 
 
 # Joining in
diff --git a/community/gsoc/2009.mdwm b/community/gsoc/2009.mdwm
deleted file mode 100644
index ce3b26fb..00000000
--- a/community/gsoc/2009.mdwm
+++ /dev/null
@@ -1,53 +0,0 @@
-[[!meta copyright="Copyright © 2008, 2009 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"]]
-
-# 2009
-
-The GNU Hurd project this year unfortunately is not in the list of accepted
-mentoring organizations.
-
-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]]
-
-
-# History
-
-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
-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]].
diff --git a/community/gsoc/2009.mdwn b/community/gsoc/2009.mdwn
new file mode 100644
index 00000000..6efeb839
--- /dev/null
+++ b/community/gsoc/2009.mdwn
@@ -0,0 +1,23 @@
+[[!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
+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 2009"]]
+
+The GNU Hurd project unfortunately was not in the list of accepted
+mentoring organizations.
+
+We did get one slot from the GNU project's.
+
+The applications have been evaluated and the following student has
+been accepted:
+
+  * [[Sergiu Ivanov|scolobb]] -- working on a *[[VFS-style union
+    mount|hurd/translator/unionmount]]* functionality; [Google's project
+    page](http://socghop.appspot.com/gsoc/student_project/show/google/gsoc2009/karlberry/t124022551214).
diff --git a/hurd/translator/unionfs.mdwn b/hurd/translator/unionfs.mdwn
index 331ad19f..d1e3868b 100644
--- a/hurd/translator/unionfs.mdwn
+++ b/hurd/translator/unionfs.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
@@ -73,6 +74,9 @@ both for comparision.) The ethernet multiplexer shall serve as an example use
 case -- any changes necessary to allow using it with the union mount
 functionality are also to be considered part of the task.
 
+[[Sergiu Ivanov|scolobb]] has been working on this as a [[Google Summer of Code
+2009 project|community/gsoc/2009]].
+
 ## Implementation
 
 ### Source