Added a Reserved Names page to the userguide, and migrated reserved controller names into it.

Added a Common Functions page to the userguide for globally available functions.

1 files changed, 3 insertions, 5 deletions

diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html
index 764e3b4cf..7dc66d1d8 100644
--- a/user_guide/general/scaffolding.html
+++ b/user_guide/general/scaffolding.html
@@ -104,7 +104,7 @@ class Blog extends Controller {<br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;function Blog()<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parent::Controller();<br /><br />

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<samp>$this->load->scaffolding(</samp><kbd>'table_name'</kbd>);</samp><br />

+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<samp>$this->load->scaffolding(</samp><kbd>'table_name'</kbd>);<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />

 }<br />

 ?&gt;</code>

@@ -135,12 +135,10 @@ database functions.</p>
 

 <div id="footer">

 <p>

-Previous Topic:&nbsp;&nbsp;<a href="autoloader.html">Auto-loading Resources</a>

-&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

+Previous Topic:&nbsp;&nbsp;<a href="common_functions.html">Common Functions</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

-Next Topic:&nbsp;&nbsp;<a href="routing.html">URI Routing</a>

-</p>

+Next Topic:&nbsp;&nbsp;<a href="routing.html">URI Routing</a></p>

 <p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2008 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>