[PATCH] Documentation/power/states.txt: fix repetition

[PATCH] Documentation/power/states.txt: fix repetition

[Alexandre Courbot]

Remove repetition of "called swsusp".

Signed-off-by: Alexandre Courbot <gnurou@gmail.com>
---
 Documentation/power/states.txt |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/power/states.txt b/Documentation/power/states.txt
index 34800cc..4416b28 100644
--- a/Documentation/power/states.txt
+++ b/Documentation/power/states.txt
@@ -62,12 +62,12 @@ setup via another operating system for it to use. Despite the
 inconvenience, this method requires minimal work by the kernel, since
 the firmware will also handle restoring memory contents on resume. 
 
-For suspend-to-disk, a mechanism called swsusp called 'swsusp' (Swap
-Suspend) is used to write memory contents to free swap space.
-swsusp has some restrictive requirements, but should work in most
-cases. Some, albeit outdated, documentation can be found in
-Documentation/power/swsusp.txt. Alternatively, userspace can do most
-of the actual suspend to disk work, see userland-swsusp.txt.
+For suspend-to-disk, a mechanism called 'swsusp' (Swap Suspend) is used
+to write memory contents to free swap space. swsusp has some restrictive
+requirements, but should work in most cases. Some, albeit outdated,
+documentation can be found in Documentation/power/swsusp.txt.
+Alternatively, userspace can do most of the actual suspend to disk work,
+see userland-swsusp.txt.
 
 Once memory state is written to disk, the system may either enter a
 low-power state (like ACPI S4), or it may simply power down. Powering
-- 
1.7.4.1

Re: [PATCH] Documentation/power/states.txt: fix repetition

[Rafael J. Wysocki]

On Thursday, March 03, 2011, Alexandre Courbot wrote:
> Remove repetition of "called swsusp".
> 
> Signed-off-by: Alexandre Courbot <gnurou@gmail.com>

This patch has already been applied to suspend-2.6/linux-next.
Is this a new version?

Rafael


> ---
>  Documentation/power/states.txt |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/Documentation/power/states.txt b/Documentation/power/states.txt
> index 34800cc..4416b28 100644
> --- a/Documentation/power/states.txt
> +++ b/Documentation/power/states.txt
> @@ -62,12 +62,12 @@ setup via another operating system for it to use. Despite the
>  inconvenience, this method requires minimal work by the kernel, since
>  the firmware will also handle restoring memory contents on resume. 
>  
> -For suspend-to-disk, a mechanism called swsusp called 'swsusp' (Swap
> -Suspend) is used to write memory contents to free swap space.
> -swsusp has some restrictive requirements, but should work in most
> -cases. Some, albeit outdated, documentation can be found in
> -Documentation/power/swsusp.txt. Alternatively, userspace can do most
> -of the actual suspend to disk work, see userland-swsusp.txt.
> +For suspend-to-disk, a mechanism called 'swsusp' (Swap Suspend) is used
> +to write memory contents to free swap space. swsusp has some restrictive
> +requirements, but should work in most cases. Some, albeit outdated,
> +documentation can be found in Documentation/power/swsusp.txt.
> +Alternatively, userspace can do most of the actual suspend to disk work,
> +see userland-swsusp.txt.
>  
>  Once memory state is written to disk, the system may either enter a
>  low-power state (like ACPI S4), or it may simply power down. Powering
> 

Re: [PATCH] Documentation/power/states.txt: fix repetition

[Alexandre Courbot]

> This patch has already been applied to suspend-2.6/linux-next.
> Is this a new version?

No - I initially sent it to linux-doc only, so I wasn't sure someone
included it. I should have checked better, my apologies for the
inconvenience.

Alex.

Re: [PATCH] Documentation/power/states.txt: fix repetition

[Rafael J. Wysocki]

On Thursday, March 03, 2011, Alexandre Courbot wrote:
> > This patch has already been applied to suspend-2.6/linux-next.
> > Is this a new version?
> 
> No - I initially sent it to linux-doc only, so I wasn't sure someone
> included it. I should have checked better, my apologies for the
> inconvenience.

No problem, I only wanted to know if I needed to update the tree.

Thanks,
Rafael