Made Environment Support optional. Comment out or delete the constant to stop environment checks.

3 files changed, 22 insertions, 2 deletions

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 26e9bbc3b..ec6e76875 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -66,6 +66,8 @@ Hg Tag: n/a</p>
 <ul>
 	<li>General changes
 		<ul>
+			<li>The <a href="./libraries/security.html">Security library</a> was moved to the core and is now loaded automatically. Please remove your loading calls.</li>
+			<li>The CI_SHA class is now deprecated. All supported versions of PHP provide a <kbd>sha1()</kbd> function.</li>
 			<li class="reactor"><kbd>constants.php</kbd> will now be loaded from the environment folder if available.</li>
 			<li class="reactor">Added language key error logging</li>
 			<li class="reactor">Made Environment Support optional. Comment out or delete the constant to stop environment checks.</li>
@@ -73,6 +75,11 @@ Hg Tag: n/a</p>
 			<li class="reactor">Added CI_ Prefix to the <a href="libraries/caching.html">Cache driver</a>.</li>
 		</ul>
 	</li>
+	<li>Helpers
+		<ul>
+			<li>Removed the previously deprecated <kbd>dohash()</kbd> from the <a href="./helpers/security_helper.html">Security helper</a>; use <kbd>do_hash()</kbd> instead.</li>
+		</ul>
+	</li>
 	<li>Database
 		<ul>
 			<li class="reactor"><kbd>$this->db->count_all_results()</kbd> will now return an integer instead of a string.</li>
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
index 7977956a8..e64a74558 100644
--- a/user_guide/general/credits.html
+++ b/user_guide/general/credits.html
@@ -62,7 +62,8 @@ Credits
 world, with many of the class libraries, helpers, and sub-systems borrowed from the code-base of
 <a href="http://www.expressionengine.com/">ExpressionEngine</a>.</p>
 
-<p>It is currently developed and maintained by the ExpressionEngine Development Team.</p>
+<p>It is currently developed and maintained by the ExpressionEngine Development Team.<br />
+Bleeding edge development is spearheaded by the handpicked contributors of the Reactor Team.</p>
 
 <p>A hat tip goes to Ruby on Rails for inspiring us to create a PHP framework, and for
 bringing frameworks into the general consciousness of the web community.</p>
diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html
index 879067c6e..9c72cf423 100644
--- a/user_guide/installation/upgrade_201.html
+++ b/user_guide/installation/upgrade_201.html
@@ -66,11 +66,23 @@ Upgrading from 2.0.0 to 2.0.1
 
 <p class="important"><strong>Note:</strong> If you have any custom developed files in these folders please make copies of them first.</p>
 
+
 <h2>Step 2: Replace config/mimes.php</h2>
 
 <p>This config file has been updated to contain more mime types, please copy it to <kbd>application/config/mimes.php</kbd>.</p>
 
-<h2>Step 3: Check for forms posting to default controller</h2>
+
+<h2>Step 3: Remove loading calls for the Security Library</h2>
+
+<p>Security has been moved to the core and is now always loaded automatically. Make sure you remove any loading calls as they will result in PHP errors.</p>
+
+
+<h2>Step 4: Move MY_Security</h2>
+
+<p>If you are overriding or extending the Security library, you will need to move it to <kbd>application/core</kbd>.</p>
+
+
+<h2>Step 5: Check for forms posting to default controller</h2>
 
 <p>
 	The default behavior for <kbd>form_open()</kbd> when called with no parameters used to be to post to the default controller, but it will now just leave an empty action="" meaning the form will submit to the current URL.