diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-28 09:00:33 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-28 09:00:33 +0200 |
| commit | d9aae2b56e64a4f417eaffa99e10cca274e928e7 (patch) | |
| tree | 8438f6f784df9b252c0f834bc7cb9c369103d4cd /actionpack/lib/action_controller/routing/generation | |
| parent | 5025ae610f89989f3e15241ec7065e3d443614d9 (diff) | |
| parent | 9533e0eca76b1df68a90e1ebe395d7b6a59d8e91 (diff) | |
| download | rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.gz rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.bz2 rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/routing/generation')
| -rw-r--r-- | actionpack/lib/action_controller/routing/generation/url_rewriter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing/generation/url_rewriter.rb b/actionpack/lib/action_controller/routing/generation/url_rewriter.rb index 16720b915b..9717582b5e 100644 --- a/actionpack/lib/action_controller/routing/generation/url_rewriter.rb +++ b/actionpack/lib/action_controller/routing/generation/url_rewriter.rb @@ -93,7 +93,7 @@ module ActionController # # * <tt>:only_path</tt> - If true, the relative url is returned. Defaults to +false+. # * <tt>:protocol</tt> - The protocol to connect to. Defaults to 'http'. - # * <tt>:host</tt> - Specifies the host the link should be targetted at. + # * <tt>:host</tt> - Specifies the host the link should be targeted at. # If <tt>:only_path</tt> is false, this option must be # provided either explicitly, or via +default_url_options+. # * <tt>:port</tt> - Optionally specify the port to connect to. |