diff options
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 8 | ||||
| -rw-r--r-- | activemodel/lib/active_model/validator.rb | 4 | ||||
| -rw-r--r-- | activeresource/test/cases/base/schema_test.rb | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index b0a57f47d3..3fa46d0f43 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -153,7 +153,7 @@ module ActionView #:nodoc: # # This refreshes the sidebar, removes a person element and highlights the user list. # - # See the ActionView::Helpers::PrototypeHelper::GeneratorMethods documentation for more details. + # See the ActionView::Helpers::PrototypeHelper::JavaScriptGenerator::GeneratorMethods documentation for more details. class Base module Subclasses end diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index f392d92e75..cd3a3eac80 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -65,7 +65,7 @@ module ActionView # //]]> # </script> # - # +html_options+ may be a hash of attributes for the <tt><script></tt> + # +html_options+ may be a hash of attributes for the <tt>\<script></tt> # tag. Example: # javascript_tag "alert('All is good')", :defer => 'defer' # # => <script defer="defer" type="text/javascript">alert('All is good')</script> diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index bc67197e64..300207dfac 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -161,7 +161,7 @@ module ActionView # JavaScriptGenerator generates blocks of JavaScript code that allow you # to change the content and presentation of multiple DOM elements. Use - # this in your Ajax response bodies, either in a <tt><script></tt> tag + # this in your Ajax response bodies, either in a <tt>\<script></tt> tag # or as plain JavaScript sent with a Content-type of "text/javascript". # # Create new instances with PrototypeHelper#update_page or with @@ -224,7 +224,7 @@ module ActionView # # You can also use PrototypeHelper#update_page_tag instead of # PrototypeHelper#update_page to wrap the generated JavaScript in a - # <tt><script></tt> tag. + # <tt>\<script></tt> tag. module GeneratorMethods def to_s #:nodoc: (@lines * $/).tap do |javascript| @@ -583,10 +583,10 @@ module ActionView end # Works like update_page but wraps the generated JavaScript in a - # <tt><script></tt> tag. Use this to include generated JavaScript in an + # <tt>\<script></tt> tag. Use this to include generated JavaScript in an # ERb template. See JavaScriptGenerator for more information. # - # +html_options+ may be a hash of <tt><script></tt> attributes to be + # +html_options+ may be a hash of <tt>\<script></tt> attributes to be # passed to ActionView::Helpers::JavaScriptHelper#javascript_tag. def update_page_tag(html_options = {}, &block) javascript_tag update_page(&block), html_options diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb index 1262d305d1..0168233fce 100644 --- a/activemodel/lib/active_model/validator.rb +++ b/activemodel/lib/active_model/validator.rb @@ -7,7 +7,7 @@ module ActiveModel #:nodoc: # == Active Model Validator # # A simple base class that can be used along with - # +ActiveModel::Validations::ClassMethods.validates_with+ + # ActiveModel::Validations::ClassMethods.validates_with # # class Person # include ActiveModel::Validations @@ -42,7 +42,7 @@ module ActiveModel #:nodoc: # end # end # - # To cause a validation error, you must add to the <tt>record<tt>'s errors directly + # To cause a validation error, you must add to the <tt>record</tt>'s errors directly # from within the validators message # # class MyValidator < ActiveModel::Validator diff --git a/activeresource/test/cases/base/schema_test.rb b/activeresource/test/cases/base/schema_test.rb index 136c827926..19861d7b32 100644 --- a/activeresource/test/cases/base/schema_test.rb +++ b/activeresource/test/cases/base/schema_test.rb @@ -399,7 +399,7 @@ class SchemaTest < ActiveModel::TestCase assert_not_equal matz.known_attributes, rick.known_attributes, "should have had different known attributes too" end - test "setting schema then fetching should add schema attributes to the intance attributes" do + test "setting schema then fetching should add schema attributes to the instance attributes" do # an attribute in common with fetched instance and one that isn't new_schema = {'name' => 'string', 'my_strange_attribute' => 'string'} |