Merge branch '3.4' into 3.5

2 files changed, 37 insertions, 29 deletions

diff --git a/ruby-doc/.footprint b/ruby-doc/.footprint
index 32feb24e7..e68f015f6 100644
--- a/ruby-doc/.footprint
+++ b/ruby-doc/.footprint
@@ -414,6 +414,14 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/Binding/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Binding/local_variables-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Binding/receiver-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Binding/source_location-i.ri
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/Builder/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Builder/build_extensions-i.ri
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Builder/cdesc-Builder.ri
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Builder/class_name-c.ri
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Builder/make-c.ri
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Builder/new-c.ri
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Builder/redirector-c.ri
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Builder/run-c.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Bundler/
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Bundler/APIResponseMismatchError/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/APIResponseMismatchError/cdesc-APIResponseMismatchError.ri
@@ -1155,6 +1163,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/Bundler/FriendlyErrors/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/FriendlyErrors/log_error-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/FriendlyErrors/request_issue_report_for-i.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Bundler/GemHelper/
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/Bundler/GemHelper/Rake/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/GemHelper/Rake/cdesc-Rake.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/GemHelper/allowed_push_host-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/GemHelper/already_tagged%3f-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/GemHelper/base-i.ri
@@ -2842,6 +2852,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/Bundler/Thor/LineEditor/Readline/Pa
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Bundler/Thor/MalformattedArgumentError/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/Thor/MalformattedArgumentError/cdesc-MalformattedArgumentError.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Bundler/Thor/RakeCompat/
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/Bundler/Thor/RakeCompat/Rake/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/Thor/RakeCompat/Rake/cdesc-Rake.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/Thor/RakeCompat/cdesc-RakeCompat.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/Thor/RakeCompat/included-c.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Bundler/Thor/RakeCompat/rake_classes-c.ri
@@ -3526,6 +3538,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/CSV/Writer/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/CSV/write_headers%3f-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/CSV/writer-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/CSV/writer_options-i.ri
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/Capistrano/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Capistrano/cdesc-Capistrano.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Class/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Class/allocate-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Class/cdesc-Class.ri
@@ -3646,6 +3660,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/DBM/
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/DBMError/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/DBMError/cdesc-DBMError.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/DEBUGGER__/
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/DEBUGGER__/Thread/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/DEBUGGER__/Thread/cdesc-Thread.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/DEBUGGER__/break_points-c.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/DEBUGGER__/cdesc-DEBUGGER__.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/DEBUGGER__/context-c.ri
@@ -3672,6 +3688,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/DRbBadScheme/
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/DRbBadURI/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/DRb/DRbBadURI/cdesc-DRbBadURI.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/DRbConn/
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/DRbConn/Thread/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/DRb/DRbConn/Thread/cdesc-Thread.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/DRb/DRbConn/cdesc-DRbConn.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/DRbConnError/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/DRb/DRbConnError/cdesc-DRbConnError.ri
@@ -3800,6 +3818,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/GW/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/DRb/GW/new-c.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/GWIdConv/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/DRb/GWIdConv/cdesc-GWIdConv.ri
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/Thread/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/DRb/Thread/cdesc-Thread.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/TimerIdConv/
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/TimerIdConv/TimerHolder2/
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/DRb/TimerIdConv/TimerHolder2/InvalidIndexError/
@@ -4603,9 +4623,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/Fiddle/Win32Types/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Fiddle/win32_last_error%3d-c.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Fiddle/win32_last_error-c.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/File/
-drwxr-xr-x	root/root	usr/share/ri/2.6/system/File/File/
-drwxr-xr-x	root/root	usr/share/ri/2.6/system/File/File/Constants/
--rw-r--r--	root/root	usr/share/ri/2.6/system/File/File/Constants/cdesc-Constants.ri
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/File/Constants/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/File/Constants/cdesc-Constants.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/File/Stat/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/File/Stat/%3c%3d%3e-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/File/Stat/atime-i.ri
@@ -4767,6 +4786,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/FileUtils/LowMethods/
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/FileUtils/NoWrite/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/FileUtils/NoWrite/cdesc-NoWrite.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/FileUtils/StreamUtils_/
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/FileUtils/StreamUtils_/RbConfig/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/FileUtils/StreamUtils_/RbConfig/cdesc-RbConfig.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/FileUtils/StreamUtils_/cdesc-StreamUtils_.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/FileUtils/StreamUtils_/fu_blksize-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/FileUtils/StreamUtils_/fu_default_blksize-i.ri
@@ -5508,14 +5529,6 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/Gem/Exception/
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Gem/Ext/
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Gem/Ext/BuildError/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Gem/Ext/BuildError/cdesc-BuildError.ri
-drwxr-xr-x	root/root	usr/share/ri/2.6/system/Gem/Ext/Builder/
--rw-r--r--	root/root	usr/share/ri/2.6/system/Gem/Ext/Builder/build_extensions-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/Gem/Ext/Builder/cdesc-Builder.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/Gem/Ext/Builder/class_name-c.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/Gem/Ext/Builder/make-c.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/Gem/Ext/Builder/new-c.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/Gem/Ext/Builder/redirector-c.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/Gem/Ext/Builder/run-c.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Gem/Ext/CmakeBuilder/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Gem/Ext/CmakeBuilder/build-c.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Gem/Ext/CmakeBuilder/cdesc-CmakeBuilder.ri
@@ -7893,6 +7906,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/Integer/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Integer/upto-i.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Interrupt/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Interrupt/cdesc-Interrupt.ri
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/JRuby/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/JRuby/cdesc-JRuby.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/JSON/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/JSON/%5b%5d-c.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/JSON/CircularDatastructure/
@@ -12210,6 +12225,7 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/RDoc/TopLevel/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/RDoc/TopLevel/http_url-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/RDoc/TopLevel/last_modified-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/RDoc/TopLevel/marshal_dump-i.ri
+-rw-r--r--	root/root	usr/share/ri/2.6/system/RDoc/TopLevel/name-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/RDoc/TopLevel/new-c.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/RDoc/TopLevel/object_class-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/RDoc/TopLevel/page_name-i.ri
@@ -15598,6 +15614,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/Shell/Tee/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Shell/Tee/cdesc-Tee.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Shell/Tee/each-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Shell/Tee/new-c.ri
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/Shell/Thread/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Shell/Thread/cdesc-Thread.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Shell/Void/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Shell/Void/cdesc-Void.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Shell/Void/each-i.ri
@@ -16209,6 +16227,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/Syslog/Logger/Formatter/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Syslog/Logger/Formatter/call-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Syslog/Logger/Formatter/cdesc-Formatter.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Syslog/Logger/Formatter/clean-i.ri
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/Syslog/Logger/Severity/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Syslog/Logger/Severity/cdesc-Severity.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Syslog/Logger/add-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Syslog/Logger/cdesc-Logger.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Syslog/Logger/debug-i.ri
@@ -16526,6 +16546,8 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/TracePoint/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/TracePoint/stat-c.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/TracePoint/trace-c.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/Tracer/
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/Tracer/Thread/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/Tracer/Thread/cdesc-Thread.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Tracer/add_filter-c.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Tracer/cdesc-Tracer.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/Tracer/display_c_call%3f-c.ri
@@ -16734,22 +16756,6 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/URI/MailTo/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/URI/MailTo/to_mailtext-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/URI/MailTo/to_rfc822text-i.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/URI/MailTo/to_s-i.ri
-drwxr-xr-x	root/root	usr/share/ri/2.6/system/URI/Parser/
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/cdesc-Parser.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/convert_to_uri-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/escape-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/extract-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/initialize_pattern-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/initialize_regexp-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/inspect-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/join-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/make_regexp-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/new-c.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/parse-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/pattern-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/regexp-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/split-i.ri
--rw-r--r--	root/root	usr/share/ri/2.6/system/URI/Parser/unescape-i.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/URI/REGEXP/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/URI/REGEXP/cdesc-REGEXP.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/URI/RFC2396_Parser/
@@ -17689,5 +17695,7 @@ drwxr-xr-x	root/root	usr/share/ri/2.6/system/lib/shell/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/page-NEWS.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/page-README_ja_md.ri
 -rw-r--r--	root/root	usr/share/ri/2.6/system/page-README_md.ri
