Merge r304 from trunk (options fix)

Author: drbrain

lib/rdoc/options.rb

@@ -430,7 +430,7 @@ def parse(argv)
         warn "--inline-source will be removed from RDoc on or after August 2009"
       end
 
-      opt.on("--promiscuous", "-p" do |value|
+      opt.on("--promiscuous", "-p") do |value|
         warn "--promiscuous will be removed from RDoc on or after August 2009"
       end