Merge branch 'eb/doc-log-manpage'