From 10747024829af32ef2d6ff7b8f825043f8a17cb4 Mon Sep 17 00:00:00 2001
From: Zechariah Campbell <zech.campbell@gmail.com>
Date: Wed, 27 Aug 2014 18:01:23 -0500
Subject: [PATCH 1/2] Added docs on how to get the current environment your
 application is using.

- http://fuelphp.com/forums/discussion/7059/configget039environment039
---
 general/environments.html | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/general/environments.html b/general/environments.html
index 62801194e..9c49aff74 100644
--- a/general/environments.html
+++ b/general/environments.html
@@ -218,6 +218,35 @@ <h3 id="env_oil">Set Environment when using Oil</h3>
 
 			<pre class="cli"><code><strong>C:\> </strong>set FUEL_ENV=production &amp;&amp; php oil -v</code></pre>
 
+			<h3 id="setting_env">Get Your Current Environment</h3>
+
+			<p>
+				There are two ways to retrieve the current environment programmatically, <strong>\Fuel::$env</strong> or <strong>$_SERVER['FUEL_ENV']</strong>
+			</p>
+
+			<pre class="php"><code>// Option 1 (recommended)
+// \Fuel::$env 
+
+if(\Fuel::$env == \Fuel::PRODUCTION)
+{
+	//do something
+}
+
+// Option 2 (only works if you set the environment. FuelPHP defaults to \Fuel::DEVELOPMENT)
+// $_SERVER['FUEL_ENV']
+
+if($_SERVER['FUEL_ENV'] == \Fuel::PRODUCTION)
+{
+	//do something
+}
+
+// Option 1 with a custom environment
+if(\Fuel::$env == "mike_dev")
+{
+	//do something
+}
+</code></pre>
+
 		</div>
 
 		<footer>

From 347091f052514e7e8efe04b627ef57fe9be93a67 Mon Sep 17 00:00:00 2001
From: Zechariah Campbell <zech.campbell@gmail.com>
Date: Mon, 1 Sep 2014 11:32:14 -0500
Subject: [PATCH 2/2] Removed $_SERVER as a valid option for getting the
 current environment.

Signed-off-by: Zechariah Campbell <zech.campbell@gmail.com>
---
 general/environments.html | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/general/environments.html b/general/environments.html
index 9c49aff74..a5ff73da1 100644
--- a/general/environments.html
+++ b/general/environments.html
@@ -221,26 +221,20 @@ <h3 id="env_oil">Set Environment when using Oil</h3>
 			<h3 id="setting_env">Get Your Current Environment</h3>
 
 			<p>
-				There are two ways to retrieve the current environment programmatically, <strong>\Fuel::$env</strong> or <strong>$_SERVER['FUEL_ENV']</strong>
+				You can retrieve the current environment programmatically using <strong>\Fuel::$env</strong>
 			</p>
 
-			<pre class="php"><code>// Option 1 (recommended)
-// \Fuel::$env 
+			<p class="note">Do not use <strong>$_SERVER['FUEL_ENV']</strong>. It will not work if you do not set the environment. Using $_SERVER is not reliable, because it might not be there, or it might be overridden in code (which makes it different from \Fuel::$env).</p>
 
-if(\Fuel::$env == \Fuel::PRODUCTION)
-{
-	//do something
-}
-
-// Option 2 (only works if you set the environment. FuelPHP defaults to \Fuel::DEVELOPMENT)
-// $_SERVER['FUEL_ENV']
+			<pre class="php"><code>
+// comparing current appliation environment to a predefinded environment
 
-if($_SERVER['FUEL_ENV'] == \Fuel::PRODUCTION)
+if(\Fuel::$env == \Fuel::PRODUCTION)
 {
 	//do something
 }
 
-// Option 1 with a custom environment
+// comparing current appliation environment to a custom environment
 if(\Fuel::$env == "mike_dev")
 {
 	//do something