From 7e8114c0683e6ecfd400a5a798ae7e2fc91249fb Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 25 Apr 2008 08:24:41 +0200 Subject: documentation: help: add "man..path" config variable This patch documents the "man..path" configuration variable. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/config.txt | 4 ++++ Documentation/git-help.txt | 9 +++++++++ 2 files changed, 13 insertions(+) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index 7a24f6e819..138ba9ad8f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -805,6 +805,10 @@ merge..recursive:: performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details. +man..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..path:: Override the path for the given tool. This is useful in case your tool is not in the PATH. diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index be2ae53b90..4c6cb2194c 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -104,6 +104,15 @@ DISPLAY is not set) and in that case emacs' woman mode will be tried. If everything fails the 'man' program will be tried anyway. +man..path +~~~~~~~~~~~~~~~ + +You can explicitly provide a full path to your preferred man viewer by +setting the configuration variable 'man..path'. For example, you +can configure the absolute path to konqueror by setting +'man.konqueror.path'. Otherwise, 'git help' assumes the tool is +available in PATH. + Note about git config --global ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- cgit v1.2.3 From 0bb64009586b7fd674b1c3238f041b61c5d03f91 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 25 Apr 2008 08:25:35 +0200 Subject: documentation: help: add info about "man..cmd" config var This patch also describes the current behavior for "konqueror" and how to modify it using "man..cmd" if needed. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/config.txt | 5 +++++ Documentation/git-help.txt | 48 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index 138ba9ad8f..3b65c07517 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -805,6 +805,11 @@ merge..recursive:: performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details. +man..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..path:: Override the path for the given tool that may be used to display help in the 'man' format. See linkgit:git-help[1]. diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index 4c6cb2194c..bfbba9e235 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -82,22 +82,28 @@ man.viewer ~~~~~~~~~~ The 'man.viewer' config variable will be checked if the 'man' format -is chosen. Only the following values are currently supported: +is chosen. The following values are currently supported: * "man": use the 'man' program as usual, * "woman": use 'emacsclient' to launch the "woman" mode in emacs (this only works starting with emacsclient versions 22), -* "konqueror": use a man KIO slave in konqueror. +* "konqueror": use 'kfmclient' to open the man page in a new konqueror +tab (see 'Note about konqueror' below). -Multiple values may be given to this configuration variable. Their -corresponding programs will be tried in the order listed in the -configuration file. +Values for other tools can be used if there is a corresponding +'man..cmd' configuration entry (see below). + +Multiple values may be given to the 'man.viewer' configuration +variable. Their corresponding programs will be tried in the order +listed in the configuration file. For example, this configuration: +------------------------------------------------ [man] viewer = konqueror viewer = woman +------------------------------------------------ will try to use konqueror first. But this may fail (for example if DISPLAY is not set) and in that case emacs' woman mode will be tried. @@ -113,6 +119,38 @@ can configure the absolute path to konqueror by setting 'man.konqueror.path'. Otherwise, 'git help' assumes the tool is available in PATH. +man..cmd +~~~~~~~~~~~~~~ + +When the man viewer, specified by the 'man.viewer' configuration +variables, is not among the supported ones, then the corresponding +'man..cmd' configuration variable will be looked up. If this +variable exists then the specified tool will be treated as a custom +command and a shell eval will be used to run the command with the man +page passed as arguments. + +Note about konqueror +~~~~~~~~~~~~~~~~~~~~ + +When 'konqueror' is specified in the 'man.viewer' configuration +variable, we launch 'kfmclient' to try to open the man page on an +already opened konqueror in a new tab if possible. + +For consistency, we also try such a trick if 'man.konqueror.path' is +set to something like 'A_PATH_TO/konqueror'. That means we will try to +launch 'A_PATH_TO/kfmclient' instead. + +If you really want to use 'konqueror', then you can use something like +the following: + +------------------------------------------------ + [man] + viewer = konq + + [man "konq"] + cmd = A_PATH_TO/konqueror +------------------------------------------------ + Note about git config --global ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- cgit v1.2.3 From ac3a4a2694fa8bea477b1a265efd6829de686e5c Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 25 Apr 2008 08:25:41 +0200 Subject: documentation: web--browse: add a note about konqueror This note explains how to work around the fact that we try to use kfmclient to launch konqueror. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/git-web--browse.txt | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt index ddbae5b194..92ef574565 100644 --- a/Documentation/git-web--browse.txt +++ b/Documentation/git-web--browse.txt @@ -20,7 +20,7 @@ The following browsers (or commands) are currently supported: * firefox (this is the default under X Window when not using KDE) * iceweasel -* konqueror (this is the default under KDE) +* konqueror (this is the default under KDE, see 'Note about konqueror' below) * w3m (this is the default outside graphical environments) * links * lynx @@ -71,6 +71,28 @@ variable exists then "git web--browse" will treat the specified tool as a custom command and will use a shell eval to run the command with the URLs passed as arguments. +Note about konqueror +-------------------- + +When 'konqueror' is specified by the a command line option or a +configuration variable, we launch 'kfmclient' to try to open the HTML +man page on an already opened konqueror in a new tab if possible. + +For consistency, we also try such a trick if 'brower.konqueror.path' is +set to something like 'A_PATH_TO/konqueror'. That means we will try to +launch 'A_PATH_TO/kfmclient' instead. + +If you really want to use 'konqueror', then you can use something like +the following: + +------------------------------------------------ + [web] + browser = konq + + [browser "konq"] + cmd = A_PATH_TO/konqueror +------------------------------------------------ + Note about git config --global ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- cgit v1.2.3