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

[lilypond.git] / Documentation / user / install.itely

diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index 0e62f977f68b6d4e182ceacd5449b982580c2434..52d3a18f87950f27e8a562a64938ddc4b89a3a3f 100644 (file)
--- a/Documentation/user/install.itely
+++ b/Documentation/user/install.itely
@@ -83,7 +83,7 @@ mingw       - Windows x86
 
 Download source
 
-@itemize @bullet
+@itemize
 @item tarballs from
 @uref{http://lilypond.org/download/} by HTTP.
 @item tarballs from
@@ -132,7 +132,7 @@ to work.
 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{ftp://ftp.gnu.org/gnu/texinfo/,Texinfo} (version 4.11 or newer).
 
 @item @uref{http://gcc.gnu.org/, The GNU c++ compiler} (version 4.x or
 newer). 
@@ -159,7 +159,7 @@ header files and libraries.
 
 Running LilyPond requires proper installation of the following software
 
-@itemize @bullet
+@itemize
 
 @item @uref{http://www.freetype.org/,Freetype} (version 2.1.10 or newer).
 @item @uref{http://www.freetype.org/,FontConfig} (version 2.2).
@@ -190,7 +190,7 @@ make web
 
 Building the website requires some additional tools and packages
 
-@itemize @bullet
+@itemize
 @item The @uref{http://netpbm.sourceforge.net/,netpbm utilities}
 @item ImageMagick
 @item International fonts (see input/regression/utf-8.ly for hints
@@ -236,7 +236,7 @@ points into your home directory, e.g.
 
 If you want to build multiple versions of LilyPond with different
 configuration settings, you can use the @code{--enable-config=CONF}
-option of configure.  You should use @samp{make conf=CONF} to generate
+option of configure.  You should use @code{make conf=CONF} to generate
 the output in @file{out-CONF}.  Example: Suppose you want to build
 with and without profiling, then use the following for the normal
 build
@@ -296,6 +296,27 @@ export DYLD_LIBRARY_PATH=/sw/lib
 exec /sw/bin/pngtopnm "$@" 
 @end verbatim
 
+In order to force make to build a complete manual (this does not
+rebuild all examples, only things which are changed), I recommend
+writing a script like this:
+
+@verbatim
+### run from Documentation/user/
+#  possibly required on OSX and/or old texinfo
+# ulimit -n 4096
+if [ -e out-www/lilypond.texi ]; then rm out-www/lilypond.* ; fi;
+if [ -e out-www/lilypond-program.texi ]; then rm
+out-www/lilypond-program.* ; fi;
+if [ -e out-www/lilypond-learning.texi ]; then rm
+out-www/lilypond-learning.* ; fi;
+nice make LILYPOND_EXTERNAL_BINARY=~/usr/bin/lilypond web
+@end verbatim
+
+To rebuild the complete HTML docs, run the above script from the
+@file{Documentation/user/} directory, then run the final line (the
+@code{nice make}) from the top source dir.
+
+
 
 @node Testing LilyPond
 @subsection Testing LilyPond