From 098fa943565e06dafa67ca59ccf433939d2941b4 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 7 Feb 2005 14:15:53 +0000 Subject: Fixed documentation snafus #575, #576, #577, #585 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@525 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/base.rb | 4 ++-- actionpack/lib/action_view/helpers/active_record_helper.rb | 2 +- actionpack/lib/action_view/helpers/form_options_helper.rb | 12 ++++++------ actionpack/lib/action_view/partials.rb | 2 +- actionpack/lib/action_view/vendor/builder/xmlbase.rb | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'actionpack/lib/action_view') diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index ad809e2bff..3f94a76cd0 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -61,12 +61,12 @@ module ActionView #:nodoc: # # The parsing of ERb templates are cached by default, but the reading of them are not. This means that the application by default # will reflect changes to the templates immediatly. If you'd like to sacrifice that immediacy for the speed gain given by also - # caching the loading of templates (reading from the file systen), you can turn that on with + # caching the loading of templates (reading from the file system), you can turn that on with # ActionView::Base.cache_template_loading = true. # # == Builder # - # Builder templates are a more programatic alternative to ERb. They are especially useful for generating XML content. An +XmlMarkup+ object + # Builder templates are a more programmatic alternative to ERb. They are especially useful for generating XML content. An +XmlMarkup+ object # named +xml+ is automatically made available to templates with a +.rxml+ extension. # # Here are some basic examples: diff --git a/actionpack/lib/action_view/helpers/active_record_helper.rb b/actionpack/lib/action_view/helpers/active_record_helper.rb index 82c6d1cd81..45a5aff8bd 100644 --- a/actionpack/lib/action_view/helpers/active_record_helper.rb +++ b/actionpack/lib/action_view/helpers/active_record_helper.rb @@ -10,7 +10,7 @@ module ActionView module Helpers # The Active Record Helper makes it easier to create forms for records kept in instance variables. The most far-reaching is the form # method that creates a complete form for all the basic content types of the record (not associations or aggregations, though). This - # is a great of making the record quickly available for editing, but likely to prove lacklusters for a complicated real-world form. + # is a great of making the record quickly available for editing, but likely to prove lackluster for a complicated real-world form. # In that case, it's better to use the input method and the specialized form methods in link:classes/ActionView/Helpers/FormHelper.html module ActiveRecordHelper # Returns a default input tag for the type of object returned by the method. Example diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index 4f0a0fbfe0..aa448764da 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -9,7 +9,7 @@ module ActionView include ERB::Util # Create a select tag and a series of contained option tags for the provided object and method. - # The option currenlty held by the object will be selected, provided that the object is available. + # The option currently held by the object will be selected, provided that the object is available. # # This can be used to provide a default set of options in the standard way: before rendering the create form, a # new model instance is assigned the default options and bound to @model_name. Usually this model is not saved @@ -40,14 +40,14 @@ module ActionView # options_for_select([["Dollar", "$"], ["Kroner", "DKK"]]) # \n # - # options_for_select([ "VISA", "Mastercard" ], "Mastercard") - # \n + # options_for_select([ "VISA", "MasterCard" ], "MasterCard") + # \n # # options_for_select({ "Basic" => "$20", "Plus" => "$40" }, "$40") # \n # - # options_for_select([ "VISA", "Mastercard", "Discover" ], ["VISA", "Discover"]) - # \n\n + # options_for_select([ "VISA", "MasterCard", "Discover" ], ["VISA", "Discover"]) + # \n\n def options_for_select(container, selected = nil) container = container.to_a if Hash === container @@ -87,7 +87,7 @@ module ActionView # An array of group objects are passed. Each group should return an array of options when calling group_method # Each group should should return its name when calling group_label_method. # - # html_option_groups_from_collection(@continents, "countries", "contient_name", "country_id", "country_name", @selected_country.id) + # html_option_groups_from_collection(@continents, "countries", "continent_name", "country_id", "country_name", @selected_country.id) # # Could become: # diff --git a/actionpack/lib/action_view/partials.rb b/actionpack/lib/action_view/partials.rb index 1255a060dd..f771f0a826 100644 --- a/actionpack/lib/action_view/partials.rb +++ b/actionpack/lib/action_view/partials.rb @@ -12,7 +12,7 @@ module ActionView # # == Rendering a collection of partials # - # The example of partial use describes a familar pattern where a template needs to iterate over an array and render a sub + # The example of partial use describes a familiar pattern where a template needs to iterate over an array and render a sub # template for each of the elements. This pattern has been implemented as a single method that accepts an array and renders # a partial by the same name as the elements contained within. So the three-lined example in "Using partials" can be rewritten # with a single line: diff --git a/actionpack/lib/action_view/vendor/builder/xmlbase.rb b/actionpack/lib/action_view/vendor/builder/xmlbase.rb index d065d6fae1..7202bb2ead 100644 --- a/actionpack/lib/action_view/vendor/builder/xmlbase.rb +++ b/actionpack/lib/action_view/vendor/builder/xmlbase.rb @@ -76,7 +76,7 @@ module Builder #:nodoc: end # Append text to the output target. Escape any markup. May be - # used within the markup brakets as: + # used within the markup brackets as: # # builder.p { br; text! "HI" } #=>


HI

def text!(text) @@ -84,7 +84,7 @@ module Builder #:nodoc: end # Append text to the output target without escaping any markup. - # May be used within the markup brakets as: + # May be used within the markup brackets as: # # builder.p { |x| x << "
HI" } #=>


HI

# @@ -94,7 +94,7 @@ module Builder #:nodoc: # # It is also useful for stacking builder objects. Builders only # use << to append to the target, so by supporting this - # method/operation builders can use oother builders as their + # method/operation builders can use other builders as their # targets. def <<(text) _text(text) -- cgit v1.2.3