From: Graham Percival <graham@percival-music.ca>
Date: Sat, 13 Feb 2010 18:34:01 +0000 (+0000)
Subject: Doc: CG: fix cut&paste instructions.
X-Git-Tag: release/2.13.14-1~79
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=43bdc4023b8724942b54457d905ec2e1c24266f4;p=lilypond.git

Doc: CG: fix cut&paste instructions.

I forgot that vi would capture keystrokes.  I've now split the
command-line stuff into two @examples.
---

diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi
index 608e1859f4..67ab80db07 100644
--- a/Documentation/contributor/release-work.itexi
+++ b/Documentation/contributor/release-work.itexi
@@ -84,14 +84,22 @@ 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, upload:
+announcement:
 
 @example
 git checkout release/unstable
 git merge origin
 vi Documentation/web/news-front.itexi Documentation/web/news.itexi
+@end example
+
+@item
+Commit, push, switch back to master:
+
+@example
 git commit -m "Release: update news." Documentation/web/
 git push origin
+git checkout master
+git merge release/unstable
 @end example
 
 @item (optional) Check that lilypond builds from scratch in an