summaryrefslogtreecommitdiffstats
path: root/git-web--browse.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 12:16:29 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-06 12:16:29 -0700
commite1aeb5ef657d0c4fdff12a9c7503431edd9cd128 (patch)
tree0b26e69547edd5d5bbc66d1dd470d1ce66463b1e /git-web--browse.html
parentb051caf02ee59e3c9d1da4a61339f667f28754d1 (diff)
downloadgit-htmldocs-e1aeb5ef657d0c4fdff12a9c7503431edd9cd128.tar.gz
Autogenerated HTML docs for v2.0.0-239-g09531
Diffstat (limited to 'git-web--browse.html')
-rw-r--r--git-web--browse.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-web--browse.html b/git-web--browse.html
index bdd0a193e..0f88c05c9 100644
--- a/git-web--browse.html
+++ b/git-web--browse.html
@@ -900,7 +900,7 @@ xdg-open
<div class="sect2">
<h3 id="_conf_var_from_c_option_and_web_browser">CONF.VAR (from -c option) and web.browser</h3>
<div class="paragraph"><p>The web browser can be specified using a configuration variable passed
-with the -c (or --config) command line option, or the <em>web.browser</em>
+with the -c (or --config) command-line option, or the <em>web.browser</em>
configuration variable if the former is not used.</p></div>
</div>
<div class="sect2">
@@ -925,7 +925,7 @@ the URLs passed as arguments.</p></div>
<div class="sect1">
<h2 id="_note_about_konqueror">Note about konqueror</h2>
<div class="sectionbody">
-<div class="paragraph"><p>When <em>konqueror</em> is specified by a command line option or a
+<div class="paragraph"><p>When <em>konqueror</em> is specified by a command-line option or a
configuration variable, we launch <em>kfmclient</em> to try to open the HTML
man page on an already opened konqueror in a new tab if possible.</p></div>
<div class="paragraph"><p>For consistency, we also try such a trick if <em>browser.konqueror.path</em> is
@@ -964,7 +964,7 @@ See <a href="git-config.html">git-config(1)</a> for more information about this.
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-11-01 09:52:04 PDT
+Last updated 2014-06-06 12:15:38 PDT
</div>
</div>
</body>