aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/routing.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 2d939a5e09..e46c6c1aba 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix documentation typo in routes. [norbert]
+
* Sweep flash when filter chain is halted. [Caio Chassot <lists@v2studio.com>]
* Fixed that content_tag with a block will just return the result instead of concate it if not used in a ERb view #7857, #7432 [michael.niessner]
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 5786e66942..bad31f6827 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -205,7 +205,7 @@ module ActionController
#
# You can reload routes if you feel you must:
#
- # Action::Controller::Routes.reload
+ # ActionController::Routing::Routes.reload
#
# This will clear all named routes and reload routes.rb
#