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 faf4cbc5224aa1be1afd078ee64a040065bd9827..91bd1a334ca98a8b106c7cffdbe0dbcd1d7c0d92 100644 (file)
--- a/Documentation/web/download.itexi
+++ b/Documentation/web/download.itexi
@@ -47,7 +47,7 @@ our @ref{Text input}.}
 @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,,,}}
@@ -207,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
@@ -230,17 +230,17 @@ upgrade to these versions.
 @item
 @sourceimage{logo-fedora,,,}
 @uref{http://koji.fedoraproject.org/koji/packageinfo?packageID=2447,
-Fedora: LilyPond 2.14.1}
+Fedora: LilyPond 2.14.2}
 
 @item
 @sourceimage{logo-ubuntu,,,}
 @uref{http://packages.ubuntu.com/search?keywords=lilypond,
-Ubuntu: LilyPond 2.12.3}
+Ubuntu: LilyPond 2.14.2}
 
 @item
 @sourceimage{logo-slackware,,,}
 @uref{http://www.johannes-schoepfer.de/lilypond/,
-Slackware: LilyPond 2.14.1}
+Slackware: LilyPond 2.14.2}
 
 @item
 @sourceimage{logo-debian,,,}
@@ -257,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
 
@@ -292,12 +300,14 @@ acknowledged.
 For MacOS X 10.4 or higher, running on Intel CPUs (if in doubt,
 use this).
 
+
 @item
 @sourceimage{logo-macosx,,,}
 @downloadStableDarwinPPC
 For MacOS X 10.4 or higher, running on G3 and G4 CPUs (old Apple
 computers).
 
+
 @end itemize
 
 @subsubheading Install
@@ -311,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
 
@@ -346,6 +349,7 @@ Create a file called @command{lilypond} which contains
 
 @divClass{h-scroll-auto}
 @example
+#!/bin/bash
 exec @var{DIR}/LilyPond.app/Contents/Resources/bin/lilypond "$@@"
 @end example
 @divEnd
@@ -403,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
 
@@ -434,7 +446,7 @@ acknowledged.
 @item
 @sourceimage{logo-windows,,,}
 @downloadStableWindows
-For Windows 2000, XP, Vista and Windows 7.
+For Windows 2000, XP, Vista, Windows 7 and 8.
 
 @end itemize
 
@@ -473,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
 
@@ -534,6 +538,14 @@ lilypond test.ly
 @divEnd
 
 
+@divClass{column-center-top}
+@subheading Compiling a file
+
+@lilypadWindows
+
+@divEnd
+
+
 @divClass{column-center-bottom}
 @subheading Legalese