[lostwages]Add Ubuntu 9.10 instructions to download page

[Scott Ritchie (none)]

---
 templates/en/download.template     |    2 +-
 templates/en/download/deb.template |   11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/templates/en/download.template b/templates/en/download.template
index 9697da8..3c40998 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">Ubuntu</a></b> 
-     binary and source .debs for Ubuntu Hardy (8.04), Intrepid (8.10), and Jaunty (9.04)
+     binary and source .debs for Ubuntu Karmic (9.10), Jaunty (9.04), Intrepid (8.10), and Hardy (8.04)
     <td><a href="mailto:scott at open-vote.org">Scott Ritchie</a></td>
   </tr>
 
diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template
index 18972d9..6f44d0a 100644
--- a/templates/en/download/deb.template
+++ b/templates/en/download/deb.template
@@ -32,6 +32,8 @@ Party Software</b> tab and click <b>Add</b>.</p>
 <p>Then, <b>copy and paste one of the lines below</b> depending on which 
 version you are running.</p>
 
+<p><b>For Ubuntu Karmic (9.10):</b><br>
+<i>ppa:ubuntu-wine/ppa</i></p>
 <p><b>For Ubuntu Jaunty (9.04):</b><br>
 <i>deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope"</i></p>
 <p><b>For Ubuntu Intrepid (8.10):</b><br>
@@ -39,12 +41,13 @@ version you are running.</p>
 <p><b>For Ubuntu Hardy (8.04):</b><br>
 <i>deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron"</i></p>
 
-<h2>Trusting the WineHQ APT Repository and installing Wine:</h2>
+<h2>Trusting the WineHQ APT Repository:</h2>
 
 <p>After adding the repository, you also need to add the key for the repository 
-to your system's list of trusted keys.</p>
+to your system's list of trusted keys. Ubuntu 9.10 users may skip this step.</p>
 
-<p><b><a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Download
+<p>For Ubuntu 9.04 and earlier, 
+<b><a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">download
 and save Scott Ritchie's key</a></b> (right click -> save as) to your desktop. 
 Then open the <b>Authentication</b> tab, click <b>import key file</b>, and 
 select the key file you just saved (<i>Scott Ritchie.gpg</i>).  It is safe to 
@@ -52,6 +55,8 @@ delete this file after doing this step.</p>
 
 <img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0">
 
+<h2>Installing Wine:</h2>
+
 <p>Click close to finish, and then <b>reload the package information</b> when 
 prompted. If you have Wine installed, the system's update manager will now 
 inform you of the latest Wine beta release and prompt you to upgrade. If you 
-- 
1.6.3.3


--------------030900090907030300010404--