merge revision(s) r47820: [Backport #10330]

	* error.c: update exception tree. [DOC]
	  reported by @hemge via twitter.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) r47819: [Backport #9914]

	* configure.in: Fix typo. [Bug #9914]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) r47850: [Backport #10294]

	* dir.c (dir_s_aref): fix rdoc.  `Dir.glob` allows an array but
	  `Dir[]` not.  the former accepts an optional parameter `flags`,
	  while the latter accepts arbitrary number of arguments but no
	  `flags`.  [ruby-core:65265] [Bug #10294]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e