X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fweb.texi;h=90d9f79251a326c12c8dba68bdb9cc829ca48e5a;hb=5463954bb6cca25e64f8480aa2946857276bf210;hp=f2001a8ad409033f9d39412a18977770bcc92c06;hpb=2736ea1c42686cb73cfec4110b40f6581a76b7e7;p=lilypond.git

diff --git a/Documentation/web.texi b/Documentation/web.texi
index f2001a8ad4..90d9f79251 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,12 @@
 @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
+@c bump the required version.  -gp
+This file documents the LilyPond website.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this
@@ -48,6 +52,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
@@ -93,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}!
@@ -175,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 ************
@@ -273,6 +277,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