Xavier Noria 0b5d3f3273 Merge remote-tracking branch 'docrails/master' ... Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb guides/code/getting_started/app/controllers/comments_controller.rb		2013-01-26 17:41:56 +01:00
..
kindle
2_2_release_notes.md
2_3_release_notes.md
3_0_release_notes.md
3_1_release_notes.md
3_2_release_notes.md
4_0_release_notes.md	Merge remote-tracking branch 'docrails/master'	2013-01-26 17:41:56 +01:00
_license.html.erb
_welcome.html.erb
action_controller_overview.md	consistently inherit from ApplicationController in guides exemples	2013-01-20 03:38:45 +01:00
action_mailer_basics.md	Merge pull request #9084 from senny/document_am_delivieries_reset	2013-01-26 08:14:26 -08:00
action_view_overview.md
active_model_basics.md
active_record_basics.md
active_record_callbacks.md
active_record_querying.md
active_record_validations.md	Update guides/source/active_record_validations.md	2013-01-15 22:54:21 +06:00
active_support_core_extensions.md
active_support_instrumentation.md
api_documentation_guidelines.md
asset_pipeline.md	Merge remote-tracking branch 'docrails/master'	2013-01-26 17:41:56 +01:00
association_basics.md
caching_with_rails.md	generic pass before merging docrails	2013-01-26 17:36:38 +01:00
command_line.md	script => bin	2013-01-18 17:12:47 +09:00
configuring.md	Merge remote-tracking branch 'docrails/master'	2013-01-26 17:41:56 +01:00
contributing_to_ruby_on_rails.md
credits.html.erb
debugging_rails_applications.md
development_dependencies_install.md	Add new DB rake tasks to the contributing section.	2013-01-23 20:45:31 +05:30
documents.yaml	Remove WIP from Working With JavaScript Guide.	2013-01-13 13:34:36 -05:00
engines.md	[engines guide] reformatted some stuff	2013-01-24 02:42:40 -06:00
form_helpers.md
generators.md
getting_started.md	fixing link to validations guide in getting started guide	2013-01-22 00:09:00 -05:00
i18n.md	Revert "updating i18n guide with locale config location."	2013-01-22 09:28:07 -02:00
index.html.erb
initialization.md
layout.html.erb
layouts_and_rendering.md	Remove old asset tags API from docs, reflecting changes from #7900	2013-01-23 00:24:01 +04:00
migrations.md	Replacing plugin to gem	2013-01-19 15:49:28 -02:00
nested_model_forms.md	consistently inherit from ApplicationController in guides exemples	2013-01-20 03:38:45 +01:00
plugins.md
rails_application_templates.md
rails_on_rack.md
routing.md
ruby_on_rails_guides_guidelines.md
security.md	Remove mass-assignment line from guide summary	2013-01-25 23:45:55 -05:00
testing.md	Merge remote-tracking branch 'docrails/master'	2013-01-26 17:41:56 +01:00
upgrading_ruby_on_rails.md
working_with_javascript_in_rails.md