Merge lp:~crhrabal/ubuntu/saucy/ubuntu-docs/13.04.3ubuntu1 into lp:ubuntu/saucy/ubuntu-docs

Proposed by Craig Hrabal on 2013-04-28
Status: Needs review
Proposed branch: lp:~crhrabal/ubuntu/saucy/ubuntu-docs/13.04.3ubuntu1
Merge into: lp:ubuntu/saucy/ubuntu-docs
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
ubuntu-help/C/disk-capacity.page (+1/-1)
To merge this branch: bzr merge lp:~crhrabal/ubuntu/saucy/ubuntu-docs/13.04.3ubuntu1
Reviewer Review Type Date Requested Status
Benjamin Kerensa (community) 2013-04-28 Disapprove on 2013-05-10
Review via email: mp+161311@code.launchpad.net

Description of the change

Fixed bug (LP: #1059535), replacing incorrect mention of "Disks" in reference to "Disk Usage Analyzer." I only made a change for the main source code page (ubuntu-help/C/disk-capacity.page) instead of the translations that I completed in my earlier merge proposal.

To post a comment you must log in.
Doug Smythies (dsmythies) wrote :

Changes do not get merged at this level. The master code is at:
https://code.launchpad.net/~ubuntu-core-doc/ubuntu-docs/raring
and that is what has to be the destination for a merge proposal. (or for saucy, once it has been setup).
If it seems confusing, yes it is.

review: Disapprove
Doug Smythies (dsmythies) wrote :

This was fixed in the master code for 14.04. This MP should be deleted.

Unmerged revisions

113. By Craig Hrabal on 2013-04-28

*Fixed improper mention of the "Disks" application in reference to
 "Disk Usage Analyzer" (LP :1059535)

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 2013-04-22 15:02:53 +0000
3+++ debian/changelog 2013-04-28 06:17:26 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-docs (13.04.3ubuntu1) UNRELEASED; urgency=low
6+
7+ *Fixed improper mention of the "Disks" application in reference to
8+ "Disk Usage Analyzer" (LP :1059535)
9+
10+ -- Craig Hrabal <crhrabal@mix.wvu.edu> Sun, 28 Apr 2013 02:03:06 -0400
11+
12 ubuntu-docs (13.04.3) raring; urgency=low
13
14 * Updated translations for raring
15
16=== modified file 'ubuntu-help/C/disk-capacity.page'
17--- ubuntu-help/C/disk-capacity.page 2013-04-15 19:33:07 +0000
18+++ ubuntu-help/C/disk-capacity.page 2013-04-28 06:17:26 +0000
19@@ -37,7 +37,7 @@
20
21 <list>
22 <item>
23- <p>Open the <app>Disks</app> application from the
24+ <p>Open the <app>Disk Usage Analyzer</app> application from the
25 <gui>Dash</gui>. The window will display the <gui>Total file system capacity</gui>
26 and <gui>Total file system usage</gui>.</p>
27 </item>

Subscribers

People subscribed via source and target branches