4 files changed, 7 insertions, 7 deletions
diff --git a/guides/source/2_3_release_notes.md b/guides/source/2_3_release_notes.md
index 328656f4a4..0a62f34371 100644
--- a/guides/source/2_3_release_notes.md
+++ b/guides/source/2_3_release_notes.md
@@ -187,7 +187,7 @@ MySQL supports a reconnect flag in its connections - if set to true, then the cl
 
 * Lead Contributor: [Dov Murik](http://twitter.com/dubek)
 * More information:
-    * [Controlling Automatic Reconnection Behavior](http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html)
+    * [Controlling Automatic Reconnection Behavior](http://dev.mysql.com/doc/refman/5.6/en/auto-reconnect.html)
     * [MySQL auto-reconnect revisited](http://groups.google.com/group/rubyonrails-core/browse_thread/thread/49d2a7e9c96cb9f4)
 
 ### Other Active Record Changes
diff --git a/guides/source/active_record_migrations.md b/guides/source/active_record_migrations.md
index b8db21a989..0e6c8c4f4a 100644
--- a/guides/source/active_record_migrations.md
+++ b/guides/source/active_record_migrations.md
@@ -241,7 +241,7 @@ generates
 ```ruby
 class AddUserRefToProducts < ActiveRecord::Migration
   def change
-    add_reference :products, :user, index: true
+    add_reference :products, :user, index: true, foreign_key: true
   end
 end
 ```
diff --git a/guides/source/initialization.md b/guides/source/initialization.md
index 43f15d1551..8fbb234698 100644
--- a/guides/source/initialization.md
+++ b/guides/source/initialization.md
@@ -278,7 +278,7 @@ def parse_options(args)
 
   options.merge! opt_parser.parse!(args)
   options[:config] = ::File.expand_path(options[:config])
-  ENV["RAILS_ENV"] = options[:environment]
+  ENV["RACK_ENV"] = options[:environment]
   options
 end
 ```
@@ -287,7 +287,7 @@ With the `default_options` set to this:
 
 ```ruby
 def default_options
-  environment  = ENV['RAILS_ENV'] || 'development'
+  environment  = ENV['RACK_ENV'] || 'development'
   default_host = environment == 'development' ? 'localhost' : '0.0.0.0'
 
   {
@@ -669,7 +669,7 @@ def self.run(app, options = {})
   end
 
   if options[:environment]
-    ENV['RAILS_ENV'] = options[:environment].to_s
+    ENV['RACK_ENV'] = options[:environment].to_s
   end
 
   server   = ::Puma::Server.new(app)
@@ -677,7 +677,7 @@ def self.run(app, options = {})
 
   puts "Puma #{::Puma::Const::PUMA_VERSION} starting..."
   puts "* Min threads: #{min}, max threads: #{max}"
-  puts "* Environment: #{ENV['RAILS_ENV']}"
+  puts "* Environment: #{ENV['RACK_ENV']}"
   puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
 
   server.add_tcp_listener options[:Host], options[:Port]
diff --git a/guides/source/testing.md b/guides/source/testing.md
index 84f1f25df9..008a485720 100644
--- a/guides/source/testing.md
+++ b/guides/source/testing.md
@@ -138,7 +138,7 @@ users(:david)
 users(:david).id
 
 # one can also access methods available on the User class
-email(david.girlfriend.email, david.location_tonight)
+email(david.partner.email, david.location_tonight)
 ```
 
 ### Rake Tasks for Running your Tests