From 25850d17ac670e754945fd39dd024c539e05ee04 Mon Sep 17 00:00:00 2001
From: Mike Howard <mike@clove.com>
Date: Sun, 24 Jul 2011 10:54:19 -0600
Subject: Changed wording of paragraph 2.1.1 Models to clarify table/model
 relationship.

changed wording 'one table ... corresponds to one model' to 'each table
...'
---
 railties/guides/source/getting_started.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 6aca5d3420..60cd0217ad 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -50,7 +50,7 @@ At the core of Rails is the Model, View, Controller architecture, usually just c
 
 h5. Models
 
-A model represents the information (data) of the application and the rules to manipulate that data. In the case of Rails, models are primarily used for managing the rules of interaction with a corresponding database table. In most cases, one table in your database will correspond to one model in your application. The bulk of your application's business logic will be concentrated in the models.
+A model represents the information (data) of the application and the rules to manipulate that data. In the case of Rails, models are primarily used for managing the rules of interaction with a corresponding database table. In most cases, each table in your database will correspond to one model in your application. The bulk of your application's business logic will be concentrated in the models.
 
 h5. Views
 
-- 
cgit v1.2.3


From 5712e7aa47b6b4bcf4a0cc23a8d4e53e5df567dd Mon Sep 17 00:00:00 2001
From: Mike Howard <mike@clove.com>
Date: Sun, 24 Jul 2011 11:35:51 -0600
Subject: Clarified notes in 3.2 Creating the Blog Application

Changed descriptino of Gemfile to add reference to Bundler
Changed description of README to add 'You should edit ...'
Changed description of Rakefile to reflect dynamic nature of Rakefile
and point to app/lib/tasks/ as the place to add app-specific rake tasks.
---
 railties/guides/source/getting_started.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 60cd0217ad..d4a5b58c6b 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -174,9 +174,9 @@ $ cd blog
 In any case, Rails will create a folder in your working directory called <tt>blog</tt>. Open up that folder and explore its contents. Most of the work in this tutorial will happen in the <tt>app/</tt> folder, but here's a basic rundown on the function of each folder that Rails creates in a new application by default:
 
 |_.File/Folder|_.Purpose|
-|Gemfile|This file allows you to specify what gem dependencies are needed for your Rails application.|
-|README|This is a brief instruction manual for your application. Use it to tell others what your application does, how to set it up, and so on.|
-|Rakefile|This file contains batch jobs that can be run from the terminal.|
+|Gemfile|This file allows you to specify what gem dependencies are needed for your Rails application. See section on Bundler, below.|
+|README|This is a brief instruction manual for your application. You should edit this file to tell others what your application does, how to set it up, and so on.|
+|Rakefile|This file locates and loads tasks that can be run from the command line. The task definitions are defined throughout the components of Rails. Rather than changing Rakefile, you should add your own tasks by adding files to the lib/tasks directory of your application.|
 |app/|Contains the controllers, models, views and assets for your application. You'll focus on this folder for the remainder of this guide.|
 |config/|Configure your application's runtime rules, routes, database, and more.|
 |config.ru|Rack configuration for Rack based servers used to start the application.|
-- 
cgit v1.2.3


From 3eb99aab77c04dbd95dfc9f73e03a667f114914f Mon Sep 17 00:00:00 2001
From: Jason Noble & Ralph Shnelvar <perlwizard@gmail.com>
Date: Sun, 24 Jul 2011 11:42:15 -0600
Subject: Added some context for rack apps, linked to the Rails on Rack guide.

---
 railties/guides/source/getting_started.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index d4a5b58c6b..bfb37e887e 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -90,7 +90,7 @@ Action View manages the views of your Rails application. It can create both HTML
 
 h5. Action Dispatch
 
-Action Dispatch handles routing of web requests and dispatches them as you want, either to your application or any other Rack application.
+Action Dispatch handles routing of web requests and dispatches them as you want, either to your application or any other Rack application.  Rack applications are a more advanced topic and are covered in a later guide called "Rails on Rack":http://edgeguides.rubyonrails.org/rails_on_rack.html.
 
 h5. Action Mailer
 
-- 
cgit v1.2.3

