Merge commit 'origin' into release/unstable

diff --git a/Documentation/web/GNUmakefile b/Documentation/web/GNUmakefile
index d96ffebc0a9521b7419a66ae82c15c207676f17a..37ce914f53ff021d4d967c597e826322c2f1160d 100644 (file)
--- a/Documentation/web/GNUmakefile
+++ b/Documentation/web/GNUmakefile
@@ -1,5 +1,8 @@
 depth = ../..
-LOCALSTEPMAKE_TEMPLATES = ly
+
+STEPMAKE_TEMPLATES=tex documentation
+LOCALSTEPMAKE_TEMPLATES = lilypond ly
+
 SUBDIRS = ly-examples server
 include $(depth)/make/stepmake.make
 

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 77d358b7b632b631c3aa0462467928410ebc93bb..bc28aa283a92b65269728479fb9b1bea0a38d71e 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -8,6 +8,16 @@
 
 @c used for news about the upcoming release; see CG 10.2
 
+@newsItem
+@subsubheading LilyPond 2.13.31 released!  @emph{Aug 21, 2010}
+
+We are happy to announce the release of LilyPond 2.13.31.  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 LilyPond 2.13.30 released!  @emph{Aug 13, 2010}
 

diff --git a/scripts/auxiliar/GNUmakefile b/scripts/auxiliar/GNUmakefile
index 4ac41794bac106751aefeb6a53886b3dd594fada..d70ff71da46feb717b88792fab30ffa6384e0e80 100644 (file)
--- a/scripts/auxiliar/GNUmakefile
+++ b/scripts/auxiliar/GNUmakefile
@@ -3,6 +3,7 @@ depth=../..
 EXTRA_DIST_FILES = $(call src-wildcard,*.sh) $(call src-wildcard,*.py)
 EXTRA_DIST_FILES += pfx2ttf.fontforge
 EXTRA_DIST_FILES += lily-git.tcl
+EXTRA_DIST_FILES += ref_check.tely
 
 include $(depth)/make/stepmake.make