aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/README.rdoc
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-05-25 22:48:47 +0200
committerXavier Noria <fxn@hashref.com>2011-05-25 22:48:47 +0200
commit00e1d0832e1242fe41cf43490b0a3a21a40f3c26 (patch)
tree06d3fcf35727a37f78885fc63fe15ff265aa309a /activesupport/README.rdoc
parentd25b7c2eeefff3a0abf7b532c10ce25a71d0fba2 (diff)
parent03f418370a4266e414ff32706381bb2b60baadfc (diff)
downloadrails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.tar.gz
rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.tar.bz2
rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.zip
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
Diffstat (limited to 'activesupport/README.rdoc')
-rw-r--r--activesupport/README.rdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/README.rdoc b/activesupport/README.rdoc
index 8bb15e849a..a38ad76f43 100644
--- a/activesupport/README.rdoc
+++ b/activesupport/README.rdoc
@@ -26,7 +26,7 @@ Active Support is released under the MIT license.
API documentation is at
-* http://api.rubyonrails.com
+* http://api.rubyonrails.org
Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here: