hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit

1 files changed, 15 insertions, 15 deletions

diff --git a/index.php b/index.php
index e56de13ed..f4ac11a72 100644
--- a/index.php
+++ b/index.php
@@ -11,9 +11,9 @@
  *
  * This can be set to anything, but default usage is:
  *
- *   development
- *   testing
- *   production
+ *     development
+ *     testing
+ *     production
  *
  * NOTE: If you change these, also change the error_reporting() code below
  *
@@ -35,7 +35,7 @@ if (defined('ENVIRONMENT'))
 		case 'development':
 			error_reporting(E_ALL);
 		break;
-
+	
 		case 'testing':
 		case 'production':
 			error_reporting(0);
@@ -52,7 +52,7 @@ if (defined('ENVIRONMENT'))
  *---------------------------------------------------------------
  *
  * This variable must contain the name of your "system" folder.
- * Include the path if the folder is not in the same directory
+ * Include the path if the folder is not in the same  directory
  * as this file.
  *
  */
@@ -65,7 +65,7 @@ if (defined('ENVIRONMENT'))
  *
  * If you want this front controller to use a different "application"
  * folder then the default one you can set its name here. The folder
- * can also be renamed or relocated anywhere on your server. If
+ * 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
  *
@@ -81,24 +81,24 @@ if (defined('ENVIRONMENT'))
  *
  * Normally you will set your default controller in the routes.php file.
  * You can, however, force a custom routing by hard-coding a
- * specific controller class/function here. For most applications, you
+ * specific controller class/function here.  For most applications, you
  * 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.
  *
- * IMPORTANT: If you set the routing here, NO OTHER controller will be
+ * IMPORTANT:  If you set the routing here, NO OTHER controller will be
  * callable. In essence, this preference limits your application to ONE
- * specific controller. Leave the function name blank if you need
+ * specific controller.  Leave the function name blank if you need
  * to call functions dynamically via the URI.
  *
  * Un-comment the $routing array below to use this feature
  *
  */
-	// The directory name, relative to the "controllers" folder. Leave blank
+	// 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
+	// The controller class file name.  Example:  Mycontroller
 	// $routing['controller'] = '';
 
 	// The controller function you wish to be called.
@@ -107,7 +107,7 @@ if (defined('ENVIRONMENT'))
 
 /*
  * -------------------------------------------------------------------
- * CUSTOM CONFIG VALUES
+ *  CUSTOM CONFIG VALUES
  * -------------------------------------------------------------------
  *
  * The $assign_to_config array below will be passed dynamically to the
@@ -125,12 +125,12 @@ if (defined('ENVIRONMENT'))
 
 
 // --------------------------------------------------------------------
-// END OF USER CONFIGURABLE SETTINGS. DO NOT EDIT BELOW THIS LINE
+// END OF USER CONFIGURABLE SETTINGS.  DO NOT EDIT BELOW THIS LINE
 // --------------------------------------------------------------------
 
 /*
  * ---------------------------------------------------------------
- * Resolve the system path for increased reliability
+ *  Resolve the system path for increased reliability
  * ---------------------------------------------------------------
  */
 
@@ -156,7 +156,7 @@ if (defined('ENVIRONMENT'))
 
 /*
  * -------------------------------------------------------------------
- * Now that we know the path, set the main path constants
+ *  Now that we know the path, set the main path constants
  * -------------------------------------------------------------------
  */
 	// The name of THIS file