diff options
author | Robin Dupret <robin.dupret@gmail.com> | 2016-05-30 15:58:53 +0200 |
---|---|---|
committer | Robin Dupret <robin.dupret@gmail.com> | 2016-05-30 15:58:53 +0200 |
commit | 1afdbbeb27e3bda6b7db02ea4b71ad1b170d6ecc (patch) | |
tree | 4cf79eabe6f3d2a9bf5f7b11b39819f3a3d2fd4d | |
parent | 3f2e83d964fcb4cd7f7f2ed8fb2b2592ffc57647 (diff) | |
download | rails-1afdbbeb27e3bda6b7db02ea4b71ad1b170d6ecc.tar.gz rails-1afdbbeb27e3bda6b7db02ea4b71ad1b170d6ecc.tar.bz2 rails-1afdbbeb27e3bda6b7db02ea4b71ad1b170d6ecc.zip |
Tiny document fixes [ci skip]
Add a missing capital letter and avoid using absolute links to the
API because they may refer to out-dated documentation on the Edge
site.
-rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/associations.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index 480e265e44..e21449f376 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -129,7 +129,7 @@ module ActionController # * <tt>:etag</tt> Sets a "weak" ETag validator on the response. See the # +:weak_etag+ option. # * <tt>:weak_etag</tt> Sets a "weak" ETag validator on the response. - # requests that set If-None-Match header may return a 304 Not Modified + # Requests that set If-None-Match header may return a 304 Not Modified # response if it matches the ETag exactly. A weak ETag indicates semantic # equivalence, not byte-for-byte equality, so they're good for caching # HTML pages in browser caches. They can't be used for responses that diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index ec9b073c18..3729e22e64 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -300,7 +300,7 @@ module ActiveRecord # # === A word of warning # - # Don't create associations that have the same name as [instance methods](http://api.rubyonrails.org/classes/ActiveRecord/Core.html) of + # Don't create associations that have the same name as {instance methods}[rdoc-ref:ActiveRecord::Core] of # <tt>ActiveRecord::Base</tt>. Since the association adds a method with that name to # its model, using an association with the same name as one provided by <tt>ActiveRecord::Base</tt> will override the method inherited through <tt>ActiveRecord::Base</tt> and will break things. # For instance, +attributes+ and +connection+ would be bad choices for association names, because those names already exist in the list of <tt>ActiveRecord::Base</tt> instance methods. |