From 6b65cd57ca20381e7d0f169d7b8cfd7db10e6efb Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 19 Dec 2010 17:57:20 +0530
Subject: deleting trailing whitespaces

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

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

diff --git a/railties/guides/source/ruby_on_rails_guides_guidelines.textile b/railties/guides/source/ruby_on_rails_guides_guidelines.textile
index 0bc409cbda..8a6e87e155 100644
--- a/railties/guides/source/ruby_on_rails_guides_guidelines.textile
+++ b/railties/guides/source/ruby_on_rails_guides_guidelines.textile
@@ -48,7 +48,7 @@ To generate all the guides just cd into the +railties+ directory and execute
 rake generate_guides
 </plain>
 
-You'll need the gems erubis, i18n, and RedCloth. 
+You'll need the gems erubis, i18n, and RedCloth.
 
 To process +my_guide.textile+ and nothing else use the +ONLY+ environment variable:
 
-- 
cgit v1.2.3


From 4197fad8413e4b599c1c7f2382f4dcaeccf9473d Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Mon, 20 Dec 2010 00:07:43 +0530
Subject: fix typos

---
 railties/guides/source/ruby_on_rails_guides_guidelines.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/railties/guides/source/ruby_on_rails_guides_guidelines.textile b/railties/guides/source/ruby_on_rails_guides_guidelines.textile
index 8a6e87e155..a2e830b574 100644
--- a/railties/guides/source/ruby_on_rails_guides_guidelines.textile
+++ b/railties/guides/source/ruby_on_rails_guides_guidelines.textile
@@ -16,7 +16,7 @@ h3. Titles
 
 The title of every guide uses +h2+, guide sections use +h3+, subsections +h4+, etc.
 
-Capitalize all words except for internal articles, prepositions, conjuctions, and forms of the verb to be:
+Capitalize all words except for internal articles, prepositions, conjunctions, and forms of the verb to be:
 
 <plain>
 h5. Middleware Stack is an Array
@@ -58,7 +58,7 @@ rake generate_guides ONLY=my_guide
 
 Although by default guides that have not been modified are not processed, so +ONLY+ is rarely needed in practice.
 
-To force process of al the guides pass +ALL=1+.
+To force process of all the guides, pass +ALL=1+.
 
 It is also recommended that you work with +WARNINGS=1+, this detects duplicate IDs and warns about broken internal links.
 
-- 
cgit v1.2.3

