X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fintroduction.itely;h=c6761089033ce9623a1d49e7c83cd751a981aa55;hb=ece2e45d587f63565e81af44e1937ebe1f5e47a8;hp=9fd63a7e3b4000e682ba8aa06c07e9f6b6d6b84f;hpb=633f28c9c17eaf0c3e968994634417358976439e;p=lilypond.git

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 9fd63a7e3b..c676108903 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -87,9 +87,8 @@ computer edition.
 @end ifnottex
 @end ifnotinfo
 @ifinfo
-@c workaround for makeinfo-4.6: line breaks and multi-column cookies
-@image{henle-flat-bw,,,png} @image{baer-flat-bw,,,png}
-@image{lily-flat-bw,,,png}
+@image{lilypond/henle-flat-bw,,,png} @image{lilypond/baer-flat-bw,,,png}
+@image{lilypond/lily-flat-bw,,,png}
 @end ifinfo
 
 @item @tab
@@ -243,7 +242,7 @@ programming language; the program's functionality was set in stone by
 the developers.  That proved to be unsatisfactory for a number of
 reasons:
 
-@itemize @bullet
+@itemize
 @item When LilyPond makes mistakes,
 users need to override formatting decisions.  Therefore, the user must
 have access to the formatting engine.  Hence, rules and settings cannot
@@ -540,7 +539,7 @@ context.  The Score context is the top level notation context.
 
 @seealso
 
-Program reference: @internalsref{Contexts}.
+Internals Reference: @internalsref{Contexts}.
 
 @lilypond[quote,ragged-right]
 \include "engraver-example.ily"
@@ -569,14 +568,18 @@ The syntax is also the user-interface for LilyPond, hence it is easy
 to type
 
 @example
-c'4 d'8
+@{
+  c'4 d'8
+@}
 @end example
 
 @noindent
 a quarter note C1 (middle C) and an eighth note D1 (D above middle C)
 
-@lilypond[quote,fragment]
-c'4 d'8
+@lilypond[quote]
+{
+  c'4 d'8
+}
 @end lilypond
 
 On a microscopic scale, such syntax is easy to use.  On a larger
@@ -651,8 +654,11 @@ of music engraving into a computer program.  Thanks to all that hard
 work, the program can now be used to perform useful tasks.  The
 simplest application is printing notes.
 
-@lilypond[quote,relative=1,fragment]
-\time 2/4 c4 c g'4 g a4 a g2
+@lilypond[quote,relative=1]
+{
+  \time 2/4
+  c4 c g'4 g a4 a g2
+}
 @end lilypond
 
 @noindent
@@ -690,22 +696,20 @@ to mix music and text in documents.
 @node About this manual
 @section About this manual
 
-There are two manuals about LilyPond: the @emph{user manual} (this
-document), and @emph{program usage}.
+FIXME: needs almost-complete rewrite.  -gp
 
+There are four manuals about LilyPond: the @emph{Learning Manual},
+the @emph{Notation Reference}, the @emph{Application Usage}, and the
+@emph{Internals Reference}.
 
-@subheading User manual
 
-The manual is divided into three books.
-
-@subsubheading Learning manual
+@subheading Learning Manual (LM)
 
 This book explains how to begin learning LilyPond, as well as explaining
 some key concepts in easy terms.  It is recommended to read these
 chapters in a linear fashion.
 
-
-@itemize @bullet
+@itemize
 
 @item
 @ifhtml
@@ -716,7 +720,7 @@ gives a gentle introduction to typesetting music.  First time
 users should start here.
 
 @item
-@emph{@ref{Putting it all together}},
+@emph{@ref{Fundamental concepts}},
 explains some general concepts about the lilypond file format.  If
 you are not certain where to place a command, read this chapter!
 
@@ -733,7 +737,7 @@ produces.
 @end itemize
 
 
-@subsubheading Notation reference
+@subheading Notation Reference (NR)
 
 This book explains all the LilyPond commands which produce notation.  It
 assumes that readers are familiar with the concepts in the Learning
@@ -743,7 +747,7 @@ All of this needs to be rewritten after GDP, anyway.
 
 @ignore
 
-@itemize @bullet
+@itemize
 
 @item
 @emph{@r ef{Basic notation}},
@@ -787,7 +791,7 @@ explains how to create music functions.
 
 This book contains useful reference charts.
 
-@itemize @bullet
+@itemize
 @item
 @ifhtml
 The
@@ -836,7 +840,7 @@ is a complete index.
 This book explains how to execute the program and how to integrate
 LilyPond notation with other programs.
 
-@itemize @bullet
+@itemize
 
 @item
 @emph{@rprogram{Install}},
@@ -872,7 +876,7 @@ formats to the @code{.ly} format.
 
 There are a number of other places which may be very valuable.
 
-@itemize @bullet
+@itemize
 @cindex idiom
 @cindex jargon
 @cindex terminology
@@ -898,7 +902,7 @@ advisable to consult the glossary.
 @item
 The
 @ifhtml
-@uref{source/input/lsr/collated-files.html,Snippets}
+@uref{source/input/lsr/snippets/index.html,Snippets}
 @end ifhtml
 @ifnothtml
 Snippets
@@ -912,10 +916,10 @@ Repository}.  This website also has a searchable LilyPond manual.
 @item
 The
 @iftex
-Program reference
+Internals Reference
 @end iftex
 @ifnottex
-@ref{Top,Program reference,,lilypond-internals}
+@ref{Top,Internals Reference,,lilypond-internals}
 @end ifnottex
 is a set of heavily cross linked HTML pages, which document the
 nitty-gritty details of each and every LilyPond class, object, and