Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi
index 929a09988699cc7545a8bb32c6273e2996ba4f2c..129e3be63368196e098b472327bc31f70d9ff839 100644 (file)
--- a/Documentation/contributor/release-work.itexi
+++ b/Documentation/contributor/release-work.itexi
@@ -173,15 +173,22 @@ git checkout master
 git merge release/unstable
 @end example
 
-@item Update @file{VERSION} in lilypond git:
+@item Update @file{VERSION} in lilypond git and upload changes:
 
-@example
+@quotation
+@quotation
 VERSION = what you just did +0.0.1
 DEVEL_VERSION = what you just did (i.e. is now online)
 STABLE_VERSION = what's online
+@end quotation
+@end quotation
+
+@example
+vi VERSION
+git commit -m "Release: bump version." VERSION
+git push origin
 @end example
 
-@item Push changes.
 
 @item (for now) do a @code{make doc} and manually upload:
 

diff --git a/Documentation/fr/GNUmakefile b/Documentation/fr/GNUmakefile
index 03246fbf8bb610bbc9e79034eb1b99a13f8054a3..962f616d6c9e082bec80e53d6fca6eb52c9bff97 100644 (file)
--- a/Documentation/fr/GNUmakefile
+++ b/Documentation/fr/GNUmakefile
@@ -1,6 +1,6 @@
 ISOLANG = fr
 depth = ../..
-SUBDIRS = web learning notation texidocs usage
+SUBDIRS = web learning notation texidocs usage included
 STEPMAKE_TEMPLATES = documentation
 LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root
 

diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi
index ea155db0fff1de77b5a2514b010d1e1a3ef3cdbc..815fe760d3ff49109e2e46aa97073402860bebba 100644 (file)
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -198,16 +198,6 @@ already decided to try LilyPond, first read about our
 LilyPond is a powerful and flexible tool for engraving tasks of
 all kinds. Please browse our gallery of examples and be inspired!
 
-@ignore
-Here is a passage from Franz Liszt's solo piano transcription
-of the Overture to Wagner's @emph{Tannhäuser}. The spacing
-in this example was all performed by LilyPond's formatting
-algorithms, without tweaks of any kind. It
-handles cross-staff beaming gracefully and puts the system brace
-perfectly around all three staves.
-
-@exampleImage{liszt-wagner}
-@end ignore
 
 @newsItem
 @subsubheading Classical Music
@@ -278,8 +268,9 @@ staff.
 @newsItem
 @subsubheading Schenker Graphs
 
-Standard output can be modified heavily. Here someone has created
-an impressive Schenkerian analysis.
+Standard output can be modified heavily. Here is an impressive
+Schenkerian analysis, created by Kris Schaffer, for an article
+in @uref{http://www.linuxjournal.com/article/8364 , Linux Journal}
 
 @exampleImage{bach-schenker}
 @newsEnd

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index a305b1eff57c5c0f577e1bdd94cb4ddf395e0c15..10b10c189d571105986c4e909f03ffcfd74e6b19 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,6 +9,14 @@
 @c DO NOT WRITE BETWEEN THESE LINES
 @c DO NOT WRITE BETWEEN THESE LINES
 
+@newsItem
+@subsubheading LilyPond 2.13.16 released!  @emph{March 15, 2010}
+
+We are happy to announce the release of LilyPond 2.13.16.  This
+release is intended for developers only, and includes the usual
+round of bugfixes.
+@newsEnd
+
 @newsItem
 @subsubheading LilyPond 2.13.15 released!  @emph{March 4, 2010}
 
@@ -33,12 +41,4 @@ LilyPond Report 17} now!
 
 @newsEnd
 
-@newsItem
-@subsubheading LilyPond 2.13.14 released!  @emph{February 27, 2010}
-
-We are happy to announce the release of LilyPond 2.13.14.  This
-release is intended for developers only, and includes a large
-translation update in addition to the usual round of bugfixes.
-@newsEnd
-
 

diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi
index ed3a88bc3222b11e4ddba427f7766f84657ef85d..0ebcf555c8a78a75af879fa8678e5cecf9c3577b 100644 (file)
--- a/Documentation/web/news.itexi
+++ b/Documentation/web/news.itexi
@@ -27,6 +27,14 @@ NOTE:
 @end ignore
 
 
+@newsItem
+@subsubheading LilyPond 2.13.14 released!  @emph{February 27, 2010}
+
+We are happy to announce the release of LilyPond 2.13.14.  This
+release is intended for developers only, and includes a large
+translation update in addition to the usual round of bugfixes.
+@newsEnd
+
 @newsItem
 @subsubheading LilyPond 2.13.13 released!  @emph{February 13, 2010}
 

diff --git a/Documentation/web/server/GNUmakefile b/Documentation/web/server/GNUmakefile
index 264e9b40a22204ea0a8cbd3f1243c47c687f9349..b8e004a8884ebf3f5ae52c40bacb3d66acf27105 100644 (file)
--- a/Documentation/web/server/GNUmakefile
+++ b/Documentation/web/server/GNUmakefile
@@ -2,5 +2,6 @@ depth=../../..
 LOCALSTEPMAKE_TEMPLATES = ly
 include $(depth)/make/stepmake.make
 
-EXTRA_DIST_FILES = lilypond.org.htaccess favicon.ico robots.txt
+EXTRA_DIST_FILES = favicon.ico robots.txt
+EXTRA_DIST_FILES += lilypond.org.htaccess website-dir.htaccess
 

diff --git a/VERSION b/VERSION
index b08e49481522408e604c936b4bc4b1af32668426..5d3c7403b3bb59909e414f6e85b8ce9a43eaa704 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=13
-PATCH_LEVEL=16
+PATCH_LEVEL=17
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.12.3
-VERSION_DEVEL=2.13.15
+VERSION_DEVEL=2.13.16

diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py
index b268db1d25924de6201ac93b4138e4f01cf2cd54..f327e4e393a474d2155e54fb7b8d4f026d0e6b21 100644 (file)
--- a/python/auxiliar/postprocess_html.py
+++ b/python/auxiliar/postprocess_html.py
@@ -102,7 +102,7 @@ def source_links_replace (m, source_val):
     return 'href="' + os.path.join (source_val, m.group (1)) + '"'
 
 # More hardcoding, yay!
-splitted_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|music-glossary|usage|web|learning|snippets))/')
+splitted_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|extending|music-glossary|usage|web|learning|snippets))/')
 lily_snippets_re = re.compile ('(href|src)="([0-9a-f]{2}/lily-.*?)"')
 pictures_re = re.compile ('src="(pictures/.*?)"')