Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast