Merge branch 'jz/gitweb-conf-doc-fix'