Web:Reworded UNIX Download page more strongly not to use distro-based packages

Issue 3829

Reworded 'Generic Packages or ....' section more 'strongly' to  get
users to _not_ use  distribution-specific packages but to use
the generic packages from lilypond.org.

Removed the 'Distribution-specific' Packages section completely.

Added some '32bit/64bit' labels for the generic package download links

Minor grammar and syntax edits

diff --git a/Documentation/included/generating-output.itexi b/Documentation/included/generating-output.itexi
index 9fd3c62c7f342c1a54f0547a7ddce57c457f48ba..21969bf4f0564e8c41787db1f233a8f6ce239c6c 100644 (file)
--- a/Documentation/included/generating-output.itexi
+++ b/Documentation/included/generating-output.itexi
@@ -9,8 +9,8 @@
 @macro lilypadOSX
 @warning{These instructions assume that you are using the LilyPond
 application.  If you are using any of the programs described in
-@rweb{Easier editing}, please consult the documentation for
-those programs if you have any problems.}
+@rweb{Easier editing}, consult the documentation for those
+programs should you have any problems.}
 
 
 @subsubheading Step 1. Create your @file{.ly} file
@@ -80,8 +80,8 @@ may fail to generate an update PDF until you close the original.
 @macro lilypadWindows
 @warning{These instructions assume that you are using the built-in
 LilyPad editor.  If you are using any of the programs described in
-@rweb{Easier editing}, please consult the documentation for
-those programs if you have any problems compiling a file.}
+@rweb{Easier editing}, consult the documentation for those programs
+should you have any problems.}
 
 
 @subsubheading Step 1. Create your @file{.ly} file
@@ -163,10 +163,9 @@ while it is still being viewed.
 @c not lilypad at all, but I ran out of names.  :(
 @macro lilypadCommandLine
 @warning{These instructions assume that you are familiar with
-command-line programs.  If you are using any of the programs
-described in @rweb{Easier editing}, please consult the
-documentation for those programs if you have any problems
-compiling a file.}
+command-line programs.  If you are using any of the programs described
+in @rweb{Easier editing}, consult the documentation for those programs
+should you have any problems.}
 
 
 @subsubheading Step 1. Create your @file{.ly} file

diff --git a/Documentation/web/download.itexi b/Documentation/web/download.itexi
index 4781d161b7134486f7d446c0246a6614000d8407..b4c6e2f13bb5a07736c1258e75b7ae42a672ac25 100644 (file)
--- a/Documentation/web/download.itexi
+++ b/Documentation/web/download.itexi
@@ -142,13 +142,12 @@ acknowledged.
 @divClass{column-center-top}
 @subheading Generic Packages or Distribution-Specific Packages?
 
-Many distributions already include LilyPond within their normal
-package repositories and these are often much easier to install than the
-generic packages found here.  However the version of LilyPond in those
-repositories may be @emph{significantly} older than the current stable
-version.  If you wish to use our generic packages, please check that
-your LilyPond editor is using the correct version of lilypond.  See
-@ref{Easier editing}.
+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 @@ your LilyPond editor is using the correct version of lilypond.  See
 @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 @@ your LilyPond editor is using the correct version of lilypond.  See
 @item
 @sourceimage{logo-freebsd,,,}
 @downloadStableFreeBSDNormal
+32bit Systems.
 
 @item
 @sourceimage{logo-freebsd,,,}
 @downloadStableFreeBSDBig
+64bit Systems
 
 @end itemize
 
@@ -220,44 +221,6 @@ sh lilypond-@versionStable{}-OS-TYPE.sh --help
 
 
 @divClass{column-right-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.14.2}
-
-@item
-@sourceimage{logo-ubuntu,,,}
-@uref{http://packages.ubuntu.com/search?keywords=lilypond,
-Ubuntu: LilyPond 2.14.2}
-
-@item
-@sourceimage{logo-slackware,,,}
-@uref{http://www.johannes-schoepfer.de/lilypond/,
-Slackware: LilyPond 2.14.2}
-
-@item
-@sourceimage{logo-debian,,,}
-@uref{http://packages.debian.org/search?keywords=lilypond,
-Debian: LilyPond 2.12.3}
-
-@item
-@sourceimage{logo-suse,,,}
-@uref{http://software.opensuse.org/search?baseproject=openSUSE%3A11.2&p=1&q=lilypond,
-openSUSE: LilyPond 2.12.3}
-
-@end itemize
-
-@divEnd
-
-
-@divClass{column-center-top}
 @subheading Compiling a file
 
 @lilypadCommandLine