Merge branch 'doc/4.8-fixes' into docs-next

This commit is contained in:
Jonathan Corbet 2016-08-14 13:57:38 -06:00
commit d9bd993640