From a45c2d59343a27bdef51118f10faf180ee4ca3d1 Mon Sep 17 00:00:00 2001 From: Hendy Tanata Date: Wed, 27 Jul 2011 17:30:35 +0700 Subject: Fix two spaces between sententes on README.rdoc. --- README.rdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'README.rdoc') diff --git a/README.rdoc b/README.rdoc index bca2126559..f87d6e9edb 100644 --- a/README.rdoc +++ b/README.rdoc @@ -3,11 +3,11 @@ 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 +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). @@ -21,7 +21,7 @@ provided by the ActiveModel module. You can read more about Active Record in its {README}[link: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. -- cgit v1.2.3 From b15cc2e8ec50188d14a840c1bb70d87c7e3cc6d3 Mon Sep 17 00:00:00 2001 From: Waynn Lue Date: Fri, 29 Jul 2011 16:01:20 -0700 Subject: Superfluous "the". --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.rdoc') diff --git a/README.rdoc b/README.rdoc index f87d6e9edb..288a7a3c55 100644 --- a/README.rdoc +++ b/README.rdoc @@ -27,7 +27,7 @@ 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]. -- cgit v1.2.3 From 2350185e40af76c44eac79182fc143f965a998fd Mon Sep 17 00:00:00 2001 From: Bratish Goswami Date: Sat, 30 Jul 2011 12:53:21 +0530 Subject: '/' was outside of anchor tag. --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.rdoc') diff --git a/README.rdoc b/README.rdoc index 288a7a3c55..5d1e3f5c5d 100644 --- a/README.rdoc +++ b/README.rdoc @@ -49,7 +49,7 @@ can read more about Action Pack in its {README}[link:blob/master/actionpack/READ Run with --help 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!" -- cgit v1.2.3 From c3bd6bb75fdbeb8f5d92b12ed2a9f5d4958d2f9c Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Sat, 13 Aug 2011 22:14:18 +0530 Subject: Fixes readme links better - earlier links broke when the current page is anything other than github.com/rails/rails/. Even github.com/rails/rails (without the trailing slash) broke the readme links. Also change the rakefile that generates the rdoc readme accordingly --- README.rdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.rdoc') diff --git a/README.rdoc b/README.rdoc index 5d1e3f5c5d..1e78799e83 100644 --- a/README.rdoc +++ b/README.rdoc @@ -18,7 +18,7 @@ you to present the data from database rows as objects and embellish these data o 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 @@ -29,7 +29,7 @@ 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 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 -- cgit v1.2.3 From 71232f5d5d88d5390ff790b7b3336f5168e9f270 Mon Sep 17 00:00:00 2001 From: Anand Date: Mon, 22 Aug 2011 17:07:23 +0530 Subject: Travis status image added to GitHub README, excluding API pages. --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.rdoc') diff --git a/README.rdoc b/README.rdoc index 1e78799e83..f0aa962272 100644 --- a/README.rdoc +++ b/README.rdoc @@ -62,7 +62,7 @@ can read more about Action Pack in its {README}[link:/rails/rails/blob/master/ac * The {API Documentation}[http://api.rubyonrails.org]. -== Contributing +== Contributing http://travis-ci.org/rails/rails.png 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 -- cgit v1.2.3 From 8526f727cfadb49e629e7ac3a0bbcbf9a89ec3cd Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Sun, 28 Aug 2011 02:25:54 +0530 Subject: doc fixes --- README.rdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'README.rdoc') diff --git a/README.rdoc b/README.rdoc index f0aa962272..9f017cd05f 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. -- cgit v1.2.3 From 82de8ad9c140afa81d334780e96428ef10ce52e8 Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Thu, 8 Sep 2011 01:27:24 +0530 Subject: Use Travis https build status image in order to prevent GitHub from caching the http version. The syntax for including an https image url in RDoc taken from http://about.travis-ci.org/docs/user/status-images. Having this in a line of its own now to make regex replacement for the API simpler! --- README.rdoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'README.rdoc') diff --git a/README.rdoc b/README.rdoc index 9f017cd05f..ac43962d97 100644 --- a/README.rdoc +++ b/README.rdoc @@ -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 http://travis-ci.org/rails/rails.png +== 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 {}[https://secure.travis-ci.org/rails/rails.png] + == License Ruby on Rails is released under the MIT license. -- cgit v1.2.3 From 37f1cf0a8b9ce1bc9c25dc2bec99e3edcdb8b254 Mon Sep 17 00:00:00 2001 From: Jeff Dutil Date: Thu, 8 Sep 2011 22:53:38 -0400 Subject: Travis-ci build image should link to the rails travis ci build page rather than to the image. --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.rdoc') diff --git a/README.rdoc b/README.rdoc index ac43962d97..0def4e5d12 100644 --- a/README.rdoc +++ b/README.rdoc @@ -67,7 +67,7 @@ We encourage you to contribute to Ruby on Rails! Please check out the {Contribut 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 {}[https://secure.travis-ci.org/rails/rails.png] +== Travis Build Status {}[http://travis-ci.org/rails/rails] == License -- cgit v1.2.3