From a09bd9bfe163aa265b68ce195d9796dd4646b63c Mon Sep 17 00:00:00 2001
From: Thom Brown <thom@linux.com>
Date: Mon, 5 Mar 2012 21:49:41 +0000
Subject: [PATCH] Updated GSoC page for 2012 and archived 2011 GSoC page.

---
 templates/pages/developer/summerofcode.html   |  27 ++--
 .../pages/developer/summerofcode2011.html     | 115 ++++++++++++++++++
 2 files changed, 130 insertions(+), 12 deletions(-)
 create mode 100644 templates/pages/developer/summerofcode2011.html

diff --git a/templates/pages/developer/summerofcode.html b/templates/pages/developer/summerofcode.html
index cc06460b..c123132d 100644
--- a/templates/pages/developer/summerofcode.html
+++ b/templates/pages/developer/summerofcode.html
@@ -6,7 +6,7 @@
 <h1>PostgreSQL and Google Summer of Code</h1>
 
 <p>The PostgreSQL Project hopes to participate in the Google <a
-href="http://socghop.appspot.com/">Summer of Code 2011</a> program. This program endeavors to fund students to contribute to an open source project over the summer break.</p>
+href="http://socghop.appspot.com/">Summer of Code 2012</a> program. This program endeavors to fund students to contribute to an open source project over the summer break.</p>
 
 <ul>
 <li><a href="#ideas">Example Proposal Ideas</a>
@@ -27,7 +27,7 @@ href="http://socghop.appspot.com/">Summer of Code 2011</a> program. This program
 <ul>
 <li><strong>TODO Items</strong>: A number of the items on our TODO list have been marked as good projects for beginners who are new to the PostgreSQL code. Items on this list have the advantage of already having general community agreement that the feature is desireable. These items should also have some general discussion available in the mailing list archives to help get you started. You can find these items on the <a href="http://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be marked with an [E].
 </li>
-<li><strong>Other Ideas</strong>: are given on our <a href="http://wiki.postgresql.org/wiki/GSoC_2011#Project_Ideas">GSOC2011 Wiki Page</a></li>
+<li><strong>Other Ideas</strong>: are given on our <a href="http://wiki.postgresql.org/wiki/GSoC_2012#Project_Ideas">GSOC2012 Wiki Page</a></li>
 
 <a id="mentors" name="mentors"></a>
 <h2>Mentors</h2>
@@ -40,7 +40,7 @@ href="http://socghop.appspot.com/">Summer of Code 2011</a> program. This program
 	<li>Dave Page &lt;dpage @t pgadmin.org&gt;, EnterpriseDB, pgAdmin, GUI tools, and Windows</li>
 </ul>
 
-<p>A list of prospective mentors is provided on our <a href="http://wiki.postgresql.org/wiki/GSoC_2011#2011_Mentors">GSOC2011 Wiki Page</a></p>
+<p>A list of prospective mentors will be provided on our <a href="http://wiki.postgresql.org/wiki/GSoC_2012#2012_Mentors">GSOC2012 Wiki Page</a> when decided.</p>
 
 <p>If your project is not selected for funding by Google, but you still think you have a
 feasible project proposal, then please email our developers mailing list at <a
@@ -81,15 +81,16 @@ Can you supply us with an email/IM/phone method for being contacted, in case of
 <a id="past" name="past"></a>
 <h2>Previously Accepted Projects</h2>
 <ul>
-	<li>Improve pgPHPAdmin user experience</li>
-	<li>Add MERGE command</li>
-	<li>pgAdmin database designer</li>
-	<li>Materialized Views</li>
-	<li>Database schema difference visualizer</li>
-	<li>Add JSON data type</li>
+	<li>Fast GiST index build</li>
+	<li>Enhancing FDW</li>
+	<li>New phpPgAdmin Plugin Architecture</li>
+	<li>Database Designer for pgAdmin</li>
+	<li>Extending pgTune</li>
+	<li>Indexing XML Data in PostgreSQL</li>
+	<li>Caching Results in pgPool-II</li>
 </ul>
 
-<p>More information on these projects can be found on Google's PostgreSQL SoC pages: (<a href="http://wiki.postgresql.org/wiki/GSoC_2010">2010</a> | <a href="http://code.google.com/soc/2008/postgres/about.html">2008</a> | <a href="http://code.google.com/soc/2008/postgres/about.html">2007</a> | <a href="http://code.google.com/soc/2006/pgsql/about.html">2006</a>)</p>
+<p>More information on these projects can be found on Google's PostgreSQL SoC pages: (<a href="http://wiki.postgresql.org/wiki/GSoC_2011">2011</a> | <a href="http://wiki.postgresql.org/wiki/GSoC_2010">2010</a> | <a href="http://code.google.com/soc/2008/postgres/about.html">2008</a> | <a href="http://code.google.com/soc/2008/postgres/about.html">2007</a> | <a href="http://code.google.com/soc/2006/pgsql/about.html">2006</a>)</p>
 
 
 <a id="faq" name="faq"></a>
