diff options
author | Matthew Bergman <MZBPhoto@gmail.com> | 2008-09-22 06:55:12 -0400 |
---|---|---|
committer | Matthew Bergman <MZBPhoto@gmail.com> | 2008-09-22 06:55:12 -0400 |
commit | 46fac72e4e79f03641e049136e7d164ecbb6e710 (patch) | |
tree | e3ff899de1cd0fe9218d09e98446126d9e4a7353 /railties | |
parent | 13307e420f122af1bc09f28b320b943b0cd384a7 (diff) | |
parent | f6360ba196658f9d25ad03261b6b42582b5f4818 (diff) | |
download | rails-46fac72e4e79f03641e049136e7d164ecbb6e710.tar.gz rails-46fac72e4e79f03641e049136e7d164ecbb6e710.tar.bz2 rails-46fac72e4e79f03641e049136e7d164ecbb6e710.zip |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties')
-rw-r--r-- | railties/Rakefile | 3 | ||||
-rw-r--r-- | railties/doc/guides/index.txt | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index be37023a1d..e279bf922e 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -285,7 +285,8 @@ guides = [ { 'forms' =>'form_helpers' }, { 'activerecord' => 'association_basics' }, { 'debugging' => 'debugging_rails_applications' }, - { 'caching' => 'caching_with_rails' } + { 'caching' => 'caching_with_rails' }, + { 'benchmarking_and_profiling' => 'preamble' } ] guides_html_files = [] # autogenerated from the 'guides' variable. diff --git a/railties/doc/guides/index.txt b/railties/doc/guides/index.txt index 402037a7d1..78228ea4a0 100644 --- a/railties/doc/guides/index.txt +++ b/railties/doc/guides/index.txt @@ -53,6 +53,13 @@ link:http://rails.lighthouseapp.com/projects/16213/tickets/1[Lighthouse Ticket] Guide to using built in Form helpers. *********************************************************** +.link:benchmarking_and_profiling/preamble.html[Benchmarking and Profiling Rails Applications] +*********************************************************** +link:http://rails.lighthouseapp.com/projects/16213/tickets/4[Lighthouse Ticket] + +TODO: Insert some description here. +*********************************************************** + .link:testing_rails_applications/testing_rails_applications.html[Testing Rails Applications] *********************************************************** link:http://rails.lighthouseapp.com/projects/16213/tickets/8[Lighthouse Ticket] |