Merge remote-tracking branch 'upstream/master'

1 files changed, 11 insertions, 10 deletions

diff --git a/README.rdoc b/README.rdoc
index bca2126559..0def4e5d12 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -3,33 +3,33 @@
 Rails is a web-application framework that includes everything needed to create
 database-backed web applications according to the {Model-View-Controller (MVC)}[http://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller] pattern.
 
-Understanding the MVC pattern is key to understanding Rails.  MVC divides your application
+Understanding the MVC pattern is key to understanding Rails. MVC divides your application
 into three layers, each with a specific responsibility.
 
 The View layer is composed of "templates" that are responsible for providing 
-appropriate representations of your application's resources.  Templates
-can come in a variety of formats, but most view templates are HTML with embedded Ruby 
+appropriate representations of your application's resources. Templates
+can come in a variety of formats, but most view templates are \HTML with embedded Ruby
 code (.erb files). 
 
 The Model layer represents your domain model (such as Account, Product, Person, Post) 
 and encapsulates the business logic that is specific to your application. In Rails, 
-database-backed model classes are derived from ActiveRecord::Base. ActiveRecord allows
+database-backed model classes are derived from ActiveRecord::Base. Active Record allows
 you to present the data from database rows as objects and embellish these data objects 
 with business logic methods. Although most Rails models are backed by a database, models 
 can also be ordinary Ruby classes, or Ruby classes that implement a set of interfaces as
 provided by the ActiveModel module. You can read more about Active Record in its
-{README}[link:blob/master/activerecord/README.rdoc].
+{README}[link:/rails/rails/blob/master/activerecord/README.rdoc].
 
 The Controller layer is responsible for handling incoming HTTP requests and providing a 
-suitable response.  Usually this means returning HTML, but Rails controllers can also 
+suitable response. Usually this means returning \HTML, but Rails controllers can also
 generate XML, JSON, PDFs, mobile-specific views, and more. Controllers manipulate models 
 and render view templates in order to generate the appropriate HTTP response.
 
 In Rails, the Controller and View layers are handled together by Action Pack.
 These two layers are bundled in a single package due to their heavy interdependence. 
-This is unlike the relationship between the Active Record and Action Pack which are
+This is unlike the relationship between Active Record and Action Pack which are
 independent. Each of these packages can be used independently outside of Rails. You 
-can read more about Action Pack in its {README}[link:blob/master/actionpack/README.rdoc].
+can read more about Action Pack in its {README}[link:/rails/rails/blob/master/actionpack/README.rdoc].
 
 == Getting Started
 
@@ -49,7 +49,7 @@ can read more about Action Pack in its {README}[link:blob/master/actionpack/READ
 
    Run with <tt>--help</tt> for options.
 
-4. Go to http://localhost:3000/ and you'll see:
+4. Go to http://localhost:3000 and you'll see:
 
     "Welcome aboard: You're riding Ruby on Rails!"
 
@@ -61,13 +61,14 @@ can read more about Action Pack in its {README}[link:blob/master/actionpack/READ
 * The {Ruby on Rails Guides}[http://guides.rubyonrails.org].
 * The {API Documentation}[http://api.rubyonrails.org].
 
-
 == Contributing
 
 We encourage you to contribute to Ruby on Rails! Please check out the {Contributing to Rails
 guide}[http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html] for guidelines about how
 to proceed. {Join us}[http://contributors.rubyonrails.org]!
 
+== Travis Build Status {<img src="https://secure.travis-ci.org/rails/rails.png"/>}[http://travis-ci.org/rails/rails]
+
 == License
 
 Ruby on Rails is released under the MIT license.