Merge branch 'master' of git://github.com/lifo/docrails

3 files changed, 16 insertions, 4 deletions

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 9098ffbfec..b4f0c42e37 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -210,11 +210,11 @@ module ActiveSupport
       # be specified as an option to the construction in which call all entries will be
       # affected. Or it can be supplied to the +fetch+ or +write+ method for just one entry.
       #
-      #   cache = ActiveSupport::Cache::MemoryStore.new(:expire_in => 5.minutes)
-      #   cache.write(key, value, :expire_in => 1.minute)  # Set a lower value for one entry
+      #   cache = ActiveSupport::Cache::MemoryStore.new(:expires_in => 5.minutes)
+      #   cache.write(key, value, :expires_in => 1.minute)  # Set a lower value for one entry
       #
       # Setting <tt>:race_condition_ttl</tt> is very useful in situations where a cache entry
-      # is used very frequently unver heavy load. If a cache expires and due to heavy load
+      # is used very frequently and is under heavy load. If a cache expires and due to heavy load
       # seven different processes will try to read data natively and then they all will try to
       # write to cache. To avoid that case the first process to find an expired cache entry will
       # bump the cache expiration time by the value set in <tt>:race_condition_ttl</tt>. Yes
diff --git a/activesupport/lib/active_support/configurable.rb b/activesupport/lib/active_support/configurable.rb
index 58ed37b018..644db0b205 100644
--- a/activesupport/lib/active_support/configurable.rb
+++ b/activesupport/lib/active_support/configurable.rb
@@ -38,6 +38,18 @@ module ActiveSupport
         yield config
       end
 
+      # Allows you to add shortcut so that you don't have to refer to attribute through config.
+      # Also look at the example for config to contrast.
+      #
+      #   class User
+      #     include ActiveSupport::Configurable
+      #     config_accessor :allowed_access
+      #   end
+      #
+      #   user = User.new
+      #   user.allowed_access = true
+      #   user.allowed_access # => true
+      #
       def config_accessor(*names)
         names.each do |name|
           code, line = <<-RUBY, __LINE__ + 1
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 787437c49a..dab6fdbac6 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -331,7 +331,7 @@ module ActiveSupport #:nodoc:
         if load?
           log "loading #{file_name}"
 
-          # Enable warnings iff this file has not been loaded before and
+          # Enable warnings if this file has not been loaded before and
           # warnings_on_first_load is set.
           load_args = ["#{file_name}.rb"]
           load_args << const_path unless const_path.nil?