Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / soc.mdwn

diff --git a/doc/soc.mdwn b/doc/soc.mdwn
index f82dbdc89be80560686268aa2977122401f78bc1..e05543bd5ebef99b6d1e93f1e9f8d637fecd1b85 100644 (file)
--- a/doc/soc.mdwn
+++ b/doc/soc.mdwn
@@ -1,23 +1,20 @@
-[[meta title="Summer of Code"]]
+[[!meta title="Summer of Code"]]

 
 This page includes information about ikiwiki's involvement in
 [Google Summer of Code](http://code.google.com/soc/).
 
 
 This page includes information about ikiwiki's involvement in
 [Google Summer of Code](http://code.google.com/soc/).
 

-We started with a list of [[ideas]]. Our [[application]] was accepted, and
-the following projects will be worked on:
+For SoC 2007, we started with a list of [[ideas]]. Our [[application]] was
+accepted, and the following projects were worked on:

 
 * latex plugin input/output for ikiwiki  
   by [[PatrickWinnertz]] 
   (See [[todo/latex]])
 * Implement File Upload Functionality and Image Gallery Creation  
   by Ben Coffey  
 
 * latex plugin input/output for ikiwiki  
   by [[PatrickWinnertz]] 
   (See [[todo/latex]])
 * Implement File Upload Functionality and Image Gallery Creation  
   by Ben Coffey  

-  (See [[todo/fileupload/soc-proposal]])
+  (See [[todo/fileupload/soc-proposal]] and [[plugins/contrib/attach]])

 * Wiki WYSIWYG Editor  
   by [[TaylorKillian]]  
   (See [[todo/wikiwyg]])
 * Creating a gallery of a bunch of images  
   by [[ArpitJain]]  
   (See [[todo/Gallery]])
 * Wiki WYSIWYG Editor  
   by [[TaylorKillian]]  
   (See [[todo/wikiwyg]])
 * Creating a gallery of a bunch of images  
   by [[ArpitJain]]  
   (See [[todo/Gallery]])

-
-Students working on these projects are encouraged to add links to any blogs,
-patch repositories, etc that they will use.