Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / Documentation / general.texi

diff --git a/Documentation/general.texi b/Documentation/general.texi
index cbf4de3bf32a3d8bf8a2b2fb6782d28f3e3cfc90..f011440799ae150d124b4757e31cd82762a8d307 100644 (file)
--- a/Documentation/general.texi
+++ b/Documentation/general.texi
@@ -6,8 +6,8 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@setfilename lilypond.info
-@settitle GNU LilyPond New Website
+@setfilename general.info
+@settitle LilyPond -- Music notation for everyone
 @documentencoding UTF-8
 @documentlanguage en
 
@@ -16,49 +16,61 @@
 
 @afourpaper
 
+@c don't remove this comment.
+@ignore
+@omfcreator Graham Percival and Patrick McCarty
+@omfdescription General info about the LilyPond music engraving system
+@omftype program usage
+@omfcategory Applications|Publishing
+@omflanguage English
+@end ignore
+
+
+@copying
+Copyright @copyright{} 2009 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
-@top GNU LilyPond --- Web site
-@chapheading The music typesetter
+@top LilyPond... music notation for everyone
 @end ifnottex
 
 
+@c hack for texi2html, bleh -gp
+@ifnothtml
+
 @finalout
 
 @titlepage
 @title LilyPond
 @subtitle The music typesetter
-@titlefont{New Website}
+@titlefont{General Information}
 @author The LilyPond development team
 
-Copyright @copyright{} 1999--2009 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
+@vskip 0pt plus 1filll
+@c @vskip 20pt
 
-@vskip 20pt
+@insertcopying{}
 
-For LilyPond version 
+For LilyPond version @version{}
 @end titlepage
+@end ifnothtml
+@c end hack for texi2html
 
-@copying
-Copyright @copyright{} 1999--2009 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 ************************ WEBSITE START ***************
+
 
 @divId{pageHeader}
 @heading LilyPond
@@ -67,19 +79,24 @@ Free Documentation License''.
 @divEnd
 
 @c @imageId{cmws,web-clef-g-eight-alpha.png,Catchy Musical Web Snippet}
-@imageId{lilylogo,double-lily-modified3.png,LilyPond logo}
+@imageId{lilylogo,double-lily-modified3,png,LilyPond logo}
 @c @im ageId{cmws,web-snippet-alpha.png,Catchy Musical Web Snippet}
 
 @divId{quickSummary}
 @subheading What is LilyPond?
 
 LilyPond is an open-source music engraving program, devoted to
-producing the highest-quality sheet music possible.  We bring the
-aesthetics of traditionally engraved music to computer printouts.
+producing the highest-quality sheet music possible.  This free
+software brings the aesthetics of traditionally engraved music to
+computer printouts.
 
 @divClass{align-right}
 Read more in our @ref{Introduction}!
+
+@divEnd
 @divEnd
+
+@divClass{separator}
 @divEnd
 
 
@@ -88,8 +105,6 @@ FIXME: process news items like the old web site:
 select first 4 items to insert here, and generate
 RSS.
 
-@c @include news-front.itexi
-
 @divClass{float-right}
 (@ref{Old news})
 @divEnd
@@ -117,6 +132,8 @@ RSS.
 @divEnd
 
 
+@ifnottex
+
 @divClass{hide}
 @menu
 * Introduction::     Start here to creating sheet music.
@@ -126,6 +143,8 @@ RSS.
 @end menu
 @divEnd
 
+@end ifnottex
+
 @contents