Adapt questions in organization application according to list in 2009 FAQ

Note: Only the *questions* are adapted for now, not any answers...

1 files changed, 14 insertions, 18 deletions

diff --git a/community/gsoc/organization_application.mdwn b/community/gsoc/organization_application.mdwn
index ca844fff..fc3ddbe1 100644
--- a/community/gsoc/organization_application.mdwn
+++ b/community/gsoc/organization_application.mdwn
@@ -63,7 +63,7 @@ contact with the most distinguished researchers in that field from the
 microkernel operating system groups, and have written a couple of [research
 papers](http://walfield.org/).
 
-* Why is your organization applying to participate in GSoC 2008? What do you
+* Why is your organization applying to participate in GSoC 2009? What do you
 hope to gain by participating?
 
 For one, it is a way to make progress with tasks that require an amount of
@@ -80,9 +80,8 @@ progress is.
 Last but not least, we hope the participation will have a positive effect on
 our community -- new impulses, increased communication etc.
 
-* Did your organization participate in previous GSoC years? If so, please
-summarize your involvement and the successes and failures of your student
-projects.
+* Did your organization participate in past GSoCs? If so, please summarize
+your involvement and the successes and challenges of your participation.
 
 We did not participate as an organisation on our own so far. In 2006 and 2007,
 we participated under the umbrella of the GNU project, getting one slot each
@@ -105,7 +104,7 @@ applied in the past? If so, for what year(s)?
 
 We didn't apply as as organisation so far.
 
-* What license does your project use?
+* What license(s) does your project use?
 
 Most of the code in the Hurd servers and the Hurd-specific glibc parts is
 licensed GPLv2 or later; it might move to GPLv3 soon. Some components (mostly
@@ -115,15 +114,15 @@ thus GPLv2 only.
 The microkernel (gnumach) is covered by the three-clause BSD license. (And some
 minor variations of same...)
 
-* URL for your ideas page
+* What is the URL for your ideas page?
 
 [[project_ideas]]
 
-* What is the main development mailing list for your organization?
+* What is the main development mailing list or forum for your organization?
 
 bug-hurd@gnu.org, see http://lists.gnu.org/mailman/listinfo/bug-hurd
 
-* Where is the main IRC channel for your organization?
+* What is the main IRC channel for your organization?
 
 \#hurd on freenode.net
 
@@ -132,12 +131,16 @@ students use? If so, please provide it now.
 
 [[student_application_form]]
 
-* Who will be your backup organization administrator? Please enter their Google
-Account address. We will email them to confirm, your organization will not
-become active until they respond.
+*  Who will be your backup organization administrator? Please include Google
+Account information.
 
 bddebian at gmail
 
+*  Who will your mentors be? Please include Google Account information.
+
+antrik at gmx.net, benasselstine at gmail, samuel.thibault at ens-lyon.org,
+glguida at gmail, neal, marcus, ...
+
 * What criteria did you use to select these individuals as mentors? Please be
 as specific as possible.
 
@@ -149,13 +152,6 @@ ask.
 It's also important that the mentors are reliable and helpful, so the students
 won't be left on their own with any problems they face.
 
-* Who will your mentors be? Please enter their Google Account address separated
-by commas. If your organization is accepted we will email each mentor to invite
-them to take part.
-
-antrik at gmx.net, benasselstine at gmail, samuel.thibault at ens-lyon.org,
-glguida at gmail, neal, marcus, ...
-
 * What is your plan for dealing with disappearing students?
 
 The plan is mostly to avoid that happening in the first place. For that, we