X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fweb.texi;h=f8e572b6847fcd6931634b04163937e3c9713af3;hb=a17624f0068b92ac91f199496cad59849b038eaa;hp=4e57c29ec1503626d16e0254f0f59a53ccc5156a;hpb=d7c0f4263534307616c82d9b2ce6fdef9472456f;p=lilypond.git

diff --git a/Documentation/web.texi b/Documentation/web.texi
index 4e57c29ec1..f8e572b684 100644
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -15,7 +15,7 @@
 
 @c `Web' was imported 2009-08-05 with git commit b938d71...
 @c @macro copyrightDeclare
-@c Copyright @copyright{} 2009--2010 by the authors.
+@c Copyright @copyright{} 2009--2011 by the authors.
 @c @end macro
 
 @set FDL
@@ -23,7 +23,6 @@
 @include macros.itexi
 @include weblinks.itexi
 
-@afourpaper
 
 @c don't remove this comment.
 @ignore
@@ -35,7 +34,7 @@
 @end ignore
 
 @copying
-Copyright @copyright{} 2009--2010 by the authors.
+Copyright @copyright{} 2009--2011 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
@@ -119,10 +118,11 @@ For LilyPond version @version{}
 @divId{quickSummary}
 @subheading What is LilyPond?
 
-LilyPond is an open-source music engraving program, devoted to
-producing the highest-quality sheet music possible.  This free
-software brings the aesthetics of traditionally engraved music to
-computer printouts.
+LilyPond is a music engraving program, devoted to producing the
+highest-quality sheet music possible.  It brings the aesthetics of
+traditionally engraved music to computer printouts.  LilyPond is free
+software and part of the @uref{http://gnu.org,GNU Project}.
+
 
 @divClass{align-right}
 Read more in our @ref{Introduction}!
@@ -215,30 +215,15 @@ 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)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (split HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (big HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (big HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.pdf, \base\.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 
@@ -277,6 +262,33 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @end macro
 
 
+@ifhtml
+@macro contactUsAbout{topic}
+
+@divClass{heading-center}
+@divClass{contactBox}
+If you are aware of any other \topic\ which could be listed here,
+please let us know by following the instructions on
+@ref{Bug reports}.
+
+@divEnd
+@divEnd
+
+@end macro
+@end ifhtml
+
+@ifnothtml
+@macro contactUsAbout{topic}
+@cartouche
+If you are aware of any other \topic\ which could be listed here,
+please let us know by following the instructions on
+@ref{Bug reports}.
+
+@end cartouche
+
+@end macro
+@end ifnothtml
+
 @include web/introduction.itexi
 @include web/download.itexi
 @include web/manuals.itexi