{"thread":{"id":"24835","subject":"HTML help files are broken","startedAt":"2010-08-23T15:59:04Z","lastAt":"2010-08-23T21:20:25Z","messageCount":4,"participants":["Nathan W. Panike","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"148757","messageId":"AANLkTimMZGswhWXyDMaFa9N1ipzoBXT7RptHMq2TYhmv@mail.gmail.com","threadId":"24835","inReplyTo":null,"subject":"HTML help files are broken","fromName":"Nathan W. Panike","fromEmail":"nathan.panike@gmail.com","sentAt":"2010-08-23T15:59:04Z","receivedAt":"2010-08-23T15:59:04Z","isPatch":false,"sender":{"key":"nathan.panike@gmail.com","avatar":"https://avatars.githubusercontent.com/u/389447?v=4"},"body":"Some of the HTML manual files produced on my machine (Ubuntu 10.04)\nfrom the git source are broken: in git-help.html, I get the following\nfor the link to the git-web--browse manual page:\n\n<a href=\"git-web&#8212;browse.html\">git-web&#8212;browse(1)</a>\n\nwhere the &#8212; (en-dash) replaces the \"--\" (dash-dash) that is on\nthe filesystem.  How does one fix it, so that the line above would be\n\n<a href=\"git-web--browse.html\">git-web--browse(1)</a>?\n\nThe command line I am using is a simple\n\nmake doc.\n\nI checked the git repository origin/html, and the correct link is\nproduced there, so something in my configuration is messed up.\n\nNathan Panike\n"},{"id":"148758","messageId":"AANLkTi=QVoBkCLPwiqJUuoVQgVPfierr9xQU3F=qyO=A@mail.gmail.com","threadId":"24835","inReplyTo":"AANLkTimMZGswhWXyDMaFa9N1ipzoBXT7RptHMq2TYhmv@mail.gmail.com","subject":"Re: HTML help files are broken","fromName":"Nathan W. Panike","fromEmail":"nathan.panike@gmail.com","sentAt":"2010-08-23T16:17:33Z","receivedAt":"2010-08-23T16:17:33Z","isPatch":false,"sender":{"key":"nathan.panike@gmail.com","avatar":"https://avatars.githubusercontent.com/u/389447?v=4"},"body":"On Mon, Aug 23, 2010 at 10:59 AM, Nathan W. Panike\n<nathan.panike@gmail.com> wrote:\n> Some of the HTML manual files produced on my machine (Ubuntu 10.04)\n> from the git source are broken: in git-help.html, I get the following\n> for the link to the git-web--browse manual page:\n>\n> <a href=\"git-web&#8212;browse.html\">git-web&#8212;browse(1)</a>\n>\n> where the &#8212; (en-dash) replaces the \"--\" (dash-dash) that is on\n> the filesystem.  How does one fix it, so that the line above would be\n>\n> <a href=\"git-web--browse.html\">git-web--browse(1)</a>?\n>\n> The command line I am using is a simple\n>\n> make doc.\n\nI neglected to mention here that the perl version is 5.10.1 and\nasciidoc version is 8.5.2\n\n>\n> I checked the git repository origin/html, and the correct link is\n> produced there, so something in my configuration is messed up.\n>\n> Nathan Panike\n>\n"},{"id":"148765","messageId":"7vmxsd1b2a.fsf@alter.siamese.dyndns.org","threadId":"24835","inReplyTo":"AANLkTimMZGswhWXyDMaFa9N1ipzoBXT7RptHMq2TYhmv@mail.gmail.com","subject":"Re: HTML help files are broken","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-08-23T17:41:17Z","receivedAt":"2010-08-23T17:41:17Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Nathan W. Panike\" <nathan.panike@gmail.com> writes:\n\n> Some of the HTML manual files produced on my machine (Ubuntu 10.04)\n> from the git source are broken: in git-help.html, I get the following\n> for the link to the git-web--browse manual page:\n>\n> <a href=\"git-web&#8212;browse.html\">git-web&#8212;browse(1)</a>\n>\n> where the &#8212; (en-dash) replaces the \"--\" (dash-dash) that is on\n> the filesystem.  How does one fix it, so that the line above would be\n>\n> <a href=\"git-web--browse.html\">git-web--browse(1)</a>?\n>\n> The command line I am using is a simple\n>\n> make doc.\n>\n> I checked the git repository origin/html, and the correct link is\n> produced there, so something in my configuration is messed up.\n\nYup, I can see that on an Ubuntu 10.4 box with AsciiDoc 8.5.2 but not on\nboxes with 8.2.5 nor 8.2.7.\n"},{"id":"148784","messageId":"7vhbilyqjq.fsf_-_@alter.siamese.dyndns.org","threadId":"24835","inReplyTo":"7vmxsd1b2a.fsf@alter.siamese.dyndns.org","subject":"[PATCH] Work around em-dash handling in newer AsciiDoc","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-08-23T21:20:25Z","receivedAt":"2010-08-23T21:20:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Older versions of AsciiDoc used to literally pass double dashes when we\nused them in our linkgit macros and manpage titles, but newer ones (the\nissue was first reported with AsciiDoc 8.5.2) turn them into em dashes.\n\nDefine litdd (literal double-dash) custom attribute in asciidoc.conf to\nwork this around.  While we are at it, fix a few double-dashes (e.g. the\ndescription of \"project--devo--version\" convention used by tla, among\nother things) that used to be incorrectly written as em dashes in the body\ntext to also use this attribute.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n\n  * Only lightly tested on boxes with AsciiDoc 8.5.2 (that has this\n  problem) and 8.2.7 (that doesn't---to make sure this does not regress\n  the resulting output for the current documentation toolchain), by\n  eyeballing the resulting HTML and manpage output.  Help testing by\n  people with other AsciiDoc versions are welcome.\n\ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nindex 87a90f2..3267bae 100644\n--- a/Documentation/asciidoc.conf\n+++ b/Documentation/asciidoc.conf\n@@ -18,6 +18,7 @@ startsb=&#91;\n endsb=&#93;\n tilde=&#126;\n backtick=&#96;\n+litdd=&#45;&#45;\n \n ifdef::backend-docbook[]\n [linkgit-inlinemacro]\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex e22a62f..a008f7e 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -220,7 +220,7 @@ binary so line count cannot be shown) and there is no\n difference between indexed copy and the working tree\n version (if the working tree version were also different,\n 'binary' would have been shown in place of 'nothing').  The\n-other file, git-add--interactive.perl, has 403 lines added\n+other file, git-add{litdd}interactive.perl, has 403 lines added\n and 35 lines deleted if you commit what is in the index, but\n working tree file has further modifications (one addition and\n one deletion).\ndiff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt\nindex 4d4325f..4f358c8 100644\n--- a/Documentation/git-archimport.txt\n+++ b/Documentation/git-archimport.txt\n@@ -44,7 +44,7 @@ archives that it imports, it is also possible to specify git branch names\n manually.  To do so, write a git branch name after each <archive/branch>\n parameter, separated by a colon.  This way, you can shorten the Arch\n branch names and convert Arch jargon to git jargon, for example mapping a\n-\"PROJECT--devo--VERSION\" branch to \"master\".\n+\"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\".\n \n Associating multiple Arch branches to one git branch is possible; the\n result will make the most sense only if no commits are made to the first\n@@ -85,8 +85,8 @@ OPTIONS\n -o::\n \tUse this for compatibility with old-style branch names used by\n \tearlier versions of 'git archimport'.  Old-style branch names\n-\twere category--branch, whereas new-style branch names are\n-\tarchive,category--branch--version.  In both cases, names given\n+\twere category{litdd}branch, whereas new-style branch names are\n+\tarchive,category{litdd}branch{litdd}version.  In both cases, names given\n \ton the command-line will override the automatically-generated\n \tones.\n \ndiff --git a/Documentation/git-help.txt b/Documentation/git-help.txt\nindex f8df109..eccd0ff 100644\n--- a/Documentation/git-help.txt\n+++ b/Documentation/git-help.txt\n@@ -55,9 +55,9 @@ other display programs (see below).\n +\n The web browser can be specified using the configuration variable\n 'help.browser', or 'web.browser' if the former is not set. If none of\n-these config variables is set, the 'git web--browse' helper script\n+these config variables is set, the 'git web{litdd}browse' helper script\n (called by 'git help') will pick a suitable default. See\n-linkgit:git-web--browse[1] for more information about this.\n+linkgit:git-web{litdd}browse[1] for more information about this.\n \n CONFIGURATION VARIABLES\n -----------------------\n@@ -80,7 +80,7 @@ help.browser, web.browser and browser.<tool>.path\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+section above and linkgit:git-web{litdd}browse[1].\n \n man.viewer\n ~~~~~~~~~~\ndiff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt\nindex e70cea9..7477ce8 100644\n--- a/Documentation/git-instaweb.txt\n+++ b/Documentation/git-instaweb.txt\n@@ -44,9 +44,9 @@ OPTIONS\n -b::\n --browser::\n \tThe web browser that should be used to view the gitweb\n-\tpage. This will be passed to the 'git web--browse' helper\n+\tpage. This will be passed to the 'git web{litdd}browse' helper\n \tscript along with the URL of the gitweb instance. See\n-\tlinkgit:git-web--browse[1] for more information about this. If\n+\tlinkgit:git-web{litdd}browse[1] for more information about this. If\n \tthe script fails, the URL will be printed to stdout.\n \n start::\n@@ -82,7 +82,7 @@ You may specify configuration in your .git/config\n \n If the configuration variable 'instaweb.browser' is not set,\n 'web.browser' will be used instead if it is defined. See\n-linkgit:git-web--browse[1] for more information about this.\n+linkgit:git-web{litdd}browse[1] for more information about this.\n \n Author\n ------\ndiff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt\nindex 78eb03f..d8df553 100644\n--- a/Documentation/git-mergetool--lib.txt\n+++ b/Documentation/git-mergetool--lib.txt\n@@ -1,5 +1,5 @@\n-git-mergetool--lib(1)\n-=====================\n+git-mergetool{litdd}lib(1)\n+==========================\n \n NAME\n ----\n@@ -16,11 +16,11 @@ This is not a command the end user would want to run.  Ever.\n This documentation is meant for people who are studying the\n Porcelain-ish scripts and/or are writing new ones.\n \n-The 'git-mergetool--lib' scriptlet is designed to be sourced (using\n+The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using\n `.`) by other shell scripts to set up functions for working\n with git merge tools.\n \n-Before sourcing 'git-mergetool--lib', your script must set `TOOL_MODE`\n+Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE`\n to define the operation mode for the functions listed below.\n 'diff' and 'merge' are valid values.\n \ndiff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt\nindex 7572049..e1586c7 100644\n--- a/Documentation/git-web--browse.txt\n+++ b/Documentation/git-web--browse.txt\n@@ -1,5 +1,5 @@\n-git-web--browse(1)\n-==================\n+git-web{litdd}browse(1)\n+=======================\n \n NAME\n ----\n@@ -7,7 +7,7 @@ git-web--browse - git helper script to launch a web browser\n \n SYNOPSIS\n --------\n-'git web--browse' [OPTIONS] URL/FILE ...\n+'git web{litdd}browse' [OPTIONS] URL/FILE ...\n \n DESCRIPTION\n -----------\n@@ -71,7 +71,7 @@ browser.<tool>.cmd\n When the browser, specified by options or configuration variables, is\n not among the supported ones, then the corresponding\n 'browser.<tool>.cmd' configuration variable will be looked up. If this\n-variable exists then 'git web--browse' will treat the specified tool\n+variable exists then 'git web{litdd}browse' will treat the specified tool\n as a custom command and will use a shell eval to run the command with\n the URLs passed as arguments.\n \n"}]}