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

3 files changed, 4 insertions, 4 deletions

diff --git a/actionview/lib/action_view/vendor/html-scanner/html/node.rb b/actionview/lib/action_view/vendor/html-scanner/html/node.rb
index 7e7cd4f7b6..27f0f2f6f8 100644
--- a/actionview/lib/action_view/vendor/html-scanner/html/node.rb
+++ b/actionview/lib/action_view/vendor/html-scanner/html/node.rb
@@ -71,12 +71,12 @@ module HTML #:nodoc:
       @line, @position = line, pos
     end
 
-    # Return a textual representation of the node.
+    # Returns a textual representation of the node.
     def to_s
       @children.join()
     end
 
-    # Return false (subclasses must override this to provide specific matching
+    # Returns false (subclasses must override this to provide specific matching
     # behavior.) +conditions+ may be of any type.
     def match(conditions)
       false
diff --git a/actionview/lib/action_view/vendor/html-scanner/html/selector.rb b/actionview/lib/action_view/vendor/html-scanner/html/selector.rb
index 7f8609c408..dfdd724b9b 100644
--- a/actionview/lib/action_view/vendor/html-scanner/html/selector.rb
+++ b/actionview/lib/action_view/vendor/html-scanner/html/selector.rb
@@ -488,7 +488,7 @@ module HTML
     end
 
 
-    # Return the next element after this one. Skips sibling text nodes.
+    # Returns the next element after this one. Skips sibling text nodes.
     #
     # With the +name+ argument, returns the next element with that name,
     # skipping other sibling elements.
diff --git a/actionview/lib/action_view/vendor/html-scanner/html/tokenizer.rb b/actionview/lib/action_view/vendor/html-scanner/html/tokenizer.rb
index 8ac8d34430..adf4e45930 100644
--- a/actionview/lib/action_view/vendor/html-scanner/html/tokenizer.rb
+++ b/actionview/lib/action_view/vendor/html-scanner/html/tokenizer.rb
@@ -30,7 +30,7 @@ module HTML #:nodoc:
       @current_line = 1
     end
 
-    # Return the next token in the sequence, or +nil+ if there are no more tokens in
+    # Returns the next token in the sequence, or +nil+ if there are no more tokens in
     # the stream.
     def next
       return nil if @scanner.eos?