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

7 files changed, 18 insertions, 21 deletions

diff --git a/railties/configs/databases/frontbase.yml b/railties/configs/databases/frontbase.yml
index 2eed3133a1..c0c3588be1 100644
--- a/railties/configs/databases/frontbase.yml
+++ b/railties/configs/databases/frontbase.yml
@@ -10,8 +10,8 @@ development:
   username: <%= app_name %>
   password: ''
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: frontbase
diff --git a/railties/configs/databases/mysql.yml b/railties/configs/databases/mysql.yml
index c5c894c5e1..7fcadcdf2c 100644
--- a/railties/configs/databases/mysql.yml
+++ b/railties/configs/databases/mysql.yml
@@ -26,8 +26,8 @@ development:
   host: localhost
 <% end -%>
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: mysql
diff --git a/railties/configs/databases/oracle.yml b/railties/configs/databases/oracle.yml
index c86cbdbaba..a1883f6256 100644
--- a/railties/configs/databases/oracle.yml
+++ b/railties/configs/databases/oracle.yml
@@ -4,7 +4,7 @@
 #  http://rubyforge.org/projects/ruby-oci8/
 #
 # Specify your database using any valid connection syntax, such as a
-# tnsnames.ora service name, or a sql connect url string of the form:
+# tnsnames.ora service name, or a SQL connect url string of the form:
 #
 #   //host:[port][/service name]
 #
@@ -23,8 +23,8 @@ development:
   username: <%= app_name %>
   password:
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: oracle
diff --git a/railties/configs/databases/postgresql.yml b/railties/configs/databases/postgresql.yml
index c1b911a9a4..36f6e5ae49 100644
--- a/railties/configs/databases/postgresql.yml
+++ b/railties/configs/databases/postgresql.yml
@@ -30,8 +30,8 @@ development:
   # The server defaults to notice.
   #min_messages: warning
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: postgresql
diff --git a/railties/configs/databases/sqlite2.yml b/railties/configs/databases/sqlite2.yml
index 26d3957d79..fc48bd6753 100644
--- a/railties/configs/databases/sqlite2.yml
+++ b/railties/configs/databases/sqlite2.yml
@@ -4,8 +4,8 @@ development:
   adapter: sqlite
   database: db/development.sqlite2
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: sqlite
diff --git a/railties/configs/databases/sqlite3.yml b/railties/configs/databases/sqlite3.yml
index b444b03cd4..fff44a4124 100644
--- a/railties/configs/databases/sqlite3.yml
+++ b/railties/configs/databases/sqlite3.yml
@@ -5,8 +5,8 @@ development:
   database: db/development.sqlite3
   timeout: 5000
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: sqlite3
diff --git a/railties/configs/initializers/new_rails_defaults.rb b/railties/configs/initializers/new_rails_defaults.rb
index b8f0e2cac2..5e60c0ade4 100644
--- a/railties/configs/initializers/new_rails_defaults.rb
+++ b/railties/configs/initializers/new_rails_defaults.rb
@@ -1,18 +1,15 @@
-# These settins change the behavior of Rails 2 apps and will be defaults
+# These settings change the behavior of Rails 2 apps and will be defaults
 # for Rails 3. You can remove this initializer when Rails 3 is released.
 
-# Only save the attributes that have changed since the record was loaded.
-ActiveRecord::Base.partial_updates = true
-
-# Include ActiveRecord class name as root for JSON serialized output.
+# Include Active Record class name as root for JSON serialized output.
 ActiveRecord::Base.include_root_in_json = true
 
-# Store the full class name (including module namespace) in STI type column
+# Store the full class name (including module namespace) in STI type column.
 ActiveRecord::Base.store_full_sti_class = true
 
-# Use ISO 8601 format for JSON serialized times and dates
+# Use ISO 8601 format for JSON serialized times and dates.
 ActiveSupport.use_standard_json_time_format = true
 
-# Don't escape HTML entities in JSON, leave that for the #json_escape helper
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
 # if you're including raw json in an HTML page.
 ActiveSupport.escape_html_entities_in_json = false
\ No newline at end of file