Merge branch 'lilypond/translation' into staging

[lilypond.git] / Documentation / contributor / quick-start.itexi

diff --git a/Documentation/contributor/quick-start.itexi b/Documentation/contributor/quick-start.itexi
index 6da1913bda3fcf263a62d6520993e64d750e8ca7..903cb3862e68b0783d83a881a3710d8c7d3b573c 100644 (file)
--- a/Documentation/contributor/quick-start.itexi
+++ b/Documentation/contributor/quick-start.itexi
@@ -52,26 +52,18 @@ Any virtualization tool can be used, but we recommend VirtualBox:
 @end example
 
 In virtualization terminology, your main operating system is the
-@qq{host}, while lilydev is the @qq{guest}.
+@strong{host}, while lilydev is the @strong{guest}.
 
 @item
-Download the Ubuntu LilyPond Developer Remix disk image:
-(approximately 1 GB)
+Download the Ubuntu LilyPond Developer Remix disk image (approximately
+1 GB) from here:
 
 @example
-@uref{http://files.lilynet.net/ubuntu-lilydev-remix-1.1.iso}
+@uref{http://www.philholmes.net/lilypond/lilydev/ubuntu-lilydev-remix-2.6.iso}
 @end example
 
-@advanced{Some users might want these files, but if you don't
-recognize what they are, then you don't want them:
-@*
-@uref{http://files.lilynet.net/ubuntu-lilydev-remix-1.1.iso.md5}
-@c @*
-@c @uref{http://files.lilynet.net/ubuntu-lilydev-remix-1.0.iso.torrent}
-}
-
 @item
-Create a music new @qq{virtual machine} inside your virtualization
+Create a new @qq{virtual machine} inside your virtualization
 software.
 
 If possible, use at least 700 MB of RAM (1GB would be better) for
@@ -80,14 +72,14 @@ for the virtual hard drive.  A complete compile of everything
 (code, docs, regression tests) can reach 10 GB.
 
 @item
-Install @file{lilydev2.iso} as the @qq{guest} operating system
-on your virtualized system.
+Install @file{ubuntu-lilydev-remix-2.6.iso} as the @strong{guest}
+operating system on your virtualized system.
 
 @enumerate
 
 @item
-When @file{lilydev.iso} boots, it shows an ISOLINUX
-@code{boot:} prompt.  Type:
+When @file{ubuntu-lilydev-remix-2.6.iso} boots, it shows an
+ISOLINUX @code{boot:} prompt.  Type:
 
 @example
 install
@@ -96,12 +88,13 @@ install
 @item
 At the @qq{Prepare disk space} stage, do not be afraid to select
 @qq{Erase and use the entire disk}, since this refers to your
-@emph{virtual disk}, not your machine's actual hard drive.
+@strong{@emph{virtual disk}}, not your machine's actual hard
+drive.
 
 @item
 When prompted to remove the installation CD, go to
 @clicksequence{Devices @click{} CD/DVD Devices} and de-select
-@file{lilydev2.iso}.
+@file{ubuntu-lilydev-remix-2.6.iso}.
 
 @end enumerate
 
@@ -128,7 +121,12 @@ client.
 
 Not all hardware is supported in all virtualization tools.  In
 particular, some contributors have reported problems with USB
-devices.  If you would like to investigate further, then look for
+devices, for example USB network adapters.  If you have problems
+with network connection (for example internet connection in the
+host system is lost when you launch virtual system), try installing
+and running Lilydev with your computer's built-in network adapter
+used to connect to the network.
+If you would like to investigate further, then look for
 help for your virtualization tool using your normal OS as the
 @qq{host} and Ubuntu as the @qq{client}.
 
@@ -218,7 +216,7 @@ Right-click allows you to edit a file with gedit.  We recommend
 using gedit.
 
 @item
-Some contributors have recommended: (pdf available for free)
+Some contributors have recommended a free pdf:
 
 @example
 @uref{http://www.ubuntupocketguide.com/}
@@ -258,10 +256,15 @@ Click on the @qq{Get source} button.
 
 This will create a directory called @file{lilypond-git/} within
 your home directory, and will download the source code into that
-directory (around 55Mb).  When the process is finished, the
+directory (around 150@tie{}Mb).  When the process is finished, the
 @qq{Command output} window will display @qq{Done}, and the button
 label will change to say @qq{Update source}.
 
+@warning{Some contributors have reported that nothing happens at
+this step.  If this occurs, then try again in a few minutes -- we
+suspect that this is an intermittant network problem.  If the
+problem persists, please ask for help.}
+
 @item
 Navigate to the @file{lilypond-git/} directory to view the source
 files.
@@ -274,13 +277,6 @@ You should now progress to @ref{Compiling with lilydev}.
 input should be entered from @file{~/lilypond-git/}.  This is
 referred to as the @emph{top source directory}.}
 
-@advanced{the @qq{Get source} button does not fetch the entire
-history of the git repository, so utilities like @command{gitk}
-will only be able to display the most recent additions.  As you
-continue to work with @command{lily-git.tcl}, the @qq{Update
-source} button will take any new additions and add it to whatever
-is currently in your repository's history.}
-
 
 @node Daily use of lily-git.tcl
 @unnumberedsubsec Daily use of @command{lily-git.tcl}
@@ -438,6 +434,7 @@ will likely take 2 to 10 hours.
 
 @example
 cd ~/lilypond-git/build/
+make
 make doc
 @end example