Merge branch 'release/unstable' of git+ssh://git.savannah.gnu.org/srv/git/lilypond

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index a301535606f069ebba1ba7122e574432f95f9b75..0f033a7bd2780d4e1009fc0fe6c015c8f5999c75 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -6,19 +6,9 @@
 
 @c keep two blank lines between news entries
 
-@c TODO: fill in number
+@c FIXME: fill in number
 @c used for news about the upcoming release; see CG x.y
 
-@newsItem
-@subsubheading LilyPond 2.13.27 released!  @emph{July 5, 2010}
-
-We are happy to announce the release of LilyPond 2.13.27.  This
-release contains the usual number of bugfixes.  However, a number
-of critical issues still remain, so this release is intended for
-developers only.
-@newsEnd
-
-
 @newsItem
 @subsubheading Testing our new website!  @emph{June 29, 2010}
 

diff --git a/input/regression/lilypond-book/GNUmakefile b/input/regression/lilypond-book/GNUmakefile
index d4bc8550a109e0e5905956d5ba0f9a7260ec31bf..a1e5bdc3b7598d568fccf7662a82737e29b89a1e 100644 (file)
--- a/input/regression/lilypond-book/GNUmakefile
+++ b/input/regression/lilypond-book/GNUmakefile
@@ -3,12 +3,7 @@ depth = ../../..
 STEPMAKE_TEMPLATES=documentation texinfo
 LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc lilypond-book
 
-ifndef LILYBOOK_OUT_FILES
-LILYBOOK_OUT_FILES = ""
-endif
-
-COLLATED_FILES = $(LILYBOOK_OUT_FILES)
-EXTRA_DIST_FILES = suffix-texinfo.texinfo
+COLLATED_FILES = $(OUT_FILES)
 
 include $(depth)/make/stepmake.make