Automated merge with http://hg.ellislab.com/CodeIgniter2

5 files changed, 13 insertions, 9 deletions

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 80d830d9d..0b060da22 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -69,6 +69,7 @@ Hg Tag: </p>
 			<li>Plugins have been removed, in favor of Helpers.  The CAPTCHA plugin has been converted to a Helper and <a href="./helpers/captcha_helper.html">documented</a>.  The JavaScript calendar plugin was removed due to the ready availability of great JavaScript calendars, particularly with jQuery.</li>
 			<li>Added new special Library type: <a href="./general/drivers.html">Drivers</a>.</li>
 			<li>Moved the application folder outside of the system folder.</li>
+			<li>Moved system/cache and system/logs directories to the application directory.</li>
 			<li>Added routing overrides to the main index.php file, enabling the normal routing to be overridden on a per "index" file basis.</li>
 			<li>Added the ability to set config values (or override config values) directly from data set in the main index.php file.  This allows a single application to be used with multiple front controllers, each having its own config values.</li>
 			<li>Added <kbd>$config['directory_trigger']</kbd> to the config file so that a controller sub-directory can be specified when running _GET strings instead of URI segments.</li>
@@ -113,7 +114,7 @@ Hg Tag: </p>
 	</li>
 	<li>Database
 		<ul>
-			<li>Added <kbd>swap_pre</kbd> value to <a href="./database/configuration.html">database configuration</a>.</li>
+			<li><a href="./database/configuration.html">database configuration</a>.</li>
 			<li>Added <kbd>autoinit</kbd> value to <a href="./database/configuration.html">database configuration</a>.</li>
 			<li>Added <kbd>stricton</kbd> value to <a href="./database/configuration.html">database configuration</a>.</li>
 			<li>Added <kbd>database_exists()</kbd> to the <a href="database/utilities.html">Database Utilities Class</a>.</li>
@@ -123,6 +124,7 @@ Hg Tag: </p>
 			<li>Modified the database errors to show the filename and line number of the problematic query.</li>
 			<li>Removed the following deprecated functions: orwhere, orlike, groupby, orhaving, orderby, getwhere.</li>
 			<li>Removed deprecated _drop_database() and _create_database() functions from the db utility drivers.</li>
+			<li>Improved dbforge create_table() function for the Postgres driver.</li>
 		</ul>
 	</li>
 	<li>Helpers
@@ -162,6 +164,7 @@ Hg Tag: </p>
 			<li>Documented db->close().</li>
 			<li>Updated the router to support a default route with any number of segments.</li>
 			<li>Moved _remove_invisible_characters() function from the <a href="libraries/security.html">Security Library</a> to <a href="general/common_functions.html">common functions.</a></li>
+			<li>Added audio/mpeg3 as a valid mime type for MP3.</li>
 		</ul>
 	</li>
 </ul>
@@ -195,6 +198,7 @@ Hg Tag: </p>
 	<li>Added a log message in core/output if the cache directory config value was not found.</li>
 	<li>Fixed a bug where multiple libraries could not be loaded by passing an array to load-&gt;library()</li>
 	<li>Fixed a bug in the html helper where too much white space was rendered between the src and alt tags in the img() function.</li>
+	<li>Fixed a bug in the profilers _compile_queries() function.</li>
 </ul>
 
 <h2>Version 1.7.2</h2>
diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html
index f8775b146..e38d81a82 100644
--- a/user_guide/helpers/date_helper.html
+++ b/user_guide/helpers/date_helper.html
@@ -134,7 +134,7 @@ echo standard_date($format, $time);
 	<tr>
 		<td>DATE_RFC822</td>
 		<td>RFC 822</td>
-		<td>Sun, 14 Aug 2005 16:13:03 UTC</td>
+		<td>Sun, 14 Aug 05 16:13:03 UTC</td>
 	</tr>
 	<tr>
 		<td>DATE_RFC850</td>
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html
index 00bc0c076..54725d035 100644
--- a/user_guide/libraries/file_uploading.html
+++ b/user_guide/libraries/file_uploading.html
@@ -28,7 +28,7 @@
 <div id="masthead">
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">
 <tr>
-<td><h1>CodeIgniter User Guide Version 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html
index 574110807..094d7aac6 100644
--- a/user_guide/libraries/table.html
+++ b/user_guide/libraries/table.html
@@ -4,12 +4,12 @@
 
 <title>CodeIgniter User Guide : HTML Table Class</title>
 
-<link rel='stylesheet' type='text/css' media='all' href='http://codeigniter.com/user_guide/userguide.css' />
+<link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="http://codeigniter.com/user_guide/nav/nav.js"></script>
-<script type="text/javascript" src="http://codeigniter.com/user_guide/nav/prototype.lite.js"></script>
-<script type="text/javascript" src="http://codeigniter.com/user_guide/nav/moo.fx.js"></script>
-<script type="text/javascript" src="http://codeigniter.com/user_guide/nav/user_guide_menu.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
+<script type="text/javascript" src="../nav/prototype.lite.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/user_guide_menu.js"></script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv='expires' content='-1' />
diff --git a/user_guide/license.html b/user_guide/license.html
index c76035d16..96ca53a70 100644
--- a/user_guide/license.html
+++ b/user_guide/license.html
@@ -60,7 +60,7 @@ License Agreement
 
 <h1>CodeIgniter License Agreement</h1>
 
-<p>Copyright (c) 2008 - 2010, EllisLab, Inc.<br />
+<p>Copyright (c) 2008 - 2011, EllisLab, Inc.<br />
 All rights reserved.</p>
 
 <p>This license is a legal agreement between you and EllisLab Inc. for the use of CodeIgniter Software (the "Software").  By obtaining the Software you agree to comply with the terms and conditions of this license.</p>