Merge branch 'master' into translation

[lilypond.git] / Documentation / contributor / release-work.itexi

diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi
index 517b5e3c1462adc4cbae18d94daff245bc73b495..cc05df8c65a576dac5c4a97b1e9dc4d9e16f5cc4 100644 (file)
--- a/Documentation/contributor/release-work.itexi
+++ b/Documentation/contributor/release-work.itexi
@@ -131,11 +131,31 @@ git checkout release/unstable
 git merge origin/master
 make -C $LILYPOND_BUILD_DIR po-replace
 mv $LILYPOND_BUILD_DIR/po/lilypond.pot po/
-gedit Documentation/web/news-front.itexi Documentation/web/news.itexi
+gedit Documentation/web/news-new.itexi Documentation/web/news-old.itexi
+gedit Documentation/web/news-headlines.itexi
 gedit VERSION
 gedit ly/Wel*.ly
 @end example
 
+Editing the @file{news-headlines.itexi} file is a bit tricky, since it contains
+URLs with escaped characters.  An example of what is needed is that releasing
+@code{2.19.50} after the release of @code{2.19.49} needed the line:
+
+@example
+@@uref@{news.html#LilyPond-2_002e19_002e49-released-October-16_002c-2016,
+  LilyPond 2.19.49 released - @@emph@{October 16, 2016@}@}
+@end example
+
+to be changed to:
+
+@example
+@@uref@{news.html#LilyPond-2_002e19_002e50-released-November-6_002c-2016,
+  LilyPond 2.19.50 released - @@emph@{November 6, 2016@}@}
+@end example
+
+Don't forget to update the entry above that line to show the latest release
+version.
+
 @item
 Commit, push, switch back to master (or wherever else):
 
@@ -718,7 +738,7 @@ pulls git master to the web server, and the other makes the
 website with the standard @code{make website} command.  They run
 hourly, 30 minutes apart.  So - to update the front page of the
 website, it's necessary to update @code{VERSION} and
-@code{news-front.itexi} in master and then wait for the cron
+@code{news-headlines.itexi} in master and then wait for the cron
 jobs to run.  (N.B. - this is done by pushing the changes to
 staging and letting patchy do its checks before it pushes to
 master).