From 01cfd2b00afc25fa4ca8e538f59a405e7eec7bb5 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 7 Nov 2005 09:36:43 +0000 Subject: Fix docs (closes #2725) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2906 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 6 +++--- actionpack/lib/action_controller/base.rb | 4 ++-- actionpack/lib/action_view/helpers/form_options_helper.rb | 2 +- actionpack/lib/action_view/helpers/url_helper.rb | 2 +- actionwebservice/lib/action_web_service/casting.rb | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index f884c8d404..e28dd6dc91 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -571,7 +571,7 @@ * Added ActionController::Base.asset_host that will then be used by all the asset helpers. This enables you to easily offload static content like javascripts and images to a separate server tuned just for that. -* Fixed action/fragment caching using the filestore when a directory and a file wanted to to use the same name. Now there's a .cache prefix that sidesteps the conflict #1188 [imbcmdth@hotmail.com] +* Fixed action/fragment caching using the filestore when a directory and a file wanted to use the same name. Now there's a .cache prefix that sidesteps the conflict #1188 [imbcmdth@hotmail.com] * Fixed missing id uniqueness in FormTag#radio_button #1207 [Jarkko] @@ -1179,7 +1179,7 @@ * Added POST support for the breakpoint retries, so form processing that raises an exception can be retried with the original request [Florian Gross] -* Fixed regression with Base#reset_session that wouldn't use the the DEFAULT_SESSION_OPTIONS [adam@the-kramers.net] +* Fixed regression with Base#reset_session that wouldn't use the DEFAULT_SESSION_OPTIONS [adam@the-kramers.net] * Fixed error rendering of rxml documents to not just swallow the exception and return 0 (still not guessing the right line, but hey) @@ -1431,7 +1431,7 @@ * Added another case to DateHelper#distance_in_minutes to return "less than a minute" instead of "0 minutes" and "1 minute" instead of "1 minutes" * Added a hidden field to checkboxes generated with FormHelper#check_box that will make sure that the unchecked value (usually 0) - is sent even if the checkbox is not checked. This relieves the controller from doing custom checking if the the checkbox wasn't + is sent even if the checkbox is not checked. This relieves the controller from doing custom checking if the checkbox wasn't checked. BEWARE: This might conflict with your run-on-the-mill work-around code. [Tobias Luetke] * Fixed error_message_on to just use the first if more than one error had been added [marcel] diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 07b9b443d2..b787af3fde 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -542,7 +542,7 @@ module ActionController #:nodoc: # # Renders the clear text "Hi there!" within the current active layout (if one exists) # render :text => "Explosion!", :layout => true # - # # Renders the clear text "Hi there!" within the the layout + # # Renders the clear text "Hi there!" within the layout # # placed in "app/views/layouts/special.r(html|xml)" # render :text => "Explosion!", :layout => "special" # @@ -726,7 +726,7 @@ module ActionController #:nodoc: # # * Hash: The URL will be generated by calling url_for with the +options+. # * String starting with protocol:// (like http://): Is passed straight through as the target for redirection. - # * String not containing a protocol: The current current protocol and host is prepended to the string. + # * String not containing a protocol: The current protocol and host is prepended to the string. # * :back: Back to the page that issued the request. Useful for forms that are triggered from multiple places. # Short-hand for redirect_to(request.env["HTTP_REFERER"]) # diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index 261ff76ae0..cd2a00254d 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -146,7 +146,7 @@ module ActionView # Returns a string of option tags, like options_from_collection_for_select, but surrounds them with tags. # # 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. + # Each group should return its name when calling group_label_method. # # html_option_groups_from_collection(@continents, "countries", "continent_name", "country_id", "country_name", @selected_country.id) # diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 118b5b158b..3ec0a65971 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -282,7 +282,7 @@ module ActionView # # "attr" => bool_value # - # if the the associated _bool_value_ evaluates to true, it is + # if the associated _bool_value_ evaluates to true, it is # replaced with the attribute's name; otherwise the attribute is # removed from the _html_options_ hash. (See the XHTML 1.0 spec, # section 4.5 "Attribute Minimization" for more: diff --git a/actionwebservice/lib/action_web_service/casting.rb b/actionwebservice/lib/action_web_service/casting.rb index 9ce8192d49..c9982f13a0 100644 --- a/actionwebservice/lib/action_web_service/casting.rb +++ b/actionwebservice/lib/action_web_service/casting.rb @@ -18,7 +18,7 @@ module ActionWebService # :nodoc: self.class.cast_expects(@api_method, params) end - # Coerces the given +return_value+ into the the type returned by this + # Coerces the given +return_value+ into the type returned by this # method def cast_returns(return_value) self.class.cast_returns(@api_method, return_value) -- cgit v1.2.3