3 files changed, 21 insertions, 2 deletions

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 188d8566a..e556684e8 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -75,7 +75,7 @@ Change Log
 <li>Added support for % character in URL.</li>

 <li>Added the ability to supply full URLs using the <a href="../helpers/url_helper.html">anchor()</a> helper function.</li>

 <li>Added mode parameter to <a href="../helpers/file_helper.html">file_write()</a> helper.</li>

-<li>Added support for changing the port number in the <a href="../libraries/database/configuration.html">Postgre driver.</li>

+<li>Added support for changing the port number in the <a href="../libraries/database/configuration.html">Postgre driver</a>.</li>

 <li>Moved the list of "allowed URI characters" out of the Router class and into the config file.</li>

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

 <li>Updated the <a href="../libraries/config.html">Config Library</a> to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).</li>

diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
index 33d343d82..a780a5cdd 100644
--- a/user_guide/general/hooks.html
+++ b/user_guide/general/hooks.html
@@ -69,6 +69,12 @@ For example, you might want to run a script right before your controllers get lo
 your own scripts in some other location.

 </p>

 

+<h2>Enabling Hooks</h2>

+

+<p>The hooks feature can be globally enabled/disabled by setting the following item in the <kbd>application/config/config.php</kbd> file:</p>

+

+<code>$config['enable_hooks'] = TRUE;</code>

+

 

 <h2>Defining a Hook</h2>

 

diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html
index 810d10786..1c72b5d70 100644
--- a/user_guide/installation/upgrade_140.html
+++ b/user_guide/installation/upgrade_140.html
@@ -89,9 +89,22 @@ have not upgraded to that version please do so first.</p>
 

 <h2>Step 2: Update your config.php file</h2>

 

-<p>Open your <dfn>application/config/config.php</dfn> file and add this new item:</p>

+<p>Open your <dfn>application/config/config.php</dfn> file and add these new items:</p>

 

 <pre>

+

+/*

+|--------------------------------------------------------------------------

+| Enable/Disable System Hooks

+|--------------------------------------------------------------------------

+|

+| If you would like to use the "hooks" feature you must enable it by

+| setting this variable to TRUE (boolean).  See the user guide for details.

+|

+*/

+$config['enable_hooks'] = FALSE;

+

+

 /*

 |--------------------------------------------------------------------------

 | Allowed URL Characters