Ubuntu Documentation

Merge lp:~evfool/ubuntu-docs/typofixes into lp:ubuntu-docs/oneiric

  1. typofixes
  2. Merge into oneiric
Proposed by Robert Roth
Status: Merged
Merged at revision: 49
Proposed branch: lp:~evfool/ubuntu-docs/typofixes
Merge into: lp:ubuntu-docs/oneiric
Diff against target: 54 lines (+12/-3)
4 files modified
debian/changelog (+9/-0)
ubuntu-help/C/color-gettingprofiles.page (+1/-1)
ubuntu-help/C/files-copy.page (+1/-1)
ubuntu-help/C/hardware-driver-proprietary.page (+1/-1)
To merge this branch: bzr merge lp:~evfool/ubuntu-docs/typofixes
Reviewer Review Type Date Requested Status
Jeremy Bícha Approve
Review via email: mp+76995@code.launchpad.net

Description of the change

Fix three simple typos:
* color-gettingprofiles: use supplied instead of suplied
* files-copy: use different device instead of difference device
* hardware-driver-proprietary: use Ubuntu Documentation Team instead of Ubuntu Documentation Teak

To post a comment you must log in.
Revision history for this message
Jeremy Bícha (jbicha) wrote :

Approved. Thank you!

review: Approve

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 2011-09-18 11:20:16 +0000
3+++ debian/changelog 2011-09-26 14:49:23 +0000
4@@ -1,3 +1,12 @@
5+ubuntu-docs (11.10.3ubuntu1) oneiric; urgency=low
6+
7+ [ Robert Roth ]
8+ * Fixed typo in color-gettingprofiles (LP: #859578)
9+ * Fixed typo in files-copy (LP: #859616)
10+ * Fixed typo in hardware-driver-proprietary (LP: #859634)
11+
12+ -- Robert Roth <robert.roth.off@gmail.com> Mon, 26 Sep 2011 17:40:48 +0300
13+
14 ubuntu-docs (11.10.3) oneiric; urgency=low
15
16 [ Jeremy Bicha ]
17
18=== modified file 'ubuntu-help/C/color-gettingprofiles.page'
19--- ubuntu-help/C/color-gettingprofiles.page 2011-08-26 01:34:56 +0000
20+++ ubuntu-help/C/color-gettingprofiles.page 2011-09-26 14:49:23 +0000
21@@ -37,7 +37,7 @@
22
23 <p>
24 See <link xref="color-why-calibrate"/> for information on why vendor
25- suplied profiles are often worse than useless.
26+ supplied profiles are often worse than useless.
27 </p>
28
29 </page>
30
31=== modified file 'ubuntu-help/C/files-copy.page'
32--- ubuntu-help/C/files-copy.page 2011-08-04 21:57:13 +0000
33+++ ubuntu-help/C/files-copy.page 2011-09-26 14:49:23 +0000
34@@ -32,7 +32,7 @@
35 <item><p><link xref="files-browse">Open the file manager</link> to the folder containing the item you want to copy.</p></item>
36 <item><p>Click <guiseq><gui>File</gui><gui>New Window</gui></guiseq> (or press <keyseq><key>Ctrl</key><key>N</key></keyseq>) to open a second window. Navigate to the folder where you want to move or copy the item in the new window.</p></item>
37 <item><p>Click and drag the item from one window to another. By default, dragging an item will <em>move it</em> if the destination is on the same device (i.e. if both folders are on the same hard disk on your computer).</p>
38- <p>Dragging will <em>copy it</em> if the destination is on a difference device, such as a USB storage device, however. You can override this:</p>
39+ <p>Dragging will <em>copy it</em> if the destination is on a different device, such as a USB storage device, however. You can override this:</p>
40 <list style="compact">
41 <item><p>To force the file to be copied, hold down the <key>Ctrl</key> key while dragging.</p></item>
42 <item><p>To force the file to be moved, hold down the <key>Shift</key> key while dragging.</p></item>
43
44=== modified file 'ubuntu-help/C/hardware-driver-proprietary.page'
45--- ubuntu-help/C/hardware-driver-proprietary.page 2011-09-15 14:38:35 +0000
46+++ ubuntu-help/C/hardware-driver-proprietary.page 2011-09-26 14:49:23 +0000
47@@ -9,7 +9,7 @@
48
49 <revision version="11.10" date="2011-09-12" status="final"/>
50 <credit type="author">
51- <name>Ubuntu Documentation Teak</name>
52+ <name>Ubuntu Documentation Team</name>
53 <email>ubuntu-doc@lists.ubuntu.com</email>
54 </credit>
55

Subscribers

People subscribed via source and target branches

to status/vote changes: