diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 5f3b869..5721bc8 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -69,20 +69,28 @@
 

 <ul>

 <li>Added <a href="hooks.html">Hooks</a> feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.</li>

+<li>Added the ability to organize controller files <a href="controllers.html">into sub-folders</a>.  Kudos to Marco for <a href="http://www.codeigniter.com/forums/viewthread/627/">suggesting</a> this (and the next two) feature.</li>

+<li>Added regular expressions support for <a href="routing.html">routing rules</a>.</li>

 <li>Added the ability to <a href="core_classes.html">replace core system classes</a> with your own classes.</li>

 <li>Added support for % character in URL.</li>

-<li>Added the ability to organize <a href="controllers.html">controller</a> files into sub-folders.

-<li>Updated the <a href="routing.html">Routing feature</a> to accept regular expressions within routing rules.</li>

+<li>Added the ability to supply full URLs using the <dfn>anchor()</dfn> helper function.</li>

 <li>Moved the MIME type array out of the Upload class and into its own file in the applications/comfig/ folder.</li>

+<li>Tweaked the URI Protocol code to allow more options so that URLs will work more reliably in different environments.</li>

 <li>Removed a strtolower() call that was changing URL segments to lower case.</li>

+<li>Removed some references that were interfering with PHP 4.4.1 compatibility.</li>

+<li>Removed backticks from Postgre class since these are not needed.</li>

 <li>Deprecated the hash() function due to a naming conflict with a native PHP function with the same name.  Please use dohash() instead.</li>

-<li>Fixed a MS SQL issue.</li>

 <li>Fixed an issue when removing GET variables.</li>

 <li>Fixed <a href="http://www.codeigniter.com/forums/viewthread/773/">this</a> router bug.</li>

 <li>Fixed a bug that was preventing multiple discreet database calls.</li>

 <li>Fixed a bug in which loading a language file was producing a "file contains no data" message.</li>

 <li>Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.</li>

-<li>Removed backticks from Postgre class since these are not needed.</li>

+<li>Fixed some missing prefixes when using the database prefix feature.</li>

+<li>Fixed a bug that was causing the Loader class to incorrectly identify the file extension.</li>

+<li>Fixed a typo in the Calendar class (cal_november).</li> 

+<li>Fixed an evaluation bug in the database initialization function.</li>

+<li>Fixed some MS SQL bugs.</li>

+<li>Fixed some doc typos.</li>

 </ul>

 

 

diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 648298e..b45b5ae 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -71,6 +71,7 @@
 <li><a href="#functions">Functions</a></li>

 <li><a href="#private">Private Functions</a></li>

 <li><a href="#default">Defining a Default Controller</a></li>

+<li><a href="#subfolders">Organizing Controllers into Sub-folders</a></li>

 <li><a href="#constructors">Class Constructors</a></li>

 <li><a href="#reserved">Reserved Function Names</a></li>

 </ul>

@@ -204,6 +205,25 @@
 specifying any URI segments you'll see your Hello World message by default.</p>

 

 

+<a name="subfolders"></a>

+<h2>Organizing Your Controllers into Sub-folders</h2>

+

+<p>If you are building a large application you might find it convenient to organize your controllers into sub-folders.  Code Igniter permits you to do this.</p>

+

+<p>Simply create folders within your <dfn>application/controllers</dfn> directory and place your controller classes within them.</p>

+

+<p><strong>Note:</strong>&nbsp; When using this feature the first segment or your URI must specify the folder.  For example, lets say you have a controller

+located here:</p>

+

+<code>application/controllers/<kbd>products</kbd>/shoes.php</code>

+

+<p>To call the above controller your URI will look something like this:</p>

+

+<code>www.your-site.com/index.php/products/shoes/123</code>

+

+<p>Code Igniter also permits you to remap your URIs using its <a href="routing.html">URI Routing</a> feature.

+

+

 <a name="constructors"></a>

 <h2>Class Constructors</h2>

 

diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index 977698b..e5dac68 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -138,7 +138,7 @@
 

 <p>A typical RegEx route might look something like this:</p>

 

-<code>$route['products\/([a-z]+)\/(\d+)'] = "$1/id_$2";</code>

+<code>$route['products/([a-z]+)/(\d+)'] = "$1/id_$2";</code>

 

 <p>In the above example, a URI similar to <dfn>products/shirts/123</dfn> would instead call the <dfn>shirts</dfn> controller class and the <dfn>id_123</dfn> function.</p>

 

diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html
index 8593f81..f38d4ad 100644
--- a/user_guide/helpers/form_helper.html
+++ b/user_guide/helpers/form_helper.html
@@ -208,7 +208,7 @@
 <code>$options = array(<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'small'&nbsp;&nbsp;=> 'Small Shirt',<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'med'&nbsp;&nbsp;&nbsp;&nbsp;=> 'Medium Shirt',<br />

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;large'&nbsp;&nbsp; => 'Large Shirt',<br />

+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'large'&nbsp;&nbsp; => 'Large Shirt',<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'xlarge' => 'Extra Large Shirt',<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;);<br />

 <br />

@@ -217,10 +217,10 @@
 // Would produce:<br /><br />

 

 &lt;select name="shirts"><br />

-&lt;option value="small">Small Shirt</option><br />

-&lt;option value="med">Medium  Shirt</option><br />

-&lt;option value="large" selected>Large Shirt</option><br />

-&lt;option value="xlarge">Extra Large Shirt</option><br />

+&lt;option value="small">Small Shirt&lt;/option><br />

+&lt;option value="med">Medium  Shirt&lt;/option><br />

+&lt;option value="large" selected>Large Shirt&lt;/option><br />

+&lt;option value="xlarge">Extra Large Shirt&lt;/option><br />

 &lt;/select></code>

 

 

diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html
index a8f5c14..2b5b354 100644
--- a/user_guide/helpers/url_helper.html
+++ b/user_guide/helpers/url_helper.html
@@ -117,8 +117,10 @@
 <code>anchor(<var>uri segments</var>, <var>text</var>, <var>attributes</var>)</code>

 

 <p>The first parameter can contain any segments you wish appended to the URL.  As with the <dfn>site_url()</dfn> function above,

-segments can be a string or an array. Note: Do not include the base URL.  It will be built as specified in your config file. Include

-only the URI segments you wish appended to the URL.</p>

+segments can be a string or an array.</p>

+

+<p><strong>Note:</strong>&nbsp; If you are building links that are internal to your application do not include the base URL (http://...).  This

+will be added automatically from the information specified in your config file. Include only the URI segments you wish appended to the URL.</p>

 

 <p>The second segment is the text you would like the link to say.  If you leave it blank, the URL will be used.</p>

 

diff --git a/user_guide/libraries/database/active_record.html b/user_guide/libraries/database/active_record.html
index 8fc3b81..6e5d612 100644
--- a/user_guide/libraries/database/active_record.html
+++ b/user_guide/libraries/database/active_record.html
@@ -557,7 +557,7 @@
 <p>Generates a delete SQL string and runs the query.</p>

 

 <code>

-$this->db->delete('mytable', array('id', $id));

+$this->db->delete('mytable', array('id' => $id));

 <br /><br />

 // Produces:<br />

 // DELETE FROM mytable <br />