aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/performance_testing.textile
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-07-28 09:00:33 +0200
committerJosé Valim <jose.valim@gmail.com>2009-07-28 09:00:33 +0200
commitd9aae2b56e64a4f417eaffa99e10cca274e928e7 (patch)
tree8438f6f784df9b252c0f834bc7cb9c369103d4cd /railties/guides/source/performance_testing.textile
parent5025ae610f89989f3e15241ec7065e3d443614d9 (diff)
parent9533e0eca76b1df68a90e1ebe395d7b6a59d8e91 (diff)
downloadrails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.gz
rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.bz2
rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/guides/source/performance_testing.textile')
-rw-r--r--railties/guides/source/performance_testing.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/performance_testing.textile b/railties/guides/source/performance_testing.textile
index 320a5b8472..f0dc9acbb8 100644
--- a/railties/guides/source/performance_testing.textile
+++ b/railties/guides/source/performance_testing.textile
@@ -293,7 +293,7 @@ WARNING: Performance test configurability is not yet enabled in Rails. But it wi
h4. Performance Test Environment
-Performance tests are run in the +development+ environment. But running performance tests will set the following configuration parameters:
+Performance tests are run in the +test+ environment. But running performance tests will set the following configuration parameters:
<shell>
ActionController::Base.perform_caching = true