merge r42260 upstream ruby/ruby#369
Use the newer guides link over the old bookshelf
Update history for ruby/ruby#369