Merge pull request #2994 from octo/tail-doc