From e35a6fc91bc4b7cd8763e7d1d06c02d7ce22d9c1 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Tue, 29 Jan 2008 09:46:27 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.5.4-rc5-5-gab98

---
 config.txt      |  5 +++++
 git-config.html | 12 +++++++++++-
 git-help.html   | 40 +++++++++++++++++++++++++++++++++++++++-
 git-help.txt    | 10 ++++++++++
 4 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/config.txt b/config.txt
index 877eda960..4e222f15a 100644
--- a/config.txt
+++ b/config.txt
@@ -367,6 +367,11 @@ branch.<name>.rebase::
 	it unless you understand the implications (see linkgit:git-rebase[1]
 	for details).
 
+browser.<tool>.path::
+	Override the path for the given tool that may be used to
+	browse HTML help (see '-w' option in linkgit:git-help[1]) or a
+	working repository in gitweb (see linkgit:git-instaweb[1]).
+
 clean.requireForce::
 	A boolean to make git-clean do nothing unless given -f
 	or -n.   Defaults to true.
diff --git a/git-config.html b/git-config.html
index 745cd72a3..5b5ff9509 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1209,6 +1209,16 @@ branch.&lt;name&gt;.rebase
 </p>
 </dd>
 <dt>
+browser.&lt;tool&gt;.path
+</dt>
+<dd>
+<p>
+        Override the path for the given tool that may be used to
+        browse HTML help (see <em>-w</em> option in <a href="git-help.html">git-help(1)</a>) or a
+        working repository in gitweb (see <a href="git-instaweb.html">git-instaweb(1)</a>).
+</p>
+</dd>
+<dt>
 clean.requireForce
 </dt>
 <dd>
@@ -2203,7 +2213,7 @@ web.browser
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 15-Jan-2008 08:30:41 UTC
+Last updated 29-Jan-2008 09:44:48 UTC
 </div>
 </div>
 </body>
diff --git a/git-help.html b/git-help.html
index d10f7a2c8..ea4193bc2 100644
--- a/git-help.html
+++ b/git-help.html
@@ -337,6 +337,44 @@ you can configure the absolute path to firefox by setting
 is available in PATH.</p>
 <p>Note that the script tries, as much as possible, to display the HTML
 page in a new tab on an already opened browser.</p>
+<p>The following browsers are currently supported by <em>git-help--browse</em>:</p>
+<ul>
+<li>
+<p>
+firefox (this is the default under X Window when not using KDE)
+</p>
+</li>
+<li>
+<p>
+iceweasel
+</p>
+</li>
+<li>
+<p>
+konqueror (this is the default under KDE)
+</p>
+</li>
+<li>
+<p>
+w3m (this is the default outside X Window)
+</p>
+</li>
+<li>
+<p>
+links
+</p>
+</li>
+<li>
+<p>
+lynx
+</p>
+</li>
+<li>
+<p>
+dillo
+</p>
+</li>
+</ul>
 </dd>
 </dl>
 </div>
@@ -394,7 +432,7 @@ little. Maintenance is done by the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 07-Jan-2008 07:50:25 UTC
+Last updated 29-Jan-2008 09:44:48 UTC
 </div>
 </div>
 </body>
diff --git a/git-help.txt b/git-help.txt
index 09904c75c..fb77ca3a5 100644
--- a/git-help.txt
+++ b/git-help.txt
@@ -58,6 +58,16 @@ is available in PATH.
 +
 Note that the script tries, as much as possible, to display the HTML
 page in a new tab on an already opened browser.
++
+The following browsers are currently supported by 'git-help--browse':
++
+* firefox (this is the default under X Window when not using KDE)
+* iceweasel
+* konqueror (this is the default under KDE)
+* w3m (this is the default outside X Window)
+* links
+* lynx
+* dillo
 
 CONFIGURATION VARIABLES
 -----------------------
-- 
2.26.2