diff options
| author | Emilio Tagua <miloops@gmail.com> | 2011-02-15 12:01:04 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2011-02-15 12:01:04 -0300 |
| commit | 8ee0b4414890f919594c1a388d987b5b7364a505 (patch) | |
| tree | 6c6c6aa19da0eb8066d2f0b9b02b08f2cc696c29 /README.rdoc | |
| parent | 348c0ec7c656b3691aa4e687565d28259ca0f693 (diff) | |
| parent | c9f1ab5365319e087e1b010a3f90626a2b8f080b (diff) | |
| download | rails-8ee0b4414890f919594c1a388d987b5b7364a505.tar.gz rails-8ee0b4414890f919594c1a388d987b5b7364a505.tar.bz2 rails-8ee0b4414890f919594c1a388d987b5b7364a505.zip | |
Merge remote branch 'rails/master' into identity_map
Conflicts:
activerecord/examples/performance.rb
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/autosave_association.rb
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/nested_attributes.rb
activerecord/test/cases/relations_test.rb
Diffstat (limited to 'README.rdoc')
| -rw-r--r-- | README.rdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/README.rdoc b/README.rdoc index 7ca376d492..0b209cf56f 100644 --- a/README.rdoc +++ b/README.rdoc @@ -53,8 +53,8 @@ more separate. Each of these packages can be used independently outside of * The README file created within your application. * The {Getting Started with Rails}[http://guides.rubyonrails.org/getting_started.html]. * The {Ruby on Rails Tutorial}[http://railstutorial.org/book]. -* The {Ruby on Rails guides}[http://guides.rubyonrails.org/getting_started.html]. -* The {API documentation}[http://api.rubyonrails.org]. +* The {Ruby on Rails Guides}[http://guides.rubyonrails.org]. +* The {API Documentation}[http://api.rubyonrails.org]. == Contributing |