X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/409cc4f5d0b4f31e46d6dbe0b9eed40db31a9638..89a5dde72e00feb9e86537aee5992c86ed0582d7:/doc/soc/application.mdwn?ds=inline

diff --git a/doc/soc/application.mdwn b/doc/soc/application.mdwn
index d4078e7c2..ef4fdc897 100644
--- a/doc/soc/application.mdwn
+++ b/doc/soc/application.mdwn
@@ -4,7 +4,7 @@ Based on ["What should a mentoring organization application look like?"](http://
 
     The ikiwiki project aims to develop a general-purpose wiki engine, with particular emphasis on personal wikis, project wikis, blogs, and collaborative software development.  We provide several features unique or uncommon amongst wikis:
 
-    * Rather than inventing yet another simplistic, linear revision control system, ikiwiki makes use of standard version control systems such as [[Subversion]] and [[Git]].  You can edit a wiki by committing to your repository, as well as through a traditional web interface.  This makes ikiwiki ideal for collaborative software development; just keep your wiki in version control next to your software.  You can also take advantage of the features of these systems; for instance, you can keep a local branch of your wiki via [[Git]].
+    * Rather than inventing yet another simplistic, linear revision control system, ikiwiki uses a standard version control system such as [[Subversion]] or [[Git]].  You can edit a wiki by committing to your repository, as well as through a traditional web interface.  This makes ikiwiki ideal for collaborative software development; just keep your wiki in version control next to your software.  You can also take advantage of the features of these systems; for instance, you can keep a local branch of your wiki via [[Git]].
 
     * You can turn any set of pages into an inline news feed, complete with RSS and Atom support.  You can run your weblog on ikiwiki (and many people do), run a Planet-like aggregator for external feeds, or keep a TODO and bug list with tags for completed items.
 
@@ -77,7 +77,7 @@ Based on ["What should a mentoring organization application look like?"](http://
 
     Before the program, we will encourage any students interested in working on ikiwiki to contact us.  We will advise them to create an account on the ikiwiki ikiwiki, look over the TODO items, add ideas of their own, and discuss existing ideas.  We will also help them set up their own ikiwikis, both for experimentation and for actual use.  We will suggest that students begin looking at the ikiwiki codebase and asking questions.
 
-    During the program, we would like all students working on projects to create a user page with an activity blog, and update that blog regularly with the status of their project.  We will accept incremental patches towards a feature, or support students who wish to create their own branch.
+    During the program, we would like all students working on projects to create a user page with an activity blog, and update that blog regularly with the status of their project.  We also plan to aggregate these blogs into a single Summer of Code newsfeed, and suggest that students subscribe to this feed; this will allow them to observe the activity of their fellow students, to spur each other forward and help each other along the way.  We plan to accept incremental patches towards a feature, or support students who wish to create their own branch.
 
     After the program, we will continue to work towards integrating any projects that have not yet completed, and talk with students about their future plans regarding ikiwiki.  If the students have started using ikiwiki for their own wikis, as we hope they will after we encourage them to experiment with it, then they will likely have a vested interest in ongoing ikiwiki development.  Thus, we will encourage them to remain active by helping them become active and interested users.