drbrain	2008-01-07 11:52:15 +0900 (Mon, 07 Jan 2008)

  New Revision: 14923

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/generators/ri_generator.rb
    trunk/lib/rdoc/options.rb

  Log:
    Merge documentation from the same class on ri generation.
    Fixes bug where documentation could disappear.
    
    Fix typo in lib/rdoc/options.rb

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14923&r2=14922&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/options.rb?r1=14923&r2=14922&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/generators/ri_generator.rb?r1=14923&r2=14922&diff_format=u