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

[lilypond.git] / Documentation / user / lilypond-program.tely

diff --git a/Documentation/user/lilypond-program.tely b/Documentation/user/lilypond-program.tely
index 0875b059f1995c75ab86c178d313d4bcba745760..1ddba147e493f6e417faa89b99260b704bf6d2cf 100644 (file)
--- a/Documentation/user/lilypond-program.tely
+++ b/Documentation/user/lilypond-program.tely
@@ -7,6 +7,10 @@
 @end ignore
 @setfilename lilypond-program.info
 @settitle GNU LilyPond program usage
+@documentencoding UTF-8
+@documentlanguage en
+
+@include macros.itexi
 
 @iftex
 @afourpaper
@@ -21,7 +25,7 @@
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival
-@omfdescription User manual of the LilyPond music engraving system
+@omfdescription Program Usage of the LilyPond music engraving system
 @omftype program usage
 @omfcategory Applications|Publishing
 @omflanguage English
@@ -39,9 +43,6 @@ This document is also available as a
 @syncodeindex fn cp
 @syncodeindex vr cp
 
-@documentlanguage en
-@documentencoding utf-8
-
 
 @finalout
 
@@ -52,7 +53,7 @@ This document is also available as a
 @author The LilyPond development team
 
 
-Copyright @copyright{} 1999--2006 by the authors
+Copyright @copyright{} 1999--2007 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -65,25 +66,11 @@ Free Documentation License''.
 
 @vskip 20pt
 
-@lilypond[ragged-right]
-\score {
-  \context Lyrics {
-    \override Score.RehearsalMark #'self-alignment-X = #LEFT
-    \override Score.RehearsalMark #'font-size = #-2
-    \mark #(ly:export (string-append
-      "(For LilyPond version " (lilypond-version) ")"))
-    s2
-  }
-  \layout {
-    indent = 0.0\pt
-  }
-}
-@end lilypond
-
+For LilyPond version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2006 by the authors
+Copyright @copyright{} 1999--2007 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -98,7 +85,7 @@ Free Documentation License''.
 @ifnottex
 This file documents GNU LilyPond program usage.
 
-Copyright 1999--2006 by the authors
+Copyright 1999--2007 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -115,10 +102,7 @@ Free Documentation License''.
 @top GNU LilyPond --- program usage
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the program usage manual for GNU LilyPond 2.11.x series.
-@ifhtml
-(See the bottom of this page for the exact version number).
-@end ifhtml
+This is the program usage manual for GNU LilyPond version @version{}.
 
 @cindex web site
 @cindex URL
@@ -144,8 +128,6 @@ Appendices
 @contents
 
 
-@include macros.itexi
-
 @include install.itely
 @include setup.itely
 @include running.itely