Doc: Relayout the download pages (issue 3595).

[lilypond.git] / Documentation / web / download.itexi

diff --git a/Documentation/web/download.itexi b/Documentation/web/download.itexi
index 1b9f0de18e2fd59e10e81ae5ffd6419b513ceef9..91bd1a334ca98a8b106c7cffdbe0dbcd1d7c0d92 100644 (file)
--- a/Documentation/web/download.itexi
+++ b/Documentation/web/download.itexi
@@ -21,7 +21,7 @@ our @ref{Text input}.}
 
 @divClass{heading-center}
 @ifclear web_version
-  @c yes, we want verisonDevel here, since the online links
+  @c yes, we want versionDevel here, since the online links
   @c for @version won't be up yet!
   @heading Downloads for LilyPond @versionDevel
 
@@ -36,16 +36,18 @@ our @ref{Text input}.}
 
 @divEnd
 
+@divClass{link-headings}
+
 @divClass{column-left-top}
 @subheading For users
 
 @itemize
 
 @item
-@c TODO: duplicate to avoid underlined refs in HTML?  icky.
+@c ref is duplicated to avoid underlining ref as image.
 @ref{Unix, @sourceimage{logo-linux,,,}
 @sourceimage{logo-freebsd,,,}}
-@ref{Unix, Unix (Linux and FreeBSD)}
+@ref{Unix, Unix (GNU/Linux and FreeBSD)}
 
 @item
 @ref{MacOS X, @sourceimage{logo-macosx,,,}}
@@ -78,6 +80,7 @@ latest unstable version
 @end itemize
 @divEnd
 
+@divEnd
 
 @divClass{column-center-bottom}
 
@@ -92,7 +95,7 @@ LilyPond is published under the
 
 @subheading Sponsors
 
-Many thanks to @uref{http://www.vt.edu/, Virgina Tech} and
+Many thanks to @uref{http://www.vt.edu/, Virginia Tech} and
 @uref{http://www.linuxaudio.org/, linuxaudio.org} for sponsoring
 our bandwidth.
 
@@ -204,19 +207,19 @@ In the shell, type:
 uninstall-lilypond
 @end example
 
-@divEnd
-
+@subsubheading Help
 
+In the shell, type:
 
-@divClass{column-right-top}
-@subheading Compiling a file
-
-@lilypadCommandLine
+@example
+sh lilypond-@versionStable{}-OS-TYPE.sh --help
+@end example
 
 @divEnd
 
 
-@divClass{column-left-top}
+
+@divClass{column-right-top}
 @subheading Distribution-specific Packages
 
 Please use your distribution's package manager to install or
@@ -227,22 +230,22 @@ upgrade to these versions.
 @item
 @sourceimage{logo-fedora,,,}
 @uref{http://koji.fedoraproject.org/koji/packageinfo?packageID=2447,
-Fedora: LilyPond 2.12.3}
+Fedora: LilyPond 2.14.2}
 
 @item
 @sourceimage{logo-ubuntu,,,}
 @uref{http://packages.ubuntu.com/search?keywords=lilypond,
-Ubuntu: LilyPond 2.12.2}
+Ubuntu: LilyPond 2.14.2}
 
 @item
 @sourceimage{logo-slackware,,,}
 @uref{http://www.johannes-schoepfer.de/lilypond/,
-Slackware: LilyPond 2.12.3}
+Slackware: LilyPond 2.14.2}
 
 @item
 @sourceimage{logo-debian,,,}
 @uref{http://packages.debian.org/search?keywords=lilypond,
-Debian: LilyPond 2.12.2}
+Debian: LilyPond 2.12.3}
 
 @item
 @sourceimage{logo-suse,,,}
@@ -254,6 +257,14 @@ openSUSE: LilyPond 2.12.3}
 @divEnd
 
 
+@divClass{column-center-top}
+@subheading Compiling a file
+
+@lilypadCommandLine
+
+@divEnd
+
+
 @divClass{column-center-bottom}
 @subheading Legalese
 
@@ -286,12 +297,16 @@ acknowledged.
 @item
 @sourceimage{logo-macosx,,,}
 @downloadStableDarwinNormal
-For Intel chips (if in doubt, use this).
+For MacOS X 10.4 or higher, running on Intel CPUs (if in doubt,
+use this).
+
 
 @item
 @sourceimage{logo-macosx,,,}
 @downloadStableDarwinPPC
-For G3 and G4 CPUs (old Apple computers).
+For MacOS X 10.4 or higher, running on G3 and G4 CPUs (old Apple
+computers).
+
 
 @end itemize
 
@@ -306,19 +321,12 @@ Delete the LilyPond.app folder.
 
 @divEnd
 
-@divClass{column-right-top}
-@subheading Compiling a file
-
-@lilypadOSX
 
