[PATCH] Documentation: config: add 'help.*' and 'instaweb.*' variables.

[Christian Couder <chriscool@tuxfamily.org>]

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 Documentation/config.txt |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index e1eaee9..c9895dc 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -585,6 +585,15 @@ specified as 'gitcvs.<access_method>.<varname>' (where 'access_method'
 is one of "ext" and "pserver") to make them apply only for the given
 access method.
 
+help.browser::
+	Specify the browser that will be used to display help in the
+	'web' format. See gitlink:git-help[1].
+
+help.format::
+	Override the default help format used by gitlink:git-help[1].
+	Values 'man', 'info', 'web' and 'html' are supported. 'man' is
+	the default. 'web' and 'html' are the same.
+
 http.proxy::
 	Override the HTTP proxy, normally configured using the 'http_proxy'
 	environment variable (see gitlink:curl[1]).  This can be overridden
@@ -642,6 +651,25 @@ i18n.logOutputEncoding::
 	Character encoding the commit messages are converted to when
 	running `git-log` and friends.
 
+instaweb.browser::
+	Specify the program that will be used to browse your working
+	repository in gitweb. See gitlink:git-instaweb[1].
+
+instaweb.httpd::
+	The HTTP daemon command-line to start gitweb on your working
+	repository. See gitlink:git-instaweb[1].
+
+instaweb.local::
+	If true the web server started by gitlink:git-instaweb[1] will
+	be bound to the local IP (127.0.0.1).
+
+instaweb.modulepath::
+	The module path for an apache httpd used by gitlink:git-instaweb[1].
+
+instaweb.port::
+	The port number to bind the gitweb httpd to. See
+	gitlink:git-instaweb[1].
+
 log.showroot::
 	If true, the initial commit will be shown as a big creation event.
 	This is equivalent to a diff against an empty tree.
@@ -843,4 +871,8 @@ receive.denyNonFastForwards::
 transfer.unpackLimit::
 	When `fetch.unpackLimit` or `receive.unpackLimit` are
 	not set, the value of this variable is used instead.
+
+web.browser::
+	Specify a web browser that may be used by some commands.
+	Currently only gitlink:git-instaweb[1] and gitlink:git-help[1]
+	may use it.
-- 
1.5.4.rc2.38.gd6da3