{"thread":{"id":"35361","subject":"[PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","startedAt":"2013-11-20T00:14:43Z","lastAt":"2014-01-16T00:29:29Z","messageCount":10,"participants":["Jason St. John","Jonathan Nieder","Junio C Hamano","Kyle J. McKay"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"230820","messageId":"1384906483-15260-1-git-send-email-jstjohn@purdue.edu","threadId":"35361","inReplyTo":null,"subject":"[PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","fromName":"Jason St. John","fromEmail":"jstjohn@purdue.edu","sentAt":"2013-11-20T00:14:43Z","receivedAt":"2013-11-20T00:14:43Z","isPatch":true,"sender":{"key":"jstjohn@purdue.edu","avatar":"https://avatars.githubusercontent.com/u/1393510?v=4"},"body":"Documentation/git-rebase.txt: add a blank line after the two AsciiDoc\n    listing blocks\n\nWithout these blank lines, AsciiDoc thinks the opening \"-----\" is a\nsection heading and typesets the word \"to\" as such, which causes\ncascading formatting/typesetting issues until the end of the document.\n\nSigned-off-by: Jason St. John <jstjohn@purdue.edu>\n---\nYou can see the carnage here:\nhttp://git-scm.com/docs/git-rebase#_bugs\n\nThis fixes GitHub issue github/gitscm-next#281\nhttps://github.com/github/gitscm-next/issues/281\n\n\n Documentation/git-rebase.txt | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 94e07fd..88d0afb 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -743,9 +743,11 @@ For example, an attempt to rearrange\n 1 --- 2 --- 3 --- 4 --- 5\n ------------\n to\n+\n ------------\n 1 --- 2 --- 4 --- 3 --- 5\n ------------\n+\n by moving the \"pick 4\" line will result in the following history:\n ------------\n \t3\n-- \n1.8.4.2\n"},{"id":"230821","messageId":"20131120003130.GC4212@google.com","threadId":"35361","inReplyTo":"1384906483-15260-1-git-send-email-jstjohn@purdue.edu","subject":"Re: [PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-11-20T00:31:30Z","receivedAt":"2013-11-20T00:31:30Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nJason St. John wrote:\n\n> Documentation/git-rebase.txt: add a blank line after the two AsciiDoc\n>     listing blocks\n\nI'd leave out the above two description lines, since they're redundant\nnext to the patch text.\n\n> Without these blank lines, AsciiDoc thinks the opening \"-----\" is a\n> section heading and typesets the word \"to\" as such, which causes\n> cascading formatting/typesetting issues until the end of the document.\n\nInteresting.  Alas, I can't reproduce this.\n\nAre you sure it is AsciiDoc that misinterprets the document, and not,\ne.g., the predecessor of asciidoctor in gitscm-next?\n\nDo\n\n  Documentation/git-check-attr.txt\n  Documentation/git-commit.txt\n  Documentation/git-cvsserver.txt\n  Documentation/git-p4.txt\n  Documentation/git-svn.txt\n  Documentation/gitcli.txt\n  Documentation/gitweb.txt\n  Documentation/mailmap.txt\n  \navoid this problem?\n\nThanks and hope that helps,\nJonathan\n"},{"id":"230822","messageId":"CAEjxke-C1H1NpD=Hmiz6MO3OjtPvkUktKvF7zSqfGnruHQ9-Ew@mail.gmail.com","threadId":"35361","inReplyTo":"20131120003130.GC4212@google.com","subject":"Re: [PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","fromName":"Jason St. John","fromEmail":"jstjohn@purdue.edu","sentAt":"2013-11-20T01:12:33Z","receivedAt":"2013-11-20T01:12:33Z","isPatch":true,"sender":{"key":"jstjohn@purdue.edu","avatar":"https://avatars.githubusercontent.com/u/1393510?v=4"},"body":"On Tue, Nov 19, 2013 at 7:31 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:\n> Hi,\n>\n> Jason St. John wrote:\n>\n>> Documentation/git-rebase.txt: add a blank line after the two AsciiDoc\n>>     listing blocks\n>\n> I'd leave out the above two description lines, since they're redundant\n> next to the patch text.\n>\n\nI included that because SubmittingPatches says to do so.\n\n>> Without these blank lines, AsciiDoc thinks the opening \"-----\" is a\n>> section heading and typesets the word \"to\" as such, which causes\n>> cascading formatting/typesetting issues until the end of the document.\n>\n> Interesting.  Alas, I can't reproduce this.\n>\n> Are you sure it is AsciiDoc that misinterprets the document, and not,\n> e.g., the predecessor of asciidoctor in gitscm-next?\n>\n\nI regrettably must admit that I didn't test this before submitting, so\nI had presumed that it was AsciiDoc itself.\n\n> Do\n>\n>   Documentation/git-check-attr.txt\n>   Documentation/git-commit.txt\n>   Documentation/git-cvsserver.txt\n>   Documentation/git-p4.txt\n>   Documentation/git-svn.txt\n>   Documentation/gitcli.txt\n>   Documentation/gitweb.txt\n>   Documentation/mailmap.txt\n>\n> avoid this problem?\n>\n> Thanks and hope that helps,\n> Jonathan\n\nAll of the files you referenced appear to render okay except for\ngit-svn.txt and gitweb.txt.\n\nDocumentation/git-svn.txt:\n* Commands | fetch | --ignore-paths\n* Commands | dcommit | --commit-url\n* Commands | dcommit | --mergeinfo\n* Commands | reset | --parent\n* Caveats (third paragraph)\nSee http://git-scm.com/docs/git-svn#_commands and\nhttp://git-scm.com/docs/git-svn#_caveats\n\nDocumentation/gitweb.txt:\n* This cascades from the virtual host config file example until the\nBugs section.\nSee: http://git-scm.com/docs/gitweb#_webserver_configuration_with_multiple_projects'_root\n\nBased on this and the source files, I suspect the problem lies with,\nfor example, the predecessor of asciidoctor in gitscm-next.\n\nHow do you recommend I proceed? Should I resubmit with just a revised\ncommit message? Should I incorporate this into a larger patch set that\nshould fix all of the errors in git-rebase.txt, git-svn.txt, and\ngitweb.txt?\n\nThanks,\nJason\n"},{"id":"230823","messageId":"20131120012453.GD4212@google.com","threadId":"35361","inReplyTo":"CAEjxke-C1H1NpD=Hmiz6MO3OjtPvkUktKvF7zSqfGnruHQ9-Ew@mail.gmail.com","subject":"Re: [PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-11-20T01:24:53Z","receivedAt":"2013-11-20T01:24:53Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Jason St. John wrote:\n> On Tue, Nov 19, 2013 at 7:31 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:\n>> Jason St. John wrote:\n\n>>> Documentation/git-rebase.txt: add a blank line after the two AsciiDoc\n>>>     listing blocks\n>>\n>> I'd leave out the above two description lines, since they're redundant\n>> next to the patch text.\n>\n> I included that because SubmittingPatches says to do so.\n\nThanks for explaining.  Can you point me to which part of\nSubmittingPatches said to include that kind of thing?\n\n[...]\n> How do you recommend I proceed? Should I resubmit with just a revised\n> commit message? Should I incorporate this into a larger patch set that\n> should fix all of the errors in git-rebase.txt, git-svn.txt, and\n> gitweb.txt?\n\nThanks for checking.  You have a few choices.\n\n a) Check if asciidoctor reproduces the problem, and if so, report it\n    as a compatibility bug.  Ask the gitscm-next maintainers to get\n    their copy of asciidoctor up to date.\n\n b) Come up with a simple rule about how these \"----\" blocks should be\n    formatted, and apply it consistently to the documentation in\n    Documentation/, with a commit message explaining the story so\n    future contributors know to continue to follow it.\n\n c) Resend the same patch that just fixes git-rebase.txt.  Include a\n    Reported-by line to credit the person who originally caught the\n    error.  Explain what's going on in the commit message and that\n    there are other instances of the problem that this patch doesn't\n    yet fix.\n\nI prefer (b), since it would solve the problem more completely and\nmeans future readers wouldn't be confused about which style to use,\nbut other possibilities (e.g., some combination of the options listed\nabove, or something else entirely) could work as well.\n\nThanks again for tracking this down, and hope that helps,\nJonathan\n"},{"id":"230831","messageId":"xmqqwqk37kdy.fsf@gitster.dls.corp.google.com","threadId":"35361","inReplyTo":"1384906483-15260-1-git-send-email-jstjohn@purdue.edu","subject":"Re: [PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-11-20T04:43:53Z","receivedAt":"2013-11-20T04:43:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Jason St. John\" <jstjohn@purdue.edu> writes:\n\n> Documentation/git-rebase.txt: add a blank line after the two AsciiDoc\n>     listing blocks\n\nThat looks funnily formatted, out of place and redundant.\n\n> Without these blank lines, AsciiDoc thinks the opening \"-----\" is a\n> section heading and typesets the word \"to\" as such, which causes\n> cascading formatting/typesetting issues until the end of the document.\n\n>\n> Signed-off-by: Jason St. John <jstjohn@purdue.edu>\n> ---\n> You can see the carnage here:\n> http://git-scm.com/docs/git-rebase#_bugs\n>\n> This fixes GitHub issue github/gitscm-next#281\n\nHmph. https://git-htmldocs.googlecode.com/git/git.html has HTML\ndocumentation pages I preformat, but as far as I can see, the bugs\nsection of git-rebase(1) does not have such a \"carnage\".\n\nPerhaps git-scm.com uses some buggy formatter?\n"},{"id":"233019","messageId":"CAEjxke-fPwTctUt9x_o1YwTKK2fX5TOPA7LStXUh+ejUVxZtpg@mail.gmail.com","threadId":"35361","inReplyTo":"xmqqwqk37kdy.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","fromName":"Jason St. John","fromEmail":"jstjohn@purdue.edu","sentAt":"2014-01-11T01:25:12Z","receivedAt":"2014-01-11T01:25:12Z","isPatch":true,"sender":{"key":"jstjohn@purdue.edu","avatar":"https://avatars.githubusercontent.com/u/1393510?v=4"},"body":"On Tue, Nov 19, 2013 at 11:43 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> \"Jason St. John\" <jstjohn@purdue.edu> writes:\n>\n>> Documentation/git-rebase.txt: add a blank line after the two AsciiDoc\n>>     listing blocks\n>\n> That looks funnily formatted, out of place and redundant.\n>\n>> Without these blank lines, AsciiDoc thinks the opening \"-----\" is a\n>> section heading and typesets the word \"to\" as such, which causes\n>> cascading formatting/typesetting issues until the end of the document.\n>\n>>\n>> Signed-off-by: Jason St. John <jstjohn@purdue.edu>\n>> ---\n>> You can see the carnage here:\n>> http://git-scm.com/docs/git-rebase#_bugs\n>>\n>> This fixes GitHub issue github/gitscm-next#281\n>\n> Hmph. https://git-htmldocs.googlecode.com/git/git.html has HTML\n> documentation pages I preformat, but as far as I can see, the bugs\n> section of git-rebase(1) does not have such a \"carnage\".\n>\n> Perhaps git-scm.com uses some buggy formatter?\n\nThis does seem to be an issue with git-scm.com only, so this is\nprobably an issue with the AsciiDoc formatter they use.\n\nWhat AsciiDoc formatter (and version) do you use?\n\nSorry for the long delay in replying!\n\nJason\n"},{"id":"233056","messageId":"xmqq8uuj7olt.fsf@gitster.dls.corp.google.com","threadId":"35361","inReplyTo":"CAEjxke-fPwTctUt9x_o1YwTKK2fX5TOPA7LStXUh+ejUVxZtpg@mail.gmail.com","subject":"Re: [PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-01-13T17:55:58Z","receivedAt":"2014-01-13T17:55:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Jason St. John\" <jstjohn@purdue.edu> writes:\n\n> What AsciiDoc formatter (and version) do you use?\n\n    $ asciidoc --version\n    asciidoc 8.6.8\n\nChecking with www.methods.co.nz/asciidoc, I am behind by about 2\nmonths, it seems, though.\n"},{"id":"233123","messageId":"CAEjxke9NACjYWP+v1-ZB0epJk9Hwo4g15qBPZexxVNRaKPC3Nw@mail.gmail.com","threadId":"35361","inReplyTo":"xmqq8uuj7olt.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","fromName":"Jason St. John","fromEmail":"jstjohn@purdue.edu","sentAt":"2014-01-15T05:36:48Z","receivedAt":"2014-01-15T05:36:48Z","isPatch":true,"sender":{"key":"jstjohn@purdue.edu","avatar":"https://avatars.githubusercontent.com/u/1393510?v=4"},"body":"On Mon, Jan 13, 2014 at 12:55 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> \"Jason St. John\" <jstjohn@purdue.edu> writes:\n>\n>> What AsciiDoc formatter (and version) do you use?\n>\n>     $ asciidoc --version\n>     asciidoc 8.6.8\n>\n> Checking with www.methods.co.nz/asciidoc, I am behind by about 2\n> months, it seems, though.\n\nI just went through git-scm.com's GitHub issue tracker, and I found\nthat git-scm.com is, in fact, using their own AsciiDoc parser[1].\n\nThis issue, along with the other formatting issues found in\ngit-svn.txt and gitweb.txt, will hopefully be resolved soon, as one of\nthe GitHub maintainers opened an issue to update their AsciiDoc\nparser[2].\n\n[1] https://github.com/git/git-scm.com/issues/134#issuecomment-27539970\n[2] https://github.com/git/git-scm.com/issues/350\n\nJason\n"},{"id":"233154","messageId":"E942D642-562F-43E3-B896-A38CC5FCBDB9@gmail.com","threadId":"35361","inReplyTo":"CAEjxke9NACjYWP+v1-ZB0epJk9Hwo4g15qBPZexxVNRaKPC3Nw@mail.gmail.com","subject":"Re: [PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","fromName":"Kyle J. McKay","fromEmail":"mackyle@gmail.com","sentAt":"2014-01-15T11:29:57Z","receivedAt":"2014-01-15T11:29:57Z","isPatch":true,"sender":{"key":"mackyle@gmail.com","avatar":"https://avatars.githubusercontent.com/u/813346?v=4"},"body":"On Jan 14, 2014, at 21:36, Jason St. John wrote:\n> On Mon, Jan 13, 2014 at 12:55 PM, Junio C Hamano <gitster@pobox.com>  \n> wrote:\n>> \"Jason St. John\" <jstjohn@purdue.edu> writes:\n>>\n>>> What AsciiDoc formatter (and version) do you use?\n>>\n>>    $ asciidoc --version\n>>    asciidoc 8.6.8\n>>\n>> Checking with www.methods.co.nz/asciidoc, I am behind by about 2\n>> months, it seems, though.\n>\n> I just went through git-scm.com's GitHub issue tracker, and I found\n> that git-scm.com is, in fact, using their own AsciiDoc parser[1].\n>\n> This issue, along with the other formatting issues found in\n> git-svn.txt and gitweb.txt, will hopefully be resolved soon, as one of\n> the GitHub maintainers opened an issue to update their AsciiDoc\n> parser[2].\n>\n> [1] https://github.com/git/git-scm.com/issues/ \n> 134#issuecomment-27539970\n> [2] https://github.com/git/git-scm.com/issues/350\n\nHmmm.  I've also had some problems as well getting a correct man page  \nbuild although it's the non-web version.  In my case I use the git- \nconfig.1 man page to detect the problem.  Uninteresting lines have  \nbeen replaced with \"[...]\" for brevity in the following samples.   \nUsing 'MANWIDTH=65 man -c ./git-config.1' the bad man page has a  \nsection that looks like this:\n\n     http.<url>.*\n        Any of the http.* options above can be applied\n        selectively to some urls. For a config key to\n        match a URL, each element of the config key is\n        compared to that of the URL, in the following\n        order:\n\n\t1. Scheme (e.g., https in\n\t   https://example.com/). This field must\n\t   match exactly between the config key and\n\t   the URL.\n            [...]\n\t5. User name (e.g., user in\n\t   https://user@example.com/repo.git). If the\n            [...]\n\t   precedence than a config key with a user\n\t   name.\n\t   The list above is ordered by decreasing\n\t   precedence; a URL that matches a config\n            [...]\n\t   be preferred over a config key match of\n\t   https://user@example.com.\n\n\t   All URLs are normalized before attempting\n\t   any matching (the password part, if\n            [...]\n\t   any URLs visited as a result of a\n\t   redirection do not participate in matching.\n\n        i18n.commitEncoding\n\t   Character encoding the commit messages are\n\t   stored in; Git itself does not care per se,\n\nThe rest of the man page continues to be incorrectly indented too far,  \nbut I've omitted it for brevity.\n\nThe good output for the same section looks like this:\n\n     http.<url>.*\n        Any of the http.* options above can be applied\n        selectively to some urls. For a config key to\n        match a URL, each element of the config key is\n        compared to that of the URL, in the following\n        order:\n\n\t1. Scheme (e.g., https in\n\t   https://example.com/). This field must\n\t   match exactly between the config key and\n\t   the URL.\n            [...]\n\t5. User name (e.g., user in\n\t   https://user@example.com/repo.git). If the\n            [...]\n\t   precedence than a config key with a user\n\t   name.\n\n        The list above is ordered by decreasing\n        precedence; a URL that matches a config key's\n        [...]\n        preferred over a config key match of\n        https://user@example.com.\n\n        All URLs are normalized before attempting any\n        matching (the password part, if embedded in the\n        [...]\n        URLs visited as a result of a redirection do\n        not participate in matching.\n\n    i18n.commitEncoding\n        Character encoding the commit messages are\n        stored in; Git itself does not care per se, but\n\nI have two different systems to build these pages on:\n\nSystem A:\n   OS X + Mac Ports\n   asciidoc --version\n     asciidoc 8.6.6\n   xmlto --version\n     xmlto version 0.0.24\n   docbook-xsl is 1.75.2_0\n   produces bad git-config.1\n\nSystem B:\n   Ubuntu\n   asciidoc --version\n     asciidoc 8.5.2\n   xmlto --version\n     xmlto version 0.0.23\n   docbook-xsl is 1.75.2+dfsg-3\n   produces good git-config.1\n\nThe git-config.1 file is built like so:\n\n1. asciidoc produces git-config.xml from git-config.txt\n\n2. xmlto produces git-config.1 from git-config.xml\n\nSystem A:\n   git-config.txt: md5=c63cbafddb1bc3d6c38b6b2941f8cbce\n   git-config.xml: md5=99c0caa45ec02e8712c346e8842a7ce6\n   git-config.1:   md5=812f8d180ec82c2786b95e986219a5d0\n\nSystem B:\n   git-config.txt: md5=c63cbafddb1bc3d6c38b6b2941f8cbce\n   git-config.xml: md5=99c0caa45ec02e8712c346e8842a7ce6\n   git-config.1:   md5=7298467bedd0225d5edefa8700bc9b2a\n\nSo actually the problem here is not the asciidoc step, it's actually  \nthe xmlto step.\n\nAnd, if I make the following changes to the git-config.1 file produced  \non system A:\n\n     diff --git git-config.1 git-config-fix.1\n     --- git-config.1\n     +++ git-config-fix.1\n     @@ -3299,7 +3299,7 @@ user\n      in\n      https://user@example\\&.com/repo\\&.git)\\&. If the config key  \nhas[...]\n      .RE\n     -.RS 4\n     +.sp\n      The list above is ordered by decreasing precedence; a URL that  \n[...]\n      https://user@example\\&.com/foo/bar\n      a config key match of\n     @@ -4460,7 +4460,7 @@ normal\n      all\n      \\- Show also individual files in untracked directories\\&.\n      .RE\n     -.RS 4\n     +.sp\n      If this variable is not specified, it defaults to\n      \\fInormal\\fR\\&. This variable can be overridden with the [...]\n      \\fBgit-status\\fR(1)\n\nThen it will format properly again (and in fact the $googlecode/git- \nmanpages-*.tar.gz files have the same correct \".sp\" instead of \".RS 4\"  \nlines).\n\nTrying xmlto versions 0.0.23 and 0.0.25 on System A still produce the  \nsame wrong output, so while it appears to be the xmlto step that's the  \nproblem, it's not xmlto itself.\n\nAfter much gnashing of teeth and digging it turns out the problem is  \nin the docbook-xsl sources.  Debian includes a patch file  \n\"8530_manpages_lists_indentation_fix.dpatch\" in [1]:\n\n---- BEGIN PATCH ----\n#! /bin/sh /usr/share/dpatch/dpatch-run\n## 8530_manpages_lists_indentation_fix.dpatch by Daniel Leidert (dale)  \n<daniel.leidert@wgdd.de>\n##\n## All lines beginning with `## DP:' are a description of the patch.\n## DP: Upstream fix from revision 8530 ( dleidert ):\n## DP:   Fix two indentation issues: In the first case there is no  \ncorresponding\n## DP:   .RS macro (Debian #519438, sf.net 2793873). In the second  \ncase an .RS\n## DP:   instead of the probably intended .sp leads to an indentation  \nbug\n## DP:   (Debian #527309, sf.net #2642139).\n## DP:\n## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=8530&view=rev \n >\n## DP: <URL:http://sourceforge.net/search/?type_of_search=artifact&group_id=21935&words=2642139 \n >\n## DP: <URL:http://bugs.debian.org/519438>\n## DP: <URL:http://bugs.debian.org/527309>\n\n@DPATCH@\ndiff -urNad trunk~/manpages/lists.xsl trunk/manpages/lists.xsl\n--- trunk~/manpages/lists.xsl\t2009-03-27 02:25:08.000000000 +0100\n+++ trunk/manpages/lists.xsl\t2009-11-04 00:54:35.000000000 +0100\n@@ -259,8 +259,8 @@\n    <!-- * it, within the same para, then add a blank line and move -->\n    <!-- * the left margin back to where it was -->\n    <xsl:if test=\"parent::para and following-sibling::node()\">\n-    <xsl:text>.sp&#10;</xsl:text>\n-    <xsl:text>.RE&#10;</xsl:text>\n+    <xsl:text>.sp</xsl:text>\n+    <xsl:text>&#10;</xsl:text>\n    </xsl:if>\n  </xsl:template>\n\n@@ -280,11 +280,7 @@\n      parent::para[following-sibling::node()] or\n      parent::simpara[following-sibling::node()] or\n      parent::remark[following-sibling::node()]\">\n-    <xsl:text>.RS</xsl:text>\n-    <xsl:if test=\"not($list-indent = '')\">\n-      <xsl:text> </xsl:text>\n-      <xsl:value-of select=\"$list-indent\"/>\n-    </xsl:if>\n+    <xsl:text>.sp</xsl:text>\n      <xsl:text>&#10;</xsl:text>\n    </xsl:if>\n  </xsl:template>\n---- END PATCH ----\n\nAnd once I have applied that I suddenly get a correct git-config.1  \nfile on System A.  On System A that file is found at:\n\n   /opt/local/share/xsl/docbook-xsl/manpages/lists.xsl\n\nand on System B it's found at:\n\n   /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/lists.xsl\n\nSo while this is not exactly the same problem you describe, I thought  \nI'd point out the fix for others and also that the issue can end up  \nnot being in asciidoc at all especially since \"System B\" produces a  \ncorrect git-config.1 file out-of-the-box and is running an asciidoc  \nversion released over four years ago (2009-12-07).\n\nFYI, I did build git-rebase.html on \"System B\" (with its 4-year-old  \nasciidoc version 8.5.2) and it looks correct (i.e. it has correct  \nformatting in the BUGS section).\n\n--Kyle\n\n[1] http://ftp.de.debian.org/debian/pool/main/d/docbook-xsl/docbook-xsl_1.75.2+dfsg-5.diff.gz\n"},{"id":"233186","messageId":"xmqqbnzc22hi.fsf@gitster.dls.corp.google.com","threadId":"35361","inReplyTo":"E942D642-562F-43E3-B896-A38CC5FCBDB9@gmail.com","subject":"Re: [PATCH] Fix typesetting in Bugs section of 'git-rebase' man page (web version)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-01-16T00:29:29Z","receivedAt":"2014-01-16T00:29:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Kyle J. McKay\" <mackyle@gmail.com> writes:\n\n> in the docbook-xsl sources.  Debian includes a patch file\n> \"8530_manpages_lists_indentation_fix.dpatch\" in [1]:\n> ...\n> And once I have applied that I suddenly get a correct git-config.1\n> file on System A.\n> ...\n> --Kyle\n>\n> [1] http://ftp.de.debian.org/debian/pool/main/d/docbook-xsl/docbook-xsl_1.75.2+dfsg-5.diff.gz\n\nThanks for digging and sharing the result for others.\n"}]}