Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / Documentation / topdocs / INSTALL.texi

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 2e3200b5cfabd7c7db158a1c7c148397c4ad7ad3..52d8d8cf767d01049a9dc0f332873e3867dfa407 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -30,24 +30,21 @@ your platform.
 Download source
 @itemize @bullet
 @item tarballs from
-@itemize @bullet
 @uref{http://lilypond.org/download/} by HTTP.
-@end itemize
+@item tarballs from
+@uref{http://download.linuxaudio.org/lilypond/} by HTTP.
 @item 
-CVS from @uref{http://savannah.gnu.org/cvs/?group=lilypond,savannah.gnu.org}
-@itemize @bullet
-@c @quotation
+GIT from @uref{http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=summary,git.sv.gnu.org}
 @example
-CVS_RSH=ssh cvs -d:pserver:anonymous@@cvs.savannah.gnu.org:/cvsroot/lilypond co lilypond
+git clone git://git.sv.gnu.org/lilypond.git
 @end example
-@c @end quotation
-The CVS repository does not contain generated files.  To create
+
+The repository does not contain generated files.  To create
 @file{configure}, run
 @example
 ./autogen.sh
 @end example
 @end itemize
-@end itemize
 
 For information on packaging, see @uref{http://lilypond.org/devel}.
 
@@ -82,13 +79,13 @@ You will need to install some additional packages to get mftrace to
 work.
 
 @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE}
-(version 1.6.7 or newer).  If you are installing binary packages, you
+(version 1.8.2 or newer).  If you are installing binary packages, you
 may need to install guile-devel or guile-dev or libguile-dev too.
 
 @item @uref{ftp://ftp.gnu.org/gnu/texinfo/,Texinfo} (version 4.8 or newer).
 
 @item
- @uref{http://gcc.gnu.org/, The GNU c++ compiler} (version 4.x or
+@uref{http://gcc.gnu.org/, The GNU c++ compiler} (version 4.x or
 newer). 
 
 @item @uref{http://www.python.org,Python} (version 2.3 or newer)
@@ -97,7 +94,6 @@ newer).
 
 @item @uref{http://www.gnu.org/software/gettext/gettext.html,gettext}.
 
-
 @item @uref{http://www.gnu.org/software/flex/,Flex} 
 
 @item @uref{http://www.perl.org/,Perl} 
@@ -120,7 +116,8 @@ software
 @item @uref{http://www.freetype.org/,FontConfig} (version 2.2).
 @item @uref{http://www.pango.org/,Pango} (version 1.12 or newer).
 @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE}
-(version 1.8.0 or newer).
+(version 1.8.2 or newer), or patch 1.8.x with
+@uref{http://lilypond.org/vc/gub.darcs/patches/guile-1.8-rational.patch}.
 @item @uref{http://www.python.org,Python} (version 2.4 or newer).
 @item @uref{http://www.ghostscript.com,Ghostscript} (version 8.15 or
 newer. 8.50 recommended)
@@ -297,13 +294,6 @@ export PKG_CONFIG_PATH=/sw/lib/freetype219/lib/pkgconfig/:/sw/lib/fontconfig2/li
 ./configure
 @end verbatim
 
-@unnumberedsubsec NetBSD
-
-@itemize @bullet
-@item The flex precompiled in NetBSD-1.4.2 is broken.
-Upgrade to flex-2.5.4a.
-@end itemize
-
 @unnumberedsubsec  Solaris
 
 @itemize @bullet