Doc: LM 2.4.4 -- fix @ref.

[lilypond.git] / Documentation / learning / common-notation.itely

diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely
index ac86a64286d347742af33b9d2367e4e5f3263e81..e9dbf4de2dc752ca83f3576ea5fcb8b4381ccffb 100644 (file)
--- a/Documentation/learning/common-notation.itely
+++ b/Documentation/learning/common-notation.itely
@@ -33,7 +33,7 @@ Tutorial guidelines:  (different from policy.txt!)
 
 This chapter explains how to create beautiful printed music
 containing common musical notation, following the material in
-@ref{Introduction}.
+@ref{Tutorial}.
 
 @menu
 * Single staff notation::
@@ -62,6 +62,10 @@ on one staff.
 @node Accidentals and key signatures
 @subsection Accidentals and key signatures
 
+@warning{New users are often confused by these -- please read the
+warning at the bottom of this page, especially if you are not
+familiar with music theory!}
+
 @subheading Accidentals
 
 @cindex accidentals
@@ -169,6 +173,11 @@ note with pitch B-natural.}  In the key of A-flat major, it
 b
 @end lilypond
 
+If the above seems confusing, consider this: if you were playing a
+piano, which key would you hit?  If you would press a black key,
+then you @emph{must} add @code{-is} or @code{-es} to the note
+name!
+
 Adding all alterations explicitly might require a little more
 effort when typing, but the advantage is that
 @notation{transposing} is easier, and accidentals can be printed
@@ -1118,7 +1127,6 @@ introduction to the rest of the manual.
 
 @menu
 * Organizing pieces with variables::
-* Version number::
 * Adding titles::
 * Absolute note names::
 * After the tutorial::
@@ -1218,38 +1226,6 @@ places.  The following example uses the above variables:
 @end example
 
 
-@node Version number
-@subsection Version number
-
-@cindex versioning
-@cindex version
-@cindex version number
-@cindex upgrades
-@cindex future upgrades
-@cindex updating files
-@cindex files, updating
-
-@funindex \version
-@funindex version
-@funindex convert-ly
-
-The @code{\version} statement records the version of LilyPond that
-was used to write the file:
-
-@example
-\version @w{"@version{}"}
-@end example
-
-@noindent
-By convention, this is placed at the top of your LilyPond file.
-
-These annotations make future upgrades of LilyPond go more
-smoothly.  Changes in the syntax are handled with a special
-program, @command{convert-ly}, and it uses @code{\version} to
-determine what rules to apply.  For details, see
-@rprogram{Updating files with convert-ly}.
-
-
 @node Adding titles
 @subsection Adding titles
 
@@ -1390,10 +1366,8 @@ cross-references at first reading; when you have read all of the
 Learning Manual, you may want to read some sections again and follow
 cross-references for further reading.
 
-If you have not done so already, @emph{please} read
-FIXME FIXME FIXME 
-@c @ref{About the documentation}.
-There is a lot of information about LilyPond, so
+If you have not done so already, @emph{please} read @ref{Overview
+of manuals}.  There is a lot of information about LilyPond, so
 newcomers often do not know where they should look for help.  If
 you spend five minutes reading that section carefully, you might
 save yourself hours of frustration looking in the wrong places!