diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-25 19:33:33 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-25 19:33:33 +0530 |
| commit | 54e522a38827b7b78968237a762334f94c20f7d7 (patch) | |
| tree | 73771abe79e954495753e2c875f6e063bac77482 /activerecord | |
| parent | ebddca18bb16c4d9bda4db72b5154a23f459b7c8 (diff) | |
| parent | 2d1cbd02b4600625dc5db6b70ab003127a8b5559 (diff) | |
| download | rails-54e522a38827b7b78968237a762334f94c20f7d7.tar.gz rails-54e522a38827b7b78968237a762334f94c20f7d7.tar.bz2 rails-54e522a38827b7b78968237a762334f94c20f7d7.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/README.rdoc | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/persistence.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/activerecord/README.rdoc b/activerecord/README.rdoc index 70922ef864..6f9f63ceee 100644 --- a/activerecord/README.rdoc +++ b/activerecord/README.rdoc @@ -208,7 +208,9 @@ Source code can be downloaded as part of the Rails project on GitHub == License -Active Record is released under the MIT license. +Active Record is released under the MIT license: + +* http://www.opensource.org/licenses/MIT == Support diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index bf4f97b03b..09ee2ba61d 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -9,7 +9,7 @@ module ActiveRecord # Creates an object (or multiple objects) and saves it to the database, if validations pass. # The resulting object is returned whether the object was saved successfully to the database or not. # - # The +attributes+ parameter can be either be a Hash or an Array of Hashes. These Hashes describe the + # The +attributes+ parameter can be either a Hash or an Array of Hashes. These Hashes describe the # attributes on the objects that are to be created. # # +create+ respects mass-assignment security and accepts either +:as+ or +:without_protection+ options @@ -59,8 +59,8 @@ module ActiveRecord @destroyed end - # Returns if the record is persisted, i.e. it's not a new record and it was - # not destroyed. + # Returns true if the record is persisted, i.e. it's not a new record and it was + # not destroyed, otherwise returns false. def persisted? !(new_record? || destroyed?) end |