|author||Victor Lowther <email@example.com>||2010-06-18 07:09:38 -0500|
|committer||Victor Lowther <firstname.lastname@example.org>||2010-06-18 07:09:38 -0500|
Merge remote branch 'UPSTREAM/master'
3 files changed, 24 insertions, 24 deletions
diff --git a/man/pm-action.xml b/man/pm-action.xml
index 6e9f639..f698d5c 100644
@@ -144,7 +144,7 @@
Hybrid-suspend is the process where the system does everything it
- needs to hibernate, suspends instead of shutting down. This means that
+ needs to hibernate, but suspends instead of shutting down. This means that
your computer can wake up quicker than for normal hibernation
if you do not run out of power, and you can resume even if you run out of power.
s2both(8) is an hybrid-suspend implementation.
@@ -166,9 +166,9 @@
If <command>pm-suspend</command>, <command>pm-hibernate</command>,
- or <command>pm-suspend-hybrid</command> is invoked without any
+ or <command>pm-suspend-hybrid</command> are invoked without any
commandline parameters, they will try to grab the correct quirks
- from HAL if it is installed.
+ from the internal quirk database.
<!-- Use the variablelist.term.separator and the
@@ -224,7 +224,7 @@
This option initializes the video card into a VGA text mode, and
then uses the BIOS to set the video mode. On some systems S3 BIOS
- only initializes the video bios to text mode, and so both S3 BIOS
+ only initializes the video BIOS to text mode, and so both S3 BIOS
and S3 MODE are needed.
@@ -288,7 +288,7 @@
This parameter will only save the actual quirks that were
used to successfully suspend/resume a system, and will be
- specific to the exact configuration of that sustem, including
+ specific to the exact configuration of that system, including
the video hardware, video driver, and whether or not kernel
modesetting was used.
@@ -323,16 +323,16 @@
- Programs in these directories (we call them hooks) are
+ Programs in these directories (called hooks) are
combined and executed in C sort order before suspend and
hibernate with as argument 'suspend' or 'hibernate'.
- Afterwards they are called in reverse order with
+ Afterwards they are called in reverse order with
argument 'resume' and 'thaw' respectively.
If both directories contain a similar named file,
- the one in /etc/pm/sleep.d will get preference. It
+ the one in <filename>/etc/pm/sleep.d</filename> will get preference. It
is possible to disable a hook in the distribution
directory by putting a non-executable file in
- /etc/pm/sleep.d, or by adding it to the HOOK_BLACKLIST
+ <filename>/etc/pm/sleep.d</filename>, or by adding it to the HOOK_BLACKLIST
@@ -394,7 +394,7 @@
Configuration variables defined by pm-utils. These can be set
- in any file in /etc/pm/config.d
+ in any file in <filename>/etc/pm/config.d/</filename>.
@@ -479,7 +479,7 @@
If your system clock drifts across a suspend/resume or
hibernate/thaw cycle, you should set this to true.
This will cause pm-utils to synchronize the system clock
- whenever we go through a sleep/wake cycle at the expense of
+ whenever going through a sleep/wake cycle at the expense of
making suspend/resume take longer.
@@ -502,10 +502,10 @@
Return values less than 128 mean that pm-action failed before trying to
- put the system in the requested power saving state. A return value
- of 128 means that we tried to put the machine in the requested power state
- but failed. A return value greater than 128 means we encountered an error
- and we also failed to enter the requested power saving state.
+ put the system in the requested power saving state. A return value
+ of 128 means that pm-action tried to put the machine in the requested power state
+ but failed. A return value greater than 128 means pm-action encountered an error
+ and also failed to enter the requested power saving state.
diff --git a/man/pm-is-supported.xml b/man/pm-is-supported.xml
index d07c87d..4c3b2a8 100644
@@ -104,7 +104,7 @@
- Is suspend supported? Suspend is a state where
+ Test whether suspend is supported. Suspend is a state where
most devices are shutdown, except for RAM. This
state still draws power.
@@ -114,7 +114,7 @@
- Is hibernate supported? During hibernate the state of the
+ Test whether hibernate is supported. During hibernate the state of the
system is saved to disk, the system is fully powered off.
@@ -123,7 +123,7 @@
- Is hybrid-suspend supported? Hybrid-suspend is the process
+ Test whether hybrid-suspend is supported. Hybrid-suspend is the process
where first the state of the system is saved to disk
-- just like with hibernate -- but instead of poweroff, the
system goes in suspend state, which means it can wakeup
diff --git a/man/pm-powersave.xml b/man/pm-powersave.xml
index cb49204..e719575 100644
@@ -101,7 +101,7 @@
- Set the computer into low power mode to reduce energy consumption
+ Put the computer into low power mode to reduce energy consumption
and extend your laptop's battery life.
@@ -128,16 +128,16 @@
When you run <command>pm-powersave</command> it combines the
scripts in these two directories and executes them in sorted order.
If both directories contain a script with the same name, the one in
- /etc/pm/power.d/ has a higher precedence and only
+ <filename>/etc/pm/power.d/</filename> has a higher precedence and only
this one will be executed.
- Therefore to disable a script from /usr/lib/pm-utils/power.d/
- simply create an empty file in /etc/pm/power.d/ with the same
- name and without the execute bit set.
+ Therefore to disable a script from <filename>/usr/lib/pm-utils/power.d/</filename>
+ simply create an empty file in <filename>/etc/pm/power.d/</filename> with the same
+ name and without the executable bit set.