aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-04-13 10:28:56 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2014-04-13 10:28:56 -0300
commit8b3ff37cb77e1f3976e6108b67414d0666f36574 (patch)
tree961ac393d67fdd7bacc675ff7ed9c41542416d67 /actionpack/lib/action_dispatch
parent090db0ff7d2611846aef0b38f741dda6204849ce (diff)
parent2ddbe87e7acc324ce7e0a4784c4d10b79cc49a40 (diff)
downloadrails-8b3ff37cb77e1f3976e6108b67414d0666f36574.tar.gz
rails-8b3ff37cb77e1f3976e6108b67414d0666f36574.tar.bz2
rails-8b3ff37cb77e1f3976e6108b67414d0666f36574.zip
Merge pull request #14718 from mcmorgan/update-documentation-to-match-generated-config
Update documentation to use Rails.application instead
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/middleware/session/cookie_store.rb2
-rw-r--r--actionpack/lib/action_dispatch/routing.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index 3be0ce1860..0864e7ef2a 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -29,7 +29,7 @@ module ActionDispatch
#
# Configure your session store in config/initializers/session_store.rb:
#
- # Myapp::Application.config.session_store :cookie_store, key: '_your_app_session'
+ # Rails.application.config.session_store :cookie_store, key: '_your_app_session'
#
# Configure your secret key in config/secrets.yml:
#
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index a9ac2bce1d..9cd884daa3 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -11,7 +11,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
+ # Rails.application.routes.draw do
# Pattern 1 tells some request to go to one place
# Pattern 2 tell them to go to another
# ...