aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2007-05-06 04:46:11 +0000
committerMarcel Molina <marcel@vernix.org>2007-05-06 04:46:11 +0000
commit4e51123a010db2e58e9dd23147be63cee963bf2d (patch)
tree14052fbd1f2141b8ffe034910b46aa0d2e0f29f8
parent6bdcc0cfaf9e3988a27bafdaa871c930bd4a31cf (diff)
downloadrails-4e51123a010db2e58e9dd23147be63cee963bf2d.tar.gz
rails-4e51123a010db2e58e9dd23147be63cee963bf2d.tar.bz2
rails-4e51123a010db2e58e9dd23147be63cee963bf2d.zip
Fix various documentation typos throughout ActionPack. Closes #8111. [Henrik N]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6679 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/install.rb4
-rw-r--r--actionpack/lib/action_view/base.rb2
-rw-r--r--actionpack/lib/action_view/compiled_templates.rb3
4 files changed, 6 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 543bb8bb1d..4f3797de3d 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix various documentation typos throughout ActionPack. [Henrik N]
+
* Enhance documentation and add examples for url_for. [jeremymcanally]
* Fix documentation typo in routes. [norbert, pam]
diff --git a/actionpack/install.rb b/actionpack/install.rb
index 2e1eba7624..d3b83c3b00 100644
--- a/actionpack/install.rb
+++ b/actionpack/install.rb
@@ -4,7 +4,7 @@ require 'ftools'
include Config
-# this was adapted from rdoc's install.rb by ways of Log4r
+# this was adapted from rdoc's install.rb by way of Log4r
$sitedir = CONFIG["sitelibdir"]
unless $sitedir
@@ -18,7 +18,7 @@ unless $sitedir
end
end
-# the acual gruntwork
+# the actual gruntwork
Dir.chdir("lib")
Find.find("action_controller", "action_controller.rb", "action_view", "action_view.rb") { |f|
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 519872ee85..33c71407bb 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -82,7 +82,7 @@ module ActionView #:nodoc:
# Here are some basic examples:
#
# xml.em("emphasized") # => <em>emphasized</em>
- # xml.em { xml.b("emp & bold") } # => <em><b>emph &amp; bold</b></em>
+ # xml.em { xml.b("emph & bold") } # => <em><b>emph &amp; bold</b></em>
# xml.a("A Link", "href"=>"http://onestepback.org") # => <a href="http://onestepback.org">A Link</a>
# xml.target("name"=>"compile", "option"=>"fast") # => <target option="fast" name="compile"\>
# # NOTE: order of attributes is not specified.
diff --git a/actionpack/lib/action_view/compiled_templates.rb b/actionpack/lib/action_view/compiled_templates.rb
index 73cce12e0d..5a286432e3 100644
--- a/actionpack/lib/action_view/compiled_templates.rb
+++ b/actionpack/lib/action_view/compiled_templates.rb
@@ -1,4 +1,3 @@
-
module ActionView
# CompiledTemplates modules hold methods that have been compiled.
@@ -40,7 +39,7 @@ module ActionView
# Compile the provided source code for the given argument names and with the given initial line number.
# The identifier should be unique to this source.
#
- # The file_name, if provided will appear in backtraces. If not provded, the file_name defaults
+ # The file_name, if provided will appear in backtraces. If not provided, the file_name defaults
# to the identifier.
#
# This method will return the selector for the compiled version of this method.