Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely
index 2f7f304e11bc024b59e8909242f5b8abca0a8aa1..c9eb78dd1d6ef6931ce1cad1186d305d55b159c2 100644 (file)
--- a/Documentation/learning/common-notation.itely
+++ b/Documentation/learning/common-notation.itely
@@ -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,10 +173,15 @@ 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
-according to different conventions.  For some examples how
+according to different conventions.  For some examples of how
 accidentals can be printed according to different rules, see
 @ruser{Automatic accidentals}.
 
@@ -703,7 +712,7 @@ creates a bigger music expression.  In this way it resembles the
 minus sign in mathematics.  The formula @math{(4+5)} is an
 expression, so @math{-(4+5)} is a bigger expression.
 
-Time signatures entered in one staff affects all other staves by
+Time signatures entered in one staff affect all other staves by
 default.  On the other hand, the key signature of one staff does
 @emph{not} affect other staves.  This different default behavior
 is because scores with transposing instruments are more common