summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-04-18 05:58:40 +0200
committerEric Barnes <eric@ericlbarnes.com>2011-04-18 05:58:40 +0200
commitc31b3729da50eaade365451f49dac7d462684702 (patch)
tree5d6d406757afa60091fa860b295aa431c6b196ee
parent26eebddda5438c3967bad74a05c3e990528e1182 (diff)
Added ENVIRONMENT to reserved constants. Fixes #196
-rw-r--r--user_guide/changelog.html17
-rw-r--r--user_guide/general/reserved_names.html1
2 files changed, 18 insertions, 0 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index f24d8110c..0ebe74ae6 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -59,6 +59,23 @@ Change Log
<p>The <img src="images/reactor-bullet.png" width="16" height="16" alt="Reactor Marker" /> indicates items that were contributed to CodeIgniter via CodeIgniter Reactor.</p>
+<h2>Version 2.0.3</h2>
+<p>Release Date: Not Released</p>
+
+<ul>
+ <li>General Changes
+ <ul>
+ <li></li>
+ </ul>
+ </li>
+</ul>
+
+<h3>Bug fixes for 2.0.3</h3>
+<ul>
+ <li class="reactor">Added ENVIRONMENT to reserved constants. (Reactor #196)</li>
+ <li class="reactor">Changed server check to ensure SCRIPT_NAME is defined. (Reactor #57)</li>
+</ul>
+
<h2>Version 2.0.2</h2>
<p>Release Date: April 7, 2011<br />
Hg Tag: v2.0.2</p>
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index d1ee2955b..00bebff61 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -90,6 +90,7 @@ is a list of reserved names. Do not name your controller any of these:</p>
</ul>
<h3>Constants</h3>
<ul>
+ <li>ENVIRONMENT</li>
<li>EXT</li>
<li>FCPATH</li>
<li>SELF</li>