Merge branch 'mm/config-intro-in-git-doc' into maint