Merge branch 'jh/resize-convert-scratch-buffer'

diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
index 83b4388c2cb9672f5809e7c4877da12eb2c93065..92535dbac53ac49d89ef6d8ce62dd2920c83c445 100644 (file)
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@ -684,7 +684,7 @@ compressed tar archive) and "zip"; please consult gitweb sources for
 a definitive list.  By default only "tgz" is offered.
 +
 This feature can be configured on a per-repository basis via
-repository's `gitweb.blame` configuration variable, which contains
+repository's `gitweb.snapshot` configuration variable, which contains
 a comma separated list of formats or "none" to disable snapshots.
 Unknown values are ignored.