diff options
author | Xavier Noria <fxn@hashref.com> | 2013-01-26 17:41:56 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2013-01-26 17:41:56 +0100 |
commit | 0b5d3f32732f637fe29848a3597852dce9662c6b (patch) | |
tree | a0e75011bd90c1d7cde73a89b680c52ab0a589ec /guides/source/working_with_javascript_in_rails.md | |
parent | 474e7dd82af030fb22ab5a586976d21b3497882a (diff) | |
parent | 4313461587254fd8e5b5a8ea7dfc9f0230c70ecb (diff) | |
download | rails-0b5d3f32732f637fe29848a3597852dce9662c6b.tar.gz rails-0b5d3f32732f637fe29848a3597852dce9662c6b.tar.bz2 rails-0b5d3f32732f637fe29848a3597852dce9662c6b.zip |
Merge remote-tracking branch 'docrails/master'
Conflicts:
actionpack/lib/action_view/helpers/form_options_helper.rb
guides/code/getting_started/app/controllers/comments_controller.rb
Diffstat (limited to 'guides/source/working_with_javascript_in_rails.md')
-rw-r--r-- | guides/source/working_with_javascript_in_rails.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/working_with_javascript_in_rails.md b/guides/source/working_with_javascript_in_rails.md index a7ca531123..03ef770352 100644 --- a/guides/source/working_with_javascript_in_rails.md +++ b/guides/source/working_with_javascript_in_rails.md @@ -51,7 +51,7 @@ with an id of `results`. Rails provides quite a bit of built-in support for building web pages with this technique. You rarely have to write this code yourself. The rest of this guide -will show you how Rails can help you write web sites in this manner, but it's +will show you how Rails can help you write websites in this way, but it's all built on top of this fairly simple technique. Unobtrusive JavaScript |