summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-26 20:44:14 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-26 20:44:14 +0000
commitedfba216e791385346ae7f1cfab012b74a6cd816 (patch)
tree03e7986b60a2ef8aca427d12f0288e8b09339f55 /ChangeLog
parent3616c236b62dc9d80eb114cfce92399e9a093986 (diff)
downloadruby-edfba216e791385346ae7f1cfab012b74a6cd816.tar.gz
ruby-edfba216e791385346ae7f1cfab012b74a6cd816.tar.xz
ruby-edfba216e791385346ae7f1cfab012b74a6cd816.zip
Merge from HEAD.
Add --system, --site, --home, --gems to ri. Allow --doc-dir to be specified multiple times. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 97f634826..4b3407a5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 26 13:37:27 2006 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rdoc: Merge from HEAD.
+ Add options to limit the ri search path.
+
Tue Jun 27 00:54:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (powersOf10): constified.