From 9116dee726ac2567551f54f81777598ea5c6f54a Mon Sep 17 00:00:00 2001
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Mon, 10 Mar 2014 13:59:51 +0000
Subject: [PATCH] Updates to make clear we like students to propose their own
 ideas; add more key dates to the calendar.

---
 .../htdocs/projects/summerofcode.xml          | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/projects/summerofcode.xml b/en_US.ISO8859-1/htdocs/projects/summerofcode.xml
index 0b074357b9..c0ea6ea168 100644
--- a/en_US.ISO8859-1/htdocs/projects/summerofcode.xml
+++ b/en_US.ISO8859-1/htdocs/projects/summerofcode.xml
@@ -33,10 +33,11 @@
   and
   <a href="http://wiki.freebsd.org/SummerOfCode2013Projects">2013</a>.</p>
 
-  <p>This page will be updated throughout the application period
+  <p>This page and the ideas lists will be updated throughout the application period
     to include new information, such as project ideas, proposal information,
     and potential mentor contact information.  If you don't see an idea that
-    interests you, visit again in a couple of days!</p>
+    interests you, visit again in a couple of days!  Additionally, we welcome
+    proposals unrelated to the ideas listed here.</p>
 
 <ul>
   <li><a href="#benefits">Benefits of Participating</a></li>
@@ -66,7 +67,7 @@
   environment with many real world applications, and under the mentorship
   of experienced developers.</p>
 
-<p>After the summer ends, many of our students are sponsored by Google or
+<p>After the summer ends, students can be sponsored by Google or
   the FreeBSD Foundation to attend operating systems and open source
   conferences to present on their work, and a significant number go on to
   become FreeBSD developers.  It's also a great job networking
@@ -123,7 +124,7 @@ href="http://wiki.freebsd.org/SummerOfCode2005">2005</a>].</p>
     mentor &mdash; we suggest e-mailing our soc-admins alias for help if you do
     decide to propose one of them.
     These pages exist to help provide inspiration.  Students are also welcome,
-    and indeed encouraged to propose your own ideas, and if the proposal is
+    and are indeed encouraged to propose your own ideas, and if the proposal is
     strong, we'll try to match you with a mentor!</p>
 
   <p>For additional ideas about upcoming development projects in
@@ -231,7 +232,7 @@ href="http://wiki.freebsd.org/SummerOfCode2005">2005</a>].</p>
 <p>A number of FreeBSD committers are willing to mentor students.  A
   good place to start is the 'Technical contacts' listed with the
   example projects on the <a
-  href="http://wiki.freebsd.org/IdeasPage">ideas page</a>.</p>
+  href="https://wiki.FreeBSD.org/SummerOfCode2014">ideas page</a>.</p>
 
 <a name="infrastructure"></a>
 <h2>Infrastructure Provided to Students</h2>
@@ -267,8 +268,12 @@ href="http://wiki.freebsd.org/SummerOfCode2005">2005</a>].</p>
       <li><p><strong>21 March 19:00 UTC</strong> - Student application period closes.
 	</p></li>
 
-      <li><p><strong>21 April</strong> - Accepted students announced.</p>
-	</li>
+      <li><p><strong>21 April</strong> - Accepted students announced, students
+	start creating their work plans.</p></li>
+
+      <li><p><strong>19 May</strong> - Coding starts.</p></li>
+
+      <li><p><strong>11 August</strong> - Suggested end of coding.</p></li>
     </ul>
 
     <p>Note that these dates may change, and the Google FAQ timeline is the