aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/install.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/object/misc.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/string/unicode.rb4
-rw-r--r--activesupport/lib/active_support/core_ext/time/calculations.rb2
-rw-r--r--activesupport/lib/active_support/vendor/builder/xmlbase.rb2
-rw-r--r--activesupport/lib/active_support/vendor/builder/xmlmarkup.rb2
-rw-r--r--activesupport/lib/active_support/vendor/xml_simple.rb2
-rw-r--r--activesupport/test/core_ext/date_ext_test.rb2
-rw-r--r--activesupport/test/core_ext/date_time_ext_test.rb2
-rw-r--r--activesupport/test/core_ext/time_ext_test.rb2
-rw-r--r--activesupport/test/multibyte_handler_test.rb2
11 files changed, 12 insertions, 12 deletions
diff --git a/activesupport/install.rb b/activesupport/install.rb
index f84f06bdaa..9c54d8c1a9 100644
--- a/activesupport/install.rb
+++ b/activesupport/install.rb
@@ -18,7 +18,7 @@ unless $sitedir
end
end
-# the acual gruntwork
+# the actual gruntwork
Dir.chdir("lib")
Find.find("active_support", "active_support.rb") { |f|
diff --git a/activesupport/lib/active_support/core_ext/object/misc.rb b/activesupport/lib/active_support/core_ext/object/misc.rb
index e46cfe1b9b..a3637d7a8a 100644
--- a/activesupport/lib/active_support/core_ext/object/misc.rb
+++ b/activesupport/lib/active_support/core_ext/object/misc.rb
@@ -37,7 +37,7 @@ class Object
# post.has_many :all_comments
# end
#
- # Can also be used with an explicit reciever:
+ # Can also be used with an explicit receiver:
#
# map.with_options :controller => "people" do |people|
# people.connect "/people", :action => "index"
diff --git a/activesupport/lib/active_support/core_ext/string/unicode.rb b/activesupport/lib/active_support/core_ext/string/unicode.rb
index 0e4c76fb86..dd19fe5428 100644
--- a/activesupport/lib/active_support/core_ext/string/unicode.rb
+++ b/activesupport/lib/active_support/core_ext/string/unicode.rb
@@ -1,7 +1,7 @@
module ActiveSupport #:nodoc:
module CoreExtensions #:nodoc:
module String #:nodoc:
- # Define methods for handeling unicode data.
+ # Define methods for handling unicode data.
module Unicode
# +chars+ is a Unicode safe proxy for string methods. It creates and returns an instance of the
# ActiveSupport::Multibyte::Chars class which encapsulates the original string. A Unicode safe version of all
@@ -39,4 +39,4 @@ module ActiveSupport #:nodoc:
end
end
end
-end \ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index b1ad5a9e99..5754ca1bca 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -29,7 +29,7 @@ module ActiveSupport #:nodoc:
end
end
- # Returns a new Time if requested year can be accomodated by Ruby's Time class
+ # Returns a new Time if requested year can be accommodated by Ruby's Time class
# (i.e., if year is within either 1970..2038 or 1902..2038, depending on system architecture);
# otherwise returns a DateTime
def time_with_datetime_fallback(utc_or_local, year, month=1, day=1, hour=0, min=0, sec=0, usec=0)
diff --git a/activesupport/lib/active_support/vendor/builder/xmlbase.rb b/activesupport/lib/active_support/vendor/builder/xmlbase.rb
index 57c8ddfc30..ad0069ff15 100644
--- a/activesupport/lib/active_support/vendor/builder/xmlbase.rb
+++ b/activesupport/lib/active_support/vendor/builder/xmlbase.rb
@@ -26,7 +26,7 @@ module Builder
end
# Create a tag named +sym+. Other than the first argument which
- # is the tag name, the arguements are the same as the tags
+ # is the tag name, the arguments are the same as the tags
# implemented via <tt>method_missing</tt>.
def tag!(sym, *args, &block)
self.__send__(sym, *args, &block)
diff --git a/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb b/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
index 4cdcedb4a1..b7d8b487e5 100644
--- a/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
+++ b/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
@@ -153,7 +153,7 @@ module Builder
#
# xml_builder = Builder::XmlMarkup.new
# xml_builder.div { |xml|
- # xml.stong("text")
+ # xml.strong("text")
# }
#
class XmlMarkup < XmlBase
diff --git a/activesupport/lib/active_support/vendor/xml_simple.rb b/activesupport/lib/active_support/vendor/xml_simple.rb
index 48b7289c65..7ea9c8de6b 100644
--- a/activesupport/lib/active_support/vendor/xml_simple.rb
+++ b/activesupport/lib/active_support/vendor/xml_simple.rb
@@ -121,7 +121,7 @@ class XmlSimple
# Create a "global" cache.
@@cache = Cache.new
- # Creates and intializes a new XmlSimple object.
+ # Creates and initializes a new XmlSimple object.
#
# defaults::
# Default values for options.
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index 4ec595d918..97b637f974 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -36,7 +36,7 @@ class DateExtCalculationsTest < Test::Unit::TestCase
assert_equal Date.new(2005,6,22), Date.new(2005,2,22).change(:month => 6)
end
- def test_begining_of_week
+ def test_beginning_of_week
assert_equal Date.new(2005,1,31), Date.new(2005,2,4).beginning_of_week
assert_equal Date.new(2005,11,28), Date.new(2005,11,28).beginning_of_week #monday
assert_equal Date.new(2005,11,28), Date.new(2005,11,29).beginning_of_week #tuesday
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index b7bdbc5deb..204e8cd676 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -46,7 +46,7 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
assert_equal 86399,DateTime.civil(2005,1,1,23,59,59).seconds_since_midnight
end
- def test_begining_of_week
+ def test_beginning_of_week
assert_equal DateTime.civil(2005,1,31), DateTime.civil(2005,2,4,10,10,10).beginning_of_week
assert_equal DateTime.civil(2005,11,28), DateTime.civil(2005,11,28,0,0,0).beginning_of_week #monday
assert_equal DateTime.civil(2005,11,28), DateTime.civil(2005,11,29,0,0,0).beginning_of_week #tuesday
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index 4a64ebd584..5f06a4efa7 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -49,7 +49,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
end
end
- def test_begining_of_week
+ def test_beginning_of_week
assert_equal Time.local(2005,1,31), Time.local(2005,2,4,10,10,10).beginning_of_week
assert_equal Time.local(2005,11,28), Time.local(2005,11,28,0,0,0).beginning_of_week #monday
assert_equal Time.local(2005,11,28), Time.local(2005,11,29,0,0,0).beginning_of_week #tuesday
diff --git a/activesupport/test/multibyte_handler_test.rb b/activesupport/test/multibyte_handler_test.rb
index 9905cf65d6..174d7b790d 100644
--- a/activesupport/test/multibyte_handler_test.rb
+++ b/activesupport/test/multibyte_handler_test.rb
@@ -15,7 +15,7 @@ module UTF8HandlingTest
# This is an ASCII string with some russian strings and a ligature. It's nicely calibrated, because
# slicing it at some specific bytes will kill your characters if you use standard Ruby routines.
# It has both capital and standard letters, so that we can test case conversions easily.
- # It has 26 charactes and 28 when the ligature gets split during normalization.
+ # It has 26 characters and 28 when the ligature gets split during normalization.
@string = "Abcd Блå ffi бла бла бла бла"
@string_kd = "Abcd Блå ffi бла бла бла бла"
@string_kc = "Abcd Блå ffi бла бла бла бла"