Re: git: f8ff165772 - main - Collapse a wrapped line

Glen Barber <[email protected]> Thu, 7 Oct 2021 16:50:12 +0000
Newsgroups	gmane.os.freebsd.devel.cvs.doc
Message-ID	<[email protected]>
On Thu, Oct 07, 2021 at 09:23:58AM -0700, John Baldwin wrote:
> On 10/6/21 5:19 PM, Glen Barber wrote:
> > The branch main has been updated by gjb:
> > 
> > URL: https://cgit.FreeBSD.org/doc/commit/?id=f8ff165772d16da164773800034f79e7c3799b0a
> > 
> > commit f8ff165772d16da164773800034f79e7c3799b0a
> > Author:     Glen Barber <[email protected]>
> > AuthorDate: 2021-10-07 00:19:10 +0000
> > Commit:     Glen Barber <[email protected]>
> > CommitDate: 2021-10-07 00:19:10 +0000
> > 
> >      Collapse a wrapped line
> >      Sponsored by:   Rubicon Communications, LLC ("Netgate")
> > ---
> >   documentation/content/en/books/porters-handbook/versions/_index.adoc | 3 +--
> >   1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/documentation/content/en/books/porters-handbook/versions/_index.adoc b/documentation/content/en/books/porters-handbook/versions/_index.adoc
> > index 6bec40b1e2..0e5dfd87d4 100644
> > --- a/documentation/content/en/books/porters-handbook/versions/_index.adoc
> > +++ b/documentation/content/en/books/porters-handbook/versions/_index.adoc
> > @@ -207,8 +207,7 @@ Here is a convenient list of `__FreeBSD_version` values as defined in https://cg
> >   |1400036
> >   |gitref:ac847dbf73685a5df9f70bbcdefa9fdeb559071d[repository="src",length=12]
> >   |Oct 6, 2021
> > -|14.0-CURRENT after extending the AES-CCM and Chacha20-Poly1305
> > -|ciphers in OCF to support multiple nonce lengths.
> > +|14.0-CURRENT after extending the AES-CCM and Chacha20-Poly1305 ciphers in OCF to support multiple nonce lengths.
> >   |===
> 
> Huh, I didn't know our new system isn't capable of handling wrapped text.  We
> have wrapped text in all sorts of other places in our docs.  This is quite
> non-obvious.
> 

That isn't what caused the breakage.  There were extra "|==="s, which
was the real problem.  I *thought* the problem was with the text itself,
where you used "SOCK_IO_RECV|SEND)_(UN)LOCK", specifically the pipe,
which AsciiDoc treats as a special character.  (But it seems that was
indeed not the cause of the breakage.)

Commit 5a5db32f4a is what really fixed the build, from what I can tell.

Glen
signature.asc (application/pgp-signature, 833 B)