Merge remote branch 'rails/master'

2 files changed, 7 insertions, 8 deletions

diff --git a/README.rdoc b/README.rdoc
index 8476db6663..7ca376d492 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -51,8 +51,9 @@ more separate. Each of these packages can be used independently outside of
 5. Follow the guidelines to start developing your application. You can find the following resources handy:
 
 * The README file created within your application.
-* The {Getting Started Guide}[http://guides.rubyonrails.org/getting_started.html].
-* The {Ruby on Rails Tutorial Book}[http://railstutorial.org/book].
+* The {Getting Started with Rails}[http://guides.rubyonrails.org/getting_started.html].
+* The {Ruby on Rails Tutorial}[http://railstutorial.org/book].
+* The {Ruby on Rails guides}[http://guides.rubyonrails.org/getting_started.html].
 * The {API documentation}[http://api.rubyonrails.org].
 
 
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 4823876f19..d9525539ab 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -194,15 +194,13 @@ In any case, Rails will create a folder in your working directory called <tt>blo
 
 h4. Installing the Required Gems
 
-Rails uses the "Bundler":http://www.github.com/carlhuda/bundler gem to populate the +vendor+ directory with all the gems your application depends on.  As we don't need any special gems beyond the default, we just need to do the following:
+Rails applications manage gem dependencies with "Bundler":http://www.github.com/carlhuda/bundler by default. As we don't need any other gems beyond the ones in the generated +Gemfile+ we can directly run
 
 <shell>
-As the root user:
-# gem install bundler
-# bundle install
+bundle install
 </shell>
 
-This will copy down the versions of all the gems you need to start a rails application.
+to have them ready.
 
 h4. Configuring a Database
 
@@ -1453,7 +1451,7 @@ h3. What's Next?
 
 Now that you've seen your first Rails application, you should feel free to update it and experiment on your own. But you don't have to do everything without help. As you need assistance getting up and running with Rails, feel free to consult these support resources:
 
-* The "Ruby On Rails guides":index.html
+* The "Ruby on Rails guides":index.html
 * The "Ruby on Rails mailing list":http://groups.google.com/group/rubyonrails-talk
 * The "#rubyonrails":irc://irc.freenode.net/#rubyonrails channel on irc.freenode.net
 * The "Rails Wiki":http://wiki.rubyonrails.org/