From 3a42147d8c385769716c9c607489d9879858dfa3 Mon Sep 17 00:00:00 2001
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Mon, 12 Feb 2018 22:05:06 +0000
Subject: [PATCH] Minimal updates necessary for GSoC 2018.  More to come...

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

diff --git a/en_US.ISO8859-1/htdocs/projects/summerofcode.xml b/en_US.ISO8859-1/htdocs/projects/summerofcode.xml
index 2045356b9e..268be3a81f 100644
--- a/en_US.ISO8859-1/htdocs/projects/summerofcode.xml
+++ b/en_US.ISO8859-1/htdocs/projects/summerofcode.xml
@@ -16,13 +16,13 @@
 
 <p>The FreeBSD Project is looking forward to participating as a mentoring
   organization in <a
-  href="https://developers.google.com/open-source/gsoc/">Google
-  Summer of Code</a> 2017.
+  href="https://summerofcode.withgoogle.com/">Google
+  Summer of Code</a> 2018.
   This program offers students a stipend of <a
     href="https://developers.google.com/open-source/gsoc/help/student-stipends">up
     to $6,600 USD</a> to contribute to an open source project over
 the summer break.
-We have had over 200 successful
+We have had over 210 successful
 students working on FreeBSD as part of this program since 2005.</p>
 
 <p>This page and the ideas lists will be updated throughout the application period
@@ -71,6 +71,8 @@ proposals unrelated to the ideas listed here.</p>
 <p>For a complete list of student projects from previous years,
 visit:</p>
 <ul>
+  <li><a href="https://wiki.FreeBSD.org/SummerOfCode2017Projects">Summer of
+    Code 2017 FreeBSD Projects Wiki</a></li>
   <li><a href="https://wiki.FreeBSD.org/SummerOfCode2016Projects">Summer of
     Code 2016 FreeBSD Projects Wiki</a></li>
   <li><a href="https://wiki.FreeBSD.org/SummerOfCode2015Projects">Summer of
@@ -260,18 +262,18 @@ href="https://wiki.FreeBSD.org/SummerOfCode2005">2005</a>].</p>
       interest relating to the application process:</p>
 
     <ul>
-      <li><p><strong>20 March</strong> - Student application period opens.
+      <li><p><strong>12 March</strong> - Student application period opens.
 	</p></li>
 
-      <li><p><strong>3 April 19:00 UTC</strong> - Student application period closes.
+      <li><p><strong>27 March 18:00 UTC</strong> - Student application period closes.
 	</p></li>
 
-      <li><p><strong>4 May 16:00 UTC</strong> - Accepted students announced, students
-	start creating their work plans.</p></li>
+      <li><p><strong>23 April</strong> - Accepted students announced, students
+	start creating their work plans.  Community bonding period starts.</p></li>
 
-      <li><p><strong>30 May</strong> - Coding starts.</p></li>
+      <li><p><strong>14 May</strong> - Coding starts.</p></li>
 
-      <li><p><strong>21 August</strong> - Suggested end of coding.</p></li>
+      <li><p><strong>6 August</strong> - Suggested end of coding.</p></li>
     </ul>
 
     <p>Note that these dates may change, and the Google FAQ timeline is the
@@ -333,8 +335,9 @@ href="https://wiki.FreeBSD.org/SummerOfCode2005">2005</a>].</p>
     in previous summers?</strong></p>
 
     <p>Please see the <a
-      href="https://wiki.FreeBSD.org/SummerOfCode2016Projects">2016 FreeBSD
+      href="https://wiki.FreeBSD.org/SummerOfCode2017Projects">2017 FreeBSD
       Summer of Code page</a>,  as well as older project pages from
+      <a href="https://wiki.FreeBSD.org/SummerOfCode2016Projects">2016</a>,
       <a href="https://wiki.FreeBSD.org/SummerOfCode2015Projects">2015</a>,
       <a href="https://wiki.FreeBSD.org/SummerOfCode2014Projects">2014</a>,
       <a href="https://wiki.FreeBSD.org/SummerOfCode2013Projects">2013</a>,
@@ -372,6 +375,7 @@ href="https://wiki.FreeBSD.org/SummerOfCode2005">2005</a>].</p>
 
 </ul>
 
+<!--
 <a name="advertise"></a>
 <h2>Advertise on Your Campus</h2>
 
@@ -387,13 +391,12 @@ href="https://wiki.FreeBSD.org/SummerOfCode2005">2005</a>].</p>
       src="2017-freebsd-gsoc-thumbnail.png"
       alt="[FreeBSD GSoC 2017 poster thumbnail]" height="248" width="192"
       border="0" /></a>
-<!--
     <a href="2016-freebsd-gsoc-poland.jpg" style="float: left;"> <img
       src="2016-freebsd-gsoc-poland-thumbnail.png"
       alt="[FreeBSD GSoC 2016 Polish poster thumbnail]" height="248" width="192"
       border="0" /></a>
--->
   </p>
+-->
 
   </body>
 </html>