Merge doc change upstream

See ruby/ruby@736a429