Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / web.texi

diff --git a/Documentation/web.texi b/Documentation/web.texi
index a02ea308d440832d44b231a5fabc6dbce2c7983a..4e57c29ec1503626d16e0254f0f59a53ccc5156a 100644 (file)
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -3,7 +3,8 @@
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
     When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
+    version that you are working on.  For details, see the Contributors'
+    Guide, node Updating translation committishes..
 @end ignore
 
 @setfilename web.info
@@ -14,12 +15,13 @@
 
 @c `Web' was imported 2009-08-05 with git commit b938d71...
 @c @macro copyrightDeclare
-@c Copyright @copyright{} 2009 by the authors.
+@c Copyright @copyright{} 2009--2010 by the authors.
 @c @end macro
 
 @set FDL
 @set web
 @include macros.itexi
+@include weblinks.itexi
 
 @afourpaper
 
@@ -33,7 +35,12 @@
 @end ignore
 
 @copying
-Copyright @copyright{} 2009 by the authors.
+Copyright @copyright{} 2009--2010 by the authors.
+
+@c next line is necessary for broken pre-4.13 texinfo's
+@c install-info, so leave it there until we officially
+@c bump the required version.  -gp
+This file documents the LilyPond website.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this
@@ -46,6 +53,27 @@ License''.
 @end copying
 
 
+@c Info files are no longer installed in a subdirectory, images are
+@c expected to be found in lilypond/ subdirectory.
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Learning Manual: (lilypond-learning).  Start here.
+* Music Glossary: (music-glossary).               For non-English users.
+* LilyPond: (lilypond-notation).                           LilyPond Notation Reference.
+* LilyPond Snippets: (lilypond-snippets).         Short tricks, tips, and examples.
+* LilyPond Internals Reference: (lilypond-internals).  Definitions for tweaking.
+* LilyPond Application Usage: (lilypond-usage). Installing and running applications.
+* LilyPond Website: (lilypond-web).    Preview of new website.
+* lilypond: (lilypond-usage)Running lilypond.      Invoking the LilyPond program.
+* abc2ly: (lilypond-usage)Invoking abc2ly.      Importing ABC.
+* convert-ly: (lilypond-usage)Updating files with convert-ly. Older LilyPond versions.
+* etf2ly: (lilypond-usage)Invoking etf2ly.      Importing Finale.
+* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music.
+* midi2ly: (lilypond-usage)Invoking midi2ly.    Importing MIDI.
+* musicxml2ly: (lilypond-usage)Invoking musicxml2ly.  Importing MusicXML.
+@end direntry
+
+
 @c TITLE PAGE
 @ifnottex
 @node Top
@@ -158,6 +186,7 @@ Read more in our @ref{Introduction}!
 
 @contents
 
+@allowcodebreaks false
 
 @c ****************** GENERAL STUFF FOR INFO ************
 @ignore
@@ -172,30 +201,8 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
   * List all commands in direntry.
 
-@c  * lilypond: (lilypond-application)Running LilyPond.      Invoking the
-@c    LilyPond  program.
 @end ignore
 
-@c Info files are no longer installed in a subdirectory, images are
-@c expected to be found in lilypond/ subdirectory.
-@dircategory GNU LilyPond --- the music typesetter
-@direntry
-* LilyPond Learning Manual: (lilypond-learning).  Start here.
-* Music Glossary: (music-glossary).               For non-English users.
-* LilyPond: (lilypond-notation).                           LilyPond Notation Reference.
-* LilyPond Snippets: (lilypond-snippets).         Short tricks, tips, and examples.
-* LilyPond Internals Reference: (lilypond-internals).  Definitions for tweaking.
-* LilyPond Application Usage: (lilypond-application). Installing and running applications.
-* LilyPond Website: (lilypond-general).    Preview of new website.
-* abc2ly: (lilypond-application)Invoking abc2ly.      Importing ABC.
-* convert-ly: (lilypond-application)Updating files with convert-ly. Older LilyPond versions.
-* etf2ly: (lilypond-application)Invoking etf2ly.      Importing Finale.
-* lilypond-book: (lilypond-application)LilyPond-book. Integrating text and music.
-* midi2ly: (lilypond-application)Invoking midi2ly.    Importing MIDI.
-* musicxml2ly: (lilypond-application)Invoking musicxml2ly.  Importing MusicXML.
-@end direntry
-
-
 @c FIXME: this still doesn't solve the broken links in pdf and big
 @c        html; we'll need a bunch of @iftext and stuff in here. -gp
 @c ****************** SPECIAL MACROS FOR WEB MANUAL ************
@@ -209,28 +216,28 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 @macro docLinkSplit{name,base,webLink}
 @ifclear web_version
-  @uref{../\base\/index.html, \name\ (split HTML)}:
+  @uref{../\base\/index.html, \name\ (split HTML)}
 @end ifclear
 @ifset web_version
-  \webLink\:
+  \webLink\
 @end ifset
 @end macro
 
 @macro docLinkBig{name,base,webLink}
 @ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (big HTML)}:
+  @uref{../\base\-big-page.html, \name\ (big HTML)}
 @end ifclear
 @ifset web_version
-  \webLink\:
+  \webLink\
 @end ifset
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
 @ifclear web_version
-  @uref{../\base\.pdf, \base\.pdf}:
+  @uref{../\base\.pdf, \base\.pdf}
 @end ifclear
 @ifset web_version
-  \webLink\:
+  \webLink\
 @end ifset
 @end macro
 
@@ -240,15 +247,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @divClass{keep-bullets}
 @itemize
 
-@item @docLinkSplit{\name\,\base\,\split\}
+@item @docLinkSplit{\name\,\base\,\split\} @minus{}
   the manual is split between many HTML pages.
   @*@ @ @emph{(small download for each page)}
 
-@item @docLinkBig{\name\,\base\,\split\}
+@item @docLinkBig{\name\,\base\,\big\} @minus{}
   read this manual as one huge HTML page.
   @*@ @ @emph{(large single download, \bigsize\)}
 
-@item @docLinkPdf{\name\,\base\,\pdf\}
+@item @docLinkPdf{\name\,\base\,\pdf\} @minus{}
   download as a PDF file.
   @*@ @ @emph{(large single download, \pdfsize\)}