Lighthouse has a new layout. Prefer the old one? Return to the old layout, and switch back any time from the link at the top of each page.

This project is archived and is in readonly mode.

Changeset [4134d7db34506887f5cb945bb4e51c53c5f67ec3] by Xavier Noria

Revision 4134d7db34506887f5cb945bb4e51c53c5f67ec3, committed by Xavier Noria · August 12th, 2010 @ 04:36 PM

Merge remote branch 'docrails/master'
http://github.com/rails/rails/commit/4134d7db34506887f5cb945bb4e51c...

16 changed files

M actionmailer/README.rdoc
M activemodel/README.rdoc
M activemodel/lib/active_model/serializers/json.rb
M activerecord/CHANGELOG
M activerecord/lib/active_record/associations.rb
M activerecord/lib/active_record/autosave_association.rb
M activerecord/lib/active_record/base.rb
M activerecord/lib/active_record/named_scope.rb
M activerecord/lib/active_record/reflection.rb
M activeresource/README.rdoc
M activesupport/CHANGELOG
M activesupport/lib/active_support/core_ext/class/attribute.rb
M activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
M activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
M railties/guides/source/association_basics.textile
M railties/guides/source/security.textile