Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / Documentation / user / basic-notation.itely

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index eac3bfc26c2cf4cc0175f749d0e664d788e61406..e17f3e480f4a9b3f17fc47eade0c293194d5349e 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -854,7 +854,7 @@ b16*4 c4
 
 @seealso
 
-This manual: @ref{Tuplets}
+This manual: @ref{Tuplets}.
 
 
 @node Bar check
@@ -1505,7 +1505,7 @@ can be specified by setting this property directly.
 
 Accidentals and key signatures often confuse new users, because
 unaltered notes get natural signs depending on the key signature.  For
-more information, see @ref{Accidentals} or @ref{Accidentals and key signatures}.
+more information, see @ref{Accidentals}, or @ref{Accidentals and key signatures}.
 
 @lilypond[quote,ragged-right,verbatim,relative=2,fragment]
 \key g \major
@@ -1571,7 +1571,7 @@ property.  Setting it to @code{#'()} uses fraction style for 4/4 and
 @end lilypond
 
 There are many more options for its layout.  See @ref{Ancient time
-signatures} for more examples.
+signatures}, for more examples.
 
 @code{\time} sets the property @code{timeSignatureFraction},
 @code{beatLength} and @code{measureLength} in the @code{Timing}
@@ -1716,7 +1716,7 @@ point (without increasing the bar number counter).
 In scores with many staves, a @code{\bar} command in one staff is
 automatically applied to all staves.  The resulting bar lines are
 connected between different staves of a @code{StaffGroup},
-@code{PianoStaff}, or @code{ChoirStaff}.
+@code{PianoStaff}, or @code{GrandStaff}.
 
 @lilypond[quote,ragged-right,fragment,verbatim]
 <<
@@ -2267,7 +2267,7 @@ LilyPond inserts beams automatically
 
 When these automatic decisions are not good enough, beaming can be
 entered explicitly.  It is also possible to define beaming patterns
-that differ from the defaults.  See @ref{Setting automatic beam behavior}
+that differ from the defaults.  See @ref{Setting automatic beam behavior},
 for details.
 
 Individual notes may be marked with @code{\noBeam} to prevent them
@@ -2354,7 +2354,8 @@ behavior can be changed by setting @code{breakable}.
 @refbugs
 
 Kneed beams are inserted automatically when a large gap is detected
-between the note heads.
+between the note heads.  This behavior can be tuned through the
+@code{auto-knee-gap} object.
 
 Automatically kneed cross-staff beams cannot be used together with
 hidden staves.  See @ref{Hiding staves}.
@@ -2449,7 +2450,7 @@ length of the main note.  The fraction 3/4 can be changed by setting
 @code{afterGraceFraction}, ie.
 
 @example
-afterGraceFraction = #(cons 7 8)
+#(define afterGraceFraction (cons 7 8))
 @end example
 
 @noindent
@@ -3200,18 +3201,13 @@ c1
 \alternative { {d2 d} {f f,} }
 @end lilypond
 
-In the following example, the first ending is not a complete
-bar (it only had 3 beats).  The beginning of the second ending
-contains the 4th beat from the first ending.  This @q{extra}
-beat in the second ending is due to the first time ending,
-and has nothing to do with the @code{\partial} at the
-beginning of the example.
+Repeats with upbeats may be created.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \new Staff {
-  \partial 4
-  \repeat volta 4 { e | c2 d2 | e2 f2 | }
-  \alternative { { g4 g g } { a | a a a a | b2. } }
+  \partial 4 e |
+  \repeat volta 4 { c2 d2 | e2 f2 | }
+  \alternative { { g4 g g e } { a a a a | b2. } }
 }
 @end lilypond