From: John Mandereau <john.mandereau@gmail.com>
Date: Sun, 10 Feb 2008 10:43:54 +0000 (+0100)
Subject: Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.40-1~3^2~20^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=13cfd8beeed2a99d3989a70769f078d6a02a8021;hp=-c;p=lilypond.git

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

* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  Minor tweaks to formatting.
---

13cfd8beeed2a99d3989a70769f078d6a02a8021
diff --combined Documentation/user/lilypond.tely
index 62045348ba,29fca60d35..0631951f5a
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@@ -23,7 -23,7 +23,7 @@@
  @ignore
  Distributions will want to install lilypond.info in postinstall, doing:
  
 -    install-info --info-dir=/usr/share/info out/lilypond.info
 +    install-info --info-dir=/usr/share/info out[-www]/lilypond.info
  
    * Prepend GNU for dir, must be unique.
  
@@@ -38,21 -38,16 +38,21 @@@
  
  
  @c
 -@c Info files are installed in subdirectories to allow images to be present. 
 -@c 
 -@dircategory LilyPond
 +@c Info files are no longer installed in a subdirectory, images are
 +@c expected to be found in lilypond/ subdirectory.
 +@dircategory GNU LilyPond --- the music typesetter
  @direntry
 -* LilyPond: (lilypond/lilypond).           The GNU music typesetter.
 -* abc2ly: (lilypond/lilypond-program)Invoking abc2ly.          Importing ABC.      
 -* convert-ly: (lilypond/lilypond-program)Invoking convert-ly.  Older LilyPond versions.
 -* etf2ly: (lilypond/lilypond-program)Invoking etf2ly.          Importing Finale.
 -* lilypond-book: (lilypond/lilypond-program)LilyPond-book.     Integrating text and music.
 -* midi2ly: (lilypond/lilypond-program)Invoking midi2ly.        Importing MIDI.
 +* LilyPond Learning Manual: (lilypond-learning).  Start here.
 +* Music Glossary: (music-glossary).               For non-English users.
 +* LilyPond: (lilypond).                           LilyPond Notation Reference.
 +* LilyPond Internals Reference: (lilypond-internals).  Definitions for tweaking.
 +* LilyPond Application Usage: (lilypond-program). Installing and running applications.
 +* abc2ly: (lilypond-program)Invoking abc2ly.      Importing ABC.      
 +* convert-ly: (lilypond-program)Updating files with convert-ly. Older LilyPond versions.
 +* etf2ly: (lilypond-program)Invoking etf2ly.      Importing Finale.
 +* lilypond-book: (lilypond-program)LilyPond-book. Integrating text and music.
 +* midi2ly: (lilypond-program)Invoking midi2ly.    Importing MIDI.
 +* musicxml2ly: (lilypond-program)Invoking musicxml2ly.  Importing MusicXML.
  @end direntry
  
  @c don't remove this comment.
@@@ -208,11 -203,15 +208,15 @@@ Appendice
  @node LilyPond command index
  @appendix LilyPond command index
  
+ This index does blah blah blah.
+ 
  @printindex ky
  
  @node LilyPond index
  @appendix LilyPond index
  
+ In contrast, this index does blaz blaz blaz.
+ 
  @printindex cp
  
  @bye