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

Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/configurable.rb
	activesupport/lib/active_support/core_ext/module/deprecation.rb
	guides/source/action_controller_overview.md
	guides/source/active_support_core_extensions.md
	guides/source/ajax_on_rails.textile
	guides/source/association_basics.textile
	guides/source/upgrading_ruby_on_rails.md

While resolving conflicts, I have chosen to ignore changes done in
docrails at some places - these will be most likely 1.9 hash syntax
changes.

1 files changed, 6 insertions, 5 deletions

diff --git a/guides/source/getting_started.md b/guides/source/getting_started.md
index 0789a59f9c..ccfef07090 100644
--- a/guides/source/getting_started.md
+++ b/guides/source/getting_started.md
@@ -4,10 +4,11 @@ Getting Started with Rails
 This guide covers getting up and running with Ruby on Rails. After reading it,
 you should be familiar with:
 
-* Installing Rails, creating a new Rails application, and connecting your application to a database
-* The general layout of a Rails application
-* The basic principles of MVC (Model, View Controller) and RESTful design
-* How to quickly generate the starting pieces of a Rails application
+* Installing Rails, creating a new Rails application, and connecting your
+  application to a database.
+* The general layout of a Rails application.
+* The basic principles of MVC (Model, View, Controller) and RESTful design.
+* How to quickly generate the starting pieces of a Rails application.
 
 --------------------------------------------------------------------------------
 
@@ -93,7 +94,7 @@ To verify that you have everything installed correctly, you should be able to ru
 $ rails --version
 ```
 
-If it says something like "Rails 3.2.3" you are ready to continue.
+If it says something like "Rails 3.2.8" you are ready to continue.
 
 ### Creating the Blog Application