From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Oct 2010 19:10:35 +0000 (-0700)
Subject: Merge branch 'cw/gitweb-hilite-config'
X-Git-Tag: v1.7.4-rc0~189
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/314ae0f421511137580ff6707643ccb75b2d2b34?ds=inline;hp=-c

Merge branch 'cw/gitweb-hilite-config'

* cw/gitweb-hilite-config:
Enable highlight executable path as a configuration option
---

314ae0f421511137580ff6707643ccb75b2d2b34
diff --combined gitweb/README
index d481198796,bf3664f2b7..bf3664f2b7
mode 100644,100755..100644
--- a/gitweb/README
+++ b/gitweb/README
@@@ -114,6 -114,11 +114,11 @@@ You can specify the following configura
     when gitweb.cgi is executed, then the file specified in the environment
     variable will be loaded instead of the file specified when gitweb.cgi was
     created.  [Default: /etc/gitweb.conf]
+  * HIGHLIGHT_BIN
+    Path to the highlight executable to use (must be the one from
+    http://www.andre-simon.de due to assumptions about parameters and output).
+    Useful if highlight is not installed on your webserver's PATH.
+    [Default: highlight]
  
  
  Runtime gitweb configuration
@@@ -236,7 -241,11 +241,11 @@@ not include variables usually directly 
     If server load exceed this value then return "503 Service Unavailable" error.
     Server load is taken to be 0 if gitweb cannot determine its value.  Set it to
     undefined value to turn it off.  The default is 300.
- 
+  * $highlight_bin
+    Path to the highlight executable to use (must be the one from
+    http://www.andre-simon.de due to assumptions about parameters and output).
+    Useful if highlight is not installed on your webserver's PATH.
+    [Default: highlight]
  
  Projects list file format
  ~~~~~~~~~~~~~~~~~~~~~~~~~