Changeset 9d11bbb7


Ignore:
Timestamp:
06/01/2021 06:36:24 PM (4 months ago)
Author:
Ken Moffat <ken@…>
Branches:
11.0, qt5new, trunk
Children:
6ca17c82
Parents:
0d4a7b68 (diff), b1c3841 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Ken Moffat <ken@…> (06/01/2021 06:32:15 PM)
git-committer:
Ken Moffat <ken@…> (06/01/2021 06:36:24 PM)
Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • general/genutils/genutils.xml

    r0d4a7b68 r9d11bbb7  
    2020
    2121  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
     22
     23  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoctor.xml"/>
    2224
    2325  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bogofilter.xml"/>
  • general/prog/git.xml

    r0d4a7b68 r9d11bbb7  
    136136    <para role="optional">
    137137      <xref linkend="xmlto"/> and
    138       <xref linkend="asciidoc"/> or
    139       <ulink url="http://asciidoctor.org/">AsciiDoctor</ulink>, and also
     138      <xref linkend="asciidoc"/>
     139      <!-- or xref linkend="asciidoctor", doesn't work now because it needs docbook-xsl-ns -->,
     140      and also
    140141      <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink>
    141142      (for the PDF version of the user manual), and
  • introduction/welcome/changelog.xml

    r0d4a7b68 r9d11bbb7  
    4545      <para>June 1st, 2021</para>
    4646      <itemizedlist>
    47        <listitem>
     47        <listitem>
     48          <para>[xry111] - Add asciidoctor, to build man page for
     49          util-linux (in LFS).</para>
     50        </listitem>
     51        <listitem>
    4852          <para>[ken] - Update to firefox-78.11.0esr (security fixes) and
    4953          JS-78.11.0. Fixes
  • packages.ent

    r0d4a7b68 r9d11bbb7  
    247247<!-- Chapter 11 -->
    248248<!ENTITY asciidoc-version             "9.1.0">
     249<!ENTITY asciidoctor-version          "2.0.15">
    249250<!ENTITY bogofilter-version           "1.2.5">
    250251<!ENTITY chrpath-version              "0.16">
     
    374375<!ENTITY ruby-patch-version           "1">
    375376<!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
     377<!ENTITY ruby-gemdir                  "/usr/lib/ruby/gems/&ruby-minor-version;.0">
    376378<!ENTITY rust-version                 "1.52.0">
    377379<!ENTITY scons-version                "4.1.0">
Note: See TracChangeset for help on using the changeset viewer.