Browse Source

Two versions of one of my own pictures added to images/gsoc/.

Eliminated the original google pic from all 5 gsoc2012 .org files and
replaced it with my own pic.

Changed the disclaimer in the admin, mentor and student pages from the
gsoc2012 folder to avoid any danger of copyright violations. The text
is now expicitly declared as verbatim quote, to be consumed at the
readers own risk.

Explicitly declared verbatim quotes from Google gsoc 2012 homepage in
the main and ideas .org files in the gsoc2012 folder.
tj 8 years ago
parent
commit
8c2066ebcd

BIN
images/gsoc/DSCI0279.png


BIN
images/gsoc/DSCI0279_60pc.png


+ 13 - 3
org-contrib/gsoc2012/index.org

@@ -19,8 +19,10 @@
   Org Mode info-page for GNU's application to  <a href="http://www.google-melange.com/gsoc/homepage/google/gsoc2012">GSoC 2012</a>
   </p>
   <p>
-  <a href="http://www.google-melange.com/gsoc/homepage/google/gsoc2012"/>
-  <img src="http://t1.gstatic.com/images?q=tbn:ANd9GcRbAgQorAr3evNbItUq1iaF53LzPknqMme1frngxXS4XHpP1LWsBw" />
+  <a
+  href="http://www.google-melange.com/gsoc/homepage/google/gsoc2012"/>
+<img src="../../images/gsoc/DSCI0279_60pc.png"  alt="Beach, Books
+  and Beer"/>
   </a>
   </p>
   </div>
@@ -29,6 +31,8 @@
 
 * Google Summer of Code (GSoC) 2012
 ** How Google describes it
