Merge branch 'master' of git@github.com:lifo/docrails

* 'master' of git@github.com:lifo/docrails: (319 commits)
  deletes screencast promo in prologue, its proper place is the References section
  Typo fix
  list -> index
  in caching guide, RESTifies some examples, revised conventions here and there
  Tech edit of caching guide from Gregg Pollack
  Fix typo in comment: hide_actions -> hide_action
  Fix two typos in a comment in config/initializers/backtrace_silencers.rb
  With -> with in a title
  Clear up a little confusing wording in Routing Guide.
  copyedited minor details in the rack on rails guide
  remove piece of UrlWriter documentation claiming that you can access named routes as its class methods
  Add note about change to session options
  TRUNCATE is also a MySQL DDL statement, so document this is a possible caveat when using transactions and savepoints.
  Improve documentation for ActiveResource::Validations, fix typos
  Fix typos in ActiveResource::Base documentation, use present tense, reword confusing sentences
  Update ActiveResource::Connection documentation to use present tense
  Fix typos in Active Resource README
  Fix a small typo
  ensure authors get warnings about broken links, and ensure end users don't
  in guides generator, warn about duplicate header IDs only if WARN_DUPLICATE_HEADERS
  ...

1 files changed, 14 insertions, 9 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index 05f767dc3b..a9adbda0b5 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -28,7 +28,8 @@ task :default => :test
 ## we can see the failures
 task :test do 
   Dir['test/**/*_test.rb'].all? do |file|
-    system("ruby -Itest #{file}")
+    ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
+    system(ruby, '-Itest', file)
   end or raise "Failures"
 end
 
@@ -246,6 +247,7 @@ end
 
 desc 'Generate guides (for authors), use ONLY=foo to process just "foo.textile"'
 task :guides do
+  ENV["WARN_BROKEN_LINKS"] = "1" # authors can't disable this
   ruby "guides/rails_guides.rb"
 end
 
@@ -310,11 +312,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('activesupport',    '= 2.3.0' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.3.0' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.3.0' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.3.0' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.3.0' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.3.2' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
@@ -343,9 +345,12 @@ task :pgem => [:gem] do
   `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
 end
 
-desc "Publish the API documentation"
-task :pdoc => :rdoc do
-  # railties API isn't separately published
+desc "Publish the guides"
+task :pguides => :guides do
+  mkdir_p 'pkg'
+  `tar -czf pkg/guides.gz guides/output`
+  Rake::SshFilePublisher.new("web.rubyonrails.org", "/u/sites/guides.rubyonrails.org/public", "pkg", "guides.gz").upload
+  `ssh web.rubyonrails.org 'cd /u/sites/guides.rubyonrails.org/public/ && tar -xvzf guides.gz && mv guides/output/* . && rm -rf guides*'`
 end
 
 desc "Publish the release files to RubyForge."