Merge branch 'ah/doc-gitk-config'