Misc cleanups.

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 97bf00113496a7c37e4ef8c9db9d47230ff4e838..71fe0f3b0106b557798be75036b9b82b17578656 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -690,21 +690,19 @@ to mix music and text in documents.
 @node About this manual
 @section About this manual
 
-There are two manuals about LilyPond: the @emph{user manual} (this
-document), and @emph{program usage}.
+FIXME: needs almost-complete rewrite.  -gp
 
+There are four manuals about LilyPond: the @emph{Learning Manual},
+the @emph{Notation Reference}, the @emph{Program Usage}, and the
+@emph{Program Reference}.
 
-@subheading User manual
 
-The manual is divided into three books.
-
-@subsubheading Learning manual
+@subheading Learning Manual (LM)
 
 This book explains how to begin learning LilyPond, as well as explaining
 some key concepts in easy terms.  It is recommended to read these
 chapters in a linear fashion.
 
-
 @itemize
 
 @item
@@ -715,10 +713,10 @@ The
 gives a gentle introduction to typesetting music.  First time
 users should start here.
 
-@c @item
-@c @emph{@ref{Putting it all together}},
-@c explains some general concepts about the lilypond file format.  If
-@c you are not certain where to place a command, read this chapter!
+@item
+@emph{@ref{Fundamental concepts}},
+explains some general concepts about the lilypond file format.  If
+you are not certain where to place a command, read this chapter!
 
 @item
 @emph{@ref{Working on LilyPond projects}},
@@ -733,7 +731,7 @@ produces.
 @end itemize
 
 
-@subsubheading Notation reference
+@subheading Notation Reference (NR)
 
 This book explains all the LilyPond commands which produce notation.  It
 assumes that readers are familiar with the concepts in the Learning

diff --git a/Documentation/user/percussion.itely b/Documentation/user/percussion.itely
index 29aff239bc08840386617ca802d8c5f5f67d195f..dc94f41d94a01e9243c7329ec2d547ca5062b859 100644 (file)
--- a/Documentation/user/percussion.itely
+++ b/Documentation/user/percussion.itely
@@ -289,7 +289,7 @@ Because general MIDI does not contain rim shots, the sidestick is used
 for this purpose instead.
 
 
-@c FIXME: check name -gp
+@c TODO: check name -gp
 @node Ghost notes
 @unnumberedsubsubsec Ghost notes
 

diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index 639960adc98edf28cc3f7dee14c2d98d4ebefa59..e33182425b6addc43314cc399233a42d88346e37 100644 (file)
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -535,6 +535,7 @@ be altered for page formatting, set @code{annotate-spacing} in the
 @code{\paper} block, like this
 
 
+@c need to have \book{} otherwise we get  the separate systems. -hwn
 @lilypond[verbatim]
 #(set-default-paper-size "a6" 'landscape)
 
@@ -544,10 +545,9 @@ be altered for page formatting, set @code{annotate-spacing} in the
 }
 @end lilypond
 
-@c need to have \book{} otherwise we get  the separate systems. -hwn
 
+@c  TODO: really bad vagueness due to bug in annotate-spacing.  -gp
 @noindent
-@c  FIXME: really bad vagueness due to bug in annotate-spacing.  -gp
 Some unit dimensions are measured in staff spaces, while others
 are measured in millimeters.
 The pairs

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index 8241fd6b8113835437527e9b2ee40f336693bad5..6830cf42d22de65af891aefe0133f1c8b51cdef2 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -615,7 +615,7 @@ There is one tricky aspect: the setting for @code{ignoreMelismata}
 must be set one syllable @emph{before} the non-melismatic syllable
 in the text, as shown here,
 
-@c  FIXME: breaks compile
+@c  TODO: breaks compile
 @lilypond[verbatim,ragged-right,quote]
 %{
 <<