X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fweb.texi;h=f2001a8ad409033f9d39412a18977770bcc92c06;hb=d9cf518a0650fc0e8912ef8e683d4661576afbea;hp=a8e5e0e20212957db8481fdb004d6dfa45b5dce1;hpb=4abaa5a03e2dc9d857ef86c152bd014c76b6139d;p=lilypond.git

diff --git a/Documentation/web.texi b/Documentation/web.texi
index a8e5e0e202..f2001a8ad4 100644
--- 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,7 @@
 @end ignore
 
 @copying
-Copyright @copyright{} 2009 by the authors.
+Copyright @copyright{} 2009--2010 by the authors.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this
@@ -158,6 +160,7 @@ Read more in our @ref{Introduction}!
 
 @contents
 
+@allowcodebreaks false
 
 @c ****************** GENERAL STUFF FOR INFO ************
 @ignore
@@ -207,35 +210,48 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @end macro
 
 
-@macro docLinksBare{name,base,refLink,split,big,bigsize,pdf,pdfsize}
-
-@divClass{keep-bullets}
-@itemize
-
+@macro docLinkSplit{name,base,webLink}
 @ifclear web_version
-  @item @uref{../\base\/index.html, \name\ (split HTML)}:
+  @uref{../\base\/index.html, \name\ (split 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 docLinkBig{name,base,webLink}
 @ifclear web_version
-  @item @uref{../\base\-big-page.html, \name\ (big HTML)}:
+  @uref{../\base\-big-page.html, \name\ (big HTML)}
 @end ifclear
 @ifset web_version
-  @item \big\:
+  \webLink\
 @end ifset
-  read this manual as one huge HTML page.
-  @*@ @ @emph{(large single download, \bigsize\)}
+@end macro
 
+@macro docLinkPdf{name,base,webLink}
 @ifclear web_version
-  @item @uref{../\base\.pdf, \base\.pdf}:
+  @uref{../\base\.pdf, \base\.pdf}
 @end ifclear
 @ifset web_version
-  @item \pdf\:
+  \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\)}
+
+@item @docLinkPdf{\name\,\base\,\pdf\} @minus{}
   download as a PDF file.
   @*@ @ @emph{(large single download, \pdfsize\)}