From a72edab3b319ebada1d674a6b2fdcf46ad62fbdb Mon Sep 17 00:00:00 2001
From: "Nicholas E. May (on Enterprise)" <may@greentext.net>
Date: Sat, 2 Oct 2010 21:57:01 -0500
Subject: Removed unnecessary 'the' in the '2.2.9 Active Suport' section of
 Getting Started.

---
 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 92b9131b59..e6bf094b7d 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -110,7 +110,7 @@ Active Resource provides a framework for managing the connection between busines
 
 h5. Active Support
 
-Active Support is an extensive collection of utility classes and standard Ruby library extensions that are used in the Rails, both by the core code and by your applications.
+Active Support is an extensive collection of utility classes and standard Ruby library extensions that are used in Rails, both by the core code and by your applications.
 
 h5. Railties
 
-- 
cgit v1.2.3


From ffe24354cc55a59ae5efafd69d51dd8e2c5f00fe Mon Sep 17 00:00:00 2001
From: "Nicholas E. May (on Enterprise)" <may@greentext.net>
Date: Sat, 2 Oct 2010 22:26:26 -0500
Subject: Section 3.2, table: 'README.rdoc' -> 'README'

---
 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 e6bf094b7d..41563a5704 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -175,7 +175,7 @@ In any case, Rails will create a folder in your working directory called <tt>blo
 
 |_.File/Folder|_.Purpose|
 |Gemfile|This file allows you to specify what gem dependencies are needed for your Rails application.|
-|README.rdoc|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.|
+|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.|
 |app/|Contains the controllers, models, and views 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.|
-- 
cgit v1.2.3


From ab7b99f150ade08c079fc3425e23a297ea0a3e41 Mon Sep 17 00:00:00 2001
From: "Nicholas E. May (on Enterprise)" <may@greentext.net>
Date: Sat, 2 Oct 2010 22:43:45 -0500
Subject: Section 3.3: '# bundle install' instead of just 'bundle install'

---
 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 41563a5704..ed2a4188db 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -195,7 +195,7 @@ h4. Installing the Required Gems
 Rails applications manage gem dependencies with "Bundler":http://gembundler.com/v1.0/index.html by default. As we don't need any other gems beyond the ones in the generated +Gemfile+ we can directly run
 
 <shell>
-bundle install
+# bundle install
 </shell>
 
 to have them ready.
-- 
cgit v1.2.3


From bcc103367b2ad0c8f7bfabe0c4148b0cb9b19509 Mon Sep 17 00:00:00 2001
From: "Nicholas E. May (on Enterprise)" <may@greentext.net>
Date: Sat, 2 Oct 2010 23:05:08 -0500
Subject: Section 4.3, wrong word used: 'contact' => 'content'

---
 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 ed2a4188db..44203ae4f1 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -316,7 +316,7 @@ The first step to doing this is to delete the default page from your application
 $ rm public/index.html
 </shell>
 
-We need to do this as Rails will deliver any static file in the +public+ directory in preference to any dynamic contact we generate from the controllers.
+We need to do this as Rails will deliver any static file in the +public+ directory in preference to any dynamic content we generate from the controllers.
 
 Now, you have to tell Rails where your actual home page is located. Open the file +config/routes.rb+ in your editor. This is your application's _routing file_ which holds entries in a special DSL (domain-specific language) that tells Rails how to connect incoming requests to controllers and actions. This file contains many sample routes on commented lines, and one of them actually shows you how to connect the root of your site to a specific controller and action. Find the line beginning with +root :to+, uncomment it and change it like the following:
 
-- 
cgit v1.2.3


From 467d20c897ba8e837b1ec67095482f57e8a78dfc Mon Sep 17 00:00:00 2001
From: "Nicholas E. May (on Enterprise)" <may@greentext.net>
Date: Sun, 3 Oct 2010 00:37:15 -0500
Subject: Section 6, table, typo (extra '.rb')

---
 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 44203ae4f1..b2810188c2 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -352,7 +352,7 @@ NOTE. While scaffolding will get you up and running quickly, the "one size fits
 The scaffold generator will build 15 files in your application, along with some folders, and edit one more. Here's a quick overview of what it creates:
 
 |_.File                                       |_.Purpose|
-|db/migrate/20100207214725_create_posts.rb.rb    |Migration to create the posts table in your database (your name will include a different timestamp)|
+|db/migrate/20100207214725_create_posts.rb    |Migration to create the posts table in your database (your name will include a different timestamp)|
 |app/models/post.rb                           |The Post model|
 |test/fixtures/posts.yml                      |Dummy posts for use in testing|
 |app/controllers/posts_controller.rb          |The Posts controller|
-- 
cgit v1.2.3


From 879cac5d76d0d491c97941b9c0f84869a8988dae Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Tue, 12 Oct 2010 23:06:55 +0200
Subject: getting started guide: deletes orphan <% end %>, reported by Michael
 L. Miller

---
 railties/guides/source/getting_started.textile | 1 -
 1 file changed, 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 42b3313752..acb9c2c487 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -727,7 +727,6 @@ After finding the requested post, Rails uses the +edit.html.erb+ view to display
 
 <%= link_to 'Show', @post %> |
 <%= link_to 'Back', posts_path %>
-<% end %>
 </erb>
 
 Again, as with the +new+ action, the +edit+ action is using the +form+ partial, this time however, the form will do a PUT action to the PostsController and the submit button will display "Update Post"
-- 
cgit v1.2.3

