assorted guide fixes and additions

6 files changed, 17 insertions, 19 deletions

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index f86e1f539..e1d2365d4 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -72,7 +72,7 @@ Change Log
 		<ul>

 			<li>Added <kbd>protect_identifiers()</kbd> in <a href="./database/active_record.html">Active Record</a>.</li>

 		    <li>All AR queries are backticked if appropriate to the database.</li>

-			<li>Added <kbd>where_in()</kbd>, <kbd>where_in_or()</kbd>, <kbd>where_not_in()</kbd>,  <kbd>where_not_in_or()</kbd>, <kbd>not_like()</kbd> and <kbd>or_not_like()</kbd> to <a href="./database/active_record.html">Active Record</a>.</li>

+			<li>Added <kbd>where_in()</kbd>, <kbd>or_where_in()</kbd>, <kbd>where_not_in()</kbd>,  <kbd>or_where_not_in()</kbd>, <kbd>not_like()</kbd> and <kbd>or_not_like()</kbd> to <a href="./database/active_record.html">Active Record</a>.</li>

 			<li>Added support for <kbd>limit()</kbd>  into <kbd>update()</kbd> and <kbd>delete()</kbd> statements in  <a href="./database/active_record.html">Active Record</a>.</li>

 		    <li>Added <kbd>empty_table()</kbd> and <kbd>truncate_table()</kbd> to <a href="./database/active_record.html">Active Record</a>.</li>

 		    <li>Added the ability to pass an array of tables to the <kbd>delete()</kbd> statement in <a href="./database/active_record.html">Active Record</a>.</li>

@@ -113,7 +113,7 @@ Change Log
 		    <li>Moved the safe mode and auth checks for the Email library into the constructor. </li>

 			<li>Modified prep_for_form() in the Validation class to accept arrays, adding support for POST array validation (via callbacks only)</li>

 			<li>Changed the behaviour of custom callbacks so that they no longer trigger the &quot;required&quot; rule. </li>

-			<li>Modified Upload class $_FILE error messages to be more precise.</li>

+			<li>Modified Upload class $_FILES error messages to be more precise.</li>

 			<li>Modified variable names in _ci_load() method of Loader class to avoid conflicts with view variables.</li>

 			<li>Added a few additional mime type variations for CSV.</li>

 		</ul>

diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index cd11eb1ac..d4f1489cb 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -375,6 +375,8 @@ is a list of reserved names.  Do not name your controller functions any of these
 <li>CI_Loader</li>

 <li>config</li>

 <li>database</li>

+<li>dbutil</li>

+<li>dbforge</li>

 <li>file</li>

 <li>helper</li>

 <li>helpers</li>

diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html
index 9acbd57d0..11a507679 100644
--- a/user_guide/general/requirements.html
+++ b/user_guide/general/requirements.html
@@ -58,8 +58,8 @@ Server Requirements
 <h1>Server Requirements</h1>

 

 <ul>

-	<li><a href="http://www.php.net/">PHP</a> version 4.3.2 or newer</li>

-	<li>A Database. Supported databases are MySQL, MySQLi, MS SQL, Postgre, Oracle, SQLite, and ODBC</li>

+	<li><a href="http://www.php.net/">PHP</a> version 4.3.2 or newer.</li>

+	<li>A Database is required for most web appliction programming. Current supported databases are MySQL, MySQLi, MS SQL, Postgre, Oracle, SQLite, and ODBC.</li>

 </ul>

 

 

diff --git a/user_guide/general/views.html b/user_guide/general/views.html
index e41503f5f..851da92e8 100644
--- a/user_guide/general/views.html
+++ b/user_guide/general/views.html
@@ -162,7 +162,7 @@ $this->load->view('blogview', <var>$data</var>);</code>
 <p>Let's try it with your controller file.  Open it add this code:</p>

 

 <textarea class="textarea" style="width:100%" cols="50" rows="14">

-<?php

+&lt;?php

 class Blog extends Controller {

 

 	function index()

@@ -173,7 +173,7 @@ class Blog extends Controller {
 		$this->load->view('blogview', $data);

 	}

 }

-?>

+?&gt;

 </textarea>

 

 

@@ -193,9 +193,6 @@ class Blog extends Controller {
 

 <p>Then load the page at the URL you've been using and you should see the variables replaced.</p>

 

-<p><strong>Note:</strong> You'll notice that in the example above we are using PHP's alternative syntax.  If you

-are not familiar with it you can read about it <a href="alternative_php.html">here</a>.</p>

-

 <h2>Creating Loops</h2>

 

 <p>The data array you pass to your view files is not limited to simple variables.  You can

@@ -205,7 +202,7 @@ pull data from your database it will typically be in the form of a multi-dimensi
 <p>Here's a simple example. Add this to your controller:</p>

 

 <textarea class="textarea" style="width:100%" cols="50" rows="17">

-<?php

+&lt;?php

 class Blog extends Controller {

 

 	function index()

@@ -218,7 +215,7 @@ class Blog extends Controller {
 		$this->load->view('blogview', $data);

 	}

 }

-?>

+?&gt;

 </textarea>

 

 

@@ -242,12 +239,12 @@ class Blog extends Controller {
 

 &lt;?php endforeach;?>

 &lt;/ul>

-

 	

 &lt;/body>

 &lt;/html>

 </textarea>

-

+<p><strong>Note:</strong> You'll notice that in the example above we are using PHP's alternative syntax.  If you

+are not familiar with it you can read about it <a href="alternative_php.html">here</a>.</p>

 

 

 </div>

diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html
index b7aff6f21..48c47f298 100644
--- a/user_guide/helpers/email_helper.html
+++ b/user_guide/helpers/email_helper.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

 <head>

 

-<title>CodeIgniter User Guide : Download Helper</title>

+<title>CodeIgniter User Guide : Email Helper</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -57,15 +57,14 @@ Download Helper
 <div id="content">

 

 

-<h1>Download Helper</h1>

-

-<p>The Download Helper lets you download data to your desktop.</p>

+<h1>Email Helper</h1>

 

+<p>The Email Helper provides some assitive functions for working with Email. For a more robust email solution, see CodeIgniter's <a href="../libraries/email.html">Email Class</a>.</p>

 

 <h2>Loading this Helper</h2>

 

 <p>This helper is loaded using the following code:</p>

-<code>$this->load->helper(email);</code>

+<p><code>$this->load->helper('email');</code></p>

 

 <p>The following functions are available:</p>

 

diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html
index 282081099..f762f7893 100644
--- a/user_guide/overview/at_a_glance.html
+++ b/user_guide/overview/at_a_glance.html
@@ -74,7 +74,7 @@ For more information please read the <a href="../license.html">license agreement
 <p>CodeIgniter is written to be compatible with PHP 4.  Although we would have loved to take advantage of the better object handling

 in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance),

 at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our

-potential audience.  Major OS vendors like RedHat have yet to support PHP 5, and they are unlikely to do so until 2007, so

+potential audience.  Major OS vendors like RedHat are moving slowly to support PHP 5, and they are unlikely to do so in the short term, so

 we felt that it did not serve the best interests of the PHP community to write CodeIgniter in PHP 5.</p>

 

 <p>Note:  CodeIgniter will run on PHP 5.  It simply does not take advantage of any native features that are only available in that version.</p>