2 files changed, 50 insertions, 55 deletions
diff --git a/system/application/config/routes.php b/system/application/config/routes.php
index 1702e4f4b..8a09dec39 100644
--- a/system/application/config/routes.php
+++ b/system/application/config/routes.php
@@ -1,49 +1,50 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
-/*
-| -------------------------------------------------------------------------
-| URI ROUTING
-| -------------------------------------------------------------------------
-| This file lets you re-map URI requests to specific controller functions.
-|
-| Typically there is a one-to-one relationship between a URL string
-| and its corresponding controller class/method. The segments in a
-| URL normally follow this pattern:
-|
-| 	www.your-site.com/class/method/id/
-|
-| In some instances, however, you may want to remap this relationship
-| so that a different class/function is called than the one
-| corresponding to the URL.
-|
-| Please see the user guide for complete details:
-|
-|	http://www.codeigniter.com/user_guide/general/routing.html
-|
-| -------------------------------------------------------------------------
-| RESERVED ROUTES
-| -------------------------------------------------------------------------
-|
-| There are two reserved routes:
-|
-|	$route['default_controller'] = 'welcome';
-|
-| This route indicates which controller class should be loaded if the
-| URI contains no data. In the above example, the "welcome" class
-| would be loaded.
-|
-|	$route['scaffolding_trigger'] = 'scaffolding';
-|
-| This route lets you se t a "secret" word that will trigger the
-| scaffolding feature for added security. Note: Scaffolding must be
-| enabled in the controller in which you intend to use it.
-|
-*/
-
-$route['default_controller'] = "welcome";
-$route['scaffolding_trigger'] = "";
-
-
-
-
-
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
+/*
+| -------------------------------------------------------------------------
+| URI ROUTING
+| -------------------------------------------------------------------------
+| This file lets you re-map URI requests to specific controller functions.
+|
+| Typically there is a one-to-one relationship between a URL string
+| and its corresponding controller class/method. The segments in a
+| URL normally follow this pattern:
+|
+| 	www.your-site.com/class/method/id/
+|
+| In some instances, however, you may want to remap this relationship
+| so that a different class/function is called than the one
+| corresponding to the URL.
+|
+| Please see the user guide for complete details:
+|
+|	http://www.codeigniter.com/user_guide/general/routing.html
+|
+| -------------------------------------------------------------------------
+| RESERVED ROUTES
+| -------------------------------------------------------------------------
+|
+| There are two reserved routes:
+|
+|	$route['default_controller'] = 'welcome';
+|
+| This route indicates which controller class should be loaded if the
+| URI contains no data. In the above example, the "welcome" class
+| would be loaded.
+|
+|	$route['scaffolding_trigger'] = 'scaffolding';
+|
+| This route lets you set a "secret" word that will trigger the
+| scaffolding feature for added security. Note: Scaffolding must be
+| enabled in the controller in which you intend to use it.   The reserved 
+| routes must come before any wildcard or regular expression routes.
+|
+*/
+
+$route['default_controller'] = "welcome";
+$route['scaffolding_trigger'] = "";
+
+
+
+
+
 ?>
 \ No newline at end of file
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index 6f94b4bf3..fe4efa3a9 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -159,13 +159,7 @@ are encouraged to always have a default route otherwise a 404 page will appear b
 <p>This route lets you set a secret word, which when present in the URL, triggers the scaffolding feature.
 Please read the <a href="scaffolding.html">Scaffolding</a> page for details.</p>
 
-
-
-
-
-
-
-
+<p class="important"><strong>Important:</strong>&nbsp; The reserved routes must come before any wildcard or regular expression routes.</p>
 
 </div>
 <!-- END CONTENT -->