diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-14 11:21:27 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-14 11:21:27 +0200 |
| commit | d49113023676fbf0b6653730f5bde759990caede (patch) | |
| tree | de8a47655ad3a1fa1e73dbc307ec9b806637b3ec /actionpack/lib/action_view/helpers/atom_feed_helper.rb | |
| parent | db886c817c3620ceaa68a988947e49e5219532fd (diff) | |
| parent | e5524d538c0d0f39d655a78fc45d2122c0ff2f2a (diff) | |
| download | rails-d49113023676fbf0b6653730f5bde759990caede.tar.gz rails-d49113023676fbf0b6653730f5bde759990caede.tar.bz2 rails-d49113023676fbf0b6653730f5bde759990caede.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/date_helper.rb
railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
Diffstat (limited to 'actionpack/lib/action_view/helpers/atom_feed_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/atom_feed_helper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb index 96e5722252..889ea8a763 100644 --- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb +++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb @@ -81,8 +81,8 @@ module ActionView # # The Atom spec defines five elements (content rights title subtitle # summary) which may directly contain xhtml content if :type => 'xhtml' - # is specified as an attribute. If so, this helper will take care of - # the enclosing div and xhtml namespace declaration. Example usage: + # is specified as an attribute. If so, this helper will take care of + # the enclosing div and xhtml namespace declaration. Example usage: # # entry.summary :type => 'xhtml' do |xhtml| # xhtml.p pluralize(order.line_items.count, "line item") @@ -91,8 +91,8 @@ module ActionView # end # # - # atom_feed yields an AtomFeedBuilder instance. Nested elements yield - # an AtomBuilder instance. + # <tt>atom_feed</tt> yields an +AtomFeedBuilder+ instance. Nested elements yield + # an +AtomBuilder+ instance. def atom_feed(options = {}, &block) if options[:schema_date] options[:schema_date] = options[:schema_date].strftime("%Y-%m-%d") if options[:schema_date].respond_to?(:strftime) |