aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/ri/driver.rb6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9bfc80af01..42170475a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 98e8a3dc2e..a1aa64e598 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