Import changes from Ruby trunk

Author: drbrain

lib/rdoc.rb

@@ -20,7 +20,7 @@
 # * If you want to include extensions written in C, see RDoc::Parser::C
 # * For information on the various markups available in comment blocks, see
 #   RDoc::Markup.
-# * If you want to drive RDoc programatically, see RDoc::RDoc.
+# * If you want to drive RDoc programmatically, see RDoc::RDoc.
 # * If you want to use the library to format text blocks into HTML, have a look
 #   at RDoc::Markup.
 # * If you want to try writing your own HTML output template, see
@@ -206,7 +206,7 @@
 #   Stop and start adding new documentation elements to the current container.
 #   For example, if a class has a number of constants that you don't want to
 #   document, put a +:stopdoc:+ before the first, and a +:startdoc:+ after the
-#   last.  If you don't specifiy a +:startdoc:+ by the end of the container,
+#   last.  If you don't specify a +:startdoc:+ by the end of the container,
 #   disables documentation for the entire class or module.
 #
 # = Other stuff

lib/rdoc/generator/html/html.rb

@@ -7,19 +7,19 @@
 # This is a template for RDoc that uses XHTML 1.0 Transitional and dictates a
 # bit more of the appearance of the output to cascading stylesheets than the
 # default. It was designed for clean inline code display, and uses DHTMl to
-# toggle the visbility of each method's source with each click on the '[source]'
-# link.
+# toggle the visibility of each method's source with each click on the
+# '[source]' link.
 #
 # == Authors
 #
 # * Michael Granger <[email protected]>
 #
 # Copyright (c) 2002, 2003 The FaerieMUD Consortium. Some rights reserved.
 #
-# This work is licensed under the Creative Commons Attribution License. To view
-# a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or
-# send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California
-# 94305, USA.
+# This work is licensed under the Creative Commons Attribution License. To
+# view a copy of this license, visit
+# http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative
+# Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
 
 module RDoc::Generator::HTML::HTML
 

lib/rdoc/markup.rb

@@ -17,7 +17,7 @@
 # RDoc::Markup is intended to be the basis for a family of tools which share
 # the common requirement that simple, plain-text should be rendered in a
 # variety of different output formats and media.  It is envisaged that
-# RDoc::Markup could be the basis for formating RDoc style comment blocks,
+# RDoc::Markup could be the basis for formatting RDoc style comment blocks,
 # Wiki entries, and online FAQs.
 #
 # = Basic Formatting
@@ -129,7 +129,7 @@
 #
 # You can extend the RDoc::Markup parser to recognise new markup
 # sequences, and to add special processing for text that matches a
-# regular epxression.  Here we make WikiWords significant to the parser,
+# regular expression.  Here we make WikiWords significant to the parser,
 # and also make the sequences {word} and \<no>text...</no> signify
 # strike-through text.  When then subclass the HTML output class to deal
 # with these:
@@ -197,7 +197,7 @@ def initialize
 
   ##
   # Add to the sequences used to add formatting to an individual word (such
-  # as *bold*).  Matching entries will generate attibutes that the output
+  # as *bold*).  Matching entries will generate attributes that the output
   # formatters can recognize by their +name+.
 
   def add_word_pair(start, stop, name)

lib/rdoc/options.rb

@@ -577,7 +577,7 @@ def setup_generator
     end
   end
 
-  # Check that the right version of 'dot' is available.  Unfortuately this
+  # Check that the right version of 'dot' is available.  Unfortunately this
   # doesn't work correctly under Windows NT, so we'll bypass the test under
   # Windows.
 

lib/rdoc/parser/ruby.rb

@@ -1494,7 +1494,7 @@ def collect_first_comment
       if first_line and tk.text =~ /\A#!/ then
         skip_tkspace
         tk = get_tk
-      elsif first_line and tk.text =~ /\A#\s*-\*-/ =~ tk.text then
+      elsif first_line and tk.text =~ /\A#\s*-\*-/ then
         first_line = false
         skip_tkspace
         tk = get_tk

lib/rdoc/rdoc.rb

@@ -137,7 +137,7 @@ def parse_dot_doc_file(in_dir, filename, options)
     # subdirectories.
     #
     # The effect of this is that if you want a file with a non-standard
-    # extension parsed, you must name it explicity.
+    # extension parsed, you must name it explicitly.
 
     def normalized_file_list(options, relative_files, force_doc = false,
                              exclude_pattern = nil)

lib/rdoc/ri/descriptions.rb

@@ -2,11 +2,10 @@
 require 'rdoc/markup/fragments'
 require 'rdoc/ri'
 
-#--
+##
 # Descriptions are created by RDoc (in ri_generator) and written out in
 # serialized form into the documentation tree. ri then reads these to generate
 # the documentation
-#++
 
 class RDoc::RI::NamedThing
   attr_reader :name
@@ -83,7 +82,7 @@ class RDoc::RI::ModuleDescription < RDoc::RI::Description
   attr_accessor :constants
   attr_accessor :includes
 
-  # merge in another class desscription into this one
+  # merge in another class description into this one
   def merge_in(old)
     merge(@class_methods, old.class_methods)
     merge(@instance_methods, old.instance_methods)