Xubuntu Documentation

Merge lp:~bluesabre/xubuntu-docs/release-14.10.1 into lp:xubuntu-docs/utopic

  1. release-14.10.1
  2. Merge into utopic
Proposed by Sean Davis
Status: Merged
Merged at revision: 259
Proposed branch: lp:~bluesabre/xubuntu-docs/release-14.10.1
Merge into: lp:xubuntu-docs/utopic
Diff against target: 36 lines (+13/-2)
2 files modified
debian/changelog (+12/-2)
desktop-guide/po/LINGUAS (+1/-0)
To merge this branch: bzr merge lp:~bluesabre/xubuntu-docs/release-14.10.1
Reviewer Review Type Date Requested Status
Pasi Lallinaho Pending
Ubuntu Documentation Committers Pending
Review via email: mp+238052@code.launchpad.net

Description of the change

Update from the debian packaging.

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 'debian/changelog'
2--- debian/changelog 2014-09-19 15:33:42 +0000
3+++ debian/changelog 2014-10-11 13:25:16 +0000
4@@ -1,4 +1,11 @@
5-xubuntu-docs (14.10) UNRELEASED; urgency=medium
6+xubuntu-docs (14.10.1) utopic; urgency=medium
7+
8+ * Translation updates.
9+ - Include Spanish (es). Updates for Finnish (fi).
10+
11+ -- Sean Davis <smd.seandavis@gmail.com> Thu, 09 Oct 2014 19:54:27 -0400
12+
13+xubuntu-docs (14.10) utopic; urgency=medium
14
15 [ David Pires ]
16 * Fix the printing chapter to remove a reference
17@@ -19,7 +26,10 @@
18 [ Jack Fromm ]
19 * Updated Scanning and Printing for new version of Simple Scan (LP: #1366150)
20
21- -- Pasi Lallinaho <pasi@shimmerproject.org> Mon, 08 Sep 2014 19:20:47 +0300
22+ [ Sean Davis ]
23+ * Documentation String Freeze exception (LP: #1372085)
24+
25+ -- Sean Davis <smd.seandavis@gmail.com> Sun, 21 Sep 2014 21:53:44 -0400
26
27 xubuntu-docs (14.04.1) trusty; urgency=medium
28
29
30=== modified file 'desktop-guide/po/LINGUAS'
31--- desktop-guide/po/LINGUAS 2014-03-11 22:50:33 +0000
32+++ desktop-guide/po/LINGUAS 2014-10-11 13:25:16 +0000
33@@ -1,2 +1,3 @@
34+es
35 fi
36 pt

Subscribers

People subscribed via source and target branches