diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2014-06-07 10:05:23 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2014-06-07 10:05:23 +0000 |
| commit | b9ea1d3384ceb5c52f311089776d126b2383105a (patch) | |
| tree | b613e63fa1a881e5d8f792ab29e6a4795ec9fcc1 /activerecord | |
| parent | ad539dcb30742c019e008ccc571bfeff77e8b24c (diff) | |
| parent | 69107a72965be89200677986153e0a6820304584 (diff) | |
| download | rails-b9ea1d3384ceb5c52f311089776d126b2383105a.tar.gz rails-b9ea1d3384ceb5c52f311089776d126b2383105a.tar.bz2 rails-b9ea1d3384ceb5c52f311089776d126b2383105a.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index f3d3cdc9e3..6ba667b996 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -33,7 +33,7 @@ module ActiveRecord # is followed by an indented list of key/value pairs in the "key: value" format. Records are # separated by a blank line for your viewing pleasure. # - # Note that fixtures are unordered. If you want ordered fixtures, use the omap YAML type. + # Note: Fixtures are unordered. If you want ordered fixtures, use the omap YAML type. # See http://yaml.org/type/omap.html # for the specification. You will need ordered fixtures when you have foreign key constraints # on keys in the same table. This is commonly needed for tree structures. Example: @@ -374,8 +374,9 @@ module ActiveRecord # # == Support for YAML defaults # - # You probably already know how to use YAML to set and reuse defaults in - # your <tt>database.yml</tt> file. You can use the same technique in your fixtures: + # You can set and reuse defaults in your fixtures YAML file. + # This is the same technique used in the <tt>database.yml</tt> file + # to specify defaults: # # DEFAULTS: &DEFAULTS # created_on: <%= 3.weeks.ago.to_s(:db) %> |