diff options
author | Joost Baaij <joost@spacebabies.nl> | 2010-08-30 21:20:21 +0200 |
---|---|---|
committer | Joost Baaij <joost@spacebabies.nl> | 2010-08-30 21:20:21 +0200 |
commit | 49028f61128b8a494b2475cf5a66451cfe5a7a9a (patch) | |
tree | 94ff270843a7d5b3767dddebac11ccfac3b6c700 | |
parent | 66998c9662b0f8814496f55242e6af507ef233ea (diff) | |
parent | 4c0d5d60f7c6d8280e8d23d7b8f0ca08cb9e1c35 (diff) | |
download | rails-49028f61128b8a494b2475cf5a66451cfe5a7a9a.tar.gz rails-49028f61128b8a494b2475cf5a66451cfe5a7a9a.tar.bz2 rails-49028f61128b8a494b2475cf5a66451cfe5a7a9a.zip |
Merge branch 'master' of github.com:lifo/docrails
-rw-r--r-- | README.rdoc | 2 | ||||
-rw-r--r-- | railties/guides/source/initialization.textile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/README.rdoc b/README.rdoc index 9784f6dfe4..7ca376d492 100644 --- a/README.rdoc +++ b/README.rdoc @@ -60,7 +60,7 @@ more separate. Each of these packages can be used independently outside of == Contributing We encourage you to contribute to Ruby on \Rails! Please check out the {Contributing to Rails -guide}[http://guides.rubyonrails.org/contributing_to_rails.html] for guidelines about how +guide}[http://edgeguides.rubyonrails.org/contributing_to_rails.html] for guidelines about how to proceed. {Join us}[http://contributors.rubyonrails.org]! == License diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile index f8f9209b62..486142ea4b 100644 --- a/railties/guides/source/initialization.textile +++ b/railties/guides/source/initialization.textile @@ -1437,7 +1437,7 @@ Afterwards this includes the +ActiveSupport::Benchmarkable+ which is used for be end </ruby> -The "documentation":http://api.rails.info/classes/ActiveSupport/Benchmarkable.html#M000607 is great about explaining what precisely this does. (TODO: replace link with real documentation link when it becomes available.) +The "documentation":http://api.rubyonrails.org/classes/ActiveSupport/Benchmarkable.html is great about explaining what precisely this does. This module is also included into Active Record and +AbstractController+, meaning you can also use the +benchmark+ method in these methods. |