{"thread":{"id":"12663","subject":"[PATCH] Documentation: help: explain 'man.viewer' multiple values","startedAt":"2008-03-13T05:48:46Z","lastAt":"2008-03-15T13:00:31Z","messageCount":6,"participants":["Christian Couder","Xavier Maillard","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"71893","messageId":"20080313064846.b6b54c11.chriscool@tuxfamily.org","threadId":"12663","inReplyTo":null,"subject":"[PATCH] Documentation: help: explain 'man.viewer' multiple values","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2008-03-13T05:48:46Z","receivedAt":"2008-03-13T05:48:46Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Also add titles to paragraphs under \"CONFIGURATION VARIABLES\".\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n Documentation/config.txt   |    2 +-\n Documentation/git-help.txt |   29 ++++++++++++++++++++++++++++-\n 2 files changed, 29 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex f64b269..c72c2e6 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -749,7 +749,7 @@ log.showroot::\n \tnormally hide the root commit will now show it. True by default.\n \n man.viewer::\n-\tSpecify the program that will be used to display help in the\n+\tSpecify the programs that may be used to display help in the\n \t'man' format. See linkgit:git-help[1].\n \n merge.summary::\ndiff --git a/Documentation/git-help.txt b/Documentation/git-help.txt\nindex 73a51ae..89f6d25 100644\n--- a/Documentation/git-help.txt\n+++ b/Documentation/git-help.txt\n@@ -43,7 +43,7 @@ OPTIONS\n +\n By default the 'man' program will be used to display the manual page,\n but the 'man.viewer' configuration variable may be used to choose\n-another display program (see below).\n+other display programs (see below).\n \n -w|--web::\n \tDisplay manual page for the command in the 'web' (HTML)\n@@ -58,6 +58,9 @@ linkgit:git-web--browse[1] for more information about this.\n CONFIGURATION VARIABLES\n -----------------------\n \n+help.format\n+~~~~~~~~~~~\n+\n If no command line option is passed, the 'help.format' configuration\n variable will be checked. The following values are supported for this\n variable; they make 'git-help' behave as their corresponding command\n@@ -67,11 +70,17 @@ line option:\n * \"info\" corresponds to '-i|--info',\n * \"web\" or \"html\" correspond to '-w|--web'.\n \n+help.browser, web.browser and browser.<tool>.path\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n The 'help.browser', 'web.browser' and 'browser.<tool>.path' will also\n be checked if the 'web' format is chosen (either by command line\n option or configuration variable). See '-w|--web' in the OPTIONS\n section above and linkgit:git-web--browse[1].\n \n+man.viewer\n+~~~~~~~~~~\n+\n The 'man.viewer' config variable will be checked if the 'man' format\n is chosen. Only the following values are currently supported:\n \n@@ -80,6 +89,24 @@ is chosen. Only the following values are currently supported:\n (this only works starting with emacsclient versions 22),\n * \"konqueror\": use a man KIO slave in konqueror.\n \n+Multiple values may be given to this configuration variable. Their\n+corresponding programs will be tried in the order listed in the\n+configuration file.\n+\n+For example the following configuration:\n+\n+[man]\n+\tviewer = konqueror\n+\tviewer = woman\n+\n+will try to use konqueror first. But this may fail (for example if\n+DISPLAY is not set) and in that case emacs' woman mode will be tried.\n+\n+If everythings fails the 'man' program will be tried anyway.\n+\n+Note about git config --global\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n Note that all these configuration variables should probably be set\n using the '--global' flag, for example like this:\n \n-- \n1.5.4.3.395.g492b.dirty\n"},{"id":"72018","messageId":"200803140100.m2E107Zl004673@localhost.localdomain","threadId":"12663","inReplyTo":"20080313064846.b6b54c11.chriscool@tuxfamily.org","subject":"Re: [PATCH] Documentation: help: explain 'man.viewer' multiple values","fromName":"Xavier Maillard","fromEmail":"xma@gnu.org","sentAt":"2008-03-14T01:00:07Z","receivedAt":"2008-03-14T01:00:07Z","isPatch":true,"sender":{"key":"xma@gnu.org","avatar":null},"body":"\n   Also add titles to paragraphs under \"CONFIGURATION VARIABLES\".\n\n   Signed-off-by: Christian Couder <chriscool@tuxfamily.org>\n\n<snip>\n\n    man.viewer::\n   -\tSpecify the program that will be used to display help in the\n   +\tSpecify the programs that may be used to display help in the\n\nI would have prefered the following wording:\n\n\"List of viewer candidates used to display help in\"\n\n   +If everythings fails the 'man' program will be tried anyway.\n       ^^^^^^^^^^^\neverything :)\n\nRegards\n\n\tXavier\n-- \nhttp://www.gnu.org\nhttp://www.april.org\nhttp://www.lolica.org\n"},{"id":"72037","messageId":"7vhcf9ubtk.fsf@gitster.siamese.dyndns.org","threadId":"12663","inReplyTo":"200803140615.25266.chriscool@tuxfamily.org","subject":"Re: [PATCH] Documentation: help: explain 'man.viewer' multiple values","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-14T05:14:15Z","receivedAt":"2008-03-14T05:14:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Christian Couder <chriscool@tuxfamily.org> writes:\n\n> Le vendredi 14 mars 2008, Xavier Maillard a écrit :\n>>     man.viewer::\n>>    -\tSpecify the program that will be used to display help in the\n>>    +\tSpecify the programs that may be used to display help in the\n>>\n>> I would have prefered the following wording:\n>>\n>> \"List of viewer candidates used to display help in\"\n>>\n>>    +If everythings fails the 'man' program will be tried anyway.\n>>        ^^^^^^^^^^^\n>> everything :)\n>\n> Thank you Xavier for reviewing and testing my patches.\n> But as my patch has already been commited (in next), could you send a patch \n> on top of it ?\n\nNo need, I've locally fixed it up.\n"},{"id":"72035","messageId":"200803140615.25266.chriscool@tuxfamily.org","threadId":"12663","inReplyTo":"200803140100.m2E107Zl004673@localhost.localdomain","subject":"Re: [PATCH] Documentation: help: explain 'man.viewer' multiple values","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2008-03-14T05:15:25Z","receivedAt":"2008-03-14T05:15:25Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Le vendredi 14 mars 2008, Xavier Maillard a écrit :\n>     man.viewer::\n>    -\tSpecify the program that will be used to display help in the\n>    +\tSpecify the programs that may be used to display help in the\n>\n> I would have prefered the following wording:\n>\n> \"List of viewer candidates used to display help in\"\n>\n>    +If everythings fails the 'man' program will be tried anyway.\n>        ^^^^^^^^^^^\n> everything :)\n\nThank you Xavier for reviewing and testing my patches.\nBut as my patch has already been commited (in next), could you send a patch \non top of it ?\n\nThanks in advance,\nChristian.\n"},{"id":"72181","messageId":"200803151300.m2FD0P50003211@localhost.localdomain","threadId":"12663","inReplyTo":"200803140615.25266.chriscool@tuxfamily.org","subject":"Re: [PATCH] Documentation: help: explain 'man.viewer' multiple values","fromName":"Xavier Maillard","fromEmail":"xma@gnu.org","sentAt":"2008-03-15T13:00:25Z","receivedAt":"2008-03-15T13:00:25Z","isPatch":true,"sender":{"key":"xma@gnu.org","avatar":null},"body":"\n   Thank you Xavier for reviewing and testing my patches.\n\nThat's my pleasure :)\n\nThank you too for the features implemented.\n\n\tXavier\n-- \nhttp://www.gnu.org\nhttp://www.april.org\nhttp://www.lolica.org\n"},{"id":"72183","messageId":"200803151300.m2FD0TOH003233@localhost.localdomain","threadId":"12663","inReplyTo":"7vhcf9ubtk.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Documentation: help: explain 'man.viewer' multiple values","fromName":"Xavier Maillard","fromEmail":"xma@gnu.org","sentAt":"2008-03-15T13:00:31Z","receivedAt":"2008-03-15T13:00:31Z","isPatch":true,"sender":{"key":"xma@gnu.org","avatar":null},"body":"\n   > Thank you Xavier for reviewing and testing my patches.\n   > But as my patch has already been commited (in next), could you send a patch \n   > on top of it ?\n\n   No need, I've locally fixed it up.\n\nThank you Junio, you are very reactive !\n\n\tXavier\n-- \nhttp://www.gnu.org\nhttp://www.april.org\nhttp://www.lolica.org\n"}]}