+
+#+BEGIN_QUOTE
 Google Summer of Code is a program that offers student developers
 stipends to write code for various open source projects (see the [[http://www.google-melange.com/gsoc/homepage/google/gsoc2012][faq]]
 for more information).
@@ -43,6 +47,9 @@ Google Summer of Code has several goals:
 - Give students more exposure to real-world software development
   scenarios (e.g., distributed development, software licensing
   questions, mailing-list etiquette)
+#+END_QUOTE
+
+(quoted from the official [[http://www.google-melange.com/gsoc/homepage/google/gsoc2012][GSoC 2012]] home page)
 
 ** Org Mode participates in GNU's application
 This year, the Org Mode community will participate with project ideas
@@ -86,7 +93,10 @@ project.
 ** Info pages
 Although all related information can be found on the [[http://www.google-melange.com/gsoc/homepage/google/gsoc2012][GSoC 2012]] home
 page, we prepared an [[file:orgmode-gsoc2012-admin.org][admin page]], a [[file:orgmode-gsoc2012-mentor.org][mentor page]] and a [[file:orgmode-gsoc2012-student.org][student page]] that
-only gives the information relevant for the respective group. 
+only gives the information relevant for the respective group. Remember
+that these pages only serve for a quick overview. The complete,
+up-to-date and authorized information can be found on the original
+[[http://www.google-melange.com/gsoc/homepage/google/gsoc2012][GSoC 2012]] home page. 
 
 The most important page is the [[file:orgmode-gsoc2012-ideas.org][ideas page]]. Since the application
 process is a two step process, first the organisation (GNU), then the

+ 12 - 3
org-contrib/gsoc2012/orgmode-gsoc2012-admin.org

@@ -20,7 +20,8 @@
   </p>
   <p>
   <a href="http://www.google-melange.com/gsoc/homepage/google/gsoc2012"/>
-  <img src="http://t1.gstatic.com/images?q=tbn:ANd9GcRbAgQorAr3evNbItUq1iaF53LzPknqMme1frngxXS4XHpP1LWsBw" />
+<img src="../../images/gsoc/DSCI0279_60pc.png"  alt="Beach, Books
+  and Beer"/>
   </a>
   </p>
   </div>
@@ -31,12 +32,20 @@
 * Org Mode GSoC 2012 Admin Page
 
 #+BEGIN_QUOTE
-This page is selected content copied&pasted from Google's excellent [[http://www.google-melange.com/document/show/gsoc_program/google/gsoc2012/faqs][faq]]
+The following information is quoted verbatim from Google's excellent [[http://www.google-melange.com/document/show/gsoc_program/google/gsoc2012/faqs][faq]]
 page. It summarizes all the information relevant for GSoC 2012
-organisation admins. "We" in the following text stands for "Google",
+*admins*. "We" in the following text stands for "Google",
 not for "Org Mode" or "GNU". 
+
+This page only serves as a quick overview for one particular group of
+GSoC participants, the admins. It might be incomplete, out of date
+or even erroneous.
+
+If you want the complete, up-to date and authorized information,
+please visit [[http://www.google-melange.com/gsoc/homepage/google/gsoc2012][Google's GSoC 2012]] page. 
 #+END_QUOTE
 
+
 We'll begin accepting applications from open source mentoring
 organizations on February 27, 2012; we'll stop accepting organization
 applications on March 9th at 23:00 UTC.

+ 6 - 1
org-contrib/gsoc2012/orgmode-gsoc2012-ideas.org

@@ -20,7 +20,8 @@
   </p>
   <p>
   <a href="http://www.google-melange.com/gsoc/homepage/google/gsoc2012"/>
-  <img src="http://t1.gstatic.com/images?q=tbn:ANd9GcRbAgQorAr3evNbItUq1iaF53LzPknqMme1frngxXS4XHpP1LWsBw" />
+<img src="../../images/gsoc/DSCI0279_60pc.png"  alt="Beach, Books
+  and Beer"/>
   </a>
   </p>
   </div>
@@ -31,6 +32,7 @@
 
 **  What is an Ideas list?
 
+#+BEGIN_QUOTE
 An Ideas list should be a list of suggested student projects. This
 list is meant to introduce contributors to your project's needs and to
 provide inspiration to would-be student applicants. It is useful to
@@ -46,6 +48,9 @@ participants that some of their best student projects are those that
 greatly expanded on a proposed idea or were blue-sky proposals not
 mentioned on the Ideas list at all. A link to a bug tracker for your
 open source organization is NOT an ideas list.
+#+END_QUOTE
+
+(quoted from the official [[http://www.google-melange.com/gsoc/homepage/google/gsoc2012][GSoC 2012]] home page)
 
 
 ** Org Mode project ideas for GSoC 2012

+ 11 - 3
org-contrib/gsoc2012/orgmode-gsoc2012-mentor.org

@@ -20,7 +20,8 @@
   </p>
   <p>
   <a href="http://www.google-melange.com/gsoc/homepage/google/gsoc2012"/>
-  <img src="http://t1.gstatic.com/images?q=tbn:ANd9GcRbAgQorAr3evNbItUq1iaF53LzPknqMme1frngxXS4XHpP1LWsBw" />
+<img src="../../images/gsoc/DSCI0279_60pc.png"  alt="Beach, Books
+  and Beer"/>
   </a>
   </p>
   </div>
@@ -30,10 +31,17 @@
 * Org Mode GSoC 2012 Mentor Page
 
 #+BEGIN_QUOTE
-This page is selected content copied&pasted from Google's excellent [[http://www.google-melange.com/document/show/gsoc_program/google/gsoc2012/faqs][faq]]
+The following information is quoted verbatim from Google's excellent [[http://www.google-melange.com/document/show/gsoc_program/google/gsoc2012/faqs][faq]]
 page. It summarizes all the information relevant for GSoC 2012
-mentors. "We" in the following text stands for "Google",
+*mentors*. "We" in the following text stands for "Google",
 not for "Org Mode" or "GNU". 
+
+This page only serves as a quick overview for one particular group of
+GSoC participants, the mentors. It might be incomplete, out of date
+or even erroneous.
+
+If you want the complete, up-to date and authorized information,
+please visit [[http://www.google-melange.com/gsoc/homepage/google/gsoc2012][Google's GSoC 2012]] page. 
 #+END_QUOTE
 
 ** How do evaluations work?

+ 11 - 3
org-contrib/gsoc2012/orgmode-gsoc2012-student.org

@@ -20,7 +20,8 @@
   </p>
   <p>
   <a href="http://www.google-melange.com/gsoc/homepage/google/gsoc2012"/>
-  <img src="http://t1.gstatic.com/images?q=tbn:ANd9GcRbAgQorAr3evNbItUq1iaF53LzPknqMme1frngxXS4XHpP1LWsBw" />
+<img src="../../images/gsoc/DSCI0279_60pc.png"  alt="Beach, Books
+  and Beer"/>
   </a>
   </p>
   </div>
@@ -30,10 +31,17 @@
 * Org Mode GSoC 2012 Student Page
 
 #+BEGIN_QUOTE
-This page is selected content copied&pasted from Google's excellent [[http://www.google-melange.com/document/show/gsoc_program/google/gsoc2012/faqs][faq]]
+The following information is quoted verbatim from Google's excellent [[http://www.google-melange.com/document/show/gsoc_program/google/gsoc2012/faqs][faq]]
 page. It summarizes all the information relevant for GSoC 2012
-students. "We" in the following text stands for "Google",
+*students*. "We" in the following text stands for "Google",
 not for "Org Mode" or "GNU". 
+
+This page only serves as a quick overview for one particular group of
+GSoC participants, the students. It might be incomplete, out of date
+or even erroneous.
+
+If you want the complete, up-to date and authorized information,
+please visit [[http://www.google-melange.com/gsoc/homepage/google/gsoc2012][Google's GSoC 2012]] page. 
 #+END_QUOTE
 
 The student application period begins March 26, 2012 and ends April