rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.
*	Fix broken and duplicate headings	Prem Sichanugrist	2012-09-17	1	-1/+1
\|
*	Fix the usage of `*` in Markdown	Prem Sichanugrist	2012-09-17	1	-7/+7
\| \| \| \| \|	In Textile `` would convert to `<strong>`, but in Markdown we have to use `*` instead.
*	Fix remaining formatting problems in the guide	Prem Sichanugrist	2012-09-17	1	-1/+1
\|
*	Convert all the links into Markdown format	Prem Sichanugrist	2012-09-17	1	-10/+10
\|
*	Convert all inline codes to Markdown syntax	Prem Sichanugrist	2012-09-17	1	-62/+62
\|
*	change shell to bash	Prem Sichanugrist	2012-09-17	1	-27/+27
\|
*	Convert inline code tags to Markdown	Prem Sichanugrist	2012-09-17	1	-24/+24
\|
*	Convert heading tags and heading section	Prem Sichanugrist	2012-09-17	1	-24/+28
\|
*	Convert code blocks into GFM style	Prem Sichanugrist	2012-09-17	1	-64/+64
\|
*	Rename the rest of the guides to Markdown	Prem Sichanugrist	2012-09-17	1	-0/+614