Ubiquity Slideshow

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

  1. ubiquity-slideshow-ubuntu
  2. Merge into html
Proposed by David Pires on 2017-03-20
Status: Merged
Merged at revision: 766
Proposed branch: lp:~slickymaster/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 25 lines (+2/-2)
2 files modified
slideshows/xubuntu/slides/00_welcome.html (+1/-1)
slideshows/xubuntu/slides/01_applications.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 Pending
Review via email: mp+320438@code.launchpad.net
To post a comment you must log in.

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 2017-03-20 22:45:50 +0000
3+++ slideshows/xubuntu/slides/00_welcome.html 2017-03-20 23:31:41 +0000
4@@ -3,7 +3,7 @@
5
6 <div class="content w50">
7 <p>Congratulations for choosing to install <br /> Xubuntu 17.04!</p>
8- <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>
9+ <p>If you are running the installation from the <em>Try Xubuntu</em> option, you can use the default applications while installing. You can even install new packages to try at the same time.</p>
10 </div>
11
12 <div id="logos">
13
14=== modified file 'slideshows/xubuntu/slides/01_applications.html'
15--- slideshows/xubuntu/slides/01_applications.html 2017-03-20 22:45:50 +0000
16+++ slideshows/xubuntu/slides/01_applications.html 2017-03-20 23:31:41 +0000
17@@ -2,7 +2,7 @@
18 <h1>Ready to go!</h1>
19
20 <div class="content full">
21- <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>
22+ <p>Here are some of the applications that we feel best suit Xubuntu and its users. Find them in the applications menu and install more with the package manager.</p>
23 </div>
24 <div class="applist">
25 <div class="fo"><img src="images/icon48_firefox.png" /> <strong>Firefox</strong> <span>Web browser</span></div>

Subscribers

People subscribed via source and target branches