Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 4 insertions, 5 deletions

diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb
index ebe34a42cd..01dd33fa8c 100644
--- a/railties/lib/commands/server.rb
+++ b/railties/lib/commands/server.rb
@@ -1,4 +1,3 @@
-require 'active_support'
 require 'action_controller'
 
 require 'fileutils'
@@ -23,17 +22,17 @@ options = {
 
 ARGV.clone.options do |opts|
   opts.on("-p", "--port=port", Integer,
-          "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
+          "Runs Rails on the specified port.", "Default: #{options[:Port]}") { |v| options[:Port] = v }
   opts.on("-b", "--binding=ip", String,
-          "Binds Rails to the specified ip.", "Default: 0.0.0.0") { |v| options[:Host] = v }
+          "Binds Rails to the specified ip.", "Default: #{options[:Host]}") { |v| options[:Host] = v }
   opts.on("-c", "--config=file", String,
           "Use custom rackup configuration file") { |v| options[:config] = v }
   opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:detach] = true }
   opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { options[:debugger] = true }
   opts.on("-e", "--environment=name", String,
           "Specifies the environment to run this server under (test/development/production).",
-          "Default: development") { |v| options[:environment] = v }
-  opts.on("-P", "--path=/path", String, "Runs Rails app mounted at a specific path.", "Default: /") { |v| options[:path] = v }
+          "Default: #{options[:environment]}") { |v| options[:environment] = v }
+  opts.on("-P", "--path=/path", String, "Runs Rails app mounted at a specific path.", "Default: #{options[:path]}") { |v| options[:path] = v }
 
   opts.separator ""