upstream merge and code sprint additions

codesprints.md

@@ -4,23 +4,38 @@ title: Code Sprints
 section: codesprints
 ---
 <p class="bodybig">
-At OpenNews, we want to help build great tools to do journalism, and we want those tools to be open-sourced and freely available to everyone. But we know  that some of the most useful tools are the simplest and so we've created Code Sprints to assist in creating some of those simple tools for journalism.
+At OpenNews, we want to help build great tools to do journalism, and we want those tools to be open-sourced and freely available to everyone. We also know that some of the most useful tools are the simplest and so we've created Code Sprints to assist in creating some of those simple tools for journalism.
 </p>
+
+<h3>Real World, Real Needs</h3>
+We think that tools are built best when they're rooted in real needs, and so we want to forge relationships between newsrooms and coders to help drive newsroom-driven development. That means that some of the ideas we fund will be proposed by newsrooms, while others will be driven by coders who will then be paired with newsrooms for testing and implementation.
+
 <h3>Small Tools with Big Impact</h3>
-<p>We think that tools are built best when they're rooted in real needs, so we're partnering with news organizations from around the world to fund great code forged from the daily demands of the newsroom. We're looking to help create small tools that make big impacts, tools like:
+<p>We're not funding startups, we're not funding products, we're funding small, open-source tools that fill real-world needs in newsrooms around the globe. We're looking to help create small tools that make big impacts, tools like: 
 <ul>
 <li><a href="https://github.com/jsoma/tabletop">Tabletop.js</a>: Easier display of spreadsheet data
 <li><a href="http://propublica.github.com/timeline-setter/">Timelinesetter</a>: Easier timelines
 <li><a href="http://misoproject.com/dataset/">Dataset</a>: Easier management of data for visualization
 </ul>
 
+
+<h3>So Let's Do This</h3>
+OpenNews Code Sprints offer $10,000 to fund small-scale utilities and tools that help solve  specific, repeatable journalistic problems. These as quick projects--two months, max--that are documented on Source, tested in the newsroom, and open-sourced for others to use.
+
 <h3>How it Works</h3>
 <ul>
-<li>Code Sprints are grants for $10,000 to fund small-scale utilities and tools that help solve specific, repeatable journalistic problems.
-<li>News organizations collaborate with OpenNews to define Code Sprint projects, outline their technical needs, and find the right person to write the code.
-<li>The news organization is the project lead and should be able to both project-manage the development and shepherd the continued  life of the open-sourced code.
-<li>OpenNews pays the coder (or team) and stays involved in the development process.
-<li>All Code Sprint-funded code is documented and open-sourced on completion.
+<li>Code Sprints can be proposed by news organizations or developers.
+<li>Developers that propose projects will be teamed with a newsroom for testing and implementation and are responsible for project management and shepherding the continued life of the open-sourced code.
+<li>News organizations that propose Code Sprint projects are charged with finding the right person (or team) for the job, project management, and continued life of the open-sourced code.
+<li>OpenNews reviews the application and, when needed, consults with members of the journalism-code community.
+<li>OpenNews pays the coder (or team) and stays involved in the development process. 
+<li>All Code Sprint-funded code is documented on Source and open-sourced on completion.
 </ul>
 <h3>Apply today</h3>
-<p>If you're a news organization (big or small) that thinks they've got a good idea, get in touch by filling our our simple, <a href="https://donate.mozilla.org/page/signup/opennews-code-sprint-grant-application">six-question form</a>. It's easy to get started, and we'll be evaluating applications on a rolling basis through 2013.
+<p>We're looking for three distinct applicants for our Code Sprints, and have a simple form for each. We'll be evaluating applications on a rolling basis through 2013:
+
+<ul>
+<li>Coders with projects
+<li>Newsrooms with projects
+<li>Newsrooms that want to test
+</ul>