diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-31 00:24:05 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-31 00:24:05 +0200 |
| commit | 3805d01c9b0ee6681d3e36233a82731200b87d34 (patch) | |
| tree | 0c50c954f6561c64438dc14a7771f9ac4c320003 /railties/guides/source/initialization.textile | |
| parent | d37a65307d280e47eb5c15b61c0b20ac6cab6a84 (diff) | |
| parent | c30f6c270da5cd2ad7605ee9255f052e93609e30 (diff) | |
| download | rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.gz rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.bz2 rails-3805d01c9b0ee6681d3e36233a82731200b87d34.zip | |
resolves merge conflict
Diffstat (limited to 'railties/guides/source/initialization.textile')
| -rw-r--r-- | railties/guides/source/initialization.textile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile index be59ac2937..07ef975f80 100644 --- a/railties/guides/source/initialization.textile +++ b/railties/guides/source/initialization.textile @@ -1375,6 +1375,7 @@ the _version_ file contains this code (comments stripped): module VERSION #:nodoc: MAJOR = 3 MINOR = 1 + MINOR = 0 TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') @@ -1437,7 +1438,7 @@ Afterwards this includes the +ActiveSupport::Benchmarkable+ which is used for be end </ruby> -The "documentation":http://api.rails.info/classes/ActiveSupport/Benchmarkable.html#M000607 is great about explaining what precisely this does. (TODO: replace link with real documentation link when it becomes available.) +The "documentation":http://api.rubyonrails.org/classes/ActiveSupport/Benchmarkable.html is great about explaining what precisely this does. This module is also included into Active Record and +AbstractController+, meaning you can also use the +benchmark+ method in these methods. |