0
@@ -111,7 +111,7 @@ module Merb
0
       #   Addational conditions that the request must meet in order to match.
0
       #   the keys must be methods that the Merb::Request instance will respond
0
       #   to.  The value is the string or regexp that matched the returned value.
0
-      #   Conditions are inherited by child routes. 
0
+      #   Conditions are inherited by child routes.
0
       # &block::
0
       #   Passes a new instance of a Behavior object into the optional block so
0
       #   that sub-matching and routes nesting may occur.
0
@@ -126,7 +126,7 @@ module Merb
0
       # ==== Examples
0
       #
0
       #   # registers /foo/bar to controller => "foo", :action => "bar"
0
-      #   # and /foo/baz to controller => "foo", :action => "caz"
0
+      #   # and /foo/baz to controller => "foo", :action => "baz"
0
       #   r.match "/foo" do |f|
0
       #     f.params[:controller] = 'foo'
0
       #     f.match("/bar").to(:action => "bar")
0
@@ -284,11 +284,11 @@ module Merb
0
       #     admin.resources :accounts
0
       #     admin.resource :email
0
       #   end
0
-      # 
0
+      #
0
       #   # /super_admin/accounts
0
       #   r.namespace(:admin, :path=>"super_admin") do |admin|
0
       #     admin.resources :accounts
0
-      #   end 
0
+      #   end
0
       #---
0
       # @public
0
       def namespace(name_or_path, options={}, &block)
0
@@ -468,11 +468,11 @@ module Merb
0
         if name_prefix.nil? && !namespace.nil?
0
           name_prefix = namespace_to_name_prefix namespace
0
         end
0
-        
0
+
0
         unless @@parent_resource.empty?
0
           parent_resource = namespace_to_name_prefix @@parent_resource.join('_')
0
         end
0
-        
0
+
0
         routes = next_level.to_resource options
0
 
0
         route_name = "#{name_prefix}#{name}"