diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index <HASH>..<HASH> 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -1,8 +1,8 @@
-# Be sure to restart your webserver when you modify this file.
+# Be sure to restart your web server when you modify this file.
 
 # Uncomment below to force Rails into production mode
 # (Use only when you can't set environment variables through your web/app server)
-# ENV['RAILS_ENV'] = 'production'
+# ENV['RAILS_ENV'] ||= 'production'
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
Added in bars to help guard against the production environment being used in test

git-svn-id: <URL>