Merge branch 'jr/gitignore-doc-example-markup'