Merge lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubuntu-mate-update into lp:ubiquity-slideshow-ubuntu

[Martin Wimpress ]

A few minor changes to the text in the Ubuntu MATE slides to remove an errant scroll-bar and tweak up the language.

[Didier Roche-Tolomelli (didrocks)]

Looking good, thanks for your work! I added a changelog as an additional commit FYI, please do it for next time ;)

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Oh, seems I don't have write access, for upstream: I pushed it to lp:~didrocks/ubiquity-slideshow-ubuntu/mate-slideshow. Please grab to reconcile branches.

[lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubuntu-mate-update]

698. By Didier Roche-Tolomelli on 2015-05-26

Update changelog

699. By Didier Roche-Tolomelli on 2015-05-26

releasing package ubiquity-slideshow-ubuntu version 98

[Martin Wimpress  (flexiondotorg)]

Thanks for your help. I've consolidated here - lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubuntu-mate-update

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-20 11:24:08 +0000
+++ debian/changelog	2015-05-26 11:16:26 +0000
@@ -1,3 +1,11 @@
+ubiquity-slideshow-ubuntu (98) wily; urgency=medium
+
+  [ Martin Wimpress ]
+  * A few minor changes to the text in the Ubuntu MATE slides to remove
+    an errant scroll-bar and tweak up the language.
+
+ -- Didier Roche <[e-mail]>  Tue, 26 May 2015 10:59:53 +0200
+
 ubiquity-slideshow-ubuntu (97) vivid; urgency=medium
 
   [ Dylan McCall ]

=== modified file 'slideshows/ubuntu-mate/slides/02_about.html'
--- slideshows/ubuntu-mate/slides/02_about.html	2015-04-01 00:01:34 +0000
+++ slideshows/ubuntu-mate/slides/02_about.html	2015-05-26 11:16:26 +0000
@@ -5,7 +5,7 @@
 <div class="text">
 
 <div>
-<p>Ubuntu MATE is a stable, easy-to-use operating system with a configurable desktop environment. Ideal for those who want the most out of their desktops, laptops and netbooks and prefer a traditional desktop metaphor. With modest hardware requirements it is suitable for modern workstations and older hardware alike.</p>
+<p>Ubuntu MATE is a stable, easy-to-use operating system with a configurable desktop environment. Ideal for those who want the most out of their computers and prefer a traditional desktop metaphor. With modest hardware requirements it is suitable for modern desktops and laptops, micro computers and older hardware alike.</p>
 </div>
 
 </div>

=== modified file 'slideshows/ubuntu-mate/slides/03_usc.html'
--- slideshows/ubuntu-mate/slides/03_usc.html	2015-04-01 00:01:34 +0000
+++ slideshows/ubuntu-mate/slides/03_usc.html	2015-05-26 11:16:26 +0000
@@ -23,7 +23,7 @@
 	        	</li>
 			<li>
 				<img class="icon" src="icons/gdebi.png"/>
-	        		<p class="caption">GDebi Package Installer</p>
+	        		<p class="caption">gdebi Package Installer</p>
 	        	</li>
 		</ul>
 	</div>

=== modified file 'slideshows/ubuntu-mate/slides/09_community.html'
--- slideshows/ubuntu-mate/slides/09_community.html	2015-04-01 12:05:58 +0000
+++ slideshows/ubuntu-mate/slides/09_community.html	2015-05-26 11:16:26 +0000
@@ -24,15 +24,15 @@
 <ul>
 	<li>
 		<img class="icon2" src="link/bullet-point.png" />
-		<a href="https://plus.google.com/communities/108331279007926658904" class="caption">Google+ Community</a>
-	</li>
-	<li>
-		<img class="icon2" src="link/bullet-point.png" />
-		<a href="https://twitter.com/ubuntu_mate" class="caption">Twitter Feed</a>
-	</li>
-	<li>
-		<img class="icon2" src="link/bullet-point.png" />
-		<a href="https://www.facebook.com/UbuntuMATEedition" class="caption">Facebook Page</a>
+		<a href="https://plus.google.com/communities/108331279007926658904" class="caption">Google+</a>
+	</li>
+	<li>
+		<img class="icon2" src="link/bullet-point.png" />
+		<a href="https://twitter.com/ubuntu_mate" class="caption">Twitter</a>
+	</li>
+	<li>
+		<img class="icon2" src="link/bullet-point.png" />
+		<a href="https://www.facebook.com/UbuntuMATEedition" class="caption">Facebook</a>
 	</li>
 </ul>
 <h2 class="subtitle">Development</h2>
@@ -41,10 +41,6 @@
 		<img class="icon2" src="link/bullet-point.png" />
 		<a href="https://launchpad.net/ubuntu-mate" class="caption">Ubuntu MATE Project</a>
 	</li>
-	<li>
-		<img class="icon2" src="link/bullet-point.png" />
-		<a href="https://bugs.launchpad.net/ubuntu-mate" class="caption">Ubuntu MATE Bug Tracker</a>
-	</li>
 </ul>
 </div>