Merge branch 'maint'

* maint:
Typos in code comments, an error message, documentation

diff --cc builtin/blame.c
Simple merge

diff --cc gitweb/gitweb.perl
Simple merge

diff --cc graph.c
Simple merge