Merge branch 'fd/gitweb-snapshot-conf-doc-fix'