Merge branch 'master' into lilypond/translation

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

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 7c203800d781e15f849a179d8784cb13fa1dda17..9b3ef5a500f12046e35c87bc68b23740d135f62b 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -6,7 +6,7 @@
     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
 
@@ -60,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
@@ -84,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
@@ -136,7 +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 version @version{}.
+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
@@ -153,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.
@@ -176,7 +177,6 @@ Appendices
 @include specialist.itely
 
 @include input.itely
-@include non-music.itely
 @include spacing.itely
 
 @include changing-defaults.itely