From 9353f4c58a6b60977ac7237756a97dbbaf7b2f80 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Thu, 30 Aug 2007 23:04:16 -0700
Subject: [PATCH] Misc doc updates.

---
 Documentation/user/introduction.itely | 76 +++++++++++++++++----------
 Documentation/user/tutorial.itely     |  3 ++
 2 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 01cc7e7926..6ace6ebf90 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -690,12 +690,19 @@ to mix music and text in documents.
 @node About this manual
 @section About this manual
 
-The manual is divided into four books.
+There are two manuals about LilyPond: the @emph{user manual} (this
+document), and @emph{program usage}.
+
+
+@subheading User manual
+
+The manual is divided into three books.
 
 @subsubheading Learning manual
 
 This book explains how to begin learning LilyPond, as well as explaining
-some key concepts in easy terms.
+some key concepts in easy terms.  It is recommended to read these
+chapters in a linear fashion.
 
 @itemize @bullet
 
@@ -724,6 +731,7 @@ produces.
 
 @end itemize
 
+
 @subsubheading Notation reference
 
 This book explains all the LilyPond commands which produce notation.  It
@@ -770,33 +778,6 @@ explains how to create music functions.
 @end itemize
 
 
-@subsubheading Program usage
-
-This book explains how to execute the program and how to integrate
-LilyPond notation with other programs.
-
-@itemize @bullet
-
-@item
-@emph{@rprogram{Running LilyPond}},
-shows how to run LilyPond and its helper programs.  In addition, this
-section explains how to upgrade input files from previous versions of
-LilyPond.
-
-@item
-@emph{@rprogram{LilyPond-book}},
-explains the details behind creating
-documents with in-line music examples, like this manual.
-
-@item
-@emph{@rprogram{Converting from other formats}},
-explains how to run the conversion programs.  These programs are
-supplied with the LilyPond package, and convert a variety of music
-formats to the @code{.ly} format.
-
-@end itemize
-
-
 @subsubheading Appendices
 
 This book contains useful reference charts.
@@ -844,6 +825,43 @@ is a complete index.
 @end itemize
 
 
+@subheading Program usage
+
+This book explains how to execute the program and how to integrate
+LilyPond notation with other programs.
+
+@itemize @bullet
+
+@item
+@emph{@rprogram{Install}},
+explains how to install LilyPond (including compilation if desired).
+
+@item
+@emph{@rprogram{Setup}},
+describes how to configure your computer for optimum LilyPond usage,
+such as using special environments for certain text editors.
+
+@item
+@emph{@rprogram{Running LilyPond}},
+shows how to run LilyPond and its helper programs.  In addition, this
+section explains how to upgrade input files from previous versions of
+LilyPond.
+
+@item
+@emph{@rprogram{LilyPond-book}},
+explains the details behind creating
+documents with in-line music examples, like this manual.
+
+@item
+@emph{@rprogram{Converting from other formats}},
+explains how to run the conversion programs.  These programs are
+supplied with the LilyPond package, and convert a variety of music
+formats to the @code{.ly} format.
+
+@end itemize
+
+
+
 @subsubheading Other information
 
 There are a number of other places which may be very valuable.
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 292df275e4..6c8613b580 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1494,3 +1494,6 @@ used in an example, read the HTML version (if you are not already doing
 so) and click on the picture of the music.  This will display the exact
 input that LilyPond used to generate this manual.
 
+For information about the structure of the rest of the manual, see
+@ref{About this manual}.
+
-- 
2.39.5