Automated merge with http://hg.ellislab.com/CodeIgniter2

1 files changed, 22 insertions, 22 deletions

diff --git a/index.php b/index.php
index 0eef7b895..5bb53d2f2 100644
--- a/index.php
+++ b/index.php
@@ -6,7 +6,7 @@
  *---------------------------------------------------------------
  *
  * By default CI runs with error reporting set to ALL.  For security
- * reasons you are encouraged to change this when your site goes live.
+ * reasons you are encouraged to change this to 0 when your site goes live.
  * For more info visit:  http://www.php.net/error_reporting
  *
  */
@@ -30,7 +30,7 @@
  *---------------------------------------------------------------
  *
  * If you want this front controller to use a different "application"
- * folder then the default one you can set its name here. The folder 
+ * folder then the default one you can set its name here. The folder
  * can also be renamed or relocated anywhere on your server.  If
  * you do, use a full server path. For more info please see the user guide:
  * http://codeigniter.com/user_guide/general/managing_apps.html
@@ -46,9 +46,9 @@
  * --------------------------------------------------------------------
  *
  * Normally you will set your default controller in the routes.php file.
- * You can, however, force a custom routing by hard-coding a 
+ * You can, however, force a custom routing by hard-coding a
  * specific controller class/function here.  For most applications, you
- * WILL NOT set your routing here, but it's an option for those 
+ * WILL NOT set your routing here, but it's an option for those
  * special instances where you might want to override the standard
  * routing in a specific front controller that shares a common CI installation.
  *
@@ -60,14 +60,14 @@
  * Un-comment the $routing array below to use this feature
  *
  */
- 	// The directory name, relative to the "controllers" folder.  Leave blank
- 	// if your controller is not in a sub-folder within the "controllers" folder
+	// The directory name, relative to the "controllers" folder.  Leave blank
+	// if your controller is not in a sub-folder within the "controllers" folder
 	// $routing['directory'] = '';
-	
+
 	// The controller class file name.  Example:  Mycontroller.php
 	// $routing['controller'] = '';
-	
-	// The controller function you wish to be called. 
+
+	// The controller function you wish to be called.
 	// $routing['function']	= '';
 
 
@@ -77,10 +77,10 @@
  * -------------------------------------------------------------------
  *
  * The $assign_to_config array below will be passed dynamically to the
- * config class when initialized. This allows you to set custom config 
- * items or override any default config values found in the config.php file.  
+ * config class when initialized. This allows you to set custom config
+ * items or override any default config values found in the config.php file.
  * This can be handy as it permits you to share one application between
- * multiple front controller files, with each file containing different 
+ * multiple front controller files, with each file containing different
  * config values.
  *
  * Un-comment the $assign_to_config array below to use this feature
@@ -106,35 +106,35 @@
 	{
 		$system_path = realpath($system_path).'/';
 	}
-	
+
 	// ensure there's a trailing slash
 	$system_path = rtrim($system_path, '/').'/';
 
 	// Is the system path correct?
 	if ( ! is_dir($system_path))
 	{
-		exit("Your system folder path does not appear to be set correctly. Please open the following file and correct this: ".pathinfo(__FILE__, PATHINFO_BASENAME));	
+		exit("Your system folder path does not appear to be set correctly. Please open the following file and correct this: ".pathinfo(__FILE__, PATHINFO_BASENAME));
 	}
 
 /*
  * -------------------------------------------------------------------
  *  Now that we know the path, set the main path constants
  * -------------------------------------------------------------------
- */		
+ */
 	// The name of THIS file
 	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
 
 	// The PHP file extension
 	define('EXT', '.php');
 
- 	// Path to the system folder
+	// Path to the system folder
 	define('BASEPATH', str_replace("\\", "/", $system_path));
-		
+
 	// Path to the front controller (this file)
 	define('FCPATH', str_replace(SELF, '', __FILE__));
-	
+
 	// Name of the "system folder"
-	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));		
+	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
 
 
 	// The path to the "application" folder
@@ -143,12 +143,12 @@
 		define('APPPATH', $application_folder.'/');
 	}
 	else
-	{		
+	{
 		if ( ! is_dir(BASEPATH.$application_folder.'/'))
 		{
-			exit("Your application folder path does not appear to be set correctly. Please open the following file and correct this: ".SELF);	
+			exit("Your application folder path does not appear to be set correctly. Please open the following file and correct this: ".SELF);
 		}
-	
+
 		define('APPPATH', BASEPATH.$application_folder.'/');
 	}