Merge branches 'release' and 'doc' into release

2008-03-13 01:59:53 -04:00
parent b4de123a0b 53471121a8
commit 29ea5171cb
11 changed files with 14 additions and 12 deletions
@@ -190,7 +190,7 @@ config APM_EMULATION
 	  notification of APM "events" (e.g. battery status change).

 	  In order to use APM, you will need supporting software. For location
-	  and more information, read <file:Documentation/pm.txt> and the
+	  and more information, read <file:Documentation/power/pm.txt> and the
 	  Battery Powered Linux mini-HOWTO, available from
 	  <http://www.tldp.org/docs.html#howto>.