From: Graham Percival <graham@percival-music.ca>
Date: Thu, 10 Apr 2008 20:06:11 +0000 (-0700)
Subject: Resolve conflict, maybe?
X-Git-Tag: release/2.11.44-1~15^2~2
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=c24fb45cf071aeb818824e398ae7a3a77378d1d5;p=lilypond.git

Resolve conflict, maybe?

Merge branch 'master' of git://git.sv.gnu.org/lilypond

Conflicts:

	Documentation/user/text.itely
---

c24fb45cf071aeb818824e398ae7a3a77378d1d5
diff --cc Documentation/user/text.itely
index d1c02fba42,5910210611..a88f8f35c1
--- a/Documentation/user/text.itely
+++ b/Documentation/user/text.itely
@@@ -37,7 -36,9 +37,9 @@@ information, see @ref{Text encoding}.
  @node Writing text
  @subsection Writing text
  
+ This section introduces different ways of adding text to a score.
+ 
 -@menu     
 +@menu
  * Text scripts::                
  * Text spanners::               
  * Text marks::                  
@@@ -309,13 -310,14 +311,16 @@@ Internals Reference: @internalsref{Text
  @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::    
 -* Nested scores::               
 -* Page wrapping text::          
 -* Font selection::              
 +* Common markup commands::      
 +* Text alignment::              
 +* Graphic notation inside markup::  
 +* Music notation inside markup::  
 +* Multi-pages markup::          
  @end menu
  
  @node Text markup introduction