From f4a4bd8fac188ebc9cda822ffc811c218fd92b45 Mon Sep 17 00:00:00 2001 From: Derek Jones 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/errors/error_general.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'application/errors/error_general.php') diff --git a/application/errors/error_general.php b/application/errors/error_general.php index 8b3746285..a0509c6bf 100644 --- a/application/errors/error_general.php +++ b/application/errors/error_general.php @@ -1,3 +1,31 @@ + + -- cgit v1.2.3-24-g4f1b From 61df9060d468ce28c40ee4a57d108763f80ec583 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 21 Oct 2011 09:55:40 -0500 Subject: fixing typo in attribution block --- application/errors/error_general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/errors/error_general.php') diff --git a/application/errors/error_general.php b/application/errors/error_general.php index a0509c6bf..7d9a29f4e 100644 --- a/application/errors/error_general.php +++ b/application/errors/error_general.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 From 0defe5d33ee2633f377a109519ca818becc60f64 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Sun, 1 Jan 2012 18:46:41 -0600 Subject: Updating copyright date to 2012 --- application/errors/error_general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/errors/error_general.php') diff --git a/application/errors/error_general.php b/application/errors/error_general.php index 7d9a29f4e..2a844a8e2 100644 --- a/application/errors/error_general.php +++ b/application/errors/error_general.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2012, 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 -- cgit v1.2.3-24-g4f1b