diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/assertions/tag_assertions.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index acba014554..34b0421b67 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix broken tag in assert_tag documentation. Closes #9037 [mfazekas] + * Add documentation for route conditions. Closes #9041 [innu, manfred] * Fix typo left over from previous typo fix in url helper. Closes #9414 [Henrik N] diff --git a/actionpack/lib/action_controller/assertions/tag_assertions.rb b/actionpack/lib/action_controller/assertions/tag_assertions.rb index d911d81174..f8d2ec9798 100644 --- a/actionpack/lib/action_controller/assertions/tag_assertions.rb +++ b/actionpack/lib/action_controller/assertions/tag_assertions.rb @@ -37,8 +37,8 @@ module ActionController # to match on the children, and only matching children will be # counted. # * <tt>:content</tt>: the textual content of the node must match the - # given value. This will not match HTML tags in the body of a - # tag--only text. + # given value. This will not match HTML tags in the body of a + # tag--only text. # # Conditions are matched using the following algorithm: # @@ -90,7 +90,7 @@ module ActionController # :descendant => { :tag => "span", # :child => /hello world/ } # - # <strong>Please note</strong: #assert_tag and #assert_no_tag only work + # <b>Please note</b>: #assert_tag and #assert_no_tag only work # with well-formed XHTML. They recognize a few tags as implicitly self-closing # (like br and hr and such) but will not work correctly with tags # that allow optional closing tags (p, li, td). <em>You must explicitly |