diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-08-13 16:30:07 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-08-13 16:30:07 -0700 |
| commit | bf2b9d2de3f85e880e5afa980e6fd65b1f07557c (patch) | |
| tree | 41545ddaa2ab78f4f70bd847be99550c8c52b4f8 /railties/guides/source/performance_testing.textile | |
| parent | acfdb18d92c3ab6b80023b643f89f3ce3cab6840 (diff) | |
| parent | f566fb32c49a81636ca341f376f99ef230d71d99 (diff) | |
| download | rails-bf2b9d2de3f85e880e5afa980e6fd65b1f07557c.tar.gz rails-bf2b9d2de3f85e880e5afa980e6fd65b1f07557c.tar.bz2 rails-bf2b9d2de3f85e880e5afa980e6fd65b1f07557c.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
RELEASING_RAILS.rdoc
actionpack/lib/sprockets/railtie.rb
actionpack/test/template/sprockets_helper_test.rb
activerecord/test/cases/calculations_test.rb
railties/guides/source/3_1_release_notes.textile
railties/guides/source/active_resource_basics.textile
railties/guides/source/command_line.textile
Diffstat (limited to 'railties/guides/source/performance_testing.textile')
| -rw-r--r-- | railties/guides/source/performance_testing.textile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/performance_testing.textile b/railties/guides/source/performance_testing.textile index dbe6f97f5c..75f81cf13d 100644 --- a/railties/guides/source/performance_testing.textile +++ b/railties/guides/source/performance_testing.textile @@ -438,9 +438,9 @@ alias gcrails='~/rubygc/bin/rails' Don't forget to use your aliases from now on. -h6. Install Rubygems (1.8 only!) +h6. Install RubyGems (1.8 only!) -Download "Rubygems":http://rubyforge.org/projects/rubygems and install it from source. Rubygem's README file should have necessary installation instructions. Please note that this step isn't necessary if you've installed Ruby 1.9 and above. +Download "RubyGems":http://rubyforge.org/projects/rubygems and install it from source. Rubygem's README file should have necessary installation instructions. Please note that this step isn't necessary if you've installed Ruby 1.9 and above. h4. Using Ruby-Prof on MRI and REE |