diff --git a/actionpack/README b/actionpack/README
index 33a6095133..da48752a69 100755
--- a/actionpack/README
+++ b/actionpack/README
@@ -145,7 +145,7 @@ A short rundown of the major features:
Result of running hello_world action:
Hello world
- Learn more in link:classes/ActionController/Layout.html
+ Learn more in link:classes/ActionController/Layout/ClassMethods.html
* Advanced redirection that makes pretty urls easy
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index d06ab1fd08..98065015cb 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added that ApplicationController will catch a ControllerNotFound exception if someone attempts to access a url pointing to an unexisting controller [Tobias Luetke]
+
* Flipped code-to-test ratio around to be more readable #468 [Scott Baron]
* Fixed log file permissions to be 666 instead of 777 (so they're not executable) #471 [Lucas Carlson]