From 615ac3593499f54fde4b1eb0fba66b6bd944821b Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 22 Oct 2018 00:27:02 +0000
Subject: Merge rubygems master branch from github.com/rubygems/rubygems.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems/install_update_options.rb | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'lib/rubygems/install_update_options.rb')

diff --git a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb
index 75968605f1..824682f9ad 100644
--- a/lib/rubygems/install_update_options.rb
+++ b/lib/rubygems/install_update_options.rb
@@ -63,30 +63,6 @@ module Gem::InstallUpdateOptions
       options[:document] = []
     end
 
-    add_option(:Deprecated, '--[no-]rdoc',
-               'Generate RDoc for installed gems',
-               'Use --document instead') do |value, options|
-      if value then
-        options[:document] << 'rdoc'
-      else
-        options[:document].delete 'rdoc'
-      end
-
-      options[:document].uniq!
-    end
-
-    add_option(:Deprecated, '--[no-]ri',
-               'Generate ri data for installed gems.',
-               'Use --document instead') do |value, options|
-      if value then
-        options[:document] << 'ri'
-      else
-        options[:document].delete 'ri'
-      end
-
-      options[:document].uniq!
-    end
-
     add_option(:"Install/Update", '-E', '--[no-]env-shebang',
                "Rewrite the shebang line on installed",
                "scripts to use /usr/bin/env") do |value, options|
-- 
cgit v1.2.3