aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2010-12-20 00:07:43 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2010-12-20 00:07:43 +0530
commit4197fad8413e4b599c1c7f2382f4dcaeccf9473d (patch)
treeef07a44302df1c6bb86315ee8c7aabf9ce0afde9
parenteaad8610eea6efdd19124e965e43599811e665eb (diff)
downloadrails-4197fad8413e4b599c1c7f2382f4dcaeccf9473d.tar.gz
rails-4197fad8413e4b599c1c7f2382f4dcaeccf9473d.tar.bz2
rails-4197fad8413e4b599c1c7f2382f4dcaeccf9473d.zip
fix typos
-rw-r--r--railties/guides/source/ruby_on_rails_guides_guidelines.textile4
1 files changed, 2 insertions, 2 deletions
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.