>From 5b469a092a0492b6113d2692565f7c26aae6bf68 Mon Sep 17 00:00:00 2001
From: Rosanne DiMesio <dimesio@earthlink.net>
Date: Mon, 10 Nov 2014 09:34:08 -0600
Subject: Website Correct Ubuntu downloads instructions

---
 templates/en/download/ubuntu.template | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/templates/en/download/ubuntu.template b/templates/en/download/ubuntu.template
index 8ae3f9d..0fbd4d1 100644
--- a/templates/en/download/ubuntu.template
+++ b/templates/en/download/ubuntu.template
@@ -2,16 +2,18 @@
 <!--BLURB:[Installing the latest Wine on Ubuntu]-->
 
 <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a>
-Wine for Ubuntu and Ubuntu derivatives
+Wine for Ubuntu and Ubuntu flavors
 <a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1>
 
-<p>Ubuntu and Ubuntu derivatives (such as Kubuntu) obtain software from 
+<p>Ubuntu and Ubuntu flavors (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 package you can use WineHQ's by following these instructions.
+repository includes a Wine package built from the stable branch, however if you want to stay up to date with the
+latest development release you can obtain it by following these instructions.
 </p>
 
-<h2>Adding the WineHQ PPA Repository:</h2>
+<p><b>Ubuntu Derivatives:</b> These packages and instructions are designed for Ubuntu and <a href="http://wiki.ubuntu.com/UbuntuFlavors">recognized flavors</a>. Users of Ubuntu derivatives are welcome to use these packages, but should keep in mind that problems caused by differences between the derivative distro and mainline Ubuntu are neither Wine bugs nor packaging bugs, and should be reported to the  distro in question.</p>
+
+<h2>Adding the PPA Repository:</h2>
 
 <p>Open the Software Sources menu by launching the <b>Ubuntu Software 
 Center</b> and selecting <b>Edit->Software Sources</b>. Choose the <b>Other 
@@ -33,7 +35,7 @@ for you, then you may not want to use these beta packages.</i></p>
 
 <h2>Installing Wine:</h2>
 
-<p>Once you have added the WineHQ PPA Repository, you are ready to install.</p>
+<p>Once you have added the repository, you are ready to install.</p>
 
 <p><i>To get the most recent Wine 1.7 beta, 
 <a href="apt://wine1.7">click this link to install the wine1.7 package</a>.</i></p>
@@ -49,8 +51,8 @@ The built in update manager will not switch the Wine repository automatically.
 
 <h2>Alternative Command Line Instructions for Installing Wine:</h2>
 
-<p>It is also possible to add the Wine PPA and install via the terminal. This
-may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives.</p>
+<p>It is also possible to add the PPA and install via the terminal. This
+may be useful on Ubuntu flavors and derivatives.</p>
 
 <p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p>
 
-- 
1.8.1.4