remove performance tests from the default stack

3 files changed, 3 insertions, 6 deletions

diff --git a/guides/code/getting_started/README.rdoc b/guides/code/getting_started/README.rdoc
index 8d1b0f42e5..232856ca5f 100644
--- a/guides/code/getting_started/README.rdoc
+++ b/guides/code/getting_started/README.rdoc
@@ -25,4 +25,4 @@ Things you may want to cover:
 
 If you plan to generate application documentation with `rake doc:app` this file
 is expected to be `README.rdoc`, otherwise please feel free to rename it and use
-a different markup language.
+a different markup language.
\ No newline at end of file
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index ced04bbbc0..cd0b99b177 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -177,7 +177,6 @@ The full set of methods that can be used in this block are as follows:
 * `javascripts` turns on the hook for JavaScript files in generators. Used in Rails for when the `scaffold` generator is run. Defaults to `true`.
 * `javascript_engine` configures the engine to be used (for eg. coffee) when generating assets. Defaults to `nil`.
 * `orm` defines which orm to use. Defaults to `false` and will use Active Record by default.
-* `performance_tool` defines which performance tool to use. Defaults to `nil`.
 * `resource_controller` defines which generator to use for generating a controller when using `rails generate resource`. Defaults to `:controller`.
 * `scaffold_controller` different from `resource_controller`, defines which generator to use for generating a _scaffolded_ controller when using `rails generate scaffold`. Defaults to `:scaffold_controller`.
 * `stylesheets` turns on the hook for stylesheets in generators. Used in Rails for when the `scaffold` generator is run, but this hook can be used in other generates as well. Defaults to `true`.
diff --git a/guides/source/testing.md b/guides/source/testing.md
index 7747318d32..09d6d2d5ee 100644
--- a/guides/source/testing.md
+++ b/guides/source/testing.md
@@ -39,10 +39,10 @@ Rails creates a `test` folder for you as soon as you create a Rails project usin
 ```bash
 $ ls -F test
 
-fixtures/  functional/  integration/  performance/  test_helper.rb  unit/
+fixtures/  functional/  integration/  test_helper.rb  unit/
 ```
 
-The `unit` directory is meant to hold tests for your models, the `functional` directory is meant to hold tests for your controllers, the `integration` directory is meant to hold tests that involve any number of controllers interacting, and the `performance` directory is meant for performance tests.
+The `unit` directory is meant to hold tests for your models, the `functional` directory is meant to hold tests for your controllers and the `integration` directory is meant to hold tests that involve any number of controllers interacting.
 
 Fixtures are a way of organizing test data; they reside in the `fixtures` folder.
 
@@ -760,14 +760,12 @@ You don't need to set up and run your tests by hand on a test-by-test basis. Rai
 | Tasks                           | Description |
 | ------------------------------- | ----------- |
 | `rake test`                     | Runs all unit, functional and integration tests. You can also simply run `rake` as the _test_ target is the default.|
-| `rake test:benchmark`           | Benchmark the performance tests|
 | `rake test:controllers`         | Runs all the controller tests from `test/controllers`|
 | `rake test:functionals`         | Runs all the functional tests from `test/controllers`, `test/mailers`, and `test/functional`|
 | `rake test:helpers`             | Runs all the helper tests from `test/helpers`|
 | `rake test:integration`         | Runs all the integration tests from `test/integration`|
 | `rake test:mailers`             | Runs all the mailer tests from `test/mailers`|
 | `rake test:models`              | Runs all the model tests from `test/models`|
-| `rake test:profile`             | Profile the performance tests|
 | `rake test:recent`              | Tests recent changes|
 | `rake test:uncommitted`         | Runs all the tests which are uncommitted. Supports Subversion and Git|
 | `rake test:units`               | Runs all the unit tests from `test/models`, `test/helpers`, and `test/unit`|