lilypond-1.2.15

diff --git a/Documentation/index.texi b/Documentation/index.texi
index f308cfe45b7752543a370d524b1b9bf193f7c83a..31afd58918931e48a4ca9f5b611d19b8aa72a262 100644 (file)
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -8,33 +8,29 @@
 @unnumberedsubsec Introduction
 
 @itemize 
-@item @uref{../topdocs/out-www/README.html, README}
-@item @uref{../topdocs/out-www/INSTALL.html, Installation Instructions}
-@item @uref{../topdocs/out-www/AUTHORS.html,The Authors}
+@item @uref{DEDICATION.txt,Dedication}
+@item @uref{../topdocs/out-www/AUTHORS.html, Authors}
+@item @uref{../topdocs/out-www/README.html, Readme file}
+@item @uref{../topdocs/out-www/INSTALL.html, Installation instructions}
 @end itemize
 
 
-
-
 @unnumberedsubsec Documentation
 
 @itemize @bullet
-@item @uref{faq.html,FAQs}
+@item @uref{faq.html,Frequently asked questions}, with answers
 @item @uref{programs.html,`Manual pages'}
 @item @uref{../user/out-www/index.html,User documentation}
 @item @uref{../metadoc/out-www/index.html,Hacker documentation}
 @item @uref{../bibliography/out-www/,Bibliography}
+@item @uref{../misc/out-www/index.html,Miscellaneous texts}
 @end itemize
 
 
-@unnumberedsubsec Miscellaneous blurbs
-
-
-@itemize @bullet
-@item @uref{TODO.txt, TODO list}
-@item @uref{CHANGES.txt,Change log}
-@item @uref{DEDICATION.html,DEDICATION}
-@item @uref{AIMS.txt,Why?}
+@unnumberedsubsec{Status}
+@itemize
+@item @uref{TODO.txt, Thing to do}
+@item @uref{CHANGES.txt, Things recently done}
 @end itemize
 
 

diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely
index c750b3af9c74924716274f35240587d3e56aed78..f5ead31c6cbde6ef79972d06998017ace1e39e14 100644 (file)
--- a/Documentation/user/properties.itely
+++ b/Documentation/user/properties.itely
@@ -1,4 +1,4 @@
-@node Properties, , , Top
+@node Properties, , , Reference Manual
 
 @cindex properties!Lyrics
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 1ba86f3112d49102464f2a57c7bcbe45700223ad..bea07dc13d6fd503e9134ccede855e2b9e6eb285 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1295,17 +1295,16 @@ chords can be expressed in two different ways:
 @mudela[fragment,verbatim,center]
   \notes \context Staff {
     \cadenza 1;
-    <a c'> <b  d' > <c' e' >
-    <{a b  c'}{c' d' e'}>
+    <a c'> <b  d' > <c' e'>
+    < { a b  c' } { c' d' e' } >
   }
 @end mudela
 
 @cindex context selection
-@keyindex{context}
+@c @keyindex{context}
 
 @example
-  \context
-    @var{contexttype} [= @var{contextname}] @var{musicexpr}
+  \context @var{contexttype} [= @var{contextname}] @var{musicexpr}
 @end example
 
 Interpret @var{musicexpr} within a context of type @var{contexttype}. 

diff --git a/VERSION b/VERSION
index 03cfb773734e8bc2a0379d8b5b61ed3b29691ea8..a29c25c1b18112cdf9cbfb526f6f2ef851ede833 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
-PATCH_LEVEL=14
+PATCH_LEVEL=15
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a