add a comment about why the error handler is required, as per mail from TomH. Also...

diff --git a/config/environment.rb b/config/environment.rb
index e23f23bfa111b53b66d3fb97f0830bdb434c779e..171bb6fc8e5d4b688cad375ac39574e953669259 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -76,6 +76,12 @@ Rails::Initializer.run do |config|
   # (create the session table with 'rake db:sessions:create')
   config.action_controller.session_store = :sql_session_store
 
   # (create the session table with 'rake db:sessions:create')
   config.action_controller.session_store = :sql_session_store
 

+  # We will use the old style of migrations, rather than the newer
+  # timestamped migrations that were introduced with Rails 2.1, as
+  # it will be confusing to have the numbered and timestamped migrations
+  # together in the same folder.
+  config.active_record.timestamped_migrations = false
+

   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types

diff --git a/config/initializers/libxml.rb b/config/initializers/libxml.rb
index 4f71b6d0fd42ef0bad5b294a46d43633db46fb61..3b5919f0fca8c0a65c7a0f48f75d099f275bc4fa 100644 (file)
--- a/config/initializers/libxml.rb
+++ b/config/initializers/libxml.rb
@@ -1,8 +1,5 @@
-#require 'rubygems'
-#gem 'libxml-ruby', '>= 0.8.3'
-#require 'libxml'
-
-# Is this really needed?
+# This is required otherwise libxml writes out memory errors to
+# the standard output and exits uncleanly 

 LibXML::XML::Parser.register_error_handler do |message|
   raise message
 end
 LibXML::XML::Parser.register_error_handler do |message|
   raise message
 end