Browse files

Merge branch 'master' of github.com:lifo/docrails

  • Loading branch information...
2 parents 66998c9 + 4c0d5d6 commit 49028f61128b8a494b2475cf5a66451cfe5a7a9a @tilsammans tilsammans committed Aug 30, 2010
Showing with 2 additions and 2 deletions.
  1. +1 −1 README.rdoc
  2. +1 −1 railties/guides/source/initialization.textile
View
2 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
View
2 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.

0 comments on commit 49028f6

Please sign in to comment.