Permalink
Browse files

Merge branch 'master' of github.com:lifo/docrails

  • Loading branch information...
oscardelben committed Apr 21, 2012
2 parents 3da2b53 + 63b4a00 commit c06c842a8aec3e5ec9a6dc6379db8b27d64f7a03
Showing with 2 additions and 2 deletions.
  1. +1 −1 actionpack/lib/action_view/helpers/asset_tag_helper.rb
  2. +1 −1 guides/source/layout.html.erb
@@ -442,7 +442,7 @@ def image_alt(src)
# <video><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
# video_tag(["trailer.ogg", "trailer.flv"]) # =>
# <video><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
- # video_tag(["trailer.ogg", "trailer.flv"] :size => "160x120") # =>
+ # video_tag(["trailer.ogg", "trailer.flv"], :size => "160x120") # =>
# <video height="120" width="160"><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
def video_tag(*sources)
multiple_sources_tag('video', sources) do |options|
@@ -82,7 +82,7 @@
<p>
If you see any typos or factual errors you are confident to
patch, please clone <%= link_to 'docrails', 'https://github.com/lifo/docrails' %>
- and push the change yourself. That branch of Rails has public write access.
+ and push the change yourself. That fork of Rails has public write access.
Commits are still reviewed, but that happens after you've submitted your
contribution. <%= link_to 'docrails', 'https://github.com/lifo/docrails' %> is
cross-merged with master periodically.

0 comments on commit c06c842

Please sign in to comment.