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 ad6daf63404355e7328fec3f68b795c7a69a1c03..4828d1ae0ea348b461df37346347411e7177fb93 100644 (file)
--- a/Documentation/contributor/release-work.itexi
+++ b/Documentation/contributor/release-work.itexi
@@ -75,20 +75,26 @@ A @qq{minor release} means an update of @code{y} in @code{2.x.y}.
 
 @item
 Switch to the release branch, get changes, prep release
-announcement:
+announcement.  This requires a clean index and work tree.  If the
+checkout displays modified files, you might want to run @code{git reset
+--hard} before continuing.
 
 @example
-git checkout release/unstable
+git fetch
+git checkout origin/release/unstable
 git merge origin
+make po-replace
 vi Documentation/web/news-front.itexi Documentation/web/news.itexi
 @end example
 
 @item
-Commit, push, switch back to master:
+Commit, push, switch back to master (or wherever else):
 
 @example
+git commit -m "PO: update template." po/lilypond.pot
 git commit -m "Release: update news." Documentation/web/
-git push origin
+git push origin HEAD:release/unstable
+git checkout master
 @end example
 
 @item
@@ -183,8 +189,8 @@ make lilypond-upload \
 @item Switch back to master and get the updated news:
 
 @example
-git checkout master
-git merge release/unstable
+git checkout origin/staging
+git merge origin/release/unstable
 @end example
 
 @item Update @file{VERSION} in lilypond git and upload changes:
@@ -207,7 +213,7 @@ STABLE_VERSION = what's online (probably no change here)
 
 @example
 git commit -m "Release: bump version." VERSION
-git push origin
+git push origin HEAD:staging
 @end example
 
 
@@ -219,7 +225,7 @@ git push origin
 BUILD_DIR=$HOME/src/build-lilypond
 
 PICS=$BUILD_DIR/Documentation/pictures/out-www/
-EXAMPLES=$BUILD_DIR/Documentation/web/ly-examples/out-www/
+EXAMPLES=$BUILD_DIR/Documentation/ly-examples/out-www/
 
 cd $BUILD_DIR
 rsync -a $PICS graham@@lilypond.org:media/pictures
@@ -293,6 +299,13 @@ various websites, so be brief.
 @item
 Run convert-ly on all files, bump parser minimum version.
 
+@item
+Update lilypond.pot:
+
+@example
+make po-replace
+@end example
+
 @item
 Make directories on lilypond.org:
 
@@ -356,8 +369,8 @@ Disallow: /doc/v2.CURRENT-DEVELOPMENT/
 
 @itemize
 @item
-submit pots for translation: send url of tarball to
-translation@@iro.umontreal.ca, mentioning lilypond-VERSION.pot
+submit po template for translation: send url of tarball to
+coordinator@@translationproject.org, mentioning lilypond-VERSION.pot
 
 @item
 update links to distros providing lilypond packages?  link in: