Merge branch 'jk/add-e-kill-editor' into maint

diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
index b96ac72a3305362ac2c35860f3cbdbedb8c5e419..a096e7ddf7e7ebb73f630d023159abd395e7a512 100644 (file)
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@ -706,7 +706,7 @@ show-sizes::
        I/O.  Enabled by default.
 +
 This feature can be configured on a per-repository basis via
-repository's `gitweb.showsizes` configuration variable (boolean).
+repository's `gitweb.showSizes` configuration variable (boolean).
 
 patches::
        Enable and configure "patches" view, which displays list of commits in email