From: Phil Holmes <mail@philholmes.net>
Date: Sun, 3 Nov 2013 13:06:52 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into release/unstable
X-Git-Tag: release/2.17.95-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d01d7bd0752a3d141de5a1fb2905d30efbcd8970;hp=1ca9814191d16fd3c571d93035247db039254fc1;p=lilypond.git

Merge remote branch 'origin/master' into release/unstable
---

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 1b4e0cf6f2..8d45279fb8 100644
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,13 +9,17 @@
 @c used for news about the upcoming release; see CG 10.2
 
 @newsItem
-@subsubheading LilyPond 2.17.29 released!  @emph{October 20, 2013}
-
-We are happy to announce the release of LilyPond 2.17.29.  This
-release contains the usual number of bugfixes and enhancements, and contains
-some work in progress.  You will have access to the very latest features, but
-some may be incomplete, and you may encounter bugs and crashes.  If you require
-a stable version of Lilypond, we recommend using the 2.16 version.
+@subsubheading LilyPond 2.17.95 released!  @emph{November 3, 2013}
+
+We are excited to announce the release of LilyPond@tie{}2.17.95 as
+beta release for the upcoming stable release@tie{}2.18.  The
+developers are still busy finding solutions for some last-minute
+problems, but the release is supposed to be feature-complete, the
+documentation to be accurate, and no important issues to be
+overlooked.  For upgrading the syntax of your input files to the
+latest version, see @rprogram{Updating files with convert-ly}.
+Please test this release and report back any problems, see
+@rweb{Bug reports}.
 
 @newsEnd
 
diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi
index 20bbdb7c42..9a548e02d5 100644
--- a/Documentation/web/news.itexi
+++ b/Documentation/web/news.itexi
@@ -26,6 +26,17 @@ NOTE:
   * don't duplicate entries from news-front.itexi
 @end ignore
 
+@newsItem
+@subsubheading LilyPond 2.17.29 released!  @emph{October 20, 2013}
+
+We are happy to announce the release of LilyPond 2.17.29.  This
+release contains the usual number of bugfixes and enhancements, and contains
+some work in progress.  You will have access to the very latest features, but
+some may be incomplete, and you may encounter bugs and crashes.  If you require
+a stable version of Lilypond, we recommend using the 2.16 version.
+
+@newsEnd
+
 @newsItem
 @subsubheading LilyPond 2.17.28 released!  @emph{October 6, 2013}