ubiquity-slideshow team mailing list archive

[Gunnar Hjalmarsson <gunnar.hjalmarsson@xxxxxxxxx>]

Gunnar Hjalmarsson has proposed merging lp:~gunnarhj/ubiquity-slideshow-ubuntu/lp-1406972 into lp:ubiquity-slideshow-ubuntu.

Requested reviews:
  Ubiquity Slideshow (ubiquity-slideshow)
Related bugs:
  Bug #1406972 in ubiquity-slideshow-ubuntu (Ubuntu): "Official docs not mentioned in Ubuntu slideshow"
  https://bugs.launchpad.net/ubuntu/+source/ubiquity-slideshow-ubuntu/+bug/1406972

For more details, see:
https://code.launchpad.net/~gunnarhj/ubiquity-slideshow-ubuntu/lp-1406972/+merge/259239
-- 
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~gunnarhj/ubiquity-slideshow-ubuntu/lp-1406972 into lp:ubiquity-slideshow-ubuntu.

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-20 11:24:08 +0000
+++ debian/changelog	2015-05-15 12:08:42 +0000
@@ -1,3 +1,10 @@
+ubiquity-slideshow-ubuntu (98) UNRELEASED; urgency=medium
+
+  [ Gunnar Hjalmarsson ]
+  * gethelp.html in ubuntu slideshow rewritten (LP: #1406972).
+
+ -- Gunnar Hjalmarsson <gunnarhj@xxxxxxxxxx>  Fri, 15 May 2015 14:02:00 +0200
+
 ubiquity-slideshow-ubuntu (97) vivid; urgency=medium
 
   [ Dylan McCall ]

=== modified file 'slideshows/ubuntu/slides/gethelp.html'
--- slideshows/ubuntu/slides/gethelp.html	2015-04-01 12:05:58 +0000
+++ slideshows/ubuntu/slides/gethelp.html	2015-05-15 12:08:42 +0000
@@ -1,12 +1,14 @@
-<div class="header"><h1 class="slidetitle">Any questions?</h1></div>
+<div class="header"><h1 class="slidetitle">Help and support</h1></div>
 
 <div class="main wide">
 
 <div class="text">
 
-<div>
-<p>Check out <a href="http://askubuntu.com/";>askubuntu.com</a> for answers to all your Ubuntu questions. There’s a good chance your question will have been answered already and, if not, you’ll find thousands of volunteers eager to help. For more support options, go to <a href="http://www.ubuntu.com/support";>ubuntu.com/support</a>.</p>
-</div>
+<p>The <span class="app" data-app="docs">Official documentation</span> covers many of the most common areas about Ubuntu. It's available both <a href="https://help.ubuntu.com";>online</a> and via the Ubuntu Help item in the System meny.</p>
+
+<p>At <a href="http://askubuntu.com";>Ask Ubuntu</a> you can ask questions and search an impressive collection of already answered questions. Support in your own language may be provided by your <a href="http://loco.ubuntu.com/teams/";>Local Community Team</a>.</p>
+
+<p>For pointers to other useful resources, please visit <a href="http://community.ubuntu.com/help-information/";>community.ubuntu.com/help-information</a> or <a href="http://www.ubuntu.com/support";>ubuntu.com/support</a>.</p>
 
 </div>