From b49d202431e10109e9130f34e101345d5ca16f55 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Wed, 15 Dec 2010 22:25:11 +0000 Subject: [PATCH] CG: modify lily-git instructions for lilybuntu2. --- Documentation/contributor/introduction.itexi | 34 ++++++---- Documentation/contributor/source-code.itexi | 67 +++++++++++++------- Documentation/css/lilypond-mccarty.css | 2 +- 3 files changed, 65 insertions(+), 38 deletions(-) diff --git a/Documentation/contributor/introduction.itexi b/Documentation/contributor/introduction.itexi index ea97d4eb60..167579bc92 100644 --- a/Documentation/contributor/introduction.itexi +++ b/Documentation/contributor/introduction.itexi @@ -211,25 +211,33 @@ If you use other virutalization software, then follow the normal procedures for your virtualization software with Ubuntu as the client. +@advanced{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 help for your virtualization tool using your normal OS as +the @qq{host} and Ubuntu as the @qq{client}.} + @end enumerate -Follow instructions for Linux when reading instructions about -@ref{Working with source code}, or @ref{Compiling}. +If you are not familiar with Linux, it may be beneficial to read a +couple of @qq{introduction to Ubuntu} webpages. -If you are not familiar with Linux, it may be benefitial to read a -couple of @qq{introduction to Ubuntu} webpages. One particular -change from Windows and MacOS X is that most software should be -installed with your @qq{package manager}; this vastly simplifies -the process of installing and configuring software. Go to +@itemize +@item +One particular change from Windows and MacOS X is that most +software should be installed with your @qq{package manager}; this +vastly simplifies the process of installing and configuring +software. Go to @w{System@arrow{}Administration@arrow{}Synaptic Package Manager}. +@item +The rest of this manual assumes that you are using the +command-line; go to +@w{Applications@arrow{}Accessories@arrow{}Terminal}. -@advanced{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 help for your virtualization tool using your normal OS as -the @qq{host} and Ubuntu as the @qq{client}. -} +@end itemize + +You should now progress to @ref{Using lily-git}. @node Mentors diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi index 80c78edbfe..3223dfb9b3 100644 --- a/Documentation/contributor/source-code.itexi +++ b/Documentation/contributor/source-code.itexi @@ -37,6 +37,39 @@ share changes to the lilypond source code. @node Install and configuration of lily-git.tcl @unnumberedsubsec Install and configuration of @command{lily-git.tcl} +@subsubheading Lilybuntu + +@enumerate +@item +@code{lily-git.tcl} has already been install for you. Simply type +(or copy&paste): + +@example +cd +wish lily-git.tcl +@end example + +@item +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 +@qq{Command output} window will display @qq{Done}, and the button +label will change to say @qq{Update source}. + +@item +Navigate to the @file{lilypond-git/} directory to view the source +files. You should now be able to modify the source files using +your normal text editor. + +@end enumerate + +You should now progress to @ref{Compiling}. + + +@subsubheading Other operating music systems + @enumerate @item If you haven't already, download and install Git. @@ -83,29 +116,17 @@ wish lily-git.tcl @end example @item -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 -@qq{Command output} window will display @qq{Done}, and the button -label will change to say @qq{Update source}. - -@item -Navigate to the @file{lilypond-git/} directory to view the source -files. You should now be able to modify the source files using -your normal text editor. +Go read the lilybuntu instructions, starting from the @qq{get +source} step. @end enumerate -@quotation -Advanced note: 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. -@end quotation +@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 @@ -140,10 +161,8 @@ body is optional. After entering a commit message, click @qq{OK} to finalize the commit. -@quotation -Advanced note: For more information regarding commits and commit -messages, see @ref{Commits and patches}. -@end quotation +@advanced{for more information regarding commits and commit +messages, see @ref{Commits and patches}.} @subsubheading 2b. Amend previous commit diff --git a/Documentation/css/lilypond-mccarty.css b/Documentation/css/lilypond-mccarty.css index 9cebcf0394..3872615789 100644 --- a/Documentation/css/lilypond-mccarty.css +++ b/Documentation/css/lilypond-mccarty.css @@ -463,7 +463,7 @@ div#search p, div#search form { /* Experimental rounded corners */ -moz-border-radius: 10px; -webkit-border-radius: 10px; - margin: 1em 1em 2em 3em; + margin: 0.5em 0.5em 2em 3em; } -- 2.39.2