From: Paul Morris <paulwmorris@gmail.com>
Date: Mon, 30 Nov 2015 14:39:33 +0000 (-0500)
Subject: Doc: CG - minor edits in CG 2.1 and CG 3.3
X-Git-Tag: release/2.19.34-1~5^2~9
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=739c7a7b6de031621341717c50f308dff51b2f88;p=lilypond.git

Doc: CG - minor edits in CG 2.1 and CG 3.3
---

diff --git a/Documentation/contributor/quick-start.itexi b/Documentation/contributor/quick-start.itexi
index de89c5edd1..b515eff1de 100644
--- a/Documentation/contributor/quick-start.itexi
+++ b/Documentation/contributor/quick-start.itexi
@@ -44,7 +44,7 @@ and the Disk image was generated using Debian
 @uref{http://live.debian.net/, live-build 4}.
 
 @noindent
-Download the LilyDev disk image file from here:
+Download the LilyDev disk image file (a @code{.iso} file) from here:
 
 @example
 @uref{https://github.com/fedelibre/LilyDev/releases/latest}
@@ -124,8 +124,8 @@ Your new guest will be displayed in the VirtualBox window.
 @item
 Click the @q{Start} button and the @q{First Run Wizard} will prompt you
 for the installation media.  Click the browse icon, locate the LilyDev
-disk image and click through the wizard to begin the installation
-process.
+disk image file that you downloaded (the @code{.iso} file) and click
+through the wizard to begin the installation process.
 
 @item
 When the LilyDev disk image boots for the first time, choose either the
diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi
index 7d3c04e2ae..20077e6891 100644
--- a/Documentation/contributor/source-code.itexi
+++ b/Documentation/contributor/source-code.itexi
@@ -1355,10 +1355,6 @@ Account Settings must have the @q{Access for less secure apps} set to
 Move into the top source directory and then configure @command{git
 cl} with the following commands:
 
-@item
-Move into the top source directory and then configure @command{git
-cl} with the following commands:
-
 @example
 cd $LILYPOND_GIT
 git cl config
@@ -1393,7 +1389,7 @@ There are two methods, depending on your git setup.
 
 @itemize
 @item
-@strong{Master branch}: (easy option, and used in @command{lily-git.tcl})
+@strong{Master branch}: (easy option)
 
 If you added your patch to @code{master}, then:
 
@@ -1417,13 +1413,25 @@ option.
 @item
 @strong{Separate branch}: (complicated option)
 
-Ensure your changes are committed in a separate branch, which
-should differ from the reference branch to be used by just the
-changes to be uploaded.  If the reference branch is to be
-origin/master, ensure this is up-to-date.  If necessary, use git
-rebase to rebase the branch containing the changes to the head of
-origin/master.  Finally, check out branch with the changes and
-enter the command:
+Ensure your changes are committed in a separate branch, which should
+differ from the reference branch to be used (usually
+@code{origin/master}) by just the changes to be uploaded.  Checkout the
+branch with the changes:
+
+@example
+git checkout some-branch-with-changes
+@end example
+
+If the reference branch is to be @code{origin/master}, ensure that the
+branch containing the changes is up-to-date with it.  Use
+@command{git rebase} or @command{git pull -r} to rebase the branch to
+the head of @code{origin/master}.  For example:
+
+@example
+git pull -r origin master
+@end example
+
+Finally, start the upload by entering:
 
 @example
 git cl upload <reference SHA1 ID>