diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-01 23:49:55 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-01 23:49:55 +0530 |
| commit | 831b814a8778aad0d038aab550b7d405d4a69d37 (patch) | |
| tree | c8d3c42cd9c20843341c198da09e1e909cf2a5bd | |
| parent | eae2dbe5575fb68984f9b5157c6e236ad4ccf691 (diff) | |
| download | rails-831b814a8778aad0d038aab550b7d405d4a69d37.tar.gz rails-831b814a8778aad0d038aab550b7d405d4a69d37.tar.bz2 rails-831b814a8778aad0d038aab550b7d405d4a69d37.zip | |
copy edits [ci skip]
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date/calculations.rb | 2 | ||||
| -rw-r--r-- | guides/source/asset_pipeline.textile | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb index 2daa3b7fa9..31726962e3 100644 --- a/activesupport/lib/active_support/core_ext/date/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date/calculations.rb @@ -106,7 +106,7 @@ class Date end # Returns a new Date where one or more of the elements have been changed according to the +options+ parameter. - # The +options+ parameter takes a hash with any of these keys: <tt>:years</tt>, <tt>:month</tt>, <tt>:day</tt>. + # The +options+ parameter is a hash with a combination of these keys: <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>. # # Date.new(2007, 5, 12).change(:day => 1) # => Date.new(2007, 5, 1) # Date.new(2007, 5, 12).change(:year => 2005, :month => 1) # => Date.new(2005, 1, 12) diff --git a/guides/source/asset_pipeline.textile b/guides/source/asset_pipeline.textile index 9c641db964..2a15e95282 100644 --- a/guides/source/asset_pipeline.textile +++ b/guides/source/asset_pipeline.textile @@ -473,9 +473,7 @@ Precompiled assets exist on the filesystem and are served directly by your web s For Apache: <plain> -# the following requires mod_expires -# on Ubuntu issue: -# sudo a2enmod expires +# The Expires* directives requires the Apache module +mod_expires+ to be enabled. <LocationMatch "^/assets/.*$"> # Use of ETag is discouraged when Last-Modified is present Header unset ETag |