Scott Ritchie : Update Ubuntu download instructions for 10.10 and later

[Jeremy Newman]

Module: website
Branch: master
Commit: a03b3e6cb1becf30b62df3147c1c55c46556a8c6
URL:    http://source.winehq.org/git/website.git/?a=commit;h=a03b3e6cb1becf30b62df31...

Author: Scott Ritchie <scott(a)open-vote.org>
Date:   Mon Jan 10 14:00:34 2011 -0800

Update Ubuntu download instructions for 10.10 and later

Update Ubuntu download instructions for 10.10 and later
> From e6f633a02616564e01c1ab0192ae98567dc66c74 Mon Sep 17 00:00:00 2001
> From: Scott Ritchie <scott(a)open-vote.org>
> Date: Mon, 10 Jan 2011 13:57:31 -0800
> Subject: Update Ubuntu download instructions for 10.10 and later

---

 templates/en/download.template     |    2 +-
 templates/en/download/deb.template |   35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/templates/en/download.template b/templates/en/download.template
index 6e548c0..724f92f 100644
--- a/templates/en/download.template
+++ b/templates/en/download.template
@@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site.</p>
       <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a>
     </td>
     <td> <b><a href="{$root}/download/deb">Download Ubuntu packages</a></b> 
-     - binary and source .debs for Ubuntu Lucid (10.04 LTS)
+     - binary and source .debs for Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10), and Natty (11.04)
     <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td>
   </tr>
 
diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template
index ea725f1..7b7b09c 100644
--- a/templates/en/download/deb.template
+++ b/templates/en/download/deb.template
@@ -8,21 +8,13 @@ Wine for Ubuntu and Ubuntu derivatives
 <p>Ubuntu and Ubuntu derivatives (such as Kubuntu) obtain software from 
 <i>packages</i> which are stored in <i>repositories</i>. Ubuntu's default
 repository includes Wine, however if you want to stay up to date with the
-latest Wine beta package you can use WineHQ's by following these instructions.
+latest Wine package you can use WineHQ's by following these instructions.
 </p>
 
-<h2>Warning: These are beta packages for Ubuntu 10.04 or later</h2>
+<h2>Adding the WineHQ PPA Repository:</h2>
 
-<p><i>The packages here are beta packages.  This means they will 
-periodically suffer from 
-<a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an 
-update may break functionality in Wine. If the Wine version provided with Ubuntu
-works for you, then you may not want to use these beta packages.</i></p>
-
-<h2>Adding the WineHQ Repository:</h2>
-
-<p>Open the Software Sources menu by going to 
-<b>System->Administration->Software Sources</b>.  Then select the <b>Other 
+<p>Open the Software Sources menu by going to <b>Applications->Ubuntu Software 
+Center</b>, then selecting <b>Edit->Software Sources</b>. Choose the <b>Other 
 Software</b> tab and click <b>Add</b>.</p>
 
 <img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Other Software" border="0">
@@ -31,13 +23,22 @@ Software</b> tab and click <b>Add</b>.</p>
 
 <i>ppa:ubuntu-wine/ppa</i></p>
 
+<h2>Warning: Beta packages</h2>
+
+<p><i>The 1.3 packages here are beta packages.  This means they will 
+periodically suffer from 
+<a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an 
+update may break functionality in Wine. If the stable 1.2 Wine version works 
+for you, then you may not want to use these beta packages.</i></p>
+
 <h2>Installing Wine:</h2>
 
-<p>Click close to finish, and then <b>reload the package information</b> when 
-prompted. If you have Wine installed already, update manager will offer to
-upgrade you to the stable Wine 1.2.  To get the most recent Wine 1.3 beta, you 
-must install the <i>wine1.3 package</i> or <a href="apt://wine1.3">click this 
-link</a>.</p>
+<p>Once you have added the WineHQ PPA Repository, you are ready to install.</p>
+
+<p><i>To get the most recent Wine 1.3 beta, 
+<a href="apt://wine1.3">click this link to install the wine1.3 package</a>.</i></p>
+<p><i>To install the older, stable Wine 1.2 version, 
+<a href="apt://wine1.2">click this link to install the wine1.2 package</a>.</i></p>
 
 <h2>Upgrading to a new version of Ubuntu</h2>