Merge branch 'master' of git://github.com/rails/rails

1 files changed, 5 insertions, 4 deletions

diff --git a/README.rdoc b/README.rdoc
index 1e78799e83..0def4e5d12 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -8,12 +8,12 @@ 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 
+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
@@ -21,7 +21,7 @@ provided by the ActiveModel module. You can read more about Active Record in its
 {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.
 
@@ -61,13 +61,14 @@ can read more about Action Pack in its {README}[link:/rails/rails/blob/master/ac
 * 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.