]> git.donarmstrong.com Git - lilypond.git/commitdiff
Doc: CG: fix cut&paste instructions.
authorGraham Percival <graham@percival-music.ca>
Sat, 13 Feb 2010 18:34:01 +0000 (18:34 +0000)
committerGraham Percival <graham@percival-music.ca>
Sat, 13 Feb 2010 18:34:01 +0000 (18:34 +0000)
I forgot that vi would capture keystrokes.  I've now split the
command-line stuff into two @examples.

Documentation/contributor/release-work.itexi

index 608e1859f49f21cd5053eb8967b886f3f838a4f7..67ab80db07befa2640b08019010f62330c143637 100644 (file)
@@ -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