1
Index: pm-utils/man/pm-action.xml
2
===================================================================
3
--- pm-utils.orig/man/pm-action.xml 2010-03-18 09:32:45.758509836 +0100
4
+++ pm-utils/man/pm-action.xml 2010-03-19 02:55:16.862011399 +0100
6
For some options external programs are needed.
9
- These commands will usually be called by <command>DeviceKit-power</command>
10
+ These commands will usually be called by <command>UPower</command>
11
or <command>hald</command> when triggered to do so by a program
12
in a desktop session such as <command>gnome-power-manager</command>.
13
Calling them from the command line is also possible, but it is not
17
Hybrid-suspend is the process where the system does everything it
18
- needs to hibernate, suspends instead of shutting down. This means that
19
+ needs to hibernate, but suspends instead of shutting down. This means that
20
your computer can wake up quicker than for normal hibernation
21
if you do not run out of power, and you can resume even if you run out of power.
22
s2both(8) is an hybrid-suspend implementation.
26
If <command>pm-suspend</command>, <command>pm-hibernate</command>,
27
- or <command>pm-suspend-hybrid</command> is invoked without any
28
+ or <command>pm-suspend-hybrid</command> are invoked without any
29
commandline parameters, they will try to grab the correct quirks
30
- from HAL if it is installed.
31
+ from the internal quirk database.
34
<!-- Use the variablelist.term.separator and the
37
This option initializes the video card into a VGA text mode, and
38
then uses the BIOS to set the video mode. On some systems S3 BIOS
39
- only initializes the video bios to text mode, and so both S3 BIOS
40
+ only initializes the video BIOS to text mode, and so both S3 BIOS
41
and S3 MODE are needed.
45
<filename>/var/cache/pm-utils/last_known_working.quirkdb</filename>.
46
This parameter will only save the actual quirks that were
47
used to successfully suspend/resume a system, and will be
48
- specific to the exact configuration of that sustem, including
49
+ specific to the exact configuration of that system, including
50
the video hardware, video driver, and whether or not kernel
51
modesetting was used. If the system configuration changes, like after
52
a kernel upgrade, this file will be overwritten.
54
<term><filename>/usr/lib/pm-utils/sleep.d</filename></term>
57
- Programs in these directories (we call them hooks) are
58
+ Programs in these directories (called hooks) are
59
combined and executed in C sort order before suspend and
60
hibernate with as argument 'suspend' or 'hibernate'.
61
- Afterwards they are called in reverse order with
62
+ Afterwards they are called in reverse order with
63
argument 'resume' and 'thaw' respectively.
64
If both directories contain a similar named file,
65
- the one in /etc/pm/sleep.d will get preference. It
66
+ the one in <filename>/etc/pm/sleep.d</filename> will get preference. It
67
is possible to disable a hook in the distribution
68
directory by putting a non-executable file in
69
- /etc/pm/sleep.d, or by adding it to the HOOK_BLACKLIST
70
+ <filename>/etc/pm/sleep.d</filename>, or by adding it to the HOOK_BLACKLIST
71
configuration variable.
75
<title>CONFIGURATION VARIABLES</title>
77
Configuration variables defined by pm-utils. These can be set
78
- in any file in /etc/pm/config.d
79
+ in any file in <filename>/etc/pm/config.d/</filename>.
84
If your system clock drifts across a suspend/resume or
85
hibernate/thaw cycle, you should set this to true.
86
This will cause pm-utils to synchronize the system clock
87
- whenever we go through a sleep/wake cycle at the expense of
88
+ whenever going through a sleep/wake cycle at the expense of
89
making suspend/resume take longer.
93
<title>RETURN VALUES</title>
95
Return values less than 128 mean that pm-action failed before trying to
96
- put the system in the requested power saving state. A return value
97
- of 128 means that we tried to put the machine in the requested power state
98
- but failed. A return value greater than 128 means we encountered an error
99
- and we also failed to enter the requested power saving state.
100
+ put the system in the requested power saving state. A return value
101
+ of 128 means that pm-action tried to put the machine in the requested power state
102
+ but failed. A return value greater than 128 means pm-action encountered an error
103
+ and also failed to enter the requested power saving state.
106
<refsect1 id="debugging">
107
Index: pm-utils/man/pm-is-supported.xml
108
===================================================================
109
--- pm-utils.orig/man/pm-is-supported.xml 2010-03-18 09:33:05.266506484 +0100
110
+++ pm-utils/man/pm-is-supported.xml 2010-03-19 02:22:07.094013304 +0100
113
The intended purpose of <command>&dhpackage;</command> is to
114
find out which power management modes are supported by the
115
- system. hald(8) will call it to do just that. (Note that DeviceKit-power
116
+ system. hald(8) will call it to do just that. (Note that UPower
121
<term><option>--suspend</option></term>
124
- Is suspend supported? Suspend is a state where
125
+ Test whether suspend is supported. Suspend is a state where
126
most devices are shutdown, except for RAM. This
127
state still draws power.
130
<term><option>--hibernate</option></term>
133
- Is hibernate supported? During hibernate the state of the
134
+ Test whether hibernate is supported. During hibernate the state of the
135
system is saved to disk, the system is fully powered off.
139
<term><option>--suspend-hybrid</option></term>
142
- Is hybrid-suspend supported? Hybrid-suspend is the process
143
+ Test whether hybrid-suspend is supported. Hybrid-suspend is the process
144
where first the state of the system is saved to disk
145
-- just like with hibernate -- but instead of poweroff, the
146
system goes in suspend state, which means it can wakeup
148
<!-- In alpabetical order. -->
151
- <refentrytitle>DeviceKit-power</refentrytitle>
152
- <manvolnum>7</manvolnum>
155
<refentrytitle>hald</refentrytitle>
156
<manvolnum>8</manvolnum>
159
<refentrytitle>s2both</refentrytitle>
160
<manvolnum>8</manvolnum>
163
+ <refentrytitle>UPower</refentrytitle>
164
+ <manvolnum>7</manvolnum>
169
Index: pm-utils/man/pm-powersave.xml
170
===================================================================
171
--- pm-utils.orig/man/pm-powersave.xml 2010-03-18 09:33:05.450496147 +0100
172
+++ pm-utils/man/pm-powersave.xml 2010-03-19 02:57:20.290003347 +0100
177
- <command>&dhpackage;</command> can be used to set your system into
178
+ <command>&dhpackage;</command> can be used to put your system into
183
<term><option>true</option></term>
186
- Set the computer into low power mode to reduce energy consumption
187
+ Put the computer into low power mode to reduce energy consumption
188
and extend your laptop's battery life.
191
@@ -128,16 +128,16 @@
192
When you run <command>pm-powersave</command> it combines the
193
scripts in these two directories and executes them in sorted order.
194
If both directories contain a script with the same name, the one in
195
- /etc/pm/power.d/ has a higher precedence and only
196
+ <filename>/etc/pm/power.d/</filename> has a higher precedence and only
197
this one will be executed.
200
- Therefore to disable a script from /usr/lib/pm-utils/power.d/
201
- simply create an empty file in /etc/pm/power.d/ with the same
202
- name and without the execute bit set.
203
+ Therefore to disable a script from <filename>/usr/lib/pm-utils/power.d/</filename>
204
+ simply create an empty file in <filename>/etc/pm/power.d/</filename> with the same
205
+ name and without the executable bit set.