Merge branch 'maint'

* maint:
gitweb: Include links to feeds in HTML header only for '200 OK' response
fsck docs: remove outdated and useless diagnostic
userdiff: fix typo in ruby and python word regexes
trace.c: mark file-local function static
Fix typo in git-gc document.

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-gc.txt
Simple merge

diff --cc gitweb/gitweb.perl
Simple merge