[pull] master from ruby:master

iseq.c

@@ -1652,7 +1652,7 @@ iseqw_s_compile_parser(int argc, VALUE *argv, VALUE self, bool prism)
  *  real path and first line number of the ruby code in +source+ which are
  *  metadata attached to the returned +iseq+.
  *
- *  +file+ is used for `__FILE__` and exception backtrace. +path+ is used for
+ *  +file+ is used for +__FILE__+ and exception backtrace. +path+ is used for
  *  +require_relative+ base. It is recommended these should be the same full
  *  path.
  *
@@ -1694,7 +1694,7 @@ iseqw_s_compile(int argc, VALUE *argv, VALUE self)
  *  real path and first line number of the ruby code in +source+ which are
  *  metadata attached to the returned +iseq+.
  *
- *  +file+ is used for `__FILE__` and exception backtrace. +path+ is used for
+ *  +file+ is used for +__FILE__+ and exception backtrace. +path+ is used for
  *  +require_relative+ base. It is recommended these should be the same full
  *  path.
  *
@@ -1736,7 +1736,7 @@ iseqw_s_compile_parsey(int argc, VALUE *argv, VALUE self)
  *  real path and first line number of the ruby code in +source+ which are
  *  metadata attached to the returned +iseq+.
  *
- *  +file+ is used for `__FILE__` and exception backtrace. +path+ is used for
+ *  +file+ is used for +__FILE__+ and exception backtrace. +path+ is used for
  *  +require_relative+ base. It is recommended these should be the same full
  *  path.
  *

lib/rubygems/ext/ext_conf_builder.rb

@@ -40,7 +40,7 @@ def self.build(extension, dest_path, results, args = [], lib_dir = nil, extensio
       end
 
       ENV["DESTDIR"] = nil
-      unless RbConfig::CONFIG["MAKE"]&.include?("nmake")
+      unless RUBY_PLATFORM.include?("mswin") && RbConfig::CONFIG["configure_args"]&.include?("nmake")
         ENV["MAKEFLAGS"] ||= "-j#{Etc.nprocessors + 1}"
       end
 

numeric.c

@@ -595,8 +595,8 @@ num_uminus(VALUE num)
  *    fdiv(other) -> float
  *
  *  Returns the quotient <tt>self/other</tt> as a float,
- *  using method +/+ in the derived class of +self+.
- *  (\Numeric itself does not define method +/+.)
+ *  using method +/+ as defined in the subclass of \Numeric.
+ *  (\Numeric itself does not define +/+.)
  *
  *  Of the Core and Standard Library classes,
  *  only BigDecimal uses this implementation.
@@ -614,8 +614,8 @@ num_fdiv(VALUE x, VALUE y)
  *    div(other) -> integer
  *
  *  Returns the quotient <tt>self/other</tt> as an integer (via +floor+),
- *  using method +/+ in the derived class of +self+.
- *  (\Numeric itself does not define method +/+.)
+ *  using method +/+ as defined in the subclass of \Numeric.
+ *  (\Numeric itself does not define +/+.)
  *
  *  Of the Core and Standard Library classes,
  *  Only Float and Rational use this implementation.
@@ -847,7 +847,8 @@ num_nonzero_p(VALUE num)
  *    to_int -> integer
  *
  *  Returns +self+ as an integer;
- *  converts using method +to_i+ in the derived class.
+ *  converts using method +to_i+ in the subclass of \Numeric.
+ *  (\Numeric itself does not define +to_i+.)
  *
  *  Of the Core and Standard Library classes,
  *  only Rational and Complex use this implementation.

object.c

@@ -2012,14 +2012,26 @@ rb_mod_gt(VALUE mod, VALUE arg)
 
 /*
  *  call-seq:
- *     module <=> other_module   -> -1, 0, +1, or nil
+ *     self <=> object -> -1, 0, +1, or nil
  *
- *  Comparison---Returns -1, 0, +1 or nil depending on whether +module+
- *  includes +other_module+, they are the same, or if +module+ is included by
- *  +other_module+.
+ *  Returns:
+ *
+ *  - +-1+, if +self+ includes +object+, if or +self+ is a subclass of +object+.
+ *  - +0+, if +self+ and +object+ are the same.
+ *  - +1+, if +object+ includes +self+, or if +object+ is a subclass of +self+.
+ *  - +nil+, if none of the above is true.
+ *
+ *  Examples:
+ *
+ *    # Class Array includes module Enumerable.
+ *             Array <=> Enumerable # => -1
+ *        Enumerable <=> Enumerable # =>  0
+ *        Enumerable <=> Array      # =>  1
+ *    # Class File is a subclass of class IO.
+ *              File <=> IO         # => -1
+ *                IO <=> File       # =>  1
+ *              File <=> File       # =>  0
  *
- *  Returns +nil+ if +module+ has no relationship with +other_module+, if
- *  +other_module+ is not a module, or if the two values are incomparable.
  */
 
 static VALUE