CG: move lilybuntu into new "quick start" chapter.

[lilypond.git] / Documentation / included / helpus.itexi

diff --git a/Documentation/included/helpus.itexi b/Documentation/included/helpus.itexi
index b850e9066d6a8113a0e4f91d3516f903f491f088..e94c513aed0c8a0daff54458bf8021fe6029da22 100644 (file)
--- a/Documentation/included/helpus.itexi
+++ b/Documentation/included/helpus.itexi
@@ -1,15 +1,16 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of FIXME
+@c This file is part of web/community.itexi and
+@c contributor/introduction.itely
 
 @macro helpusNeed
 @subheading We need you!
 
 The LilyPond development team is quite small; we really want to
 get more people involved.  Please consider helping your fellow
-LilyPond users by contributing to development!
+LilyPond users by contributing!
 
-Even working on small tasks can have a big impact: taking care
-of them let experienced developers work on advanced tasks, instead
+Even working on small tasks can have a big impact: taking care of
+them allows experienced developers work on advanced tasks, instead
 of spending time on those simple tasks.
 
 @end macro
@@ -18,20 +19,23 @@ of spending time on those simple tasks.
 @macro helpusTasks
 @subheading Simple tasks
 
+No source code or compiling required!
+
 @itemize
 @item
 Mailing list support: answer questions from fellow users.
 
 @item
-Bug reporting: help users create proper @rweb{Bug reports}, and
-aid the Bug Team in handling @rcontrib{Issues}.
+Bug reporting: help users create proper @rweb{Bug reports}, and/or
+join the Bug Squad to organize @rcontrib{Issues}.
 
 @item
 Documentation: small changes can be proposed by following the
 guidelines for @rcontrib{Documentation suggestions}.
 
 @item
-LilyPond Snippet Repository (LSR): create and fix snippets.  See
+LilyPond Snippet Repository (LSR): create and fix snippets
+following the guidelines in
 @rcontrib{Adding and editing snippets}.
 
 @item
@@ -41,17 +45,23 @@ testing new features.  Please contribute to these discussions!
 
 @end itemize
 
-@subheading Moderate tasks
+@subheading Advanced tasks
+
+These jobs generally require that you have the source code and can
+compile LilyPond.
+
+@warning{We suggest that contributors using Windows or MacOS X do
+@strong{not} attempt to set up their own development environment;
+instead, use lilybuntu as discussed in @rcontrib{Quick start}.}
 
-@warning{These jobs generally require that you have the program
-and documentation source files, but do not require a full
-development environment.  See @rcontrib{Starting with Git}.}
+Contributors using Linux or FreeBSD may also use Lilybuntu, but if
+they prefer their own development environment, they should read
+@rcontrib{Working with source code}, and @rcontrib{Compiling}.
 
 @itemize
 @item
-Documentation: see
-@rcontrib{Documentation work}, and
-@rcontrib{Building documentation without compiling LilyPond}.
+Documentation: for large changes, see
+@rcontrib{Documentation work}.
 
 @item
 Website: the website is built from the normal documentation
@@ -62,22 +72,8 @@ source.  See the info about documentation, and also
 Translations: see @rcontrib{Translating the documentation}, and
 @rcontrib{Translating the website}.
 
-@end itemize
-
-
-@subheading Complex tasks
-
-@warning{These jobs generally require that you have the source
-code and can compile LilyPond.  See @rcontrib{Starting with Git},
-and @rcontrib{Compiling LilyPond}.}
-
-We suggest that new contributors using Windows use a virtual
-machine to run @emph{lilybuntu}.  See
-@rcontrib{Using a Virtual Machine to Compile LilyPond}.
-
-@itemize
 @item
-Bugfixes, new features: the best way to begin is to join the
+Bugfixes or new features: the best way to begin is to join the
 Frogs, and read @rcontrib{Programming work}.
 
 @end itemize
@@ -90,7 +86,11 @@ Frogs, and read @rcontrib{Programming work}.
 
 @subsubheading Frogs
 
-Website and mailist: @uref{http://frogs.lilynet.net}
+Website and mailing list:
+
+@example
+@uref{http://frogs.lilynet.net}
+@end example
 
 The Frogs are ordinary LilyPond users who have chosen to get
 involved in their favorite software's development.  Fixing bugs,
@@ -104,7 +104,8 @@ it, then the word is: @emph{Join the Frogs!}
 
 @subsubheading Grand LilyPond Input Syntax Standardization
 
-Website: @uref{http://lilypond.org/~graham/gliss}
+Website:
+@rcontrib{Grand LilyPond Input Syntax Standardization (GLISS)}.
 
 GLISS will stabilize the (non-tweak) input syntax for the upcoming
 LilyPond 3.0.  After updating to 3.0, the input syntax for
@@ -117,12 +118,12 @@ input specification.
 
 @subsubheading Grand Organizing Project
 
-Website: @uref{http://lilypond.org/~graham/gop}
+Website: @rcontrib{Grand Organization Project (GOP)}.
 
 GOP will be our big recruiting drive for new contributors.  We
 desperately need to spread the development duties (including
 @qq{simple tasks} which require no programming or interaction with
-soruce code!) over more people.  We also need to document
+source code!) over more people.  We also need to document
 knowledge from existing developers so that it does not get lost.
 
 Unlike most @qq{Grand Projects}, GOP is not about adding huge new
@@ -130,8 +131,7 @@ features or completely redesigning things.  Rather, it is aimed at
 giving us a much more stable foundation so that we can move ahead
 with larger tasks in the future.
 
-@warning{GLISS will start shortly before or after the 2.14
-release.}
+@warning{GOP will start shortly after the 2.14 release.}
 
 @end macro