Merge lp:~apachelogger/ubiquity-slideshow-ubuntu/kubuntu-support into lp:ubiquity-slideshow-ubuntu

[Harald Sitter]

since canonical doesn't offer support for kubuntu anymore, remove the line saying so

[Dylan McCall (dylanmccall)]

Okay, merged! Thanks, Harald.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-04 16:43:45 +0000
+++ debian/changelog	2012-06-19 16:22:21 +0000
@@ -1,9 +1,13 @@
 ubiquity-slideshow-ubuntu (59) UNRELEASED; urgency=low
 
+  [ Julien Lavergne ]
   * Lubuntu: Replacing Synaptic by Lubuntu-Software-Center (LP: #958880)
   * Lubuntu: Change the link to the mailing list
 
- -- Julien Lavergne <[e-mail]>  Fri, 04 May 2012 18:41:41 +0200
+  [ Harald Sitter ]
+  * Kubuntu: Remove reference to commercial support from Canonical
+
+ -- Harald Sitter <[e-mail]>  Tue, 19 Jun 2012 18:15:10 +0200
 
 ubiquity-slideshow-ubuntu (58) precise; urgency=low
 

=== modified file 'slideshows/kubuntu/slides/get-help.html'
--- slideshows/kubuntu/slides/get-help.html	2011-09-28 13:35:02 +0000
+++ slideshows/kubuntu/slides/get-help.html	2012-06-19 16:22:21 +0000
@@ -7,12 +7,10 @@
 	    <em>Help</em> menu in most applications.</li>
 	    <li>In addition to our extensive written help, the Kubuntu
 	    community in conjunction with the Ubuntu community, provides free
-	    technical support in person and over the Internet. There is also
-	    commercial support available through Canonical, its partners and
-	    approved companies. Learn more at <a
-		href="http://www.ubuntu.com/support">ubuntu.com/support</a>.</li>
+	    technical support in person and over the Internet. Learn more at <a
+		href="http://www.kubuntu.org/support">kubuntu.org/support</a>.</li>
 	    <li>Let us know about your Kubuntu experience at <a
-		href="http://www.ubuntu.com/community">ubuntu.com/community</a>!</li>
+		href="http://www.kubuntu.org/community">kubuntu.org/community</a>!</li>
 	</ul>
     </div>
 </div>