drbrain     Tue, 27 Jun 2006 05:44:16 +0900

  Modified files:        (Branch: ruby_1_8)
    ruby:
      ChangeLog
    ruby/lib/rdoc:
      diagram.rb
    ruby/lib/rdoc/generators:
      chm_generator.rb
    ruby/lib/rdoc/markup/simple_markup:
      inline.rb preprocess.rb
    ruby/lib/rdoc/parsers:
      parse_c.rb
    ruby/lib/rdoc/ri:
      ri_display.rb ri_driver.rb ri_formatter.rb ri_options.rb
      ri_paths.rb
  Log:
    Merge from HEAD.
    Add --system, --site, --home, --gems to ri.
    Allow --doc-dir to be specified multiple times.
  
  Revision    Changes    Path
  1.2673.2.1690 +5   -0    ruby/ChangeLog
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/ChangeLog?cvsroot=src&r1=1.2673.2.1689&r2=1.2673.2.1690
  1.2.2.3     +1   -1    ruby/lib/rdoc/diagram.rb
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/lib/rdoc/diagram.rb?cvsroot=src&r1=1.2.2.2&r2=1.2.2.3
  1.1.2.1     +2   -2    ruby/lib/rdoc/generators/chm_generator.rb
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/lib/rdoc/generators/chm_generator.rb?cvsroot=src&r1=1.1&r2=1.1.2.1
  1.2.2.2     +3   -1    ruby/lib/rdoc/markup/simple_markup/inline.rb
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/lib/rdoc/markup/simple_markup/inline.rb?cvsroot=src&r1=1.2.2.1&r2=1.2.2.2
  1.1.2.3     +6   -1    ruby/lib/rdoc/markup/simple_markup/preprocess.rb
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/lib/rdoc/markup/simple_markup/preprocess.rb?cvsroot=src&r1=1.1.2.2&r2=1.1.2.3
  1.7.2.25    +1   -1    ruby/lib/rdoc/parsers/parse_c.rb
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/lib/rdoc/parsers/parse_c.rb?cvsroot=src&r1=1.7.2.24&r2=1.7.2.25
  1.1.2.4     +16  -34   ruby/lib/rdoc/ri/ri_display.rb
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/lib/rdoc/ri/ri_display.rb?cvsroot=src&r1=1.1.2.3&r2=1.1.2.4
  1.1.2.7     +9   -10   ruby/lib/rdoc/ri/ri_driver.rb
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/lib/rdoc/ri/ri_driver.rb?cvsroot=src&r1=1.1.2.6&r2=1.1.2.7
  1.4.2.10    +1   -1    ruby/lib/rdoc/ri/ri_formatter.rb
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/lib/rdoc/ri/ri_formatter.rb?cvsroot=src&r1=1.4.2.9&r2=1.4.2.10
  1.2.2.13    +81  -24   ruby/lib/rdoc/ri/ri_options.rb
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/lib/rdoc/ri/ri_options.rb?cvsroot=src&r1=1.2.2.12&r2=1.2.2.13
  1.2.2.3     +31  -8    ruby/lib/rdoc/ri/ri_paths.rb
    http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/lib/rdoc/ri/ri_paths.rb?cvsroot=src&r1=1.2.2.2&r2=1.2.2.3