Merge commit 'origin'

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

diff --git a/Documentation/user/compile.itely b/Documentation/user/compile.itely
index 15227251bd15057f4b218eb759ebd54754521b44..44a9600638ffd791f83bec8c58f9022cf6a98ac9 100644 (file)
--- a/Documentation/user/compile.itely
+++ b/Documentation/user/compile.itely
@@ -89,7 +89,7 @@ newer.  4.x is strongly recommended).
 
 @item @uref{http://www.perl.org/,Perl}.
 
-@item @uref{http://www.gnu.org/software/flex/,GNU Bison}.
+@item @uref{http://www.gnu.org/software/bison/,GNU Bison}.
 
 @item All packages required for running, including development packages with
 header files and libraries.
@@ -224,31 +224,52 @@ LilyPond binary.
 The documentation is built by issuing
 
 @example
-make web
+make doc
 @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
+The HTML, PDF and if available Info files can be installed into the
+standard documentation path by issuing
 
 @example
-make web-install
+make install-doc
 @end example
 
 @noindent
 This also installs Info documentation with images if the installation
-prefix is properly set; otherwise, instructions for manual installation
-of Info documentation are printed on standard output.
+prefix is properly set; otherwise, instructions to complete proper
+installation of Info documentation are printed on standard output.
 
-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
+Compilation of documentation in Info format with images can be done
+separately by issuing
 
 @example
-make WEB_TARGETS=online web
+make info
+@end example
+
+@noindent
+Separate installation of this documentation is done by issuing
+
+@example
+make install-info
+@end example
+
+@noindent
+Note that to get the images in Info documentation, @code{install-doc}
+target creates symbolic links to HTML and PDF installed documentation
+tree in @file{@var{prefix}/share/info}, in order to save disk space,
+whereas @code{install-info} copies images in
+@file{@var{prefix}/share/info} subdirectories.
+
+It is 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 doc
 @end example
 
 @noindent
@@ -269,12 +290,14 @@ make help
 @noindent
 from every directory in the build tree.  Most targets for
 documentation maintenance are available from @file{Documentation/};
-for more information, see @file{Documentation/user/README.txt} and
-@file{Documentation/TRANSLATION}.
+@c FIXME: xref to CG
+for more information, see the Contributors' Guide, section
+@emph{Documentation work}.
 
 The makefile variable @code{QUIET_BUILD} may be set to @code{1} for a
 less verbose build output, just like for building the programs.
 
+
 @knownissues
 
 The most time consuming task for building the documentation is running
@@ -321,7 +344,7 @@ From a fresh Git checkout, do
 ./autogen.sh   # ignore any warning messages
 cp GNUmakefile.in GNUmakefile
 make -C python
-nice make LILYPOND_EXTERNAL_BINARY=/path/to/bin/lilypond web
+nice make LILYPOND_EXTERNAL_BINARY=/path/to/bin/lilypond doc
 @end example
 
 Please note that this may break sometimes -- for example, if a new