Resolve conflict, maybe?

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

diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely
index d1c02fba42af292adac1171370d94147a9960747..a88f8f35c144e66719f586a1dcb8a12e3ef47982 100644 (file)
--- a/Documentation/user/text.itely
+++ b/Documentation/user/text.itely
@@ -14,7 +14,7 @@
 @lilypondfile[quote]{text-headword.ly}
 
 This section explains how to include text (with various
-formatting) in your scores.
+formatting) in music scores.
 
 @noindent
 Some text elements that are not dealt with here are discussed in other
@@ -37,6 +37,8 @@ information, see @ref{Text encoding}.}
 @node Writing text
 @subsection Writing text
 
+This section introduces different ways of adding text to a score.
+
 @menu
 * Text scripts::                
 * Text spanners::               
@@ -309,6 +311,9 @@ Internals Reference: @internalsref{TextScript}.
 @node Formatting text
 @subsection Formatting text
 
+This section presents basic and advanced text formatting,
+using the @code{\markup} mode specific syntax.
+
 @menu
 * Text markup introduction::    
 * Common markup commands::