5 files changed, 15 insertions, 3 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 31edd69f46..1535b7213f 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -1,5 +1,6 @@
 require 'logger'
 require 'set'
+require File.join(File.dirname(__FILE__), 'railties_path')
 
 RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
 
@@ -488,7 +489,7 @@ module Rails
       end
       
       def default_controller_paths
-        [ File.join(root_path, 'app', 'controllers'), File.join(root_path, 'components') ]
+        [ File.join(root_path, 'app', 'controllers'), File.join(root_path, 'components'), File.join(RAILTIES_PATH, 'builtin', 'controllers') ]
       end
       
       def default_dependency_mechanism
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 01f371ce42..aee2cced24 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -64,6 +64,7 @@ class AppGenerator < Rails::Generator::Base
       
       m.template "html/favicon.ico", "public/favicon.ico"
       m.template "html/robots.txt", "public/robots.txt"
+      m.file "html/images/rails.png", "public/images/rails.png"
 
       # Javascripts
       m.file "html/javascripts/prototype.js",     "public/javascripts/prototype.js"
diff --git a/railties/lib/rails_info.rb b/railties/lib/rails_info.rb
index c0237dab7c..5c71a289c2 100644
--- a/railties/lib/rails_info.rb
+++ b/railties/lib/rails_info.rb
@@ -42,6 +42,16 @@ module Rails
 
       alias inspect to_s
       
+      def to_html
+        returning table = '<table>' do
+          properties.each do |(name, value)|
+            table << %(<tr><td class="name">#{CGI.escapeHTML(name)}</td>)
+            table << %(<td class="value">#{CGI.escapeHTML(value)}</td></tr>)
+          end
+          table << '</table>'
+        end
+      end
+      
     protected
       def svn_info
         Dir.chdir("#{RAILS_ROOT}/vendor/rails") do
diff --git a/railties/lib/railties_path.rb b/railties/lib/railties_path.rb
index b08ced8be5..817940504d 100644
--- a/railties/lib/railties_path.rb
+++ b/railties/lib/railties_path.rb
@@ -1 +1 @@
-RAILTIES_PATH = File.expand_path(File.dirname(__FILE__))
-\ No newline at end of file
+RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+\ No newline at end of file
diff --git a/railties/lib/tasks/javascripts.rake b/railties/lib/tasks/javascripts.rake
index 91965c8918..5fc01562e8 100644
--- a/railties/lib/tasks/javascripts.rake
+++ b/railties/lib/tasks/javascripts.rake
@@ -2,5 +2,5 @@
 desc "Update your javascripts from your current rails install."
 task :update_javascripts do 
   require 'railties_path'  
-  FileUtils.cp(Dir[RAILTIES_PATH + '/../html/javascripts/*.js'], RAILS_ROOT + '/public/javascripts/')
+  FileUtils.cp(Dir[RAILTIES_PATH + '/html/javascripts/*.js'], RAILS_ROOT + '/public/javascripts/')
 end