Merge branch 'release/unstable'

[lilypond.git] / Documentation / web / news-front.itexi

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index aacf4889099c7b2216ce92f357998070eee1a1ae..41b77d46d20efb513437cea0828a1a697b88074d 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,9 +9,9 @@
 @c used for news about the upcoming release; see CG 10.2
 
 @newsItem
-@subsubheading Release candidate 2 of 2.14 - LilyPond 2.13.48 released!  @emph{Feb 5, 2011}
+@subsubheading Release candidate 4 of 2.14 - LilyPond 2.13.56 released!  @emph{Mar 29, 2011}
 
-LilyPond 2.13.48 is out; this is the second release candidate of
+LilyPond 2.13.56 is out; this is the fourth release candidate of
 the upcoming 2.14 stable release.  All users are invited to
 experiment with this version.  New features since 2.12.3 are
 listed in the @qq{Changes} manual on the website section about
@@ -19,22 +19,54 @@ listed in the @qq{Changes} manual on the website section about
 
 There are no known Critical issues with this release.  If no
 Critical bugs are found, then the official 2.14.0 release will be
-on Feb 5, 2011.  If you discover any problems, please send us
+<<<<<<< HEAD
+on April 5, 2011.  If you discover any problems, please send us
+=======
+on April 2, 2011.  If you discover any problems, please send us
+>>>>>>> release/unstable
 @ref{Bug reports}.
 
 @newsEnd
 
 
+@newsItem
+@subsubheading LilyPond 2.13.55 released!  @emph{Mar 22, 2011}
+
+We are happy to announce the release of LilyPond 2.13.55.  This
+release contains the usual number of bugfixes.
+
+Please note that this is @strong{not} the fourth release candidate,
+due to a few remaining Critical bugs.
+
+@newsEnd
+
 
 @newsItem
-@subsubheading LilyPond 2.13.47 released!  @emph{Jan 28, 2011}
+@subsubheading Release candidate 3 withdrawn  @emph{Mar 15, 2011}
 
-We are happy to announce the release of LilyPond 2.13.47.  This
-release contains the usual number of bugfixes.  However, a number
-of critical issues still remain, so this release is intended for
-developers only.
+We have discovered a regression since 2.12.3, so lilypond 2.13.54
+is no longer a candidate for the 2.14.0 release.  However, please
+continue testing it -- we would like to discover (and fix!) any
+more regressions as soon as possible.  If you discover any
+problems, please send us @ref{Bug reports}.
 
 @newsEnd
 
 
+@newsItem
+@subsubheading Release candidate 3 of 2.14 - LilyPond 2.13.54 released!  @emph{Mar 13, 2011}
+
+LilyPond 2.13.54 is out; this is the third release candidate of
+the upcoming 2.14 stable release.  All users are invited to
+experiment with this version.  New features since 2.12.3 are
+listed in the @qq{Changes} manual on the website section about
+@ref{Development}.
+
+There are no known Critical issues with this release.  If no
+Critical bugs are found, then the official 2.14.0 release will be
+on March 27, 2011.  If you discover any problems, please send us
+@ref{Bug reports}.
+
+@newsEnd
+