@@ -100,14 +101,16 @@ Can you supply us with an email/IM/phone method for being contacted, in case of
 <li>
 <p><strong>Am I eligible?</strong></p>
 
-<p>Please see the Google <a href="http://socghop.appspot.com/document/show/gsoc_program/google/gsoc2011/faqs#eligibility">Eligibility FAQ</a> for all questions about eligibility.</p>
+<p>Please see the Google <a href="https://google-melange.appspot.com/document/show/gsoc_program/google/gsoc2012/faqs">FAQ</a> for all questions about eligibility.</p>
 
 </li>
 
 <li>
 <p><strong>When is the proposal deadline?</strong></p>
 
-<p>According to the <a href="http://socghop.appspot.com/document/show/gsoc_program/google/gsoc2011/faqs#timeline">Summer of Code FAQ</a>, the deadline for submitting student proposals is April 8th, 2011 (19:00 UTC). Please remember that proposals must submitted to Google themselves<!-- (via the <a href="http://code.google.com/soc/student_step1.html">student application form</a>) -->, although we are happy to discuss any proposals with you ahead of time.</p>
+<p>
+According to the <a href="https://google-melange.appspot.com/document/show/gsoc_program/google/gsoc2012/faqs#timeline">Summer of Code FAQ</a>, the deadline for submitting student proposals is April 6th, 2012 (19:00 UTC).
+Please remember that proposals must submitted to Google themselves<!-- (via the <a href="http://code.google.com/soc/student_step1.html">student application form</a>) -->, although we are happy to discuss any proposals with you ahead of time.</p>
 </li>
 
 </ul>
