Ubuntu Documentation

Merge lp:~nhandler/ubuntu-docs/printing into lp:ubuntu-docs/karmic

  1. printing
  2. Merge into ubuntu-karmic
Proposed by Nathan Handler
Status: Merged
Approved by: Cody A.W. Somerville
Approved revision: 315
Merged at revision: 315
Proposed branch: lp:~nhandler/ubuntu-docs/printing
Merge into: lp:ubuntu-docs/karmic
Diff against target: None lines
To merge this branch: bzr merge lp:~nhandler/ubuntu-docs/printing
Reviewer Review Type Date Requested Status
Cody A.W. Somerville (community) Approve
Review via email: mp+7170@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody A.W. Somerville (cody-somerville) :
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 2009-05-17 09:01:32 +0000
3+++ debian/changelog 2009-06-07 20:52:38 +0000
4@@ -24,6 +24,8 @@
5 - Merge from Connor Imes: 2009-05-06 Fix bad flag in useradd command, LP: #371730
6 * Games:
7 - remove confusing lines from supertux instructions, patch from Shane Fagan, LP: #346892
8+ * Printing:
9+ - Fix typo and update notification text, patch from Nathan Handler
10
11 -- Matthew East <mdke@ubuntu.com> Sun, 17 May 2009 09:45:19 +0100
12
13
14=== modified file 'printing/C/printing.xml'
15--- printing/C/printing.xml 2009-03-08 13:36:22 +0000
16+++ printing/C/printing.xml 2009-06-07 20:52:38 +0000
17@@ -34,10 +34,10 @@
18 </para>
19 <para>
20 To setup a new local printer, plug your printer into your computer and
21- power it on. Most printers will automatically be detected an configured.
22+ power it on. Most printers will automatically be detected and configured.
23 Once detected, a printer icon will appear in the notification area and
24 after waiting a few moments, you should get a popup with the text
25- <guilabel>Printer is ready for printing</guilabel>.
26+ <guilabel>Printer added</guilabel>.
27 </para>
28 <para>
29 If your printer was not detected after a few moments, then you will need to

Subscribers

People subscribed via source and target branches