-- 
cgit v1.2.3-24-g4f1b

From f57a46b48287d7e5e5807100156e73730cf74e0c Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@gmail.com>
Date: Mon, 29 Aug 2011 23:26:07 -0300
Subject: Added the 'user_data' key to the userdata property so that sessions
 using a database can be deleted properly when using the table schema found in
 the "Saving Session Data to a Database" section of the Session Class in the
 user guide.

---
 system/libraries/Session.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 2c8a80163..8ee08c5b2 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -317,7 +317,8 @@ class CI_Session {
 							'session_id'	=> md5(uniqid($sessid, TRUE)),
 							'ip_address'	=> $this->CI->input->ip_address(),
 							'user_agent'	=> substr($this->CI->input->user_agent(), 0, 120),
-							'last_activity'	=> $this->now
+							'last_activity'	=> $this->now,
+							'user_data'		=> ''
 							);
 
 
-- 
cgit v1.2.3-24-g4f1b


From f2d4eb599b52089989073b7c9a2c54df85732c66 Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@gmail.com>
Date: Wed, 31 Aug 2011 10:52:08 -0300
Subject: Added Sessions 'user_data' field bug fix item to log.

---
 user_guide/changelog.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 978b710be..c203746b8 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -118,6 +118,7 @@ Change Log
 	<li>Fixed a bug (#8) - <samp>load_class()</samp> now looks for core classes in <samp>APPPATH</samp> first, allowing them to be replaced.</li>
 	<li>Fixed a bug (#24) - ODBC database driver called incorrect parent in __construct().</li>
 	<li>Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did not escape correct.</li>
+	<li>Fixed a bug (#344) - Using schema found in <a href="libraries/sessions.html">Saving Session Data to a Database</a>, system would throw error "user_data does not have a default value" when deleting then creating a session.</li>
 </ul>
 
 <h2>Version 2.0.3</h2>
-- 
cgit v1.2.3-24-g4f1b


From 0e857631f5c6f38c5715450ea3f6ff514ac65b2c Mon Sep 17 00:00:00 2001
From: kenjis <kenji@codeigniter.jp>
Date: Fri, 2 Sep 2011 08:41:17 +0900
Subject: fixes potential SQL injection vector in Active Record offset()

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

diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 37d162bc1..89766e304 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -894,7 +894,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	 */
 	public function offset($offset)
 	{
-		$this->ar_offset = $offset;
+		$this->ar_offset = (int) $offset;
 		return $this;
 	}
 
-- 
cgit v1.2.3-24-g4f1b


From 87db1b7056ae2b964f13a8e3cc915b1bce8959d5 Mon Sep 17 00:00:00 2001
From: Thomas Traub <thomastraub2000@yahoo.de>
Date: Sat, 3 Sep 2011 17:19:06 +0200
Subject: Changed up to down for down method error line

---
 system/language/english/migration_lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/language/english/migration_lang.php b/system/language/english/migration_lang.php
index 4763ca243..94cb882fb 100644
--- a/system/language/english/migration_lang.php
+++ b/system/language/english/migration_lang.php
@@ -5,7 +5,7 @@ $lang['migration_not_found']			= "This migration could not be found.";
 $lang['migration_multiple_version']		= "This are multiple migrations with the same version number: %d.";
 $lang['migration_class_doesnt_exist']	= "The migration class \"%s\" could not be found.";
 $lang['migration_missing_up_method']	= "The migration class \"%s\" is missing an 'up' method.";
-$lang['migration_missing_down_method']	= "The migration class \"%s\" is missing an 'up' method.";
+$lang['migration_missing_down_method']	= "The migration class \"%s\" is missing a 'down' method.";
 $lang['migration_invalid_filename']		= "Migration \"%s\" has an invalid filename.";
 
 
-- 
cgit v1.2.3-24-g4f1b


From e3f33942387909350d15adb1fa87d926fd5d8d03 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Sun, 4 Sep 2011 13:55:28 +0100
Subject: Removed reference is IS_CLI in the documentation, which should have
 been $this->input->is_cli_request()

---
 user_guide/general/cli.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html
index befc9994a..222a77c9d 100644
--- a/user_guide/general/cli.html
+++ b/user_guide/general/cli.html
@@ -83,7 +83,7 @@ Running via the CLI
 
 <ul>
 	<li>Run your cron-jobs without needing to use wget or curl</li>
-	<li>Make your cron-jobs inaccessible from being loaded in the URL by checking for <kbd>IS_CLI</kbd></li>
+	<li>Make your cron-jobs inaccessible from being loaded in the URL by checking for <kbd>$this->input->is_cli_request()</kbd></li>
 	<li>Make interactive "tasks" that can do things like set permissions, prune cache folders, run backups, etc.</li>
 	<li>Integrate with other applications in other languages. For example, a random C++ script could call one command and run code in your models!</li>
 </ul>
-- 
cgit v1.2.3-24-g4f1b


From 40d1a7684444f6a8eb4cda23d8822f0b258f0c3e Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Sun, 4 Sep 2011 13:57:52 +0100
Subject: Fixed incorrectly named variables in the documentation.

---
 user_guide/database/results.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide/database/results.html b/user_guide/database/results.html
index ec5f97762..a47e335cb 100644
--- a/user_guide/database/results.html
+++ b/user_guide/database/results.html
@@ -105,8 +105,8 @@ Query Results
 	<br />
 	foreach ($query->result('User') as $user)<br />
 	{<br />
-	&nbsp;&nbsp;&nbsp;echo $row->name; // call attributes<br />
-	&nbsp;&nbsp;&nbsp;echo $row->reverse_name(); // or methods defined on the 'User' class<br />
+	&nbsp;&nbsp;&nbsp;echo $user->name; // call attributes<br />
+	&nbsp;&nbsp;&nbsp;echo $user->reverse_name(); // or methods defined on the 'User' class<br />
 	}
 	</code>
 
-- 
cgit v1.2.3-24-g4f1b


From 08488e8ec1ae0a0519b914459becdade7b004a09 Mon Sep 17 00:00:00 2001
From: purandi <free6300@gmail.com>
Date: Sun, 4 Sep 2011 20:15:15 +0700
Subject: Fix issue #378

---
 user_guide/database/results.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide/database/results.html b/user_guide/database/results.html
index ec5f97762..a47e335cb 100644
--- a/user_guide/database/results.html
+++ b/user_guide/database/results.html
@@ -105,8 +105,8 @@ Query Results
 	<br />
 	foreach ($query->result('User') as $user)<br />
 	{<br />
-	&nbsp;&nbsp;&nbsp;echo $row->name; // call attributes<br />
-	&nbsp;&nbsp;&nbsp;echo $row->reverse_name(); // or methods defined on the 'User' class<br />
+	&nbsp;&nbsp;&nbsp;echo $user->name; // call attributes<br />
+	&nbsp;&nbsp;&nbsp;echo $user->reverse_name(); // or methods defined on the 'User' class<br />
 	}
 	</code>
 
-- 
cgit v1.2.3-24-g4f1b

-- 
cgit v1.2.3-24-g4f1b


From 7fe625aa1b294d135c860a79830da12658238c7e Mon Sep 17 00:00:00 2001
From: Pedro Junior <v.ju.ni.or.v@gmail.com>
Date: Mon, 5 Sep 2011 09:47:09 -0300
Subject: CI_Profiler => Accepting objects while profiling session data.

---
 system/libraries/Profiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 330acce73..ac58129a9 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -506,7 +506,7 @@ class CI_Profiler {
 
 		foreach ($this->CI->session->all_userdata() as $key => $val)
 		{
-			if (is_array($val))
+			if (is_array($val) || is_object($val))
 			{
 				$val = print_r($val, TRUE);
 			}
-- 
cgit v1.2.3-24-g4f1b


From 8ed8192269cbaa7c8d47fc0608ca6169c4c9f237 Mon Sep 17 00:00:00 2001
From: genio <cwhitener@gmail.com>
Date: Tue, 6 Sep 2011 15:44:43 -0300
Subject: A few examples had http:/example.com instead of http://example.com

---
 user_guide/helpers/form_helper.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html
index dd935ebd9..0afe0eb53 100644
--- a/user_guide/helpers/form_helper.html
+++ b/user_guide/helpers/form_helper.html
@@ -84,7 +84,7 @@ in the event your URLs ever change.</p>
 
 <p>The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:</p>
 
-<code>&lt;form method="post" accept-charset="utf-8" action="http:/example.com/index.php/email/send" /></code>
+<code>&lt;form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send" /></code>
 
 <h4>Adding Attributes</h4>
 
@@ -97,7 +97,7 @@ echo form_open('email/send', $attributes);</code>
 
 <p>The above example would create a form similar to this:</p>
 
-<code>&lt;form method="post" accept-charset="utf-8" action="http:/example.com/index.php/email/send" &nbsp;class="email" &nbsp;id="myform" /></code>
+<code>&lt;form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send" &nbsp;class="email" &nbsp;id="myform" /></code>
 
 <h4>Adding Hidden Input Fields</h4>
 
@@ -110,7 +110,7 @@ echo form_open('email/send', '', $hidden);</code>
 
 <p>The above example would create a form similar to this:</p>
 
-<code>&lt;form method="post" accept-charset="utf-8" action="http:/example.com/index.php/email/send"><br />
+<code>&lt;form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send"><br />
 &lt;input type="hidden" name="username" value="Joe" /><br />
 &lt;input type="hidden" name="member_id" value="234" /></code>
 
-- 
cgit v1.2.3-24-g4f1b


From c394dbd01d3dfc75357379077d673926118b2ef8 Mon Sep 17 00:00:00 2001
From: genio <cwhitener@gmail.com>
Date: Tue, 6 Sep 2011 15:48:17 -0300
Subject: added the change to form_helper documentation to the change list

---
 user_guide/changelog.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index fb6e4493a..cee8cc52a 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -75,8 +75,9 @@ Change Log
 	<li>Helpers
 		<ul>
 			<li>Added <samp>increment_string()</samp> to <a href="helpers/string_helper.html">String Helper</a> to turn "foo" into "foo-1" or "foo-1" into "foo-2".</li>
-        	<li>Altered form helper - made action on form_open_multipart helper function call optional.  Fixes (#65)</li>
+        		<li>Altered form helper - made action on form_open_multipart helper function call optional.  Fixes (#65)</li>
 			<li><samp>url_title()</samp> will now trim extra dashes from beginning and end.</li>
+        		<li>Fixed a couple of typos in the <a href="helpers/form_helper.html">Form Helper</a> documentation.</li>
 		</ul>
 	</li>
 	<li>Database
-- 
cgit v1.2.3-24-g4f1b


From 9e2df7c1fc8f8f5c9837f52c308f72e9f326b577 Mon Sep 17 00:00:00 2001
From: druu <zappa@crushhour.net>
Date: Tue, 6 Sep 2011 22:19:59 +0300
Subject: Major speed improvement in function random_string() for cases
 'alpha', 'alnum', 'numeric' and 'nozero'

---
 system/helpers/string_helper.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php
index 9fa69f46c..dd8ffaddb 100644
--- a/system/helpers/string_helper.php
+++ b/system/helpers/string_helper.php
@@ -215,12 +215,9 @@ if ( ! function_exists('random_string'))
 						case 'nozero'	:	$pool = '123456789';
 							break;
 					}
-
-					$str = '';
-					for ($i=0; $i < $len; $i++)
-					{
-						$str .= substr($pool, mt_rand(0, strlen($pool) -1), 1);
-					}
+					
+					$str = substr(str_shuffle(str_repeat($pool, ceil($len/strlen($pool)))),0,$len);
+					
 					return $str;
 				break;
 			case 'unique'	:
-- 
cgit v1.2.3-24-g4f1b


From ec952d6694781140bbf95a589305d6a11e6a721e Mon Sep 17 00:00:00 2001
From: genio <cwhitener@gmail.com>
Date: Tue, 6 Sep 2011 16:54:37 -0300
Subject: took out the changelog on the typo

---
 user_guide/changelog.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index cee8cc52a..d9f28e96d 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -77,7 +77,6 @@ Change Log
 			<li>Added <samp>increment_string()</samp> to <a href="helpers/string_helper.html">String Helper</a> to turn "foo" into "foo-1" or "foo-1" into "foo-2".</li>
         		<li>Altered form helper - made action on form_open_multipart helper function call optional.  Fixes (#65)</li>
 			<li><samp>url_title()</samp> will now trim extra dashes from beginning and end.</li>
-        		<li>Fixed a couple of typos in the <a href="helpers/form_helper.html">Form Helper</a> documentation.</li>
 		</ul>
 	</li>
 	<li>Database
-- 
cgit v1.2.3-24-g4f1b


From 5feb8bb8c89875224049a44ae988500c532ed6d4 Mon Sep 17 00:00:00 2001
From: druu <zappa@crushhour.net>
Date: Tue, 6 Sep 2011 22:18:26 +0200
Subject: Added changelog entry

---
 user_guide/changelog.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index fb6e4493a..cdbbe6bda 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -77,6 +77,7 @@ Change Log
 			<li>Added <samp>increment_string()</samp> to <a href="helpers/string_helper.html">String Helper</a> to turn "foo" into "foo-1" or "foo-1" into "foo-2".</li>
         	<li>Altered form helper - made action on form_open_multipart helper function call optional.  Fixes (#65)</li>
 			<li><samp>url_title()</samp> will now trim extra dashes from beginning and end.</li>
+			<li>Improved speed of <a href="helpers/string_helper.html">String Helper</a>'s <b>random_string()</b> method</li>
 		</ul>
 	</li>
 	<li>Database
-- 
cgit v1.2.3-24-g4f1b


From 378d2d77485162390c286321da6f222021ab641d Mon Sep 17 00:00:00 2001
From: Troy McCormick <extjspoker@gmail.com>
Date: Wed, 7 Sep 2011 09:32:41 -0700
Subject: Added CodeIgniter version information to footer of default welcome
 message view.

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

diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 0bf5a8d2e..5faac1c2c 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -81,7 +81,7 @@
 		<p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="user_guide/">User Guide</a>.</p>
 	</div>
 
-	<p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds</p>
+	<p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. CodeIgniter Version <?php echo CI_VERSION; ?></p>
 </div>
 
 </body>
-- 
cgit v1.2.3-24-g4f1b


From 3b3e652827855cf216b6bbf872c9b7c788719823 Mon Sep 17 00:00:00 2001
From: Troy McCormick <extjspoker@gmail.com>
Date: Wed, 7 Sep 2011 09:39:53 -0700
Subject: Added environment flag to ensure there is no security risk, per
 ericbarnes on IRC...

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

diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 5faac1c2c..9a0bef847 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -81,7 +81,7 @@
 		<p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="user_guide/">User Guide</a>.</p>
 	</div>
 
-	<p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. CodeIgniter Version <?php echo CI_VERSION; ?></p>
+	<p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php if (ENVIRONMENT == "development") { echo "CodeIgniter Version " . CI_VERSION; } ?></p>
 </div>
 
 </body>
-- 
cgit v1.2.3-24-g4f1b


From bff3dfda42b58289c41f88342a0ab17846f52f3b Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Wed, 7 Sep 2011 18:54:25 +0200
Subject: Use NULL as the default value for offset in limit(x, offset) so that
 default is not LIMIT 0.

---
 system/database/DB_active_rec.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 89766e304..7162e2ac5 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -872,11 +872,11 @@ class CI_DB_active_record extends CI_DB_driver {
 	 * @param	integer	the offset value
 	 * @return	object
 	 */
-	public function limit($value, $offset = '')
+	public function limit($value, $offset = NULL)
 	{
 		$this->ar_limit = (int) $value;
 
-		if ($offset != '')
+		if ( ! is_null($offset))
 		{
 			$this->ar_offset = (int) $offset;
 		}
-- 
cgit v1.2.3-24-g4f1b


From ce592c42b6b41de2465799021a9ee71deec5b6f3 Mon Sep 17 00:00:00 2001
From: Troy McCormick <extjspoker@gmail.com>
Date: Wed, 7 Sep 2011 11:23:58 -0700
Subject: Added toopay's change and bolded the version number...as that's
 baller...or some such...

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

diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 9a0bef847..d906bc8d7 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -81,7 +81,7 @@
 		<p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="user_guide/">User Guide</a>.</p>
 	</div>
 
-	<p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php if (ENVIRONMENT == "development") { echo "CodeIgniter Version " . CI_VERSION; } ?></p>
+	<p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT == 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
 </div>
 
 </body>
-- 
cgit v1.2.3-24-g4f1b


From 2b11da4141140244431ce4010ac506160516cdfd Mon Sep 17 00:00:00 2001
From: purwandi <free6300@gmail.com>
Date: Thu, 8 Sep 2011 19:05:29 +0700
Subject: Modified repo from mercurial to git on User Guide

---
 user_guide/installation/downloads.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html
index 539fbc170..b1b315958 100644
--- a/user_guide/installation/downloads.html
+++ b/user_guide/installation/downloads.html
@@ -88,14 +88,14 @@ Downloading CodeIgniter
 
 
 
-<h1 id="hg">Mercurial Server</h1>
-<p><a href="http://mercurial.selenic.com">Mercurial</a> is a distributed version control system.</p>
+<h1 id="git">Git Server</h1>
+<p><a href="http://git-scm.com/about">Git</a> is a distributed version control system.</p>
 
-							<p>Public Hg access is available at <a href="http://bitbucket.org/ellislab/codeigniter-reactor/">BitBucket</a>.
+							<p>Public Git access is available at <a href="https://github.com/EllisLab/CodeIgniter">Github</a>.
 								Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken
 								from the tip.</p>
 
-							<p>Beginning with version 1.6.1, stable tags are also available via BitBucket, simply select the version from the Tags dropdown.</p>
+							<p>Beginning with version 2.0.3, stable tags are also available via Github, simply select the version from the Tags dropdown.</p>
 </div>
 <!-- END CONTENT -->
 
-- 
cgit v1.2.3-24-g4f1b


From a1f3175a39caabf8983b778b1e00d076e00f537b Mon Sep 17 00:00:00 2001
From: purwandi <free6300@gmail.com>
Date: Thu, 8 Sep 2011 19:40:32 +0700
Subject: Fix some typo

---
 user_guide/installation/downloads.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html
index b1b315958..bb18f1de2 100644
--- a/user_guide/installation/downloads.html
+++ b/user_guide/installation/downloads.html
@@ -91,11 +91,11 @@ Downloading CodeIgniter
 <h1 id="git">Git Server</h1>
 <p><a href="http://git-scm.com/about">Git</a> is a distributed version control system.</p>
 
-							<p>Public Git access is available at <a href="https://github.com/EllisLab/CodeIgniter">Github</a>.
+							<p>Public Git access is available at <a href="https://github.com/EllisLab/CodeIgniter">GitHub</a>.
 								Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken
 								from the tip.</p>
 
-							<p>Beginning with version 2.0.3, stable tags are also available via Github, simply select the version from the Tags dropdown.</p>
+							<p>Beginning with version 2.0.3, stable tags are also available via GitHub, simply select the version from the Tags dropdown.</p>
 </div>
 <!-- END CONTENT -->
 
-- 
cgit v1.2.3-24-g4f1b


From ca24f5e36b9c460813ee740acda1f41eaa533c3f Mon Sep 17 00:00:00 2001
From: purwandi <free6300@gmail.com>
Date: Thu, 8 Sep 2011 22:03:22 +0700
Subject: modified read me.md

---
 readme.md | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/readme.md b/readme.md
index 7919465d6..74e294a15 100644
--- a/readme.md
+++ b/readme.md
@@ -2,6 +2,94 @@
 
 CodeIgniter is an Application Development Framework - a toolkit - for people who build web sites using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by minimizing the amount of code needed for a given task.
 
+# Release Information
+
+CodeIgniter 2.1.0 Dev
+
+THIS RELASE IS A DEVELOPMENT REALEASE AND NOT INTENDED FOR PRODUCTION USE.
+PLASE USE AT YOUR OWN RISK
+
+# Changelog and New Feature
+
+You can find it on [user_guide/changelog.html](https://github.com/EllisLab/CodeIgniter/blob/develop/user_guide/changelog.html)
+
+# Server Requirements
+
+* PHP version 5.1.6 or newer.
+* A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, ODBC and CUBRID.
+
+# Installation 
+
+Please see file on [CodeIgniter User Guide](http://codeigniter.com/user_guide/installation/index.html)
+
+# Contributing
+
+CodeIgniter is a community driven project and accepts contributions of code and documentation from the community. These contributions are made in the form of Issues or Pull Requests on the EllisLab CodeIgniter repository on GitHub.
+
+Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please check a few things first:
+
+     
+    There is not already an open Issue
+     
+    The issue has already been fixed (check the develop branch, or look for closed Issues)
+     
+    Is it something really obvious that you fix it yourself?
+
+Reporting issues is helpful but an even better approach is to send a Pull Request, which is done by “Forking” the main repository and committing to your own copy. This will require you to use the version control system called Git.
+Guidelines
+
+Before we look into how, here are the guidelines. If your Pull Requests fail to pass these guidelines it will be declined and you will need to re-submit when you’ve made the changes. This might sound a bit tough, but it is required for us to maintain quality of the code-base.
+
+PHP Style: All code must meet the Style Guide, which is essentially the Allman indent style, underscores and readable operators. This makes certain that all code is the same format as the existing code and means it will be as readable as possible.
+
+Documentation: If you change anything that requires a change to documentation then you will need to add it. New classes, methods, parameters, changing default values, etc are all things that will require a change to documentation. The change-log must also be updated for every change. Also PHPDoc blocks must be maintained.
+
+Compatibility: CodeIgniter is compatible with PHP 5.1.6 so all code supplied must stick to this requirement. If PHP 5.2 or 5.3 functions or features are used then there must be a fallback for PHP 5.1.6.
+
+Branching: CodeIgniter uses the Git-Flow branching model which requires all pull requests to be sent to the “develop” branch. This is where the next planned version will be developed. The “master” branch will always contain the latest stable version and is kept clean so a “hotfix” (e.g: an emergency security patch) can be applied to master to create a new version, without worrying about other features holding it up. For this reason all commits need to be made to “develop” and any sent to “master” will be closed automatically. If you have multiple changes to submit, please place all changes into their own branch on your fork.
+
+One thing at a time: A pull request should only contain one change. That does not mean only one commit, but one change - however many commits it took. The reason for this is that if you change X and Y but send a pull request for both at the same time, we might really want X but disagree with Y, meaning we cannot merge the request. Using the Git-Flow branching model you can create new branches for both of these features and send two requests.
+How-to Guide
+
+There are two ways to make changes, the easy way and the hard way. Either way you will need to create a GitHub account.
+Easy way
+
+GitHub allows in-line editing of files for making simple typo changes and quick-fixes. This is not the best way as you are unable to test the code works. If you do this you could be introducing syntax errors, etc, but for a Git-phobic user this is good for a quick-fix.
+Hard way
+
+The best way to contribute is to “clone” your fork of CodeIgniter to your development area. That sounds like some jargon, but “forking” on GitHub means “making a copy of that repo to your account” and “cloning” means “copying that code to your environment so you can work on it”.
+
+    Set up Git (Windows, Mac & Linux)
+    Go to the CodeIgniter repo
+    Fork it
+    Clone your CodeIgniter repo: git@github.com:<your-name>/CodeIgniter.git
+    Checkout the “develop” branch At this point you are ready to start making changes. Fix existing bugs on the Issue tracker after taking a look to see nobody else is working on them.
+    Commit the files
+    Push your develop branch to your fork
+    Send a pull request http://help.github.com/send-pull-requests/
+
+The Reactor Engineers will now be alerted about the change and at least one of the team will respond. If your change fails to meet the guidelines it will be bounced, or feedback will be provided to help you improve it.
+
+Once the Reactor Engineer handling your pull request is happy with it they will post it to the internal EllisLab discussion area to be double checked by the other Engineers and EllisLab developers. If nobody has a problem with the change then it will be merged into develop and will be part of the next release.
+Keeping your fork up-to-date
+
+Unlike systems like Subversion, Git can have multiple remotes. A remote is the name for a URL of a Git repository. By default your fork will have a remote named “origin” which points to your fork, but you can add another remote named “codeigniter” which points to git://github.com/EllisLab/CodeIgniter.git. This is a read-only remote but you can pull from this develop branch to update your own.
+
+If you are using command-line you can do the following:
+
+    git remote add codeigniter git://github.com/EllisLab/CodeIgniter.git
+
+    git pull codeigniter develop
+
+    git push origin develop
+
+Now your fork is up to date. This should be done regularly, or before you send a pull request at least.
+
+# License
+
+The files in this archive are released under the EllisLab's license.
+You can find a copy of this license in license.txt.
+
 # Resources
 
  * [User Guide](http://codeigniter.com/user_guide/)
-- 
cgit v1.2.3-24-g4f1b


From 80023511af5dfb47b01ca1381da22490319835a2 Mon Sep 17 00:00:00 2001
From: purwandi <free6300@gmail.com>
Date: Thu, 8 Sep 2011 22:09:20 +0700
Subject: Added some tag link

---
 readme.md | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/readme.md b/readme.md
index 74e294a15..7d7bf9d4a 100644
--- a/readme.md
+++ b/readme.md
@@ -24,15 +24,13 @@ Please see file on [CodeIgniter User Guide](http://codeigniter.com/user_guide/in
 
 # Contributing
 
-CodeIgniter is a community driven project and accepts contributions of code and documentation from the community. These contributions are made in the form of Issues or Pull Requests on the EllisLab CodeIgniter repository on GitHub.
+CodeIgniter is a community driven project and accepts contributions of code and documentation from the community. These contributions are made in the form of Issues or [Pull Requests](http://help.github.com/send-pull-requests/) on the [EllisLab CodeIgniter repository](https://github.com/EllisLab/CodeIgniter) on GitHub.
 
 Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please check a few things first:
 
      
     There is not already an open Issue
-     
     The issue has already been fixed (check the develop branch, or look for closed Issues)
-     
     Is it something really obvious that you fix it yourself?
 
 Reporting issues is helpful but an even better approach is to send a Pull Request, which is done by “Forking” the main repository and committing to your own copy. This will require you to use the version control system called Git.
@@ -40,30 +38,30 @@ Guidelines
 
 Before we look into how, here are the guidelines. If your Pull Requests fail to pass these guidelines it will be declined and you will need to re-submit when you’ve made the changes. This might sound a bit tough, but it is required for us to maintain quality of the code-base.
 
-PHP Style: All code must meet the Style Guide, which is essentially the Allman indent style, underscores and readable operators. This makes certain that all code is the same format as the existing code and means it will be as readable as possible.
+PHP Style: All code must meet the [Style Guide](http://codeigniter.com/user_guide/general/styleguide.html), which is essentially the [Allman indent style](http://en.wikipedia.org/wiki/Indent_style#Allman_style), underscores and readable operators. This makes certain that all code is the same format as the existing code and means it will be as readable as possible.
 
 Documentation: If you change anything that requires a change to documentation then you will need to add it. New classes, methods, parameters, changing default values, etc are all things that will require a change to documentation. The change-log must also be updated for every change. Also PHPDoc blocks must be maintained.
 
 Compatibility: CodeIgniter is compatible with PHP 5.1.6 so all code supplied must stick to this requirement. If PHP 5.2 or 5.3 functions or features are used then there must be a fallback for PHP 5.1.6.
 
-Branching: CodeIgniter uses the Git-Flow branching model which requires all pull requests to be sent to the “develop” branch. This is where the next planned version will be developed. The “master” branch will always contain the latest stable version and is kept clean so a “hotfix” (e.g: an emergency security patch) can be applied to master to create a new version, without worrying about other features holding it up. For this reason all commits need to be made to “develop” and any sent to “master” will be closed automatically. If you have multiple changes to submit, please place all changes into their own branch on your fork.
+Branching: CodeIgniter uses the [Git-Flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model which requires all pull requests to be sent to the “develop” branch. This is where the next planned version will be developed. The “master” branch will always contain the latest stable version and is kept clean so a “hotfix” (e.g: an emergency security patch) can be applied to master to create a new version, without worrying about other features holding it up. For this reason all commits need to be made to “develop” and any sent to “master” will be closed automatically. If you have multiple changes to submit, please place all changes into their own branch on your fork.
 
 One thing at a time: A pull request should only contain one change. That does not mean only one commit, but one change - however many commits it took. The reason for this is that if you change X and Y but send a pull request for both at the same time, we might really want X but disagree with Y, meaning we cannot merge the request. Using the Git-Flow branching model you can create new branches for both of these features and send two requests.
 How-to Guide
+There are two ways to make changes, the easy way and the hard way. Either way you will need to [create a GitHub account](https://github.com/signup/free).
 
-There are two ways to make changes, the easy way and the hard way. Either way you will need to create a GitHub account.
 Easy way
-
 GitHub allows in-line editing of files for making simple typo changes and quick-fixes. This is not the best way as you are unable to test the code works. If you do this you could be introducing syntax errors, etc, but for a Git-phobic user this is good for a quick-fix.
-Hard way
 
+Hard way
 The best way to contribute is to “clone” your fork of CodeIgniter to your development area. That sounds like some jargon, but “forking” on GitHub means “making a copy of that repo to your account” and “cloning” means “copying that code to your environment so you can work on it”.
 
     Set up Git (Windows, Mac & Linux)
     Go to the CodeIgniter repo
     Fork it
     Clone your CodeIgniter repo: git@github.com:<your-name>/CodeIgniter.git
-    Checkout the “develop” branch At this point you are ready to start making changes. Fix existing bugs on the Issue tracker after taking a look to see nobody else is working on them.
+    Checkout the “develop” branch At this point you are ready to start making changes. 
+	Fix existing bugs on the Issue tracker after taking a look to see nobody else is working on them.
     Commit the files
     Push your develop branch to your fork
     Send a pull request http://help.github.com/send-pull-requests/
@@ -78,10 +76,8 @@ Unlike systems like Subversion, Git can have multiple remotes. A remote is the n
 If you are using command-line you can do the following:
 
     git remote add codeigniter git://github.com/EllisLab/CodeIgniter.git
-
-    git pull codeigniter develop
-
-    git push origin develop
+	git pull codeigniter develop
+	git push origin develop
 
 Now your fork is up to date. This should be done regularly, or before you send a pull request at least.
 
-- 
cgit v1.2.3-24-g4f1b


From 6855e9c78332ef8f548f33133d3c2bb4cd6691b6 Mon Sep 17 00:00:00 2001
From: purwandi <free6300@gmail.com>
Date: Thu, 8 Sep 2011 22:16:55 +0700
Subject: Fix some text

---
 readme.md | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/readme.md b/readme.md
index 7d7bf9d4a..b28329234 100644
--- a/readme.md
+++ b/readme.md
@@ -2,27 +2,27 @@
 
 CodeIgniter is an Application Development Framework - a toolkit - for people who build web sites using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by minimizing the amount of code needed for a given task.
 
-# Release Information
+## Release Information
 
 CodeIgniter 2.1.0 Dev
 
 THIS RELASE IS A DEVELOPMENT REALEASE AND NOT INTENDED FOR PRODUCTION USE.
 PLASE USE AT YOUR OWN RISK
 
-# Changelog and New Feature
+## Changelog and New Feature
 
 You can find it on [user_guide/changelog.html](https://github.com/EllisLab/CodeIgniter/blob/develop/user_guide/changelog.html)
 
-# Server Requirements
+## Server Requirements
 
 * PHP version 5.1.6 or newer.
 * A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, ODBC and CUBRID.
 
-# Installation 
+## Installation 
 
 Please see file on [CodeIgniter User Guide](http://codeigniter.com/user_guide/installation/index.html)
 
-# Contributing
+## Contributing
 
 CodeIgniter is a community driven project and accepts contributions of code and documentation from the community. These contributions are made in the form of Issues or [Pull Requests](http://help.github.com/send-pull-requests/) on the [EllisLab CodeIgniter repository](https://github.com/EllisLab/CodeIgniter) on GitHub.
 
@@ -34,7 +34,9 @@ Issues are a quick way to point out a bug. If you find a bug or documentation er
     Is it something really obvious that you fix it yourself?
 
 Reporting issues is helpful but an even better approach is to send a Pull Request, which is done by “Forking” the main repository and committing to your own copy. This will require you to use the version control system called Git.
+
 Guidelines
+----------
 
 Before we look into how, here are the guidelines. If your Pull Requests fail to pass these guidelines it will be declined and you will need to re-submit when you’ve made the changes. This might sound a bit tough, but it is required for us to maintain quality of the code-base.
 
@@ -47,7 +49,10 @@ Compatibility: CodeIgniter is compatible with PHP 5.1.6 so all code supplied mus
 Branching: CodeIgniter uses the [Git-Flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model which requires all pull requests to be sent to the “develop” branch. This is where the next planned version will be developed. The “master” branch will always contain the latest stable version and is kept clean so a “hotfix” (e.g: an emergency security patch) can be applied to master to create a new version, without worrying about other features holding it up. For this reason all commits need to be made to “develop” and any sent to “master” will be closed automatically. If you have multiple changes to submit, please place all changes into their own branch on your fork.
 
 One thing at a time: A pull request should only contain one change. That does not mean only one commit, but one change - however many commits it took. The reason for this is that if you change X and Y but send a pull request for both at the same time, we might really want X but disagree with Y, meaning we cannot merge the request. Using the Git-Flow branching model you can create new branches for both of these features and send two requests.
+
 How-to Guide
+------------
+
 There are two ways to make changes, the easy way and the hard way. Either way you will need to [create a GitHub account](https://github.com/signup/free).
 
 Easy way
@@ -81,15 +86,20 @@ If you are using command-line you can do the following:
 
 Now your fork is up to date. This should be done regularly, or before you send a pull request at least.
 
-# License
+## License
 
 The files in this archive are released under the EllisLab's license.
 You can find a copy of this license in license.txt.
 
-# Resources
+## Resources
 
  * [User Guide](http://codeigniter.com/user_guide/)
  * [Community Forums](http://codeigniter.com/forums/)
  * [User Voice](http://codeigniter.uservoice.com/forums/40508-codeigniter-reactor)
  * [Community Wiki](http://codeigniter.com/wiki/)
- * [Community IRC](http://codeigniter.com/irc/)
\ No newline at end of file
+ * [Community IRC](http://codeigniter.com/irc/)
+
+## Acknowledgement
+
+The EllisLab's team and The Reactor Engineers would like to thank all the contributors to the CodeIgniter project, our corporate sponsor, and you, the CodeIgniter user.
+Please visit us sometime soon at [CodeIgniter](http://codeigniter.com)
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 0aaaeb071f9c5e795e5d3a39888c23cba5e8e738 Mon Sep 17 00:00:00 2001
From: kenjis <kenji@codeigniter.jp>
Date: Fri, 9 Sep 2011 15:40:29 +0900
Subject: fix the variable name of system folder in
 user_guide/installation/index.html

---
 user_guide/installation/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html
index 84338e2e6..ad66ad7a6 100644
--- a/user_guide/installation/index.html
+++ b/user_guide/installation/index.html
@@ -67,14 +67,14 @@ Installation Instructions
 </ol>
 
 <p>If you wish to increase security by hiding the location of your CodeIgniter files you can rename the <dfn>system</dfn> and <dfn>application</dfn> folders
-to something more private.  If you do rename them, you must open your main <kbd>index.php</kbd> file and set the <samp>$system_folder</samp> and <samp>$application_folder</samp>
+to something more private.  If you do rename them, you must open your main <kbd>index.php</kbd> file and set the <samp>$system_path</samp> and <samp>$application_folder</samp>
 variables at the top of the file with the new name you've chosen.</p>
 
 <p>For the best security, both the <dfn>system</dfn> and any <dfn>application</dfn> folders should be placed above web root so that they are not directly accessible via a browser.  By default, .htaccess files are included in each folder to help prevent direct access, but it is best to remove them from public access entirely in case the web server configuration changes or doesn't abide by the .htaccess.</p>
 
 <p>If you would like to keep your views public it is also possible to move the <dfn>views</dfn> folder out of your application folder.</p>
 
-<p>After moving them, open your main <kdb>index.php</kbd> file and set the <samp>$system_folder</samp>, <samp>$application_folder</samp> and <samp>$view_folder</samp> variables, preferably with a full path, e.g. '<dfn>/www/MyUser/system</dfn>'.</p>
+<p>After moving them, open your main <kdb>index.php</kbd> file and set the <samp>$system_path</samp>, <samp>$application_folder</samp> and <samp>$view_folder</samp> variables, preferably with a full path, e.g. '<dfn>/www/MyUser/system</dfn>'.</p>
 
 <p>
     One additional measure to take in production environments is to disable
@@ -107,4 +107,4 @@ Next Topic:&nbsp;&nbsp;<a href="upgrading.html">Upgrading from a Previous Versio
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
-- 
cgit v1.2.3-24-g4f1b


From 68ee3db9defd9d3ec8b3b97e768863fd62c7cb6e Mon Sep 17 00:00:00 2001
From: kenjis <kenji@codeigniter.jp>
Date: Fri, 9 Sep 2011 15:44:05 +0900
Subject: fix typo of HTML tags in user_guide/changelog.html

---
 user_guide/changelog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 005237e20..7d79b4d22 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -179,7 +179,7 @@ Change Log
 	<li class="reactor">Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.</li>
 	<li class="reactor">Fixed a bug where the method <kbd>$this->cart->total_items()</kbd> from <a href="libraries/cart.html">Cart Library</a> now returns the sum of the quantity of all items in the cart instead of your total count.</li>
 	<li class="reactor">Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.</li>
-	<li class="reactor">Fixed a bug where using <kbd>$this->db->select_max()</kdb>, <kbd>$this->db->select_min()</kdb>, etc could throw notices. Thanks to w43l for the patch.</li>
+	<li class="reactor">Fixed a bug where using <kbd>$this->db->select_max()</kbd>, <kbd>$this->db->select_min()</kbd>, etc could throw notices. Thanks to w43l for the patch.</li>
 	<li class="reactor">Replace checks for STDIN with php_sapi_name() == 'cli' which on the whole is more reliable. This should get parameters in crontab working.</li>
 </ul>
 
-- 
cgit v1.2.3-24-g4f1b


From 911724f19a662ff0039c768b33818282533c41be Mon Sep 17 00:00:00 2001
From: kenjis <kenji@codeigniter.jp>
Date: Fri, 9 Sep 2011 15:46:24 +0900
Subject: fix changelog.html, correct the location of added mime types

The addition is not in 2.0.3, but in 2.1.0
fix to https://github.com/EllisLab/CodeIgniter/commit/0ba26c731cf8838b5239c1a7957bc18f58fe2f7d#user_guide/changelog.html
---
 user_guide/changelog.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 7d79b4d22..3b4c72b4c 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -70,6 +70,10 @@ Change Log
 			<li>Callback validation rules can now accept parameters like any other validation rule.</li>
 			<li>Ability to log certain error types, not all under a threshold.</li>
 			<li>Added html_escape() to <a href="general/common_functions.html">Common functions</a> to escape HTML output for preventing XSS.</li>
+			<li>Added support for pem,p10,p12,p7a,p7c,p7m,p7r,p7s,crt,crl,der,kdb,rsa,cer,sst,csr Certs to mimes.php.</li>
+			<li>Added support pgp,gpg to mimes.php.</li>
+			<li>Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.</li>
+			<li>Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.</li>
 		</ul>
 	</li>
 	<li>Helpers
@@ -143,11 +147,6 @@ Change Log
 			<li class="reactor">Added "application/x-csv" to mimes.php.</li>
 			<li class="reactor">Added CSRF protection URI whitelisting.</li>
 			<li>Fixed a bug where <a href="libraries/email.html">Email library</a> attachments with a "." in the name would using invalid MIME-types.</li>
-            <li>Added support for pem,p10,p12,p7a,p7c,p7m,p7r,p7s,crt,crl,der,kdb,rsa,cer,sst,csr Certs to mimes.php.</li>
-            <li>Added support pgp,gpg to mimes.php.</li>
-            <li>Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.</li>
-            <li>Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.</li>
-
 		</ul>
 	</li>
 	<li>Helpers
-- 
cgit v1.2.3-24-g4f1b


From 8c50c8e960e1549fc6168c60bbf6f179c80db2eb Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@gmail.com>
Date: Fri, 9 Sep 2011 12:11:21 -0300
Subject: Documented an un-documented feature, the 'enclosures' parameter, to
 the documentation for DB Util's result_to_csv() method.

---
 user_guide/database/utilities.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html
index 8231c7e78..570e44713 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -183,14 +183,15 @@ $query = $this->db->query("SELECT * FROM mytable");<br />
 echo $this->dbutil->csv_from_result($query);
 </code>
 
-<p>The second and third parameters allows you to
-set the delimiter and newline character.  By default tabs are used as the delimiter and "\n" is used as a new line.  Example:</p>
+<p>The second, third, and fourth parameters allow you to
+set the delimiter, newline, enclosure characters, respectively.  By default tabs are used as the delimiter, "\n" is used as a new line, and a double-quote is used as the enclosure.  Example:</p>
 
 <code>
 $delimiter = ",";<br />
 $newline = "\r\n";<br />
+$enclosure = '"';<br />
 <br />
-echo $this->dbutil->csv_from_result($query, $delimiter, $newline);
+echo $this->dbutil->csv_from_result($query, $delimiter, $newline, $enclosure);
 </code>
 
 <p><strong>Important:</strong>&nbsp; This function will NOT write the CSV file for you.  It simply creates the CSV layout.
-- 
cgit v1.2.3-24-g4f1b


From 07f8fb3261c820d59019e21aa8ae29f9872cdb30 Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@gmail.com>
Date: Fri, 9 Sep 2011 12:15:52 -0300
Subject: Forgot an 'and'...

---
 user_guide/database/utilities.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html
index 570e44713..c80e3d106 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -184,7 +184,7 @@ echo $this->dbutil->csv_from_result($query);
 </code>
 
 <p>The second, third, and fourth parameters allow you to
-set the delimiter, newline, enclosure characters, respectively.  By default tabs are used as the delimiter, "\n" is used as a new line, and a double-quote is used as the enclosure.  Example:</p>
+set the delimiter, newline, and enclosure characters respectively.  By default tabs are used as the delimiter, "\n" is used as a new line, and a double-quote is used as the enclosure.  Example:</p>
 
 <code>
 $delimiter = ",";<br />
-- 
cgit v1.2.3-24-g4f1b


From dd3b41544b2ac5dbac7f8240fa1ebb957fd43534 Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Fri, 9 Sep 2011 23:07:59 -0400
Subject: Small wording changes to the readme.

---
 readme.md | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/readme.md b/readme.md
index b28329234..06bf93d31 100644
--- a/readme.md
+++ b/readme.md
@@ -4,10 +4,7 @@ CodeIgniter is an Application Development Framework - a toolkit - for people who
 
 ## Release Information
 
-CodeIgniter 2.1.0 Dev
-
-THIS RELASE IS A DEVELOPMENT REALEASE AND NOT INTENDED FOR PRODUCTION USE.
-PLASE USE AT YOUR OWN RISK
+This repo contains in development code for future releases. To download the latest stable release please visit the [CodeIgniter Downloads](http://codeigniter.com/downloads/) page. 
 
 ## Changelog and New Feature
 
@@ -16,11 +13,10 @@ You can find it on [user_guide/changelog.html](https://github.com/EllisLab/CodeI
 ## Server Requirements
 
 * PHP version 5.1.6 or newer.
-* A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, ODBC and CUBRID.
 
 ## Installation 
 
-Please see file on [CodeIgniter User Guide](http://codeigniter.com/user_guide/installation/index.html)
+Please see the installation section of the [CodeIgniter User Guide](http://codeigniter.com/user_guide/installation/index.html)
 
 ## Contributing
 
@@ -88,8 +84,7 @@ Now your fork is up to date. This should be done regularly, or before you send a
 
 ## License
 
-The files in this archive are released under the EllisLab's license.
-You can find a copy of this license in license.txt.
+Please see the [license agreement](http://codeigniter.com/user_guide/license.html)
 
 ## Resources
 
@@ -101,5 +96,4 @@ You can find a copy of this license in license.txt.
 
 ## Acknowledgement
 
-The EllisLab's team and The Reactor Engineers would like to thank all the contributors to the CodeIgniter project, our corporate sponsor, and you, the CodeIgniter user.
-Please visit us sometime soon at [CodeIgniter](http://codeigniter.com)
\ No newline at end of file
+The EllisLab team and The Reactor Engineers would like to thank all the contributors to the CodeIgniter project and you, the CodeIgniter user.
-- 
cgit v1.2.3-24-g4f1b


From 61bb5012ba51ebbe5af11ef9d21741474f9f970d Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Sun, 11 Sep 2011 14:35:52 +0800
Subject: update user guide for replacing 'br/' with 'br /'

---
 user_guide/database/active_record.html   |  6 +++---
 user_guide/general/cli.html              |  4 ++--
 user_guide/helpers/string_helper.html    |  8 ++++----
 user_guide/installation/upgrade_201.html |  4 ++--
 user_guide/libraries/output.html         | 14 +++++++-------
 user_guide/libraries/user_agent.html     |  4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index 0f09e78c3..10259a4af 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -530,7 +530,7 @@ $this->db->insert('mytable', $object);
 <strong>array</strong> or an <strong>object</strong> to the function.  Here is an example using an array:</p>
 
 <code>
-$data = array(<br/>
+$data = array(<br />
 &nbsp;&nbsp;&nbsp;array(<br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'title' => 'My title' ,<br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'name' => 'My Name' ,<br />
@@ -540,7 +540,7 @@ $data = array(<br/>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'title' => 'Another title' ,<br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'name' => 'Another Name' ,<br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'date' => 'Another date'<br />
-&nbsp;&nbsp;&nbsp;)<br/>
+&nbsp;&nbsp;&nbsp;)<br />
 );<br />
 <br />
 $this->db->update_batch('mytable', $data);
@@ -783,4 +783,4 @@ Next Topic:&nbsp;&nbsp;<a href="transactions.html">Transactions</a>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html
index 222a77c9d..4e9bf8709 100644
--- a/user_guide/general/cli.html
+++ b/user_guide/general/cli.html
@@ -114,7 +114,7 @@ class Tools extends CI_Controller {
 <p>Instead, we are going to open Terminal in Mac/Lunix or go to Run > "cmd" in Windows and navigate to our CodeIgniter project.</p>
 
 <blockquote>
-	$ cd /path/to/project;<br/>
+	$ cd /path/to/project;<br />
 	$ php index.php tools message
 </blockquote>
 
@@ -147,4 +147,4 @@ Next Topic:&nbsp;&nbsp;<a href="reserved_names.html">Reserved Names</a></p>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html
index 314124037..ebdbd3ab2 100644
--- a/user_guide/helpers/string_helper.html
+++ b/user_guide/helpers/string_helper.html
@@ -96,9 +96,9 @@ String Helper
 
 <p>Usage example:</p>
 
-<code>echo increment_string('file', '_'); // "file_1"<br/>
-echo increment_string('file', '-', 2); // "file-2"<br/>
-echo increment_string('file-4'); // "file-5"<br/></code>
+<code>echo increment_string('file', '_'); // "file_1"<br />
+echo increment_string('file', '-', 2); // "file-2"<br />
+echo increment_string('file-4'); // "file-5"<br /></code>
 
 
 <h2>alternator()</h2>
@@ -186,4 +186,4 @@ Next Topic:&nbsp;&nbsp;<a href="text_helper.html">Text Helper</a>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html
index 036ef7c05..7ae29b824 100644
--- a/user_guide/installation/upgrade_201.html
+++ b/user_guide/installation/upgrade_201.html
@@ -83,7 +83,7 @@ Upgrading from 2.0.0 to 2.0.1
 
 <p>to use either a / or <kbd>base_url()</kbd>:</p>
 
-<code>echo form_open('/'); //&lt;form action="http://example.com/index.php/" method="post" accept-charset="utf-8"><br/>
+<code>echo form_open('/'); //&lt;form action="http://example.com/index.php/" method="post" accept-charset="utf-8"><br />
 echo form_open(base_url()); //&lt;form action="http://example.com/" method="post" accept-charset="utf-8"></code>
 
 </div>
@@ -102,4 +102,4 @@ Next Topic:&nbsp;&nbsp;<a href="troubleshooting.html">Troubleshooting</a>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html
index 7361d7961..64ba482ce 100644
--- a/user_guide/libraries/output.html
+++ b/user_guide/libraries/output.html
@@ -82,12 +82,12 @@ For example, if you build a page in one of your controller functions, don't set
 
 <p>Permits you to set the mime-type of your page so you can serve JSON data, JPEG's, XML, etc easily.</p>
 
-<code>$this->output<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;->set_content_type('application/json')<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;->set_output(json_encode(array('foo' => 'bar')));<br/>
-<br/>
-$this->output<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;->set_content_type('jpeg') // You could also use ".jpeg" which will have the full stop removed before looking in config/mimes.php<br/>
+<code>$this->output<br />
+&nbsp;&nbsp;&nbsp;&nbsp;->set_content_type('application/json')<br />
+&nbsp;&nbsp;&nbsp;&nbsp;->set_output(json_encode(array('foo' => 'bar')));<br />
+<br />
+$this->output<br />
+&nbsp;&nbsp;&nbsp;&nbsp;->set_content_type('jpeg') // You could also use ".jpeg" which will have the full stop removed before looking in config/mimes.php<br />
 &nbsp;&nbsp;&nbsp;&nbsp;->set_output(file_get_contents('files/something.jpg'));</code>
 
 <p><strong>Important:</strong> Make sure any non-mime string you pass to this method exists in config/mimes.php or it will have no effect.</p>
@@ -174,4 +174,4 @@ Next Topic:&nbsp;&nbsp;<a href="pagination.html">Pagination Class</a>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html
index e1d3640d3..d6641c883 100644
--- a/user_guide/libraries/user_agent.html
+++ b/user_guide/libraries/user_agent.html
@@ -133,7 +133,7 @@ You can find this list in <dfn>application/config/user_agents.php</dfn> if you w
 else if ($this->agent->is_mobile())<br />
 {<br />
 &nbsp;&nbsp;&nbsp;&nbsp;$this->load->view('mobile/home');<br />
-}<br/>
+}<br />
 else<br />
 {<br />
 &nbsp;&nbsp;&nbsp;&nbsp;$this->load->view('web/home');<br />
@@ -223,4 +223,4 @@ Next Topic:&nbsp;&nbsp;<a href="xmlrpc.html">XML-RPC Class</a>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
-- 
cgit v1.2.3-24-g4f1b


From b66af1f8bfb9b207762caf4666e0437340293b6e Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Sun, 11 Sep 2011 13:59:39 -0400
Subject: Change the wording for change log and new features.

---
 readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 06bf93d31..b6a88ea7a 100644
--- a/readme.md
+++ b/readme.md
@@ -6,9 +6,9 @@ CodeIgniter is an Application Development Framework - a toolkit - for people who
 
 This repo contains in development code for future releases. To download the latest stable release please visit the [CodeIgniter Downloads](http://codeigniter.com/downloads/) page. 
 
-## Changelog and New Feature
+## Changelog and New Features
 
-You can find it on [user_guide/changelog.html](https://github.com/EllisLab/CodeIgniter/blob/develop/user_guide/changelog.html)
+You can find a list of all changes for each release in the [user guide](https://github.com/EllisLab/CodeIgniter/blob/develop/user_guide/changelog.html).
 
 ## Server Requirements
 
-- 
cgit v1.2.3-24-g4f1b


From 869e3721d75e9798a706d24d93170f44e5ab6cb3 Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Sun, 11 Sep 2011 14:00:26 -0400
Subject: Changed the add_package_path documentation to show the second param
 for view path loading.

---
 user_guide/libraries/loader.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index af27176ad..98864a700 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -241,9 +241,9 @@ $this->load->library('foo_bar');</code>
 <p>In this instance, it is possible for view naming collisions within packages to occur, and possibly the incorrect package being loaded.  To ensure against this, set an optional second parameter of <var>FALSE</var> when calling <samp>add_package_path()</samp>.</p>
 
 <code>
-$this->load->add_package_path(APPPATH.'my_app', TRUE);<br>
+$this->load->add_package_path(APPPATH.'my_app', FALSE);<br>
 $this->load->view('my_app_index'); // Loads<br>
-$this->load->view('welcome_message'); // Will not load the default welcome_message b/c the second param to add_package_path is TRUE<br>
+$this->load->view('welcome_message'); // Will not load the default welcome_message b/c the second param to add_package_path is FALSE<br>
 <br>
 // Reset things<br>
 $this->load->remove_package_path(APPPATH.'my_app');<br>
-- 
cgit v1.2.3-24-g4f1b