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

rails · Mar 5, 2010 · 4adcbb6 · 4adcbb6
2 parents 18a9906 + 36d28f5
commit 4adcbb6
Show file tree

Hide file tree

Showing 5 changed files with 394 additions and 4 deletions.
diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
@@ -1,4 +1,5 @@
 require 'set'
+require 'fileutils'
 
 module RailsGuides
   class Generator

diff --git a/railties/guides/source/3_0_release_notes.textile b/railties/guides/source/3_0_release_notes.textile
@@ -25,8 +25,9 @@ TIP: To install the Rails 3 prerelease beta using rubygems you have to install a
 <shell>
 # Use sudo if your setup requires it
 gem install tzinfo builder i18n memcache-client rack \
-  rake rack-test rack-mount erubis mail text-format \
+  rake rack-test erubis mail text-format \
   thor bundler
+gem install rack-mount -v=0.4
 gem install rails --pre
 </shell>
 

diff --git a/railties/guides/source/action_view_overview.textile b/railties/guides/source/action_view_overview.textile
@@ -33,13 +33,13 @@ gem install actionpack
 gem install rack
 </shell>
 
-Now we'll create a simple "Hello World" application that uses the +titleize+ method provided by Action View.
+Now we'll create a simple "Hello World" application that uses the +titleize+ method provided by Active Support.
 
 *hello_world.rb:*
 
 <ruby>
 require 'rubygems'
-require 'action_view'
+require 'active_support/core_ext/string/inflections'
 require 'rack'
 
 def hello_world(env)