Permalink
Browse files

Fix typo in 5b5730c

  • Loading branch information...
1 parent 5b5730c commit b7568e77d79cba9202b961cbe2a822b8b6b34bb0 @lifo lifo committed Nov 24, 2008
Showing with 5 additions and 5 deletions.
  1. +1 −1 railties/CHANGELOG
  2. +4 −4 railties/lib/rails_generator/generators/applications/app/app_generator.rb
View
@@ -1,6 +1,6 @@
*2.3.0 [Edge]*
-* "rails <app>" will not generate public/dispatch.cgi/fcgi/rb files by default now. Please use "--with-dispatches" option if you need them. [Yaroslav Markin, Pratik Naik]
+* "rails <app>" will not generate public/dispatch.cgi/fcgi/rb files by default now. Please use "--with-dispatchers" option if you need them. [Yaroslav Markin, Pratik Naik]
* Added rake rails:update:application_controller to renamed application.rb to application_controller.rb -- included in rake rails:update so upgrading to 2.3 will automatically trigger it #1439 [kastner]
@@ -10,7 +10,7 @@ class AppGenerator < Rails::Generator::Base
DEFAULT_DATABASE = 'sqlite3'
default_options :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),
- :shebang => DEFAULT_SHEBANG, :with_dispatches => false, :freeze => false
+ :shebang => DEFAULT_SHEBANG, :with_dispatchers => false, :freeze => false
mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
def initialize(runtime_args, runtime_options = {})
@@ -83,7 +83,7 @@ def manifest
end
# Dispatches
- if options[:with_dispatches]
+ if options[:with_dispatchers]
m.file "dispatches/dispatch.rb", "public/dispatch.rb", dispatcher_options
m.file "dispatches/dispatch.rb", "public/dispatch.cgi", dispatcher_options
m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options
@@ -131,9 +131,9 @@ def add_options!(opt)
"Preconfigure for selected database (options: #{DATABASES.join('/')}).",
"Default: #{DEFAULT_DATABASE}") { |v| options[:db] = v }
- opt.on("-D", "--with-dispatches",
+ opt.on("-D", "--with-dispatchers",
"Add CGI/FastCGI/mod_ruby dispatches code to generated application skeleton",
- "Default: false") { |v| options[:with_dispatches] = v }
+ "Default: false") { |v| options[:with_dispatchers] = v }
opt.on("-f", "--freeze",
"Freeze Rails in vendor/rails from the gems generating the skeleton",

0 comments on commit b7568e7

Please sign in to comment.