Resolve conflict, maybe?

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

Conflicts:

	Documentation/user/text.itely

diff --cc Documentation/user/text.itely
index d1c02fba42af292adac1171370d94147a9960747,5910210611ed7564d232b16c3ca379e763b945ee..a88f8f35c144e66719f586a1dcb8a12e3ef47982
--- 1/Documentation/user/text.itely
--- 2/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
  
 -@menu     
+ This section introduces different ways of adding text to a score.
+ 
 +@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