Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop

2 files changed, 8 insertions, 7 deletions

diff --git a/application/config/config.php b/application/config/config.php
index ab1508e7b..6867cee88 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -62,11 +62,12 @@ $config['index_page'] = 'index.php';
 | URI string.  The default setting of 'AUTO' works for most servers.
 | If your links do not seem to work, try one of the other delicious flavors:
 |
-| 'AUTO'			Default - auto detects
-| 'PATH_INFO'		Uses the PATH_INFO
-| 'QUERY_STRING'	Uses the QUERY_STRING
-| 'REQUEST_URI'		Uses the REQUEST_URI
-| 'ORIG_PATH_INFO'	Uses the ORIG_PATH_INFO
+| 'AUTO'		Default - auto detects
+| 'CLI' or 'argv'	Uses $_SERVER['argv'] (for php-cli only)
+| 'REQUEST_URI'		Uses $_SERVER['REQUEST_URI']
+| 'PATH_INFO'		Uses $_SERVER['PATH_INFO']
+| 'QUERY_STRING'	Uses $_SERVER['QUERY_STRING']
+| 'ORIG_PATH_INFO'	Uses $_SERVER['ORIG_PATH_INFO']
 |
 */
 $config['uri_protocol']	= 'AUTO';
diff --git a/application/config/routes.php b/application/config/routes.php
index 001198615..d1a4419b7 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -59,8 +59,8 @@
 |
 |	$route['404_override'] = 'errors/page_missing';
 |
-| This route will tell the Router what URI segments to use if those provided
-| in the URL cannot be matched to a valid route.
+| This route will tell the Router which controller/method to use if those
+| provided in the URL cannot be matched to a valid route.
 |
 */