fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / Documentation / pm.txt

diff --git a/Documentation/pm.txt b/Documentation/pm.txt
index 79c0f32..da8589a 100644 (file)
--- a/Documentation/pm.txt
+++ b/Documentation/pm.txt
@@ -18,10 +18,10 @@ enabled by default).  If a working ACPI implementation is found, the
 ACPI driver will override and disable APM, otherwise the APM driver
 will be used.
 
 ACPI driver will override and disable APM, otherwise the APM driver
 will be used.
 

-No sorry, you can not have both ACPI and APM enabled and running at
+No, sorry, you cannot have both ACPI and APM enabled and running at

 once.  Some people with broken ACPI or broken APM implementations
 would like to use both to get a full set of working features, but you
 once.  Some people with broken ACPI or broken APM implementations
 would like to use both to get a full set of working features, but you

-simply can not mix and match the two.  Only one power management
+simply cannot mix and match the two.  Only one power management

 interface can be in control of the machine at once.  Think about it..
 
 User-space Daemons
 interface can be in control of the machine at once.  Think about it..
 
 User-space Daemons


@@ -106,7 +106,7 @@ void pm_unregister_all(pm_callback cback);
  *
  * Returns: 0 if the request is successful
  *          EINVAL if the request is not supported
  *
  * Returns: 0 if the request is successful
  *          EINVAL if the request is not supported

- *          EBUSY if the device is now busy and can not handle the request
+ *          EBUSY if the device is now busy and cannot handle the request

  *          ENOMEM if the device was unable to handle the request due to memory
  *          
  * Details: The device request callback will be called before the
  *          ENOMEM if the device was unable to handle the request due to memory
  *          
  * Details: The device request callback will be called before the