Merge lp:~kotux/ubuntu-docs/improved-lowpower into lp:ubuntu-docs/trusty

Proposed by John Kim
Status: Merged
Approved by: Doug Smythies
Approved revision: 217
Merged at revision: 348
Proposed branch: lp:~kotux/ubuntu-docs/improved-lowpower
Merge into: lp:ubuntu-docs/trusty
Diff against target: 20 lines (+5/-5)
1 file modified
ubuntu-help/C/power-lowpower.page (+5/-5)
To merge this branch: bzr merge lp:~kotux/ubuntu-docs/improved-lowpower
Reviewer Review Type Date Requested Status
Doug Smythies Approve
Review via email: mp+206523@code.launchpad.net

Description of the change

Just added some clarity to a paragraph on power-lowpower.page. LP #1189282

This merge proposal has been on hold for several months and is waiting for review.

To post a comment you must log in.
Revision history for this message
Doug Smythies (dsmythies) wrote :

Hmmm... This Merge Proposal is actually new. The old one, along with the useful comments seems to have been deleted.

Yes, the display differentiation issues, that I always thought were the root issue here have been fixed.

Anyway, I'll approve this and merge it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuntu-help/C/power-lowpower.page'
--- ubuntu-help/C/power-lowpower.page 2013-09-19 00:20:18 +0000
+++ ubuntu-help/C/power-lowpower.page 2014-02-14 16:24:53 +0000
@@ -28,11 +28,11 @@
28the battery. If the battery just ran out, the computer wouldn't have time to28the battery. If the battery just ran out, the computer wouldn't have time to
29shut down properly either.</p>29shut down properly either.</p>
3030
31<p>You can change what happens when the battery level gets too low by clicking31<p>You can change what happens when the battery level gets too low. First, click the
32 the <gui>battery menu</gui> in the <gui>menu bar</gui> and selecting <gui>Power Settings</gui>. Look at the <gui>When32<gui>battery menu</gui> in the <gui>menu bar</gui> and select <gui>Power Settings</gui>. At the <gui>'When
33power is critically low</gui> setting. You can choose for the computer to33power is critically low'</gui> setting, you can choose for the computer to
34suspend, <link xref="power-hibernate">hibernate</link> or shut down. If you choose shut down, your applications and34suspend, <link xref="power-hibernate">hibernate</link>, or shut down. If you choose shut down, your applications and
35documents <em>will not</em> be saved before the computer turns off.</p>35documents <em>will not</em> be saved when the computer turns off.</p>
3636
37<p>Some computers have problems suspending, and may not be able to recover the37<p>Some computers have problems suspending, and may not be able to recover the
38applications and documents you had open when you turn on the computer again. In38applications and documents you had open when you turn on the computer again. In

Subscribers

People subscribed via source and target branches