Doc: misc updates to main doc pages.

diff --git a/Documentation/application.tely b/Documentation/application.tely
index 2aaddcbb25e6070275a6447b1e07d5f5a57ed553..f8c8d8ef1e580421b0c6812dd5f19c6379933baa 100644 (file)
--- a/Documentation/application.tely
+++ b/Documentation/application.tely
@@ -11,10 +11,12 @@
 @documentlanguage en
 
 @include macros.itexi
+@c  This produces the unified index
+@syncodeindex fn cp
+@syncodeindex vr cp
 
 @afourpaper
 
-
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival
@@ -25,98 +27,64 @@
 @end ignore
 
 
-@ifnottex
-@node Top
-@top GNU LilyPond --- Application Usage
-@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
-@end ifnottex
+@copying
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007, 2008, 2009 by the authors.
 
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1
+or any later version published by the Free Software Foundation;
+with no Invariant Sections.
+A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
+@end quotation
+@end copying
 
-@ifhtml
-@ifclear bigpage
-This document is also available as a
-@uref{source/Documentation/application.pdf,PDF} and as
-@uref{source/Documentation/application-big-page.html,one big page}.
-@end ifclear
-@ifset bigpage
-This document is also available as a
-@uref{source/Documentation/application.pdf,PDF} and as
-@uref{source/Documentation/application/index.html,HTML indexed multiple pages}.
-@end ifset
-@end ifhtml
+@macro introText
+@cartouche
+This file explains how to execute the programs distributed with
+GNU LilyPond version @version{}.  In addition, it suggests some
+@qq{best practices} for efficient usage.
 
+For more information about how this fits with the other
+documentation, or to read this manual in other formats, see
+@rgeneral{Manuals}.
+@end cartouche
+@end macro
 
-@c  This produces the unified index
-@syncodeindex fn cp
-@syncodeindex vr cp
 
+@c TITLE PAGE
+@ifnottex
+@node Top
+@top GNU LilyPond --- Learning Manual
+@end ifnottex
 
 @finalout
 
 @titlepage
 @title LilyPond
 @subtitle The music typesetter
-@titlefont{Program usage}
+@titlefont{Learning Manual}
 @author The LilyPond development team
 
+@vskip 100pt
 
-Copyright @copyright{} 1999--2009 by the authors
+@introText{}
 
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with no Invariant Sections.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
-@end quotation
+@vskip 0pt plus 1filll
+@c @vskip 20pt
 
-@vskip 20pt
+@insertcopying{}
 
 For LilyPond version @version{}
 @end titlepage
 
-@copying
-Copyright @copyright{} 1999--2009 by the authors
 
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with no Invariant Sections.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
-@end quotation
-@end copying
+@c TOC -- non-tex
 
 @ifnottex
-This file documents GNU LilyPond program usage.
-
-Copyright 1999--2009 by the authors
-
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with no Invariant Sections.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
-@end quotation
-@end ifnottex
-
-@ifnottex
-This is the Application Usage (AU) manual for GNU LilyPond version @version{}.
-For more information about how this fits with the other
-documentation, see 
-FIXME FIXME FIXME
-@c @rlearning{About the documentation}.
-
-@cindex web site
-@cindex URL
-
-More information can be found at
-@uref{http://@/www@/.lilypond@/.org/}.  The website contains on-line copies
-of this and other documentation.
+@introText{}
 
 @c * Install::                        How to install or compile.
 @c * Setup::                          Using LilyPond with other programs.

diff --git a/Documentation/learning.tely b/Documentation/learning.tely
index f900e5e27b319ebe8520b4ef1e5b48585da530a9..a9eb18f26fc496f68067cf777bb286fb1f59dc7a 100644 (file)
--- a/Documentation/learning.tely
+++ b/Documentation/learning.tely
@@ -44,8 +44,11 @@ Free Documentation License''.
 @macro introText
 @cartouche
 This file provides an introduction to GNU LilyPond version
-@version{}.  For more information about how this fits with the
-other documentation, see @rgeneral{Manuals}.
+@version{}.
+
+For more information about how this fits with the other
+documentation, or to read this manual in other formats, see
+@rgeneral{Manuals}.
 @end cartouche
 @end macro
 
@@ -83,9 +86,9 @@ For LilyPond version @version{}
 @introText{}
 
 @menu
-* Introduction::                   Begin here.
-* Common notation::                A tutorial introduction.
-* Fundamental concepts::           Basic concepts required for reading the rest of this manual.
+* Introduction::                   Basics of typesetting with LilyPond.
+* Common notation::                Writing very commmon notation.
+* Fundamental concepts::           Basic concepts required for reading the rest of the manuals.
 * Tweaking output::                Introduction to modifying output.
 
 Appendices
@@ -97,6 +100,7 @@ Appendices
 @end menu
 
 
+@ignore
 @ifhtml
 @ifclear bigpage
 This document is also available as a
@@ -109,6 +113,7 @@ This document is also available as a
 @uref{source/Documentation/learning/index.html,HTML indexed multiple pages}.
 @end ifset
 @end ifhtml
+@end ignore
 
 @end ifnottex
 

diff --git a/Documentation/notation.tely b/Documentation/notation.tely
index ff1d35e253ad421f4c10fe02d391618b0f5c583a..2489b1a05919d2903ed236d9f69cbf66ad3f3231 100644 (file)
--- a/Documentation/notation.tely
+++ b/Documentation/notation.tely
@@ -153,17 +153,17 @@ More information can be found at
 @uref{http://@/www@/.lilypond@/.org/}.  The website contains on-line copies
 of this and other documentation.
 
-@include dedication.itely
 
 @menu
-* Musical notation::               Musical notation.
+* Musical notation::               Notation which is used in
+    almost all projects.
 * Specialist notation::            Notation which is only used for
     specific purposes.
 * General input and output::       General information about
     LilyPond input and output.
 * Spacing issues::                 Display of output on paper.
 * Changing defaults::              Tuning output.
-* Interfaces for programmers::     Expert usage.
+* Interfaces for programmers::     How to interface with scheme.
 
 Appendices