X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fincluded%2Fhelpus.itexi;h=1578a36174a1bbfe274f730268d26d9250006a82;hb=ee5f21d7ed3b985913194699aa1d412e4bced562;hp=3d08c278bc83f8f995ac3224dc49a150072a3d25;hpb=94408d4a2e538e8812561f29e09116ede58dd042;p=lilypond.git

diff --git a/Documentation/included/helpus.itexi b/Documentation/included/helpus.itexi
index 3d08c278bc..1578a36174 100644
--- a/Documentation/included/helpus.itexi
+++ b/Documentation/included/helpus.itexi
@@ -7,18 +7,20 @@
 
 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
 
 
-@macro helpusTasks
+@macro helpusSimple
 @subheading Simple tasks
 
+@strong{No programming skills} required!
+
 @itemize
 @item
 Mailing list support: answer questions from fellow users.
@@ -43,18 +45,29 @@ testing new features.  Please contribute to these discussions!
 
 @end itemize
 
-@subheading Moderate tasks
+@end macro
+
+
+@macro helpusAdvanced
+@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 Lilydev as discussed in @rcontrib{Quick start}.}
+
+Contributors using Linux or FreeBSD may also use Lilydev, but if
+they prefer their own development environment, they should read
+@rcontrib{Working with source code}, and @rcontrib{Compiling}.
 
-@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}.}
+Begin by reading @rcontrib{Summary for experienced developers}.
 
 @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
@@ -65,32 +78,15 @@ 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{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
-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
 
 @end macro
 
-
+@ignore
 @macro helpusProjects
 @subheading Projects
 
@@ -115,10 +111,7 @@ it, then the word is: @emph{Join the Frogs!}
 @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
@@ -127,15 +120,11 @@ untweaked music will remain stable for the foreseeable future.
 We will have an extensive discussion period to determine the final
 input specification.
 
-@warning{GLISS will start shortly after 2.14 is released.}
+@warning{GLISS will start shortly after 2.16 is released.}
 
 @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
@@ -148,9 +137,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{GOP will start shortly before or after the 2.14
-release.}
-
 @end macro
 
+@end ignore