Patchwork doc: fix --s3-sleep-delay man page entry

login
register
mail settings
Submitter Colin King
Date Dec. 10, 2013, 9:40 a.m.
Message ID <1386668424-727-1-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/299355/
State Accepted
Headers show

Comments

Colin King - Dec. 10, 2013, 9:40 a.m.
From: Colin Ian King <colin.king@canonical.com>

This contains a cut-n-paste error. Also add in the default setting
to make it clearer.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 doc/fwts.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Alex Hung - Dec. 10, 2013, 10:01 a.m.
On 12/10/2013 05:40 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> This contains a cut-n-paste error. Also add in the default setting
> to make it clearer.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   doc/fwts.1 | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/doc/fwts.1 b/doc/fwts.1
> index 218e00c..234278d 100644
> --- a/doc/fwts.1
> +++ b/doc/fwts.1
> @@ -229,7 +229,7 @@ specify a comma separated list of quirk arguments to pass to pm-suspend, for exa
>   .B \-\-s3\-sleep\-delay=N
>   sleep N seconds from the start of the suspend to the wakeup time. Note that this
>   time MUST be longer than the time it takes to suspend the machine otherwise the
> -wakeup timer will fire during the hibernate state.
> +wakeup timer will fire during the suspend state. The default is 30 seconds.
>   .TP
>   .B \-\-s3\-suspend\-time=N
>   specify the maximum allowed suspend time in seconds. If suspend takes longer than
>


Acked-by: Alex Hung <alex.hung@canonical.com>
Keng-Yu Lin - Dec. 10, 2013, 2:10 p.m.
On Tue, Dec 10, 2013 at 6:01 PM, Alex Hung <alex.hung@canonical.com> wrote:
> On 12/10/2013 05:40 PM, Colin King wrote:
>>
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> This contains a cut-n-paste error. Also add in the default setting
>> to make it clearer.
>>
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>>   doc/fwts.1 | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/doc/fwts.1 b/doc/fwts.1
>> index 218e00c..234278d 100644
>> --- a/doc/fwts.1
>> +++ b/doc/fwts.1
>> @@ -229,7 +229,7 @@ specify a comma separated list of quirk arguments to
>> pass to pm-suspend, for exa
>>   .B \-\-s3\-sleep\-delay=N
>>   sleep N seconds from the start of the suspend to the wakeup time. Note
>> that this
>>   time MUST be longer than the time it takes to suspend the machine
>> otherwise the
>> -wakeup timer will fire during the hibernate state.
>> +wakeup timer will fire during the suspend state. The default is 30
>> seconds.
>>   .TP
>>   .B \-\-s3\-suspend\-time=N
>>   specify the maximum allowed suspend time in seconds. If suspend takes
>> longer than
>>
>
>
> Acked-by: Alex Hung <alex.hung@canonical.com>
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>

Patch

diff --git a/doc/fwts.1 b/doc/fwts.1
index 218e00c..234278d 100644
--- a/doc/fwts.1
+++ b/doc/fwts.1
@@ -229,7 +229,7 @@  specify a comma separated list of quirk arguments to pass to pm-suspend, for exa
 .B \-\-s3\-sleep\-delay=N
 sleep N seconds from the start of the suspend to the wakeup time. Note that this
 time MUST be longer than the time it takes to suspend the machine otherwise the
-wakeup timer will fire during the hibernate state.
+wakeup timer will fire during the suspend state. The default is 30 seconds.
 .TP
 .B \-\-s3\-suspend\-time=N
 specify the maximum allowed suspend time in seconds. If suspend takes longer than