-@divEnd
-
-
-@divClass{column-left-top}
+@divClass{column-right-top}
 @subheading Running on the command-line
 
-@warning{If you are happy with the GUI, then please ignore these
-instructions.}
+@warning{If you are happy with the GUI instructions below, then
+please ignore these instructions.}
 
 @subsubheading MacOS X on the command line
 
@@ -339,11 +347,12 @@ cd ~/bin
 @item
 Create a file called @command{lilypond} which contains
 
-@help obvious css issue to be dealt with.  :(
-@c we need a small font here to fit.  -gp
-@smallexample
+@divClass{h-scroll-auto}
+@example
+#!/bin/bash
 exec @var{DIR}/LilyPond.app/Contents/Resources/bin/lilypond "$@@"
-@end smallexample
+@end example
+@divEnd
 
 @warning{@var{DIR} will generally be @code{/Applications/}}
 
@@ -386,9 +395,11 @@ inside the @code{.app} file for MacOS@tie{}X.
 Scripts can also be run from the command line by invoking them
 directly:
 
+@divClass{h-scroll-auto}
 @example
 @var{path/to}/LilyPond.app/Contents/Resources/bin/lilypond
 @end example
+@divEnd
 
 The same is true for all other scripts in that directory, such as
 @command{lilypond-book} and @command{convert-ly}.
@@ -396,6 +407,14 @@ The same is true for all other scripts in that directory, such as
 @divEnd
 
 
+@divClass{column-center-top}
+@subheading Compiling a file
+
+@lilypadOSX
+
+@divEnd
+
+
 @divClass{column-center-bottom}
 @subheading Legalese
 
@@ -427,7 +446,7 @@ acknowledged.
 @item
 @sourceimage{logo-windows,,,}
 @downloadStableWindows
-For Windows ME, NT, 2000, XP, Vista, and Windows 7.
+For Windows 2000, XP, Vista, Windows 7 and 8.
 
 @end itemize
 
@@ -437,10 +456,10 @@ For Windows ME, NT, 2000, XP, Vista, and Windows 7.
 
 @item
 Locate the downloaded file and double-click on it to start the
-installer. Follow the instructions given to you by the installer;
+installer.  Follow the instructions given to you by the installer;
 we recommend that you leave all the install options checked and
-use the default installation location. Click the @q{Finish} button
-when the installer has completed. LilyPond is now installed.
+use the default installation location.  Click the @q{Finish} button
+when the installer has completed.  LilyPond is now installed.
 
 @end enumerate
 
@@ -452,12 +471,12 @@ To uninstall LilyPond either:
 
 @item
 Locate the LilyPond folder from the @q{Start} menu and click on the
-@q{Uninstall} icon. Click the @q{Finish} button when the uninstaller
+@q{Uninstall} icon.  Click the @q{Finish} button when the uninstaller
 has completed.
 
 @item
-Or from witin the Control Panel,locate and select LilyPond and then
-choose the option to uninstall/remove the software. Click the @q{Finish}
+Or from within the Control Panel, locate and select LilyPond and then
+choose the option to uninstall/remove the software.  Click the @q{Finish}
 button when the uninstaller has completed.
 
 @end enumerate
@@ -466,18 +485,10 @@ button when the uninstaller has completed.
 
 
 @divClass{column-right-top}
-@subheading Compiling a file
-
-@lilypadWindows
-
-@divEnd
-
-
-@divClass{column-left-top}
 @subheading Running on the command-line
 
-@warning{If you are happy with the GUI, then please ignore these
-instructions.}
+@warning{If you are happy with the GUI instructions below, then
+please ignore these instructions.}
 
 @subsubheading Windows on the command line
 
@@ -507,16 +518,16 @@ which contains LilyPond executable files like this:
 [@var{pre-set paths}];@var{DIR}\LilyPond\usr\bin
 @end example
 
-@warning{@var{DIR} will generally be @code{C:\Program Files}.}
+@warning{@var{DIR} will generally be @code{C:@bs{}Program Files}.}
 
 @noindent
 and click @qq{OK} button to close the window.
 
 @end enumerate
 
-@subsubheading Invoking individual excecutable files
+@subsubheading Invoking individual executable files
 
-LilyPond excecutable files
+LilyPond executable files
 -- such as lilypond, lilypond-book, convert-ly, and so on --
 can be run from the command-line by invoking them:
 
@@ -527,6 +538,14 @@ lilypond test.ly
 @divEnd
 
 
+@divClass{column-center-top}
+@subheading Compiling a file
+
+@lilypadWindows
+
+@divEnd
+
+
 @divClass{column-center-bottom}
 @subheading Legalese
 
@@ -606,6 +625,3 @@ is given in @ref{Freedom}.
 @include gpl.itexi
 
 @divEnd
-
-
-