Merge branch 'lilypond/translation' into staging

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

diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi
index fcaa95d2ad4c5b8c24b6ecc4362c8709814f696b..a3b7e8671de2955a04a9243c8257e8c43161bc6f 100644 (file)
--- a/Documentation/contributor/release-work.itexi
+++ b/Documentation/contributor/release-work.itexi
@@ -88,13 +88,34 @@ Commit, push, switch back to master:
 
 @example
 git commit -m "Release: update news." Documentation/web/
-git push origin
+git push origin release/unstable
 @end example
 
 @item
 If you do not have the previous release test-output tarball, download
 it and put it in @code{regtests/}
 
+@item Prepare GUB environment by running:
+
+@example
+### my-gub.sh
+# special terminal, and default PATH environment.
+# import these special environment vars:
+#   HOME, HTTP_PROXY, TERM
+env -i \
+  HOME=$HOME \
+  HTTP_PROXY=$HTTP_PROXY \
+  bash --rcfile my-bashrc
+@end example
+
+@example
+### my-bashrc
+export PS1="\[\e[1;33mGUB-ENV \w\]$ \[\e[0m\]"
+export PATH=$PATH
+export TERM=xterm
+@end example
+
+
 @item Build release on GUB by running:
 
 @example
@@ -108,7 +129,7 @@ or something like:
 make LILYPOND_BRANCH=stable/2.12 lilypond
 @end example
 
-@item Check the regtest comparison in @file{uploads/@/webtest/} for
+@item Check the regtest comparison in @file{uploads/webtest/} for
 any unintentional breakage.  More info in
 @ref{Precompiled regression tests}.
 
@@ -162,7 +183,7 @@ make lilypond-upload \
 @item Switch back to master and get the updated news:
 
 @example
-git checkout master
+git checkout origin/staging
 git merge release/unstable
 @end example
 
@@ -186,7 +207,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
 
 
@@ -198,7 +219,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
@@ -273,7 +294,29 @@ various websites, so be brief.
 Run convert-ly on all files, bump parser minimum version.
 
 @item
-Make FTP directories on lilypond.org
+Make directories on lilypond.org:
+
+@example
+~/web/download/sources/v2.14
+~/web/download/sources/v2.15
+@end example
+
+@item
+Shortly after the release, move all current contributors to
+previous contributors in:
+
+@example
+Documentation/included/authors.itexi
+@end example
+
+Also, delete old material in:
+
+@example
+Documentation/changes.tely
+@end example
+
+but don't forget to check it still compiles!  also update the
+version numbers.
 
 @item
 Website:
@@ -318,7 +361,7 @@ translation@@iro.umontreal.ca, mentioning lilypond-VERSION.pot
 
 @item
 update links to distros providing lilypond packages?  link in:
-@file{Documentation@/web@/download.itexi}
+@file{Documentation/web/download.itexi}
 
 This has nothing to do with the release, but it's a "periodic
 maintenance" task that might make sense to include with releases.
@@ -448,7 +491,8 @@ build the specific package(s) you want, i.e.
 @example
 bin/gub mingw::lilypond-installer
 make LILYPOND_BRANCH=stable/2.12 -f lilypond.make doc
-bin/gub --platform=darwin-x86 'git://git.sv.gnu.org/lilypond-doc.git?branch=stable/2.12'
+bin/gub --platform=darwin-x86 \
+  'git://git.sv.gnu.org/lilypond-doc.git?branch=stable/2.12'
 @end example
 
 or