Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / notation / text.itely

diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index cac17599700817d51fdf08a5ee6704a096d199fc..c622fb598ed7128d91b0a30e82af3e4e8084bd82 100644 (file)
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -183,6 +183,8 @@ object property.  This syntax is described in @ref{Line styles}.
 @code{\textSpannerNeutral}.
 @endpredefined
 
+@knownissues
+LilyPond is only able to handle one text spanner per voice.
 
 @seealso
 Notation Reference:
@@ -303,8 +305,8 @@ Internals Reference:
 @funindex markup
 
 A @code{\markup} block can exist by itself, outside of any
-any @code{\score} block, as a @qq{top-level
-expression}.  This syntax is described in @ref{File structure}.
+@code{\score} block, as a @qq{top-level expression}.  This syntax
+is described in @ref{File structure}.
 
 @lilypond[verbatim,quote]
 \markup {
@@ -398,7 +400,7 @@ syntax called @qq{markup mode}.
 @cindex markup expressions
 @cindex expressions, markup
 @cindex markup syntax
-@cindex synatax, markup
+@cindex syntax, markup
 
 The markup syntax is similar to LilyPond's usual syntax: a
 @code{\markup} expression is enclosed in curly braces @code{@{
@@ -1359,10 +1361,8 @@ a1^\markup {
   \vcenter {
     \override #'(font-encoding . fetaBraces)
     \lookup #"brace120"
-    \override #'(font-encoding . fetaNumber)
-    \column { 1 3 }
-    \override #'(font-encoding . fetaDynamic)
-    sf
+    \override #'(font-encoding . fetaText)
+    \column { 1 3 sf }
     \override #'(font-encoding . fetaMusic)
     \lookup #"noteheads.s0petrucci"
   }