Doc: CG: clarify "amend previous commit".

[lilypond.git] / Documentation / web.texi

diff --git a/Documentation/web.texi b/Documentation/web.texi
index ab2421da1bda888545d7fb1e3befffd23a833c76..f2001a8ad409033f9d39412a18977770bcc92c06 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
@@ -13,13 +14,16 @@
 @afourpaper
 
 @c `Web' was imported 2009-08-05 with git commit b938d71...
-@macro copyrightDeclare
-Copyright @copyright{} 2009 by the authors.
-@end macro
+@c @macro copyrightDeclare
+@c Copyright @copyright{} 2009--2010 by the authors.
+@c @end macro
 
 @set FDL
 @set web
 @include macros.itexi
+@include weblinks.itexi
+
+@afourpaper
 
 @c don't remove this comment.
 @ignore
@@ -30,6 +34,20 @@ Copyright @copyright{} 2009 by the authors.
 @omflanguage English
 @end ignore
 
+@copying
+Copyright @copyright{} 2009--2010 by the authors.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.1 or any later version published by the Free Software
+Foundation; with no Invariant Sections.  A copy of the license is
+included in the section entitled ``GNU Free Documentation
+License''.
+@end quotation
+@end copying
+
+
 @c TITLE PAGE
 @ifnottex
 @node Top
@@ -142,6 +160,7 @@ Read more in our @ref{Introduction}!
 
 @contents
 
+@allowcodebreaks false
 
 @c ****************** GENERAL STUFF FOR INFO ************
 @ignore
@@ -186,49 +205,53 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @macro docLinks{name,base,refLink,split,big,bigsize,pdf,pdfsize}
 @subheading Read it
 
-@itemize
+@docLinksBare{\name\,\base\,\refLink\,\split\,\big\,\bigsize\,\pdf\,\pdfsize\}
+
+@end macro
 
-@c normal case, special online case
+
+@macro docLinkSplit{name,base,webLink}
 @ifclear web_version
-  @item \refLink\:
+  @uref{../\base\/index.html, \name\ (split HTML)}
 @end ifclear
 @ifset web_version
-  @c we assume that the online web version will be split html
-  @item \split\:
+  \webLink\
 @end ifset
-read this manual in the same format as this one.
-
-@end itemize
-
-@subheading All formats
-
-@divClass{keep-bullets}
-@itemize
+@end macro
 
+@macro docLinkBig{name,base,webLink}
 @ifclear web_version
-  @item @uref{../\base\/index.html, \name\ (split HTML)}:
+  @uref{../\base\-big-page.html, \name\ (big HTML)}
 @end ifclear
 @ifset web_version
-  @item \split\
+  \webLink\
 @end ifset
-  the manual is split between many HTML pages.
-  @*@ @ @emph{(small download for each page)}
+@end macro
 
+@macro docLinkPdf{name,base,webLink}
 @ifclear web_version
-  @item @uref{../\base\-big-page.html, \name\ (big HTML)}:
+  @uref{../\base\.pdf, \base\.pdf}
 @end ifclear
 @ifset web_version
-  @item \big\
+  \webLink\
 @end ifset
+@end macro
+
+
+@macro docLinksBare{name,base,refLink,split,big,bigsize,pdf,pdfsize}
+
+@divClass{keep-bullets}
+@itemize
+
+@item @docLinkSplit{\name\,\base\,\split\} @minus{}
+  the manual is split between many HTML pages.
+  @*@ @ @emph{(small download for each page)}
+
+@item @docLinkBig{\name\,\base\,\big\} @minus{}
   read this manual as one huge HTML page.
   @*@ @ @emph{(large single download, \bigsize\)}
 
-@ifclear web_version
-  @item @uref{../\base\.pdf, \base\.pdf}:
-@end ifclear
-@ifset web_version
-  @item \pdf\
-@end ifset
+@item @docLinkPdf{\name\,\base\,\pdf\} @minus{}
   download as a PDF file.
   @*@ @ @emph{(large single download, \pdfsize\)}