diff --git a/templates/pages/developer/summerofcode2011.html b/templates/pages/developer/summerofcode2011.html
new file mode 100644
index 00000000..cc06460b
--- /dev/null
+++ b/templates/pages/developer/summerofcode2011.html
@@ -0,0 +1,115 @@
+{%extends "base/page.html"%}
+{%block title%}Google Summer of Code Program{%endblock%}
+{%block contents%}
+
+<div id="CONTENTWRAP">
+<h1>PostgreSQL and Google Summer of Code</h1>
+
+<p>The PostgreSQL Project hopes to participate in the Google <a
+href="http://socghop.appspot.com/">Summer of Code 2011</a> program. This program endeavors to fund students to contribute to an open source project over the summer break.</p>
+
+<ul>
+<li><a href="#ideas">Example Proposal Ideas</a>
+
+<li><a href="#mentors">Possible Mentors</a></li>
+
+<li><a href="#proposals">Proposal Guidelines</a></li>
+
+<li><a href="#past">Previously Accepted Projects</a></li>
+
+<li><a href="#faq">Frequently Asked Questions</a></li>
+</ul>
+
+<a id="ideas" name="ideas"></a>
+<h2>Example Proposal Ideas</h2>
+<p>The PostgreSQL Project has a wide range of opinions on what it feels are acceptable GSoC projects. The examples listed here are meant only as a suggestion of things we would likely find useful, but you should not feel obligated to pick from this list by any means. If you have just discovered a new algorithm as part of your thesis work, we would love to see a proposal implementing that in PostgreSQL. The point is that all proposals will be evaluated on their own merits, so be creative.
+
+<ul>
+<li><strong>TODO Items</strong>: A number of the items on our TODO list have been marked as good projects for beginners who are new to the PostgreSQL code. Items on this list have the advantage of already having general community agreement that the feature is desireable. These items should also have some general discussion available in the mailing list archives to help get you started. You can find these items on the <a href="http://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be marked with an [E].
+</li>
+<li><strong>Other Ideas</strong>: are given on our <a href="http://wiki.postgresql.org/wiki/GSoC_2011#Project_Ideas">GSOC2011 Wiki Page</a></li>
+
+<a id="mentors" name="mentors"></a>
+<h2>Mentors</h2>
+
+<p>PostgreSQL follows an open community development model, so student projects are likely to be reviewed and commented on by any and all members of the PostgreSQL community. This also means that we may be able to find mentors for additional projects by reaching out to this community. If you are interested in working on a project not explicitly mentioned above, you may want to contact one of the Summer of Code liaisons below about writing a proposal.</p>
+
+<ul>
+	<li>Selena Deckelmann &lt;selenamarie @t gmail.com&gt;, Emma.com, user groups and applications</li>
+	<li>Josh Berkus &lt;josh @t postgresql.org&gt;, PostgreSQL Experts, performance engineering</li>
+	<li>Dave Page &lt;dpage @t pgadmin.org&gt;, EnterpriseDB, pgAdmin, GUI tools, and Windows</li>
+</ul>
+
+<p>A list of prospective mentors is provided on our <a href="http://wiki.postgresql.org/wiki/GSoC_2011#2011_Mentors">GSOC2011 Wiki Page</a></p>
+
+<p>If your project is not selected for funding by Google, but you still think you have a
+feasible project proposal, then please email our developers mailing list at <a
+href="mailto:pgsql-hackers@postgresql.org">pgsql-hackers@postgresql.org</a>.</p>
+
+<a id="proposals" name="proposals"></a>
+
+<h2>Proposal Guidelines</h2>
+
+<p><a href="http://socghop.appspot.com/document/show/gsoc_program/google/gsoc2010/faqs#student_apply">Apply to Summer of Code</a></p>
+
+<p>Students are responsible for writing a proposal and submitting it to Google before the
+application deadline. The following outline was adapted from the Perl Foundation <a
+href="http://www.perlfoundation.org/how_to_write_a_proposal">open source proposal
+HOWTO</a>. A strong proposal will include:</p>
+
+<ul>
+<li><strong>Benefits to the PostgreSQL Community</strong> - a good project will not just be
+fun to work on, but also generally useful to others.</li>
+
+<li><strong>Deliverables</strong> - It is very important to list quantifiable results
+here</li>
+
+<li><strong>Project Schedule</strong> - How long will the project take? When can you
+begin work?</li>
+
+<li><strong>Bio</strong> - Who are you? What makes you the best person to work on this
+project?</li>
+
+<li><strong>Contact</strong> - How can we contact if we have questions about your project? 
+Can you supply us with an email/IM/phone method for being contacted, in case of emergency?</li>
+</ul>
+
+<p>Please also see our additional <a href="/developer/summerofcodeadvice">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
+
+<p>We would prefer that development discussion occur on our project mailing lists when possible, with special recognition being given to those students who vet their proposal with community developers before submitting their proposal to Google SoC. This is not required, but can have a large impact on the chances of your proposal being accepted, so please don't be shy. In any case, you will be required to keep open lines of communication with your mentor should you be accepted, so if you have circumstances that may affect this, please explain them up front in your proposal.</p>
+
+<a id="past" name="past"></a>
+<h2>Previously Accepted Projects</h2>
+<ul>
+	<li>Improve pgPHPAdmin user experience</li>
+	<li>Add MERGE command</li>
+	<li>pgAdmin database designer</li>
+	<li>Materialized Views</li>
+	<li>Database schema difference visualizer</li>
+	<li>Add JSON data type</li>
+</ul>
+
+<p>More information on these projects can be found on Google's PostgreSQL SoC pages: (<a href="http://wiki.postgresql.org/wiki/GSoC_2010">2010</a> | <a href="http://code.google.com/soc/2008/postgres/about.html">2008</a> | <a href="http://code.google.com/soc/2008/postgres/about.html">2007</a> | <a href="http://code.google.com/soc/2006/pgsql/about.html">2006</a>)</p>
+
+
+<a id="faq" name="faq"></a>
+
+<h2>Frequently Asked Questions</h2>
+
+<ul>
+<li>
+<p><strong>Am I eligible?</strong></p>
+
+<p>Please see the Google <a href="http://socghop.appspot.com/document/show/gsoc_program/google/gsoc2011/faqs#eligibility">Eligibility FAQ</a> for all questions about eligibility.</p>
+
+</li>
+
+<li>
+<p><strong>When is the proposal deadline?</strong></p>
+
+<p>According to the <a href="http://socghop.appspot.com/document/show/gsoc_program/google/gsoc2011/faqs#timeline">Summer of Code FAQ</a>, the deadline for submitting student proposals is April 8th, 2011 (19:00 UTC). Please remember that proposals must submitted to Google themselves<!-- (via the <a href="http://code.google.com/soc/student_step1.html">student application form</a>) -->, although we are happy to discuss any proposals with you ahead of time.</p>
+</li>
+
+</ul>
+</div>
+{%endblock%}
-- 
2.39.5