Remove :layout option from generators.

railties/lib/rails/generators.rb

@@ -41,14 +41,9 @@ module Generators
     }
 
     DEFAULT_OPTIONS = {
-      :erb => {
-        :layout => true
-      },
-
       :rails => {
         :force_plural => false,
         :helper => true,
-        :layout => true,
         :orm => nil,
         :integration_tool => nil,
         :performance_tool => nil,

railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb

@@ -8,7 +8,6 @@ class ScaffoldGenerator < Base
 
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
-      class_option :layout,    :type => :boolean
       class_option :singleton, :type => :boolean, :desc => "Supply to skip index view"
 
       def create_root_folder