Autogenerated HTML docs for v1.5.4-rc5-5-gab98

diff --git a/config.txt b/config.txt
index 877eda960d5964b4c036433899977cf47f17846b..4e222f15a5b2b84eb5d55bc79c605510bd89b7b6 100644 (file)
--- 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 745cd72a3b40e0785e0821d65383a584ae8e4cda..5b5ff9509517e3c7ea61c81b2fa79cffb774d7c2 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1209,6 +1209,16 @@ branch.<name>.rebase
 </p>\r
 </dd>\r
 <dt>\r
+browser.&lt;tool&gt;.path\r
+</dt>\r
+<dd>\r
+<p>\r
+        Override the path for the given tool that may be used to\r
+        browse HTML help (see <em>-w</em> option in <a href="git-help.html">git-help(1)</a>) or a\r
+        working repository in gitweb (see <a href="git-instaweb.html">git-instaweb(1)</a>).\r
+</p>\r
+</dd>\r
+<dt>\r
 clean.requireForce\r
 </dt>\r
 <dd>\r
@@ -2203,7 +2213,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jan-2008 08:30:41 UTC\r
+Last updated 29-Jan-2008 09:44:48 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-help.html b/git-help.html
index d10f7a2c8ebf2dd6496e463b90812fad50b253f5..ea4193bc233f2d125b8ce5f8c3c3c39a634b65db 100644 (file)
--- 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>\r
 <p>Note that the script tries, as much as possible, to display the HTML\r
 page in a new tab on an already opened browser.</p>\r
+<p>The following browsers are currently supported by <em>git-help--browse</em>:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+firefox (this is the default under X Window when not using KDE)\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+iceweasel\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+konqueror (this is the default under KDE)\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+w3m (this is the default outside X Window)\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+links\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+lynx\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+dillo\r
+</p>\r
+</li>\r
+</ul>\r
 </dd>\r
 </dl>\r
 </div>\r
@@ -394,7 +432,7 @@ little. Maintenance is done by the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:25 UTC\r
+Last updated 29-Jan-2008 09:44:48 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-help.txt b/git-help.txt
index 09904c75c40e5b44bb9ddd6458edc4cb89af5e35..fb77ca3a57d9377e8939c6d32601cf1386f0261b 100644 (file)
--- 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
 -----------------------