diff options
author | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:11:24 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:11:24 +0200 |
commit | af1b48926f49226c934995c322ee017239158cf3 (patch) | |
tree | a496e072226dc4c16f70b5d74cb7eb800391fa82 /activesupport/lib | |
parent | f7538808d466b756df15ac3f27ca08370f7a189c (diff) | |
parent | df70b9dfb23aa05ed7ae7955ff0fb7eec68de9a3 (diff) | |
download | rails-af1b48926f49226c934995c322ee017239158cf3.tar.gz rails-af1b48926f49226c934995c322ee017239158cf3.tar.bz2 rails-af1b48926f49226c934995c322ee017239158cf3.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/core_ext/object/inclusion.rb | 4 | ||||
-rw-r--r-- | activesupport/lib/active_support/core_ext/object/try.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/inclusion.rb b/activesupport/lib/active_support/core_ext/object/inclusion.rb index 51cfc62f2b..b5671f66d0 100644 --- a/activesupport/lib/active_support/core_ext/object/inclusion.rb +++ b/activesupport/lib/active_support/core_ext/object/inclusion.rb @@ -1,11 +1,11 @@ class Object # Returns true if this object is included in the argument. Argument must be - # any object which respond to +#include?+. Usage: + # any object which responds to +#include?+. Usage: # # characters = ["Konata", "Kagami", "Tsukasa"] # "Konata".in?(characters) # => true # - # This will throw an ArgumentError if the supplied argument doesnt not respond + # This will throw an ArgumentError if the argument doesn't respond # to +#include?+. def in?(another_object) another_object.include?(self) diff --git a/activesupport/lib/active_support/core_ext/object/try.rb b/activesupport/lib/active_support/core_ext/object/try.rb index aedf5c8c82..e77a9da0ec 100644 --- a/activesupport/lib/active_support/core_ext/object/try.rb +++ b/activesupport/lib/active_support/core_ext/object/try.rb @@ -35,7 +35,7 @@ class Object end class NilClass - # Instances of +NilClass+ return always +nil+. + # Calling +try+ on +nil+ always returns +nil+. # It becomes specially helpful when navigating through associations that may return +nil+. # # === Examples |