From ab347586ef289e960ab7cfad32574e526cdcce0b Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 23 Aug 2011 12:29:29 -0400
Subject: Got PDO working

---
 application/config/database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/config/database.php')

diff --git a/application/config/database.php b/application/config/database.php
index b4b34bf66..5a84a471a 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -17,7 +17,7 @@
 |	['password'] The password used to connect to the database
 |	['database'] The name of the database you want to connect to
 |	['dbdriver'] The database type. ie: mysql.  Currently supported:
-				 mysql, mysqli, postgre, odbc, mssql, sqlite, oci8
+				 mysql, mysqli, pdo, postgre, odbc, mssql, sqlite, oci8
 |	['dbprefix'] You can add an optional prefix, which will be added
 |				 to the table name when using the  Active Record class
 |	['pconnect'] TRUE/FALSE - Whether to use a persistent connection
-- 
cgit v1.2.3-24-g4f1b


From f4a4bd8fac188ebc9cda822ffc811c218fd92b45 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Thu, 20 Oct 2011 12:18:42 -0500
Subject: adding new license file (OSL 3.0) and updating readme to ReST

added notice of license to all source files.
OSL to all except the few files we ship inside of the application folder, those are AFL.
Updated license in user guide.

incrementing next dev version to 3.0 due to licensing change
---
 application/config/database.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'application/config/database.php')

diff --git a/application/config/database.php b/application/config/database.php
index 5a84a471a..c2761bc85 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -1,4 +1,29 @@
 <?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP 5.1.6 or newer
+ *
+ * NOTICE OF LICENSE
+ * 
+ * Licensed under the Academic Free License version 3.0
+ * 
+ * This source file is subject to the Open Software License (OSL 3.0) that is
+ * bundled with this package in the files license_afl.txt / license_afl.rst.
+ * It is also available through the world wide web at this URL:
+ * http://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to obtain it
+ * through the world wide web, please send an email to
+ * licensing@ellislab.com so we can send you a copy immediately.
+ *
+ * @package		CodeIgniter
+ * @author		EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @license		http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
+ * @link		http://codeigniter.com
+ * @since		Version 1.0
+ * @filesource
+ */
 /*
 | -------------------------------------------------------------------
 | DATABASE CONNECTIVITY SETTINGS
-- 
cgit v1.2.3-24-g4f1b


From 61df9060d468ce28c40ee4a57d108763f80ec583 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 21 Oct 2011 09:55:40 -0500
Subject: fixing typo in attribution block

---
 application/config/database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/config/database.php')

diff --git a/application/config/database.php b/application/config/database.php
index c2761bc85..28b792f75 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
-- 
cgit v1.2.3-24-g4f1b