Merge branch 'km/config-doc-typofix'