2 files changed, 16 insertions, 46 deletions
diff --git a/application/controllers/migrate.php b/application/controllers/migrate.php
deleted file mode 100644
index e5442e79c..000000000
--- a/application/controllers/migrate.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-class Migrate extends CI_Controller
-{
-	function __construct()
-	{
-		parent::__construct();
-		
-		$this->load->library('migration');
-
-		/** VERY IMPORTANT - only turn this on when you need it. */
-//		show_error('Access to this controller is blocked, turn me on when you need me.');
-	}
-
-	// Install up to the most up-to-date version.
-	function install()
-	{
-		if ( ! $this->migration->current())
-		{
-			show_error($this->migration->error);
-			exit;
-		}
-
-		echo "<br />Migration Successful<br />";
-	}
-
-	// This will migrate up to the configed migration version
-	function version($id = NULL)
-	{
-		// No $id supplied? Use the config version
-		$id OR $id = $this->config->item('migration_version');
-
-		if ( ! $this->migration->version($id))
-		{
-			show_error($this->migration->error);
-			exit;
-		}
-
-		echo "<br />Migration Successful<br />";
-	}
-}
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index 79689f012..21bef43d9 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -2,12 +2,22 @@
 
 class Welcome extends CI_Controller {
 
-	function __construct()
-	{
-		parent::__construct();
-	}
-
-	function index()
+	/**
+	 * Index Page for this controller.
+	 *
+	 * Maps to the following URL
+	 * 		http://example.com/index.php/welcome
+	 *	- or -  
+	 * 		http://example.com/index.php/welcome/index
+	 *	- or -
+	 * Since this controller is set as the default controller in 
+	 * config/routes.php, it's displayed at http://example.com/
+	 *
+	 * So any other public methods not prefixed with an underscore will
+	 * map to /index.php/welcome/<method_name>
+	 * @see http://codeigniter.com/user_guide/general/urls.html
+	 */
+	public function index()
 	{
 		$this->load->view('welcome_message');
 	}