aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-04-22 23:44:39 +0200
committerXavier Noria <fxn@hashref.com>2013-04-22 23:44:39 +0200
commit756cba02c1c06c1bce899633c7b87099ea4afce7 (patch)
treebd49d439e5a64bc7916bd56289824656084eb133
parent3e5d3e438ecf07a50cffbc831d4a212c10a19311 (diff)
downloadrails-756cba02c1c06c1bce899633c7b87099ea4afce7.tar.gz
rails-756cba02c1c06c1bce899633c7b87099ea4afce7.tar.bz2
rails-756cba02c1c06c1bce899633c7b87099ea4afce7.zip
ActiveRecord -> Active Record
-rw-r--r--guides/code/getting_started/Gemfile1
-rw-r--r--railties/lib/rails/generators/app_base.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/guides/code/getting_started/Gemfile b/guides/code/getting_started/Gemfile
index f06fc65de6..acd2ed5160 100644
--- a/guides/code/getting_started/Gemfile
+++ b/guides/code/getting_started/Gemfile
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
gem 'rails', '4.0.0'
+# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use SCSS for stylesheets
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index a7c2d2d1f1..57dc7e797b 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -117,7 +117,7 @@ module Rails
def database_gemfile_entry
options[:skip_active_record] ? "" :
<<-GEMFILE.strip_heredoc.chomp
- # Use #{options[:database]} as the database for ActiveRecord
+ # Use #{options[:database]} as the database for Active Record
gem '#{gem_for_database}'
GEMFILE
end