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

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

diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index da06c1b5a2d15a127773aa94f89deb6437948b66..faad7342a372d47bc81b106844825ff78456e6e0 100644 (file)
--- a/Documentation/user/install.itely
+++ b/Documentation/user/install.itely
@@ -124,10 +124,6 @@ FOO-devel, libFOO-dev or FOO-dev package too.
 X11 and Ghostscript, and are named @file{c059033l.pfb}
 @file{c059036l.pfb}, @file{c059013l.pfb} and @file{c059016l.pfb}
 
-@item @uref{http://www.xs4all.nl/~hanwen/mftrace/,mftrace} (1.1.19 or
-newer); you may need to install some additional packages to get mftrace
-to work.
-
 @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE} (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.
@@ -181,14 +177,8 @@ or lyrics.
 
 You can view the documentation online at
 @uref{http://lilypond.org/doc/}, but you can also build it locally.
-This process requires a successful compile of lilypond.  The
-documentation is built by issuing
-
-@example
-make web
-@end example
-
-Building the website requires some additional tools and packages
+This process requires a successful compile of lilypond, and some
+additional tools and packages
 
 @itemize
 @item The @uref{http://netpbm.sourceforge.net/,netpbm utilities}
@@ -201,13 +191,38 @@ and the patch from
 @uref{http://bugs.ghostscript.com/show_bug.cgi?id=688017}.
 @end itemize
 
-The HTML files can be installed into the standard documentation path
-by issuing
+The documentation is built by issuing
+
+@example
+make web
+@end example
+
+After compilation, the HTML documentation tree is available in
+@file{out-www/offline-root/}, and can be browsed locally.
+
+The HTML and PDF files can be installed into the standard documentation
+path by issuing
 
 @example
 make out=www web-install
 @end example
 
+It is also possible to build a documentation tree in
+@file{out-www/online-root/}, with special processing, so it can be used
+on a website with content negotiation for automatic language selection;
+this can be achieved by issuing
+
+@example
+make WEB_TARGETS=online web
+@end example
+
+@noindent
+and both @q{offline} and @q{online} targets can be generated by issuing
+
+@example
+make WEB_TARGETS="offline online" web
+@end example
+
 
 @node Building LilyPond
 @subsection Building LilyPond
@@ -236,7 +251,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
@@ -279,7 +294,7 @@ unstable Lily will fail to build the docs.
 You may build the manual ( Documentation/user/ ) without building all
 the input/* stuff.
 
-@refbugs
+@knownissues
 
 You may also need to create a script for @command{pngtopnm} and
 @code{pnmtopng}.  On Linux, I use this:
@@ -312,6 +327,11 @@ 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