diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb index 2dc6459ed4..ec59dddc36 100644 --- a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb +++ b/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb @@ -38,7 +38,7 @@ module Builder # xm.title("History") # History # } # # xm.body { # - # xm.comment! "HI" # + # xm.comment! "HI" # # xm.h1("Header") #

Header

# xm.p("paragraph") #

paragraph

# } # diff --git a/railties/Rakefile b/railties/Rakefile index 88171e8078..3ffe5a2bdc 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -323,7 +323,6 @@ spec = Gem::Specification.new do |s| s.files = PKG_FILES.to_a.delete_if {|f| f.include?('.svn')} s.require_path = 'lib' - s.bindir = "bin" # Use these for applications. s.executables = ["rails"] s.default_executable = "rails"