+drwxr-xr-x	root/root	usr/share/ri/2.6/system/unknown/
+-rw-r--r--	root/root	usr/share/ri/2.6/system/unknown/cdesc-unknown.ri
 drwxr-xr-x	root/root	usr/share/ri/2.6/system/win32/
 -rw-r--r--	root/root	usr/share/ri/2.6/system/win32/page-README_win32.ri
diff --git a/ruby-doc/.signature b/ruby-doc/.signature
index f03b959e2..8585ecad2 100644
--- a/ruby-doc/.signature
+++ b/ruby-doc/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/d+qOsuk+r9S56e+3vxLxdIyP2lV+DrhYB2rlrNVkjzERO+WXVTIBgNW9xv78ZKaoeGXY6ieb4Sb3C8YpHP92gI=
+RWSE3ohX2g5d/cPWFy7fJkwcZ7PVf9s5CbFUKLcjOIHwaVMT4zei7hFkfrcSh7Rh3maPMO53SAt2JFyjxerYomdOiC5WurV6fQg=
 SHA256 (Pkgfile) = 6a0cc23a233288ca81a4e18fc034951a0eee6adcd4e85e496275a7a868422e11
-SHA256 (.footprint) = 0d8c9906d79d8d4cb16c2a3f0c712d5c869bc5e05f8878d3dcbd842d8202a285
+SHA256 (.footprint) = 56ac69c49316b41c1565678fd4f06781e035f4a0b51c4f6728544d8f5db0b0ec
 SHA256 (ruby-2.6.1.tar.xz) = 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2