Update questions in GSoC application according to the actual form

1 files changed, 44 insertions, 45 deletions

diff --git a/community/gsoc/organization_application.mdwn b/community/gsoc/organization_application.mdwn
index 04968cc6..68199b3d 100644
--- a/community/gsoc/organization_application.mdwn
+++ b/community/gsoc/organization_application.mdwn
@@ -8,15 +8,23 @@ 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]]."]]"""]]
 
-* What is your Organization's Name?
+* Link ID:
+
+hurd
+
+* Group Name:
 
 GNU Hurd
 
-* What is your Organization's Homepage?
+* Home Page URL:
 
 http://hurd.gnu.org
 
-* Describe your organization.
+* Public Email:
+
+bug-hurd@gnu.org
+
+* Description:
 
 The Hurd project is a loose community of people sharing a common interest in
 developing the Hurd kernel, which is the official kernel of the [GNU operating
@@ -63,8 +71,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 2009? What do you
-hope to gain by participating?
+* Why is your group applying to participate? What do you hope to gain by participating?
 
 The primary goal of course is to find and introduce new long-term contributors
 to the project.
@@ -83,8 +90,25 @@ 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 past GSoCs? If so, please summarize
-your involvement and the successes and challenges of your participation.
+* What is the main public mailing list for your group?
+
+bug-hurd@gnu.org, see http://lists.gnu.org/mailman/listinfo/bug-hurd
+
+* Where is the main IRC channel for your group?
+
+\#hurd on freenode.net
+
+* What criteria do you use to select the members of your group? Please be as specific as possible.
+
+The most important criterium is that the person is involved in the project for
+some time, knowing the ways; so he can actually instruct the student; and if
+there are tough technical questions he can't answer himself, he knows whom to
+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.
+
+* Has your group participated previously? If so, please summarize your involvement and any past successes and failures.
 
 In 2006 and 2007,
 we participated under the umbrella of the GNU project, getting one slot each
@@ -119,53 +143,27 @@ hoped of course, but probably as much as can be realistically expected...
 All in all, the participation was a considerable amount of work, but it was
 definitely worth it :-)
 
-* If your organization has not previously participated in GSoC, have you
-applied in the past? If so, for what year(s)?
+* If your group has not previously participated, have you applied in the past? If so, for what sort of participation?
 
 --
 
-* What license(s) does your project use?
+* What license does your organization use?
 
-Mostly GPLv2 or later. Some bits are GPLv2 only, and some three-clause BSD.
+GNU General Public License (GPL)
 
-* What is the URL for your ideas page?
+* What is the URL to the ideas list of your organization?
 
 [[project_ideas]]
 
-* What is the main development mailing list or forum for your organization?
+* What is the main development mailing list for your group?
 
 bug-hurd@gnu.org, see http://lists.gnu.org/mailman/listinfo/bug-hurd
 
-* What is the main IRC channel for your organization?
-
-\#hurd on freenode.net
-
-* Does your organization have an application template you would like to see
-students use? If so, please provide it now.
+* What is the application template you would like contributors to your organization to use.
 
 [[student_application_form]]
 
-*  Who will be your backup organization administrator? Please include Google
-Account information.
-
-
-
-*  Who will your mentors be? Please include Google Account information.
-
-antrik at gmx.net
-
-* What criteria did you use to select these individuals as mentors? Please be
-as specific as possible.
-
-The most important criterium is that the person is involved in the project for
-some time, knowing the ways; so he can actually instruct the student; and if
-there are tough technical questions he can't answer himself, he knows whom to
-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.
-
-* What is your plan for dealing with disappearing students?
+* What is your plan for dealing with disappearing contributors?
 
 The plan is mostly to avoid that happening in the first place. For that, we
 will be particularily careful with the selection of the students: Making sure
@@ -185,7 +183,7 @@ state where it is useful even if not finished.
 We will also try to limit damage by insisting that students regularily check in
 their work, so that we get partial results at least if someone disappears.
 
-* What is your plan for dealing with disappearing mentors?
+* What is your plan for dealing with disappearing members?
 
 As our mentors all have been with the project for some time, the risk of them
 disappearing is not too big. If one of them disappears nevertheless, it's not a
@@ -195,8 +193,7 @@ We will encourage the students to keep discussions public as much as possible,
 keeping private conversations with the mentors to a minimum, so the transition
 should go smoothly.
 
-* What steps will you take to encourage students to interact with your
-project's community before, during and after the program?
+* What steps will you take to encourage contributors to interact with your community before, during, and after the program?
 
 We try to make it very clear that we expect the students to get into regular
 contact with us before the end of the student selection process, and won't
@@ -216,10 +213,12 @@ part in other conversations, not directly related to their projects, as well.
 After the program we continue the regular meetings, still discussing the
 projects: The application of the code created, future directions etc.
 
-* What will you do to ensure that your accepted students stick with the project
-after GSoC concludes?
+* What will you do to ensure that your accepted contributors stick with the project after the program concludes?
 
 We will try to invite all participating students to a conference afterwards,
 where we will discuss the projects, as well as other Hurd-related topics. We
 hope this will motivate them to follow up on the work they have done during the
 program, and generally help keeping them involved.
+
+* Please select your backup group administrator.
+