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 [902d7326175cc3b737f58ac34d57497718e3c899] by Xavier Noria

Revision 902d7326175cc3b737f58ac34d57497718e3c899, committed by Xavier Noria · August 5th, 2010 @ 12:15 AM

Merge remote branch 'docrails/master' into 3-0-stable
http://github.com/rails/rails/commit/902d7326175cc3b737f58ac34d5749...

17 changed files

  • M actionpack/README.rdoc
  • M activemodel/lib/active_model/errors.rb
  • M activemodel/lib/active_model/serialization.rb
  • M activerecord/lib/active_record/associations/has_many_association.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/lib/active_record/callbacks.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/database_limits.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
  • M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
  • M activerecord/lib/active_record/persistence.rb
  • M activerecord/lib/active_record/railties/databases.rake
  • M activesupport/lib/active_support/callbacks.rb
  • M activesupport/lib/active_support/concern.rb
  • M railties/guides/source/api_documentation_guidelines.textile
  • M railties/guides/source/getting_started.textile
  • M railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
  • M railties/lib/rails/railtie.rb