X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Flilypond.tely;h=9b3ef5a500f12046e35c87bc68b23740d135f62b;hb=e647c14f4af42b2bbe35ec78ce72ce400041c2ea;hp=0631951f5ae237ab2a5e22c3f9c1008e4eea1073;hpb=9e7b53f94e1e3bd7b3f7a14ba11a6cae6c8e9a73;p=lilypond.git

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 0631951f5a..9b3ef5a500 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -6,10 +6,12 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 @setfilename lilypond.info
-@settitle GNU LilyPond user manual
+@settitle GNU LilyPond Notation Reference
 @documentencoding UTF-8
 @documentlanguage en
 
+@include macros.itexi
+
 @iftex
 @afourpaper
 @c don't replace quotes with directed quotes
@@ -58,7 +60,7 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @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 Notation Reference of the LilyPond music engraving system
 @omftype user manual
 @omfcategory Applications|Publishing
 @omflanguage English
@@ -82,7 +84,7 @@ This document is also available as a
 @titlepage
 @title LilyPond
 @subtitle The music typesetter
-@titlefont{User manual}
+@titlefont{Notation Reference}
 @author The LilyPond development team
 
 Copyright @copyright{} 1999--2007 by the authors
@@ -98,21 +100,7 @@ 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
@@ -148,10 +136,9 @@ Free Documentation License''.
 @top GNU LilyPond --- The music typesetter
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the user 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 Notation Reference (NR) for GNU LilyPond version @version{}.
+For more information about how this fits with the other
+documentation, see @rlearning{About the documentation}.
 
 @cindex web site
 @cindex URL
@@ -168,7 +155,6 @@ of this and other documentation.
     specific purposes.
 * Input syntax::                   General information about
     lilypond input files.
-* Non-musical notation::           Output that is not musical notation.
 * Spacing issues::                 Display of output on paper.
 * Changing defaults::              Tuning output.
 * Interfaces for programmers::     Expert usage.
@@ -187,13 +173,10 @@ Appendices
 @contents
 
 
-@include macros.itexi
-
 @include notation.itely
 @include specialist.itely
 
 @include input.itely
-@include non-music.itely
 @include spacing.itely
 
 @include changing-defaults.itely