Merge branch 'jn/doc-dashdash'