diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-10-20 23:20:44 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-10-20 23:20:44 +0530 |
| commit | af1b5c54cfb74caddd6ffab171d26da9a5c885d1 (patch) | |
| tree | 2e029d8df73d62c456fce667a647dabf93397863 /actionpack | |
| parent | ee9d9fb5fab3cfaa5055e5fb4225b720d3818c94 (diff) | |
| parent | 274c3fad5087306a64ca91d044756221f5ff862c (diff) | |
| download | rails-af1b5c54cfb74caddd6ffab171d26da9a5c885d1.tar.gz rails-af1b5c54cfb74caddd6ffab171d26da9a5c885d1.tar.bz2 rails-af1b5c54cfb74caddd6ffab171d26da9a5c885d1.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/record_identifier.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/document.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb index 2036442cfe..9c38ff44d8 100644 --- a/actionpack/lib/action_controller/record_identifier.rb +++ b/actionpack/lib/action_controller/record_identifier.rb @@ -14,9 +14,9 @@ module ActionController # <% end %> </div> # # # controller - # def destroy + # def update # post = Post.find(params[:id]) - # post.destroy + # post.update_attributes(params[:post]) # # redirect_to(post) # Calls polymorphic_url(post) which in turn calls post_url(post) # end diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb index 7fa3aead82..386820300a 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb @@ -4,7 +4,7 @@ require 'html/selector' require 'html/sanitizer' module HTML #:nodoc: - # A top-level HTMl document. You give it a body of text, and it will parse that + # A top-level HTML document. You give it a body of text, and it will parse that # text into a tree of nodes. class Document #:nodoc: |