aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-11-07 09:36:43 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-11-07 09:36:43 +0000
commit01cfd2b00afc25fa4ca8e538f59a405e7eec7bb5 (patch)
treed424a25811351d3f0a659cbf05cf7e4facf38007 /actionpack/lib/action_controller
parent8dda7c5449f0c8f8f8569d6ca6c1aa3d906518a1 (diff)
downloadrails-01cfd2b00afc25fa4ca8e538f59a405e7eec7bb5.tar.gz
rails-01cfd2b00afc25fa4ca8e538f59a405e7eec7bb5.tar.bz2
rails-01cfd2b00afc25fa4ca8e538f59a405e7eec7bb5.zip
Fix docs (closes #2725)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2906 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/base.rb4
1 files changed, 2 insertions, 2 deletions
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:
#
# * <tt>Hash</tt>: The URL will be generated by calling url_for with the +options+.
# * <tt>String starting with protocol:// (like http://)</tt>: Is passed straight through as the target for redirection.
- # * <tt>String not containing a protocol</tt>: The current current protocol and host is prepended to the string.
+ # * <tt>String not containing a protocol</tt>: The current protocol and host is prepended to the string.
# * <tt>:back</tt>: 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"])
#