X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fcontributor%2Fintroduction.itexi;h=c104cee17551acb2790d8a512c9bb84a1d5e63ec;hb=512542520ca60b7018df2de43e2c5f51bf05432c;hp=df5b5bcded5f961cd2f67d0dec593cd988e4c82f;hpb=32611b91b59f3dc4af2be3bfcd5476a87048c97a;p=lilypond.git

diff --git a/Documentation/contributor/introduction.itexi b/Documentation/contributor/introduction.itexi
index df5b5bcded..c104cee175 100644
--- a/Documentation/contributor/introduction.itexi
+++ b/Documentation/contributor/introduction.itexi
@@ -1,9 +1,12 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 
+@include included/helpus.itexi
+
 @node Introduction to contributing
 @chapter Introduction to contributing
 
-FIXME add fluff
+This chapter presents a quick overview of ways that people can
+help LilyPond.
 
 @menu
 * Help us::
@@ -15,9 +18,11 @@ FIXME add fluff
 @node Help us
 @section Help us
 
-FIXME: The intro should contain the "help us" material from web/,
-quite possibly as the very first thing.  This requires having a
-macro for it, which depends on issue 939.
+@helpusNeed
+
+@helpusTasks
+
+@helpusProjects
 
 
 @node Overview of work flow
@@ -69,9 +74,9 @@ interface is at
 
 Git is a complex and powerful tool, but tends to be confusing at
 first, particularly for users not familiar with the command line
-and/or version control systems.  Contributors who don't want to
-deal with Git directly are encouraged to use the
-@command{lily-git} graphical user interface instead.
+and/or version control systems.  We have created the
+@command{lily-git} graphical user interface to ease this
+difficulty.
 
 @emph{Compiling} (@q{building}) LilyPond allows developers to see
 how changes to the source code affect the program itself.
@@ -91,6 +96,10 @@ email to @email{lilypond-devel@@gnu.org}.  You can subscribe to
 the developers' mailing list here:
 @uref{http://lists.gnu.org/mailman/listinfo/lilypond-devel}.
 
+@warning{Contributors on Windows or MacOS X wishing to compile
+code or documentation are strongly advised to use lilybuntu, as
+discussed in @ref{Quick start}.}
+
 
 @node Mentors
 @section Mentors
@@ -139,7 +148,7 @@ than we think you can handle.
 
 @item
 Respond to questions from your contributor(s) promptly, even if
-the reponse is just @qq{sorry, I don't know} or @qq{sorry, I'm
+the response is just @qq{sorry, I don't know} or @qq{sorry, I'm
 very busy for the next 3 days; I'll get back to you then}.  Make
 sure they feel valued.
 
@@ -149,7 +158,7 @@ emails -- do you work on lilypond every day, or every weekend, or
 what?  Also, if you'll be unavailable for longer than usual (say,
 if you normally reply within 24 hours, but you'll be at a
 conference for a week), let your contributors know.  Again, make
-sure thay feel valued, and that your silence (if they ask a
+sure they feel valued, and that your silence (if they ask a
 question during that period) isn't their fault.
 
 @item
@@ -174,4 +183,3 @@ comments for it, or at very least add it to the google tracker.
 @end enumerate
 
 
-