3 files changed, 6 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index cbc9c0f493..d6fe436b68 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -496,9 +496,7 @@ module ActionDispatch
                 prefix_options = options.slice(*_route.segment_keys)
                 # we must actually delete prefix segment keys to avoid passing them to next url_for
                 _route.segment_keys.each { |k| options.delete(k) }
-                prefix = _routes.url_helpers.send("#{name}_path", prefix_options)
-                prefix = '' if prefix == '/'
-                prefix
+                _routes.url_helpers.send("#{name}_path", prefix_options)
               end
             end
           end
diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index ecaac84057..d70063d0e9 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -98,7 +98,7 @@ module ActionDispatch
 
       # Redirect any path to another path:
       #
-      #   get '/stories', to: redirect('/posts')
+      #   get "/stories" => redirect("/posts")
       #
       # You can also use interpolation in the supplied redirect argument:
       #
@@ -112,11 +112,11 @@ module ActionDispatch
       # return value.
       #
       #   get 'jokes/:number', to: redirect { |params, request|
-      #     path = (params[:number].to_i.even? ? 'wheres-the-beef' : 'i-love-lamp')
+      #     path = (params[:number].to_i.even? ? "wheres-the-beef" : "i-love-lamp")
       #     "http://#{request.host_with_port}/#{path}"
       #   }
       #
-      # Note that the <tt>do end</tt> syntax for the redirect block wouldn't work, as Ruby would pass
+      # Note that the +do end+ syntax for the redirect block wouldn't work, as Ruby would pass
       # the block to +get+ instead of +redirect+. Use <tt>{ ... }</tt> instead.
       #
       # The options version of redirect allows you to supply only the parts of the url which need
@@ -129,7 +129,7 @@ module ActionDispatch
       # common redirect routes. The call method must accept two arguments, params and request, and return
       # a string.
       #
-      #   get 'accounts/:name', to: redirect(SubdomainRedirector.new('api'))
+      #   get 'accounts/:name' => redirect(SubdomainRedirector.new('api'))
       #
       def redirect(*args, &block)
         options = args.extract_options!
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 61071d1228..0f95daa790 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -288,6 +288,7 @@ module ActionDispatch
 
       def clear!
         @finalized = false
+        @url_helpers = nil
         named_routes.clear
         set.clear
         formatter.clear