Merge pull request #2099 from htanata/backport_2090_to_3-1-stable

Backport #2090 to 3-1-stable
rails · Jul 16, 2011 · 5e2c1d2 · 5e2c1d2
2 parents 68e2b8a + 357e7bb
commit 5e2c1d2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -71,11 +71,11 @@
 
   For example if you have this route:
 
-    map '*pages' => 'pages#show'
+    match '*pages' => 'pages#show'
 
   by requesting '/foo/bar.json', your `params[:pages]` will be equals to "foo/bar" with the request format of JSON. If you want the old 3.0.x behavior back, you could supply `:format => false` like this:
 
-    map '*pages' => 'pages#show', :format => false
+    match '*pages' => 'pages#show', :format => false
 
 * Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH]