Web: use free software and mention that we're part of GNU.

[lilypond.git] / Documentation / web.texi

diff --git a/Documentation/web.texi b/Documentation/web.texi
index 3c24c7bdfc4877dbfa071188974f5a5d230704f9..b4bef3015a2bd5e8bf4194b82bcc00fe74ce011b 100644 (file)
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -64,11 +64,11 @@ License''.
 * 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.
+* 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.
+* 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
@@ -119,10 +119,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}!
@@ -277,6 +278,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