X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Documentation%2Fpm.txt;h=da8589a0e07df08b77ae15c5bb83f7800f9b2bdf;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=79c0f32a760e98ac60e1d8ca57f44cbcb3c33b99;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git diff --git a/Documentation/pm.txt b/Documentation/pm.txt index 79c0f32a7..da8589a0e 100644 --- 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. -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 -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 @@ -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 - * 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