Commit Graph

4 Commits

Author SHA1 Message Date
Tore Darell
38a2c4c91e Add min-height to code,pre to prevent icon from being cut off 2009-02-07 00:40:25 +01:00
Pratik Naik
b9ba2fe550 Merge commit 'mainstream/master'
Conflicts:
	railties/guides/files/javascripts/code_highlighter.js
	railties/guides/files/javascripts/guides.js
	railties/guides/files/javascripts/highlighters.js
	railties/guides/files/stylesheets/main.css
	railties/guides/files/stylesheets/print.css
	railties/guides/files/stylesheets/reset.css
	railties/guides/files/stylesheets/style.css
	railties/guides/files/stylesheets/syntax.css
	railties/guides/rails_guides/indexer.rb
	railties/guides/source/2_2_release_notes.textile
	railties/guides/source/2_3_release_notes.textile
	railties/guides/source/action_controller_overview.textile
	railties/guides/source/action_mailer_basics.textile
	railties/guides/source/active_record_basics.textile
	railties/guides/source/activerecord_validations_callbacks.textile
	railties/guides/source/association_basics.textile
	railties/guides/source/caching_with_rails.textile
	railties/guides/source/command_line.textile
	railties/guides/source/debugging_rails_applications.textile
	railties/guides/source/form_helpers.textile
	railties/guides/source/getting_started.textile
	railties/guides/source/i18n.textile
	railties/guides/source/layout.html.erb
	railties/guides/source/layouts_and_rendering.textile
	railties/guides/source/migrations.textile
	railties/guides/source/performance_testing.textile
	railties/guides/source/plugins.textile
	railties/guides/source/rails_on_rack.textile
	railties/guides/source/routing.textile
	railties/guides/source/security.textile
	railties/guides/source/testing.textile
2009-02-06 02:25:55 +00:00
Pratik Naik
96d610553e Merge docrails along with the new guides and guides generation code 2009-02-06 02:01:22 +00:00
Pratik Naik
03bb1ebec5 Convert the guides from asciidoc to textile and integrate with the new design.
If you're a guide writer and want to generate the guides, Run :

  ruby railties/guides/rails_guides.rb

And guides HTML will get generated inside railties/guides/output directory.
2009-02-04 01:44:58 +00:00