From 636e97ccb235af22c6a1137ae11c5ebda529cf4a Mon Sep 17 00:00:00 2001
From: dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 18 Dec 2003 21:08:25 +0000
Subject: Annotate enum.c. Add pager support, and report on methods in included
 modules

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/README | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'lib/rdoc/README')

diff --git a/lib/rdoc/README b/lib/rdoc/README
index 39ce8bb75..1b8671182 100644
--- a/lib/rdoc/README
+++ b/lib/rdoc/README
@@ -166,6 +166,11 @@ Options are:
 [<tt>--main</tt> _name_]
     set the class, module, or file to appear on the index page
 
+[<tt>--merge</tt>]
+    when generating _ri_ output, if classes being processed already
+    exist in the destination directory, merge in the current details
+    rather than overwrite them.
+
 [<tt>--one-file</tt>]
     place all the output into a single file
 
@@ -191,6 +196,13 @@ Options are:
 [<tt>--quiet</tt>]
     do not display progress messages
 
+[<tt>--ri</tt> _and_ <tt>--ri-site</tt>]
+    generate output than can be read by the _ri_ command-line tool.
+    By default --ri places its output in ~/.rdoc, and --ri-site in
+    $datadir/ri/<ver>/site. Both can be overridden with a subsequent
+    --op option. Both default directories are in ri's default search
+    path.
+
 [<tt>--show-hash</tt>]
     A name of the form #name in a comment is a possible hyperlink to
     an instance method name. When displayed, the '#' is removed unless
-- 
cgit