* Documentation/user/instrument-notation.itely (Laissez vibrer

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

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 0f509b497970575ce6a11b1afb8147f00878ae97..e7d66c74300cef602f9226fcaac2c265019c4f5d 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -1,20 +1,27 @@
-\input texinfo @c -*- coding: latin-1; mode: texinfo; -*-
+\input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
 @setfilename lilypond.info
 @settitle GNU LilyPond
 @iftex
 @afourpaper
 @end iftex
 
+@dircategory GNU music project
+@direntry
+
 @ignore
+(I think)
+Current version of the manual: 2.6.0
+Please update this whenever you run convert-ly on the docs.
+
+convert-ly --from=... --to=... --no-version *.itely
+ 
+%%%%%
+
 Distributions will want to install lilypond.info in postinstall, doing:
 
     install-info --info-dir=/usr/share/info out/lilypond.info
     
-@end ignore
-
-@dircategory GNU music project
-@direntry
-@ignore
+%%%%%
 
   * Prepend GNU for dir, must be unique.
   
@@ -74,6 +81,10 @@ HINTS FOR STYLE
 
 * Avoid fluff (``Notice that,'' ``as you can see,'' ``Currently,'').
 
+* The above three suggestions refer to the formal Notation Manual
+  (chapters 5 and up).  In the Tutorial, Example templates, and
+  Putting it all together, you may write more colloquially
+
 * The use of the word `illegal' is inappropriate in most cases.  Say
   `invalid' instead.
 
@@ -153,8 +164,8 @@ HINTS FOR STYLE
 
     This makes it easier to not forget `@noindent'.
 
-  . Non-ASCII characters which are in latin-1 should be directly used;
-    this is, don't say `Ba@ss{}tuba' but `Baßtuba'.  This ensures that
+  . Non-ASCII characters which are in utf-8 should be directly used;
+    this is, don't say `Ba@ss{}tuba' but `Baßtuba'.  This ensures that
     all such characters appear in all output formats.
 
 @end ignore
@@ -165,7 +176,7 @@ This document is also available in @uref{source/Documentation/user/out-www/lilyp
 
 
 @documentlanguage en
-@documentencoding ISO-8859-1
+@documentencoding utf-8
 
 @syncodeindex fn cp
 @syncodeindex ky cp
@@ -260,9 +271,9 @@ of this and other documentation.
 * Instrument-specific notation::   Notation that is only used for some
                                    instruments.
 * Advanced notation::              Less frequently used notation.
-* Global issues::                  Non-notation commands.
-
 * Changing defaults::              Tuning output.
+* Output formats::                 What LilyPond produces.
+
 * Interfaces for programmers::
 * LilyPond-book::                  Integrating text and music.
 * Converting from other formats::  Converting to lilypond source format.
@@ -289,9 +300,9 @@ of this and other documentation.
 @include basic-notation.itely
 @include instrument-notation.itely
 @include advanced-notation.itely
+@include changing-defaults.itely
 @include global.itely
 
-@include changing-defaults.itely
 @include programming-interface.itely
 @include lilypond-book.itely
 @include converters.itely