aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/Rakefile2
-rw-r--r--railties/builtin/rails_info/rails/info.rb2
-rwxr-xr-xrelease.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/Rakefile b/railties/Rakefile
index c8c688274c..2cffd73e52 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -73,7 +73,7 @@ HTML_FILES = %w( 422.html 404.html 500.html index.html robots.txt favicon.ico
javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js )
BIN_FILES = %w( about console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/inspector runner server plugin )
-VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties )
+VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport activeresource railties )
desc "Generates a fresh Rails package with documentation"
diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb
index e0eabc22a3..176abfc0f8 100644
--- a/railties/builtin/rails_info/rails/info.rb
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -89,7 +89,7 @@ module Rails
end
# Versions of each Rails component (Active Record, Action Pack,
- # Action Web Service, Active Resource, Action Mailer, and Active Support).
+ # Active Resource, Action Mailer, and Active Support).
components.each do |component|
property "#{component.titlecase} version" do
component_version(component)
diff --git a/release.rb b/release.rb
index 345110c045..a019a52e4f 100755
--- a/release.rb
+++ b/release.rb
@@ -1,7 +1,7 @@
#!/usr/local/bin/ruby
VERSION = ARGV.first
-PACKAGES = %w( activesupport activerecord actionpack actionmailer actionwebservice )
+PACKAGES = %w(activesupport activerecord actionpack actionmailer activeresource)
# Checkout source
`rm -rf release && svn export http://dev.rubyonrails.org/svn/rails/trunk release`