Merge branch 'maint-1.6.0' into maint

[git.git] / gitweb / README

diff --git a/gitweb/README b/gitweb/README
index b69b0e504283af3ae48b3975e0c0ba505f660ee5..e34ee793ef51584344f8c808454b9ead0c3348c6 100644 (file)
--- a/gitweb/README
+++ b/gitweb/README
@@ -95,7 +95,8 @@ You can specify the following configuration variables when building GIT:
  * GITWEB_JS
    Points to the localtion where you put gitweb.js on your web server
    (or to be more generic URI of JavaScript code used by gitweb).
-   Relative to base URI of gitweb.  [Default: gitweb.js]
+   Relative to base URI of gitweb.  [Default: gitweb.js (or gitweb.min.js
+   if JSMIN build variable is defined / JavaScript minifier is used)]
  * GITWEB_CONFIG
    This Perl file will be loaded using 'do' and can be used to override any
    of the options above as well as some other options -- see the "Runtime