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

3 files changed, 34 insertions, 40 deletions

diff --git a/railties/lib/generators/rails/app/templates/config/application.rb b/railties/lib/generators/rails/app/templates/config/application.rb
index 78a355d2f4..7c555c2542 100644
--- a/railties/lib/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/generators/rails/app/templates/config/application.rb
@@ -1,5 +1,19 @@
 require File.expand_path('../boot', __FILE__)
 
+<% unless options[:skip_activerecord] -%>
+require 'rails/all'
+<% else -%>
+# Pick the frameworks you want:
+# require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_resource/railtie"
+require "rails/test_unit/railtie"
+<% end -%>
+
+# Auto-require default libraries and those for the current Rails environment.
+Bundler.require :default, Rails.env
+
 module <%= app_const_base %>
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb
index 03396113e8..29c9d506e5 100644
--- a/railties/lib/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/generators/rails/app/templates/config/boot.rb
@@ -15,32 +15,3 @@ rescue LoadError
   #
   # require 'rubygems'
 end
-
-# Auto-require all bundled libraries.
-Bundler.require
-
-<% unless options[:skip_activerecord] -%>
-require 'rails/all'
-
-# To pick the frameworks you want, remove 'require "rails/all"'
-# and list the framework railties that you want:
-#
-# require "active_support/railtie"
-# require "active_model/railtie"
-# require "active_record/railtie"
-# require "action_controller/railtie"
-# require "action_view/railtie"
-# require "action_mailer/railtie"
-# require "active_resource/railtie"
-# require "rails/test_unit/railtie"
-<% else -%>
-# Pick the frameworks you want:
-# require "active_model/railtie"
-# require "active_record/railtie"
-require "active_support/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
-require "active_resource/railtie"
-require "rails/test_unit/railtie"
-<% end -%>
diff --git a/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml b/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml
index 2cecb5c879..2784a949fb 100644
--- a/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml
+++ b/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml
@@ -4,23 +4,32 @@
 #   http://rubyforge.org/projects/rubyibm/
 #
 # To install the ibm_db gem:
+#
 #   On Linux:
-#     Source the db2profile file and set the necessary environment variables:
+#       . /home/db2inst1/sqllib/db2profile
+#       export IBM_DB_INCLUDE=/opt/ibm/db2/V9.7/include
+#       export IBM_DB_LIB=/opt/ibm/db2/V9.7/lib32
+#       gem install ibm_db
 #
+#   On Mac OS X 10.5:
 #       . /home/db2inst1/sqllib/db2profile
-#       export IBM_DB_DIR=/opt/ibm/db2/V9.1
-#       export IBM_DB_LIB=/opt/ibm/db2/V9.1/lib32
+#       export IBM_DB_INCLUDE=/opt/ibm/db2/V9.7/include
+#       export IBM_DB_LIB=/opt/ibm/db2/V9.7/lib32
+#       export ARCHFLAGS="-arch i386"
+#       gem install ibm_db
 #
-#     Then issue the command: gem install ibm_db
+#   On Mac OS X 10.6:
+#       . /home/db2inst1/sqllib/db2profile
+#       export IBM_DB_INCLUDE=/opt/ibm/db2/V9.7/include
+#       export IBM_DB_LIB=/opt/ibm/db2/V9.7/lib64
+#       export ARCHFLAGS="-arch x86_64"
+#       gem install ibm_db
 #
 #   On Windows:
-#     Issue the command: gem install ibm_db
-#     If prompted, select the mswin32 option
-#
-# For more details on the installation refer to http://rubyforge.org/docman/view.php/2361/7682/IBM_DB_GEM.pdf
+#       Issue the command: gem install ibm_db
 #
-# For more details on the connection parameters below refer to:
-#   http://rubyibm.rubyforge.org/docs/adapter/0.9.0/rdoc/classes/ActiveRecord/ConnectionAdapters/IBM_DBAdapter.html
+# For more details on the installation and the connection parameters below,
+# please refer to the latest documents at http://rubyforge.org/docman/?group_id=2361
 
 development:
   adapter:     ibm_db
@@ -52,7 +61,7 @@ production:
   adapter:     ibm_db
   username:    db2inst1
   password:
-  database:    <%= app_name[0,4] %>_prd
+  database:    <%= app_name[0,8] %>
   #schema:      db2inst1
   #host:        localhost
   #port:        50000