Merge remote branch 'origin/master' into release/unstable

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

diff --git a/Documentation/web/download.itexi b/Documentation/web/download.itexi
index e83587dedde2d02abc30b360bc09b6bf1bf44f9b..ece6c7b39f72c2c75cd6e0d44134ed27687e1325 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,,,}}
@@ -82,7 +82,7 @@ latest unstable version
 
 @divEnd
 
-@divClass{column-center-bottom}
+@divClass{column-center-middle-color2}
 
 @subheading Software License
 
@@ -91,7 +91,7 @@ LilyPond is published under the
 @divEnd
 
 
-@divClass{color1}
+@divClass{column-center-bottom}
 
 @subheading Sponsors
 
@@ -142,13 +142,12 @@ acknowledged.
 @divClass{column-center-top}
 @subheading Generic Packages or Distribution-Specific Packages?
 
-Many distributions include LilyPond in their normal package
-system.  These versions are easier to install and uninstall than
-the generic packages, but they may be older.  If you wish to use
-our generic packages, please uninstall the official version from
-your system using the normal package manager for your distribution.
-See your distribution's documentation about how to use their
-package manager.
+Many distributions include LilyPond within their normal package
+repositories that are often @emph{significantly} older than the current
+stable version.  While these older packages may be easier to install, we
+@emph{strongly} recommend that you use our generic packages.  In this
+case, check that your LilyPond editor is using the correct version.
+See @ref{Easier editing}.
 
 @divEnd
 
@@ -168,12 +167,12 @@ package manager.
 @ifset web_version
   @downloadStableLinuxNormal
 @end ifset
-
-(if in doubt, use this)
+32bit Systems.
 
 @item
 @sourceimage{logo-linux,,,}
 @downloadStableLinuxBig
+64bit Systems.
 
 @item
 @sourceimage{logo-linux,,,}
@@ -182,10 +181,12 @@ package manager.
 @item
 @sourceimage{logo-freebsd,,,}
 @downloadStableFreeBSDNormal
+32bit Systems.
 
 @item
 @sourceimage{logo-freebsd,,,}
 @downloadStableFreeBSDBig
+64bit Systems
 
 @end itemize
 
@@ -207,52 +208,22 @@ In the shell, type:
 uninstall-lilypond
 @end example
 
-@divEnd
-
-
+@subsubheading Help
 
-@divClass{column-right-top}
-@subheading Compiling a file
+In the shell, type:
 
-@lilypadCommandLine
+@example
+sh lilypond-@versionStable{}-OS-TYPE.sh --help
+@end example
 
 @divEnd
 
 
-@divClass{column-left-top}
-@subheading Distribution-specific Packages
-
-Please use your distribution's package manager to install or
-upgrade to these versions.
-
-@itemize
-
-@item
-@sourceimage{logo-fedora,,,}
-@uref{http://koji.fedoraproject.org/koji/packageinfo?packageID=2447,
-Fedora: LilyPond 2.12.3}
-
-@item
-@sourceimage{logo-ubuntu,,,}
-@uref{http://packages.ubuntu.com/search?keywords=lilypond,
-Ubuntu: LilyPond 2.12.2}
-
-@item
-@sourceimage{logo-slackware,,,}
-@uref{http://www.johannes-schoepfer.de/lilypond/,
-Slackware: LilyPond 2.12.3}
-
-@item
-@sourceimage{logo-debian,,,}
-@uref{http://packages.debian.org/search?keywords=lilypond,
-Debian: LilyPond 2.12.2}
 
-@item
-@sourceimage{logo-suse,,,}
-@uref{http://software.opensuse.org/search?baseproject=openSUSE%3A11.2&p=1&q=lilypond,
-openSUSE: LilyPond 2.12.3}
+@divClass{column-right-top}
+@subheading Compiling a file
 
-@end itemize
+@lilypadCommandLine
 
 @divEnd
 
@@ -289,12 +260,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
 
@@ -309,19 +284,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
 
@@ -344,6 +312,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
@@ -401,6 +370,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
 
@@ -432,7 +409,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
 
@@ -471,18 +448,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
 
@@ -512,7 +481,7 @@ 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.
@@ -532,6 +501,14 @@ lilypond test.ly
 @divEnd
 
 
+@divClass{column-center-top}
+@subheading Compiling a file
+
+@lilypadWindows
+
+@divEnd
+
+
 @divClass{column-center-bottom}
 @subheading Legalese