Re: [PATCH] Documentation: fix build with Asciidoctor 2

From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Sep 8, 2019, 17:18 UTC
Message-ID: <20190908171807.GL11334@genre.crustytoothpaste.net>
In-Reply-To: <20190908104833.GE15641@sigill.intra.peff.net>

On 2019-09-08 at 10:48:33, Jeff King wrote:

Show 21 quoted lines

> Some of them seem bad, though:
> 
>   --- a/745f6812895b31c02b29bdfe4ae8e5498f776c26-asciidoctor/home/peff/share/man/man1/git-am.1
>   +++ b/303729d86b69657777222bf4b3a6f95932e12648-asciidoctor/home/peff/share/man/man1/git-am.1
>   [...]
>   @@ -175,10 +201,10 @@ DISCUSSION
> 
>           to process. Upon seeing the first patch that does not apply, it aborts
>           in the middle. You can recover from this in one of two ways:
>    
>   -        1. skip the current patch by re-running the command with the --skip
>   +        1.  skip the current patch by re-running the command with the --skip
>               option.
>    
>   -        2. hand resolve the conflict in the working directory, and update the
>   +        2.  hand resolve the conflict in the working directory, and update the
>               index file to bring it into a state that the patch should have
>               produced. Then run the command with the --continue option.
> 
> I tricked doc-diff into doing a comparison against 1.5.5 without the
> patch and 2.0.10 with the patch, and the diff is similar.

I see the same thing in doc-diff, but this issue doesn't appear to actually render in the manual pages themselves, even with MANWIDTH=80. I'm not sure why, but it doesn't seem to misrender in the actual man output.

I also tried with the DocBook 5 (docbook-xsl-ns) stylesheets, but that doesn't appear to make a difference in doc-diff.

-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204