diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-02-18 22:02:34 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-02-18 22:02:34 +0530 |
| commit | 2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3 (patch) | |
| tree | 1c1f928ff506c4a605356e2b1da522e08ff12020 /activesupport | |
| parent | 2f689d462d8e94365724c5575b14ab997e11bb43 (diff) | |
| parent | 709f33d6042463bd4dbfb16f6f8946785556d5ab (diff) | |
| download | rails-2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3.tar.gz rails-2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3.tar.bz2 rails-2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 4f300329f5..dd2a21fe2a 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -67,7 +67,7 @@ class Time end # Returns a new Time where one or more of the elements have been changed according to the +options+ parameter. The time options - # (hour, minute, sec, usec) reset cascadingly, so if only the hour is passed, then minute, sec, and usec is set to 0. If the hour and + # (hour, min, sec, usec) reset cascadingly, so if only the hour is passed, then minute, sec, and usec is set to 0. If the hour and # minute is passed, then sec and usec is set to 0. def change(options) ::Time.send( |