X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fweb.texi;h=935f8e8b78f61045e74586cee8ff791653e5b229;hb=e20e28d59fbaa2af651e2a4ad5474e935dd64878;hp=cdd34ba55de8b014de2d89d6fae8e958b6be9272;hpb=e4f3dbb5ce5400a309ae0f52e509853801638432;p=lilypond.git

diff --git a/Documentation/web.texi b/Documentation/web.texi
index cdd34ba55d..935f8e8b78 100644
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -13,11 +13,6 @@
 @documentlanguage en
 @afourpaper
 
-@c `Web' was imported 2009-08-05 with git commit b938d71...
-@c @macro copyrightDeclare
-@c Copyright @copyright{} 2009--2012 by the authors.
-@c @end macro
-
 @set FDL
 @set web
 @include macros.itexi
@@ -33,8 +28,17 @@
 @omflanguage English
 @end ignore
 
+@c `Web' was born 2003-03-30 with this commit:
+@c Initial revision
+@c author: Han-Wen Nienhuys
+@c commit: d189a2119004c2f75da2020ea2ed36d817582fc5
+
+@c @macro copyrightDeclare
+@c Copyright @copyright{} 2003--2015 by the authors.
+@c @end macro
+
 @copying
-Copyright @copyright{} 2009--2012 by the authors.
+Copyright @copyright{} 2003--2015 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
@@ -56,8 +60,20 @@ License''.
 @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
 
 
@@ -104,8 +120,6 @@ For LilyPond version @version{}
 @c @im ageId{cmws,web-snippet-alpha.png,Catchy Musical Web Snippet}
 
 @divId{quickSummary}
-@subheading What is LilyPond?
-
 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
@@ -118,9 +132,6 @@ Read more in our @ref{Introduction}!
 @divEnd
 @divEnd
 
-@divClass{separator}
-@divEnd
-
 
 @divId{news}
 
@@ -133,19 +144,36 @@ Read more in our @ref{Introduction}!
 
 @divEnd
 
+
 @ifclear web_version
   @c do nothing
 @end ifclear
 @ifset web_version
-  @c make the box:
-@divId{wildCardBox}
+  @c make the side bar:
+@divId{homePageSideBar}
+@subheading Stable Release
+
+@c TODO: javascript to detect OS and suggest download?
+
+@ref{Download, Download @versionStable}
+
+@ref{Manuals, Manuals @versionStable}
+
+@subheading Unstable Release
+
+@ref{Development, Download @versionDevel}
+
+@ref{Development, Manuals @versionDevel}
+
 @subheading Pondings
-@divId{wildCardText}
+@divId{pondingsText}
 
 @divEnd
+
 @divEnd
 @end ifset
 
+
 @html
 
 <script language="JavaScript" type="text/javascript">
@@ -169,33 +197,11 @@ Read more in our @ref{Introduction}!
   var index = Math.floor(Math.random() * tweets.length);
   var tweet = tweets[index];
   var text = tweet.childNodes[0];
-  document.getElementById("wildCardText").innerHTML = text.nodeValue;
+  document.getElementById("pondingsText").innerHTML = text.nodeValue;
 </script>
 
 @end html
 
-@ifset web_version
-  @c make the box:
-@divId{latestVersion}
-@subheading Quick links
-
-@c TODO: javascript to detect OS and suggest download?
-
-@subsubheading Stable
-
-@ref{Download, Download @versionStable}
-
-@ref{Manuals, Manuals @versionStable}
-
-@subsubheading Unstable
-
-@ref{Development, Download @versionDevel}
-
-@ref{Development, Manuals @versionDevel}
-
-@divEnd
-@end ifset
-
 
 @ifnottex
 
@@ -294,8 +300,12 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @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}.
+please let us know by writing a message to the bug-lilypond
+mailing list. If you're not subscribed yet you can do so on the list's
+@uref{https://lists.gnu.org/mailman/listinfo/bug-lilypond,info page}
+or post directly through the
+@uref{http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs,
+gmane lilypond.bugs web interface}.
 
 @divEnd
 @divEnd