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 3d08c278bc83f8f995ac3224dc49a150072a3d25..e94c513aed0c8a0daff54458bf8021fe6029da22 100644 (file)
--- a/Documentation/included/helpus.itexi
+++ b/Documentation/included/helpus.itexi
@@ -7,10 +7,10 @@
 
 The LilyPond development team is quite small; we really want to
 get more people involved.  Please consider helping your fellow
 
 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
 of spending time on those simple tasks.
 
 @end macro


@@ -19,6 +19,8 @@ of spending time on those simple tasks.
 @macro helpusTasks
 @subheading Simple tasks
 
 @macro helpusTasks
 @subheading Simple tasks
 

+No source code or compiling required!
+

 @itemize
 @item
 Mailing list support: answer questions from fellow users.
 @itemize
 @item
 Mailing list support: answer questions from fellow users.


@@ -43,18 +45,23 @@ testing new features.  Please contribute to these discussions!
 
 @end itemize
 
 
 @end itemize
 

-@subheading Moderate tasks
+@subheading Advanced tasks
+
+These jobs generally require that you have the source code and can
+compile LilyPond.

 
 

-@warning{These jobs generally require that you have the program
-and documentation source files, but do not require a full
-development environment.  See
-@rcontrib{Working with source code}.}
+@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}.}
+
+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
 
 @itemize
 @item

-Documentation: see
-@rcontrib{Documentation work}, and
-@rcontrib{Building documentation without compiling}.
+Documentation: for large changes, see
+@rcontrib{Documentation work}.

 
 @item
 Website: the website is built from the normal documentation
 
 @item
 Website: the website is built from the normal documentation


@@ -65,25 +72,8 @@ source.  See the info about documentation, and also
 Translations: see @rcontrib{Translating the documentation}, and
 @rcontrib{Translating the website}.
 
 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{Working with source code},
-and @rcontrib{Compiling}.
-@*@*
-We suggest that new contributors using Windows or MacOS X do
-@strong{not} attempt to set up their own development environment;
-instead, see
-@rcontrib{Using a Virtual Machine to Compile LilyPond}.
-}
-
-@itemize

 @item
 @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
 Frogs, and read @rcontrib{Programming work}.
 
 @end itemize


@@ -115,10 +105,7 @@ it, then the word is: @emph{Join the Frogs!}
 @subsubheading Grand LilyPond Input Syntax Standardization
 
 Website:
 @subsubheading Grand LilyPond Input Syntax Standardization
 
 Website:

-
-@example
-@uref{http://lilypond.org/~graham/gliss}
-@end example
+@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
 
 GLISS will stabilize the (non-tweak) input syntax for the upcoming
 LilyPond 3.0.  After updating to 3.0, the input syntax for


@@ -131,11 +118,7 @@ input specification.
 
 @subsubheading Grand Organizing Project
 
 
 @subsubheading Grand Organizing Project
 

-Website:
-
-@example
-@uref{http://lilypond.org/~graham/gop}
-@end example
+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
 
 GOP will be our big recruiting drive for new contributors.  We
 desperately need to spread the development duties (including


@@ -148,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.
 
 giving us a much more stable foundation so that we can move ahead
 with larger tasks in the future.
 

-@warning{GOP will start shortly before or after the 2.14
-release.}
+@warning{GOP will start shortly after the 2.14 release.}

 
 @end macro
 
 
 @end macro