aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJaime Iniesta <jaimeiniesta@gmail.com>2010-07-12 18:24:56 +0200
committerJaime Iniesta <jaimeiniesta@gmail.com>2010-07-12 18:24:56 +0200
commit4209cb97e39c2742410f81d86e7f7c5ad310a251 (patch)
treecc0094ae50a3cbe098fb9ba97f260a6b8a79f7f9 /actionpack
parentcf69a010790d22dc2e66f172437c71ccff2e6366 (diff)
parent1a35b6215fe4fb1630e2a635789038c5e6e56c63 (diff)
downloadrails-4209cb97e39c2742410f81d86e7f7c5ad310a251.tar.gz
rails-4209cb97e39c2742410f81d86e7f7c5ad310a251.tar.bz2
rails-4209cb97e39c2742410f81d86e7f7c5ad310a251.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing.rb2
-rw-r--r--actionpack/lib/action_view/helpers/atom_feed_helper.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index c664fb0bc2..da62b14f9b 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -31,7 +31,7 @@ module ActionDispatch
# Think of creating routes as drawing a map for your requests. The map tells
# them where to go based on some predefined pattern:
#
- # AppName::Application.routes.draw do |map|
+ # AppName::Application.routes.draw do
# Pattern 1 tells some request to go to one place
# Pattern 2 tell them to go to another
# ...
diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index cb5a1404ff..8e7cf2e701 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -10,7 +10,7 @@ module ActionView
# Full usage example:
#
# config/routes.rb:
- # Basecamp::Application.routes.draw do |map|
+ # Basecamp::Application.routes.draw do
# resources :posts
# root :to => "posts#index"
# end