aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-01-19 22:11:17 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-01-19 22:11:17 +0530
commit2c7ded31fb89c924bcb3a1b5f57d5c0f5b675ef1 (patch)
treeec5eead51cd438996d34b8f0fe762a18b28d506e /actionpack/lib/action_view
parente95e932fbe38617b72f21fde6cac53f49473d881 (diff)
parentad3a129380499035174b9a6c8df7cc6df2471f38 (diff)
downloadrails-2c7ded31fb89c924bcb3a1b5f57d5c0f5b675ef1.tar.gz
rails-2c7ded31fb89c924bcb3a1b5f57d5c0f5b675ef1.tar.bz2
rails-2c7ded31fb89c924bcb3a1b5f57d5c0f5b675ef1.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 56f999f2f5..d27d49821b 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -473,7 +473,7 @@ module ActionView
# string given as the value.
# * <tt>:subject</tt> - Preset the subject line of the email.
# * <tt>:body</tt> - Preset the body of the email.
- # * <tt>:cc</tt> - Carbon Copy addition recipients on the email.
+ # * <tt>:cc</tt> - Carbon Copy additional recipients on the email.
# * <tt>:bcc</tt> - Blind Carbon Copy additional recipients on the email.
#
# ==== Examples