diff options
author | Thiago Pinto <tapgyn@gmail.com> | 2013-07-16 22:58:57 -0400 |
---|---|---|
committer | Thiago Pinto <tapgyn@gmail.com> | 2013-07-16 22:58:57 -0400 |
commit | 7b60441d2a5b9ba5b22fd73e97268d779c950c9e (patch) | |
tree | cb07c83a291d81fb52f9c5cafe46f34cc1ecd5a9 /guides | |
parent | 786291ded3f7b910094137026377a10cdda52008 (diff) | |
parent | 86fd83770ff07967b420085af2f496bc1d28678b (diff) | |
download | rails-7b60441d2a5b9ba5b22fd73e97268d779c950c9e.tar.gz rails-7b60441d2a5b9ba5b22fd73e97268d779c950c9e.tar.bz2 rails-7b60441d2a5b9ba5b22fd73e97268d779c950c9e.zip |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'guides')
-rw-r--r-- | guides/source/command_line.md | 2 | ||||
-rw-r--r-- | guides/source/debugging_rails_applications.md | 4 | ||||
-rw-r--r-- | guides/source/rails_on_rack.md | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/guides/source/command_line.md b/guides/source/command_line.md index 218b4dd39a..6eadbe8435 100644 --- a/guides/source/command_line.md +++ b/guides/source/command_line.md @@ -384,7 +384,7 @@ Active Record version 4.0.0 Action Pack version 4.0.0 Action Mailer version 4.0.0 Active Support version 4.0.0 -Middleware ActionDispatch::Static, Rack::Lock, Rack::Runtime, Rack::MethodOverride, ActionDispatch::RequestId, Rails::Rack::Logger, ActionDispatch::ShowExceptions, ActionDispatch::DebugExceptions, ActionDispatch::RemoteIp, ActionDispatch::Reloader, ActionDispatch::Callbacks, ActiveRecord::Migration::CheckPending, ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActionDispatch::Cookies, ActionDispatch::Session::EncryptedCookieStore, ActionDispatch::Flash, ActionDispatch::ParamsParser, Rack::Head, Rack::ConditionalGet, Rack::ETag +Middleware Rack::Sendfile, ActionDispatch::Static, Rack::Lock, Rack::Runtime, Rack::MethodOverride, ActionDispatch::RequestId, Rails::Rack::Logger, ActionDispatch::ShowExceptions, ActionDispatch::DebugExceptions, ActionDispatch::RemoteIp, ActionDispatch::Reloader, ActionDispatch::Callbacks, ActiveRecord::Migration::CheckPending, ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActionDispatch::Cookies, ActionDispatch::Session::EncryptedCookieStore, ActionDispatch::Flash, ActionDispatch::ParamsParser, Rack::Head, Rack::ConditionalGet, Rack::ETag Application root /home/foobar/commandsapp Environment development Database adapter sqlite3 diff --git a/guides/source/debugging_rails_applications.md b/guides/source/debugging_rails_applications.md index 98f91c1ac6..77a2dd4b18 100644 --- a/guides/source/debugging_rails_applications.md +++ b/guides/source/debugging_rails_applications.md @@ -301,7 +301,7 @@ This command shows you where you are in the code by printing 10 lines centered a 7 8 respond_to do |format| 9 format.html # index.html.erb - 10 format.json { render :json => @posts } + 10 format.json { render json: @posts } ``` If you repeat the `list` command, this time using just `l`, the next ten lines of the file will be printed out. @@ -337,7 +337,7 @@ On the other hand, to see the previous ten lines you should type `list-` (or `l- 7 8 respond_to do |format| 9 format.html # index.html.erb - 10 format.json { render :json => @posts } + 10 format.json { render json: @posts } ``` This way you can move inside the file, being able to see the code above and over the line you added the `debugger`. diff --git a/guides/source/rails_on_rack.md b/guides/source/rails_on_rack.md index d144fba762..73f541bda4 100644 --- a/guides/source/rails_on_rack.md +++ b/guides/source/rails_on_rack.md @@ -119,6 +119,7 @@ $ rake middleware For a freshly generated Rails application, this might produce something like: ```ruby +use Rack::Sendfile use ActionDispatch::Static use Rack::Lock use #<ActiveSupport::Cache::Strategy::LocalCache::Middleware:0x000000029a0838> |