From e033b5d037c303a34e0c5aec2b38ec6270f00f86 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 25 Jul 2009 16:03:58 +0100
Subject: Merge docrails

---
 actionpack/lib/action_controller/routing/generation/url_rewriter.rb | 2 +-
 actionpack/lib/action_controller/routing/route_set.rb               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_controller/routing')

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.
diff --git a/actionpack/lib/action_controller/routing/route_set.rb b/actionpack/lib/action_controller/routing/route_set.rb
index f5a4b1e1db..040a7e2cb6 100644
--- a/actionpack/lib/action_controller/routing/route_set.rb
+++ b/actionpack/lib/action_controller/routing/route_set.rb
@@ -155,7 +155,7 @@ module ActionController
 
           def define_url_helper(route, name, kind, options)
             selector = url_helper_name(name, kind)
-            # The segment keys used for positional paramters
+            # The segment keys used for positional parameters
 
             hash_access_method = hash_access_name(name, kind)
 
-- 
cgit v1.2.3