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

diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
index 0506f07d74421e277c608f37951a063d66a5a5b3..a096e7ddf7e7ebb73f630d023159abd395e7a512 100644 (file)
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@ -482,7 +482,7 @@ project config.  Per-repository configuration takes precedence over value
 composed from `@git_base_url_list` elements and project name.
 +
 You can setup one single value (single entry/item in this list) at build
-time by setting the `GITWEB_BASE_URL` built-time configuration variable.
+time by setting the `GITWEB_BASE_URL` build-time configuration variable.
 By default it is set to (), i.e. an empty list.  This means that gitweb
 would not try to create project URL (to fetch) from project name.