This project is archived and is in readonly mode.

Changeset [e162e912c9f2b3ed5789a2d262c7962a67fb6b5d] by Xavier Noria

Revision e162e912c9f2b3ed5789a2d262c7962a67fb6b5d, committed by Xavier Noria · April 19th, 2011 @ 08:54 PM

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

Conflicts:

railties/guides/source/ajax_on_rails.textile
railties/guides/source/generators.textile

https://github.com/rails/rails/commit/e162e912c9f2b3ed5789a2d262c79...

34 changed files

M actionmailer/lib/action_mailer/base.rb
M actionpack/lib/action_view/helpers/date_helper.rb
M actionpack/lib/action_view/helpers/number_helper.rb
M actionpack/lib/action_view/helpers/sanitize_helper.rb
M actionpack/lib/action_view/helpers/text_helper.rb
M actionpack/lib/action_view/helpers/url_helper.rb
M activesupport/lib/active_support/core_ext/array/random_access.rb
M activesupport/lib/active_support/core_ext/object/blank.rb
M activesupport/lib/active_support/core_ext/object/duplicable.rb
M activesupport/lib/active_support/core_ext/object/try.rb
M railties/guides/source/action_controller_overview.textile
M railties/guides/source/action_view_overview.textile
M railties/guides/source/active_record_querying.textile
M railties/guides/source/active_record_validations_callbacks.textile
M railties/guides/source/active_support_core_extensions.textile
M railties/guides/source/ajax_on_rails.textile
M railties/guides/source/caching_with_rails.textile
M railties/guides/source/command_line.textile
M railties/guides/source/contributing_to_ruby_on_rails.textile
M railties/guides/source/debugging_rails_applications.textile
M railties/guides/source/form_helpers.textile
M railties/guides/source/generators.textile
M railties/guides/source/getting_started.textile
M railties/guides/source/i18n.textile
M railties/guides/source/index.html.erb
M railties/guides/source/initialization.textile
M railties/guides/source/layouts_and_rendering.textile
M railties/guides/source/migrations.textile
M railties/guides/source/plugins.textile
M railties/guides/source/rails_application_templates.textile
M railties/guides/source/routing.textile
M railties/guides/source/ruby_on_rails_guides_guidelines.textile
M railties/guides/source/security.textile
M railties/guides/source/testing.textile