Merge remote branch 'origin' into release/unstable

diff --git a/Documentation/contributor/quick-start.itexi b/Documentation/contributor/quick-start.itexi
index e56eab872219a4d8d2d66461b1178fba662e197f..d12ff3578d649c0606e0d74cca5764098a483e1b 100644 (file)
--- a/Documentation/contributor/quick-start.itexi
+++ b/Documentation/contributor/quick-start.itexi
@@ -448,6 +448,7 @@ will likely take 2 to 10 hours.
 
 @example
 cd ~/lilypond-git/build/
+make
 make doc
 @end example
 

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 272ddfbb200dbdd46fce777cf0e520c75f490b78..a26c9005c70866e30db56ea22369753558288ca4 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,6 +9,18 @@
 @c used for news about the upcoming release; see CG 10.2
 
 
+@newsItem
+@subsubheading LilyPond 2.15.3 released!  @emph{July 2, 2011}
+
+We are happy to announce the release of LilyPond 2.15.4.  This
+release contains the usual number of bugfixes.
+
+It is strongly recommended that normal users do @strong{not} use
+this release, and instead use the stable 2.14 version.
+
+@newsEnd
+
+
 @newsItem
 @subsubheading LilyPond 2.15.3 released!  @emph{June 27, 2011}