Merge lp:~slickymaster/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu into lp:ubiquity-slideshow-ubuntu

Proposed by David Pires on 2017-03-20
Status: Merged
Merged at revision: 765
Proposed branch: lp:~slickymaster/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 39 lines (+4/-4)
3 files modified
slideshows/xubuntu/slides/00_welcome.html (+2/-2)
slideshows/xubuntu/slides/01_applications.html (+1/-1)
slideshows/xubuntu/slides/05_contribute.html (+1/-1)
To merge this branch: bzr merge lp:~slickymaster/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Reviewer Review Type Date Requested Status
Pasi Lallinaho 2017-03-20 Approve on 2017-03-20
Review via email: mp+320437@code.launchpad.net
To post a comment you must log in.
Pasi Lallinaho (knome) :
review: Approve
765. By Pasi Lallinaho on 2017-03-20

Merging David's MP.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'slideshows/xubuntu/slides/00_welcome.html'
2--- slideshows/xubuntu/slides/00_welcome.html 2016-09-13 16:03:22 +0000
3+++ slideshows/xubuntu/slides/00_welcome.html 2017-03-20 22:48:16 +0000
4@@ -2,8 +2,8 @@
5 <h1>Welcome to Xubuntu</h1>
6
7 <div class="content w50">
8- <p>Congratulations for choosing to install <br /> Xubuntu 16.10!</p>
9- <p>If you are running this installation via the <em>Try Xubuntu</em> option, feel free to examine things as Xubuntu installs. After the installation, the desktop will look similar to how it does now.</p>
10+ <p>Congratulations for choosing to install <br /> Xubuntu 17.04!</p>
11+ <p>If you are running the installation from the <em>Try Ubuntu</em> option, you can use the default applications while installing. You can even install new packages to try at the same time.</p>
12 </div>
13
14 <div id="logos">
15
16=== modified file 'slideshows/xubuntu/slides/01_applications.html'
17--- slideshows/xubuntu/slides/01_applications.html 2016-03-10 14:07:51 +0000
18+++ slideshows/xubuntu/slides/01_applications.html 2017-03-20 22:48:16 +0000
19@@ -2,7 +2,7 @@
20 <h1>Ready to go!</h1>
21
22 <div class="content full">
23- <p>Here is a list of some applications that are preinstalled with Xubuntu for your convenience. Find them in the applications menu and install more with the package manager.</p>
24+ <p>Here are some of the applications that we feel best suit Xubuntu and it's users. Find them in the applications menu and install more with the package manager.</p>
25 </div>
26 <div class="applist">
27 <div class="fo"><img src="images/icon48_firefox.png" /> <strong>Firefox</strong> <span>Web browser</span></div>
28
29=== modified file 'slideshows/xubuntu/slides/05_contribute.html'
30--- slideshows/xubuntu/slides/05_contribute.html 2016-03-10 14:07:51 +0000
31+++ slideshows/xubuntu/slides/05_contribute.html 2017-03-20 22:48:16 +0000
32@@ -2,7 +2,7 @@
33 <div class="content w50">
34 <h1>Want to contribute?</h1>
35
36- <p>Like what you see? Like what you use? Why not join in? You don't have to be able to code – there are many different parts we need help with.</p>
37+ <p>Ever wondered if you could help Xubuntu? You don't have to be able to code – there are many different areas we need help with.</p>
38 <p>To read about all of the opportunities available to you, head to the <a href="http://xubuntu.org/contribute/">Get Involved</a> section of our website. This page has introductions to our various subteams as well as links to other important websites related to Xubuntu development.</p>
39 </div>
40

Subscribers

People subscribed via source and target branches