git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/3] contrib/subtree: rename .txt to .adoc

From
Patrick Steinhardt <ps@pks.im>
Date
Feb 28, 2025, 14:09 UTC
Message-ID
<Z8HDhZ7I5D6Zrr-E@pks.im>
In-Reply-To
<Z8G_Ia-oXgRcgVvs@teonanacatl.net>
On Fri, Feb 28, 2025 at 08:50:25AM -0500, Todd Zullinger wrote:
Show 41 quoted lines
> Patrick Steinhardt wrote:
> > On Thu, Feb 27, 2025 at 10:47:06PM -0500, Todd Zullinger wrote:
> >> The .txt extensions were changed to .adoc in 1f010d6bdf (doc: use .adoc
> >> extension for AsciiDoc files, 2025-01-20).
> > 
> > Same here, we also need the following change on top:
> > 
> > diff --git a/contrib/subtree/meson.build b/contrib/subtree/meson.build
> > index a752a188df1..9c72b236259 100644
> > --- a/contrib/subtree/meson.build
> > +++ b/contrib/subtree/meson.build
> > @@ -32,7 +32,7 @@ if get_option('docs').contains('man')
> >        '@INPUT@',
> >      ],
> >      depends: documentation_deps,
> > -    input: 'git-subtree.txt',
> > +    input: 'git-subtree.adoc',
> >      output: 'git-subtree.xml',
> >    )
> >  
> > @@ -63,7 +63,7 @@ if get_option('docs').contains('html')
> >        '@INPUT@',
> >      ],
> >      depends: documentation_deps,
> > -    input: 'git-subtree.txt',
> > +    input: 'git-subtree.adoc',
> >      output: 'git-subtree.html',
> >      install: true,
> >      install_dir: get_option('datadir') / 'doc/git-doc',
> 
> Thanks.  I have not yet looked at the meson build so I
> didn't remember that should be checked.  I still build a
> full set of packages for rpm-based systems and there were a
> few remaining items which were not covered by meson in
> 2.49.0-rc0 (or so I thought). :)
> 
> In particular, it was contrib/contacts and contrib/subtree;
> although the latter is obviously not true and the former
> won't be for long.  I'll definitely have to take a stab at
> building my local rpm's with meson very soon so I have some
> better testing there.
That would be great indeed and very much appreciated!
Patrick
Previous: Todd ZullingerNext: Junio C Hamano
Message 12 of 22 in “doc: txt -> adoc fixes”
  1. 0/3 doc: txt -> adoc fixesTodd Zullinger, Feb 28, 2025
  2. 1/3 doc: update howto-index.sh for .adoc extensionsTodd Zullinger, Feb 28, 2025
  3. Junio C HamanoFeb 28, 2025
  4. 2/3 contrib/contacts: rename .txt to .adocTodd Zullinger, Feb 28, 2025
  5. Patrick SteinhardtFeb 28, 2025
  6. Todd ZullingerFeb 28, 2025
  7. Junio C HamanoFeb 28, 2025
  8. Todd ZullingerMar 1, 2025
  9. 3/3 contrib/subtree: rename .txt to .adocTodd Zullinger, Feb 28, 2025
  10. Patrick SteinhardtFeb 28, 2025
  11. Todd ZullingerFeb 28, 2025
  12. Patrick SteinhardtFeb 28, 2025
  13. Junio C HamanoFeb 28, 2025
  14. Junio C HamanoFeb 28, 2025
  15. 0/3 doc: txt -> adoc fixesTodd Zullinger, Mar 1, 2025
  16. 1/3 doc: update howto-index.sh for .adoc extensionsTodd Zullinger, Mar 1, 2025
  17. 2/3 contrib/contacts: rename .txt to .adocTodd Zullinger, Mar 1, 2025
  18. 3/3 contrib/subtree: rename .txt to .adocTodd Zullinger, Mar 1, 2025
  19. Junio C HamanoMar 1, 2025
  20. Junio C HamanoMar 1, 2025
  21. 4/3 doc: fix build-docdep.perlJunio C Hamano, Mar 1, 2025
  22. Todd ZullingerMar 1, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.