Merge branch 'cc/help'

* cc/help:
  documentation: web--browse: add a note about konqueror
  documentation: help: add info about "man.<tool>.cmd" config var
  help: use "man.<tool>.cmd" as custom man viewer command
  documentation: help: add "man.<tool>.path" config variable
  help: use man viewer path from "man.<tool>.path" config var

diff --combined Documentation/config.txt
index c4d6ccdf275552828fe9e2f8845a1572ae064fad,3b65c075175818a927829752914a417cb44b5ae2..7a91ac16fb1030bc735f3d2c849b69fab8d62967
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -234,13 -234,7 +234,13 @@@ core.worktree:
        used in combination with repositories found automatically in
        a .git directory (i.e. $GIT_DIR is not set).
        This can be overridden by the GIT_WORK_TREE environment
 -      variable and the '--work-tree' command line option.
 +      variable and the '--work-tree' command line option. It can be
 +      a absolute path or relative path to the directory specified by
 +      --git-dir or GIT_DIR.
 +      Note: If --git-dir or GIT_DIR are specified but none of
 +      --work-tree, GIT_WORK_TREE and core.worktree is specified,
 +      the current working directory is regarded as the top directory
 +      of your working tree.
  
  core.logAllRefUpdates::
        Enable the reflog. Updates to a ref <ref> is logged to the file
@@@ -684,36 -678,6 +684,36 @@@ specified as 'gitcvs.<access_method>.<v
  is one of "ext" and "pserver") to make them apply only for the given
  access method.
  
 +gui.commitmsgwidth::
 +      Defines how wide the commit message window is in the
 +      linkgit:git-gui[1]. "75" is the default.
 +
 +gui.diffcontext::
 +      Specifies how many context lines should be used in calls to diff
 +      made by the linkgit:git-gui[1]. The default is "5".
 +
 +gui.matchtrackingbranch::
 +      Determines if new branches created with linkgit:git-gui[1] should
 +      default to tracking remote branches with matching names or
 +      not. Default: "false".
 +
 +gui.newbranchtemplate::
 +      Is used as suggested name when creating new branches using the
 +      linkgit:git-gui[1].
 +
 +gui.pruneduringfetch::
 +      "true" if linkgit:git-gui[1] should prune tracking branches when
 +      performing a fetch. The default value is "false".
 +
 +gui.trustmtime::
 +      Determines if linkgit:git-gui[1] should trust the file modification
 +      timestamp or not. By default the timestamps are not trusted.
 +
 +gui.spellingdictionary::
 +      Specifies the dictionary used for spell checking commit messages in
 +      the linkgit:git-gui[1]. When set to "none" spell checking is turned
 +      off.
 +
  help.browser::
        Specify the browser that will be used to display help in the
        'web' format. See linkgit:git-help[1].
@@@ -841,6 -805,15 +841,15 @@@ merge.<driver>.recursive:
        performing an internal merge between common ancestors.
        See linkgit:gitattributes[5] for details.
  
+ man.<tool>.cmd::
+       Specify the command to invoke the specified man viewer. The
+       specified command is evaluated in shell with the man page
+       passed as argument. (See linkgit:git-help[1].)
+ 
+ man.<tool>.path::
+       Override the path for the given tool that may be used to
+       display help in the 'man' format. See linkgit:git-help[1].
+ 
  mergetool.<tool>.path::
        Override the path for the given tool.  This is useful in case
        your tool is not in the PATH.
@@@ -951,10 -924,6 +960,10 @@@ remote.<name>.push:
        The default set of "refspec" for linkgit:git-push[1]. See
        linkgit:git-push[1].
  
 +remote.<name>.mirror::
 +      If true, pushing to this remote will automatically behave
 +      as if the `\--mirror` option was given on the command line.
 +
  remote.<name>.skipDefaultUpdate::
        If true, this remote will be skipped by default when updating
        using the update subcommand of linkgit:git-remote[1].