diff options
| author | Victor Lowther <victor.lowther@gmail.com> | 2009-11-07 23:26:39 -0600 |
|---|---|---|
| committer | Victor Lowther <victor.lowther@gmail.com> | 2009-11-07 23:26:39 -0600 |
| commit | 6014e54b7f007109616965ff601ff05ea6fc397a (patch) | |
| tree | 50fc73bc32b4ee91bb7cdc9d3cc003bf46a65d5f | |
| parent | 504faf0a0c31cbdbc03a608cf633d58f12e49eb7 (diff) | |
| parent | 6691c51d58951c328e08e50087b354ceb2c4f3db (diff) | |
Merge commit 'remotes/UPSTREAM/master'
| -rw-r--r-- | man/pm-action.xml | 6 | ||||
| -rw-r--r-- | pm/HOWTO.hooks | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/90clock | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/man/pm-action.xml b/man/pm-action.xml index a6e064c..8c1732e 100644 --- a/man/pm-action.xml +++ b/man/pm-action.xml @@ -302,7 +302,7 @@ is specific to this system. The file will be saved in <filename>/etc/hal/fdi/information/99local-pm-utils-quirks.fdi</filename>. This parameter will only save the actual quirks that were - used to sucessfully suspend/resume a system -- if you are + used to successfully suspend/resume a system -- if you are running proprietary video drivers or kernel modesetting video drivers, you will generate a potentially incorrect .fdi file. @@ -325,7 +325,7 @@ of pm-utils. If a global configuration variable is set, the value set to will be appended to the previous value. If any other variable is set, it will be ignored. - The syntax is simply: VAR_NAME = value. + The syntax is simply: VAR_NAME=value. See the CONFIGURATION VARIABLES section for valid variables defined by pm-utils. External packages can define others, see @@ -492,7 +492,7 @@ <listitem> <para> If your system clock drifts across a suspend/resume or - hiberante/thaw cycle, you should set this to true. + 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 making suspend/resume take longer. diff --git a/pm/HOWTO.hooks b/pm/HOWTO.hooks index a506759..ad7d4a7 100644 --- a/pm/HOWTO.hooks +++ b/pm/HOWTO.hooks @@ -43,7 +43,7 @@ In normal operation, hooks should only return either 0 or 254 as exit codes. Any other return code is interpreted by the pm-utils machinery as a signal from the hook that it should abort whatever it is doing. When running sleep.d hooks, that means that pm-utils stops running hooks, aborts the suspend/resume -process, calls any hooks that ran sucessfully prior to this one with the +process, calls any hooks that ran successfully prior to this one with the appropriate wakeup options, and exits with a non-zero exit code. When running power.d hooks, any hooks after this one will be skipped. diff --git a/pm/sleep.d/90clock b/pm/sleep.d/90clock index fb8ef44..b8ade29 100755 --- a/pm/sleep.d/90clock +++ b/pm/sleep.d/90clock @@ -1,7 +1,6 @@ #!/bin/sh # Synchronize system time with hardware time. -# TODO: Do modern kernels handle this correctly? If so, we should detect that -# and skip this hook. +# Modern kernels handle this correctly so we skip this hook by default. . "${PM_FUNCTIONS}" |