diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-11 09:18:53 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-11 09:18:53 +0000 |
| commit | 4a1491bf005b6314b3a99811bb8c717bc43b837a (patch) | |
| tree | a9374a19071f0e5663fd222281a2fc4ec5ba80f0 | |
| parent | 7a2fcea0346afd85c9da1fa94993f47e9b1dda16 (diff) | |
| download | ruby-4a1491bf005b6314b3a99811bb8c717bc43b837a.tar.gz ruby-4a1491bf005b6314b3a99811bb8c717bc43b837a.tar.xz ruby-4a1491bf005b6314b3a99811bb8c717bc43b837a.zip | |
Follow namespace change for RDoc/RI [ruby-core:14964]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rdoc/ri/driver.rb | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Fri Jan 11 18:17:10 2008 Eric Hodel <drbrain@segment7.net> + + * lib/rdoc/ri/driver.rb (read_yaml): Follow namespace change + [ruby-core:14964]. + Fri Jan 11 16:55:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_append): performance improvement. diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb index 98e8a3dc2..a1aa64e59 100644 --- a/lib/rdoc/ri/driver.rb +++ b/lib/rdoc/ri/driver.rb @@ -54,8 +54,8 @@ Where name can be: All class names may be abbreviated to their minimum unambiguous form. If a name is ambiguous, all valid options will be listed. -The form '.' method matches either class or instance methods, while -#method matches only instance and ::method matches only class methods. +The form '.' method matches either class or instance methods, while #method +matches only instance and ::method matches only class methods. For example: @@ -341,7 +341,7 @@ Options may also be set in the 'RI' environment variable. end def read_yaml(path) - YAML.load File.read(path).gsub(/ \!ruby\/(object|struct):RI.*/, '') + YAML.load File.read(path).gsub(/ \!ruby\/(object|struct):(RDoc|RI).*/, '') end def run |