0
@@ -103,10 +103,10 @@
0
     # uses to simplify transition of legacy application, you can
0
     # set it up like this:
0
     #
0
-    # Merb.push_path(:models,      Merb.root / "app" / "models",      "**/*.rb")
0
-    # Merb.push_path(:mailers,     Merb.root / "app" / "models",      "**/*.rb")
0
-    # Merb.push_path(:controllers, Merb.root / "app" / "controllers", "**/*.rb")
0
-    # Merb.push_path(:views,       Merb.root / "app" / "views",       "**/*.rb")
0
+    # Merb.push_path(:model,      Merb.root / "app" / "models",      "**/*.rb")
0
+    # Merb.push_path(:mailer,     Merb.root / "app" / "models",      "**/*.rb")
0
+    # Merb.push_path(:controller, Merb.root / "app" / "controllers", "**/*.rb")
0
+    # Merb.push_path(:view,       Merb.root / "app" / "views",       "**/*.rb")
0
     #
0
     # ==== Parameters
0
     # type<Symbol>:: The type of path being registered (i.e. :view)
0
@@ -132,8 +132,8 @@
0
     # application components.
0
     #
0
     # Merb.root = "path/to/legacy/app/root"
0
-    # Merb.remove_paths(:mailers)
0
-    # Merb.push_path(:mailers,     Merb.root / "app" / "models",      "**/*.rb")
0
+    # Merb.remove_paths(:mailer)
0
+    # Merb.push_path(:mailer,     Merb.root / "app" / "models",      "**/*.rb")
0
     #
0
     # Will make Merb use app/models for mailers just like Ruby on Rails does.
0
     def remove_paths(*args)

0
@@ -101,7 +101,7 @@
0
     # ==== Examples
0
     #   redirect("/posts/34")
0
     #   redirect("http://www.merbivore.com/")
0
-    #   redirect("http://www.merbivore.com/")
0
+    #   redirect("http://www.merbivore.com/", true)
0
     def redirect(url, permanent = false)
0
       self.status = permanent ? 301 : 302
0
       Merb.logger.info("Redirecting to: #{url} (#{self.status})")