CG: explain archive/XYZ git branches.

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

diff --git a/Documentation/included/helpus.itexi b/Documentation/included/helpus.itexi
index 986327f7b710edb619175d465e908a801d7e01b6..07b6ffb4bd33c5f601088d1c6c57bfedd2b99541 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,20 +19,23 @@ 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.
 
 @item
 @itemize
 @item
 Mailing list support: answer questions from fellow users.
 
 @item

-Bug reporting: help users create proper @rweb{Bug reports}, and
-aid the Bug Squad 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
 
 @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
 @rcontrib{Adding and editing snippets}.
 
 @item


@@ -42,18 +45,25 @@ 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{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}.}

 
 

-@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}.}
+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}.
+
+Begin by reading @rcontrib{Summary for experienced developers}.

 
 @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


@@ -64,25 +74,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


@@ -95,7 +88,11 @@ Frogs, and read @rcontrib{Programming work}.
 
 @subsubheading Frogs
 
 
 @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,
 
 The Frogs are ordinary LilyPond users who have chosen to get
 involved in their favorite software's development.  Fixing bugs,


@@ -109,7 +106,8 @@ it, then the word is: @emph{Join the Frogs!}
 
 @subsubheading Grand LilyPond Input Syntax Standardization
 
 
 @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
 
 GLISS will stabilize the (non-tweak) input syntax for the upcoming
 LilyPond 3.0.  After updating to 3.0, the input syntax for


@@ -118,16 +116,16 @@ untweaked music will remain stable for the foreseeable future.
 We will have an extensive discussion period to determine the final
 input specification.
 
 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
 
 
 @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
 
 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
 knowledge from existing developers so that it does not get lost.
 
 Unlike most @qq{Grand Projects}, GOP is not about adding huge new


@@ -135,9 +133,6 @@ 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.}
-

 @end macro
 
 
 @end macro