Merge branch 'doc/4.2' into docs-next

This commit is contained in:
Jonathan Corbet 2015-06-08 17:04:11 -06:00
commit f8785d94fc
31 changed files with 349 additions and 236 deletions