Changeset 9d11bbb7

Timestamp:

06/01/2021 06:36:24 PM (3 years ago)

Author:

Ken Moffat <ken@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

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:

• general/genutils/asciidoctor.xml (added)
• general/genutils/genutils.xml (modified) (1 diff)
• general/prog/git.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)

general/genutils/genutils.xml

@@ -20 +20 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoctor.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bogofilter.xml"/>

general/prog/git.xml

@@ -136 +136 @@
     <para role="optional">
       <xref linkend="xmlto"/> and
-      <xref linkend="asciidoc"/> or
-      <ulink url="http://asciidoctor.org/">AsciiDoctor</ulink>, and also
+      <xref linkend="asciidoc"/>
+      <!-- or xref linkend="asciidoctor", doesn't work now because it needs docbook-xsl-ns -->,
+      and also
       <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink>
       (for the PDF version of the user manual), and

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>June 1st, 2021</para>
       <itemizedlist>
-       <listitem>
+        <listitem>
+          <para>[xry111] - Add asciidoctor, to build man page for
+          util-linux (in LFS).</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Update to firefox-78.11.0esr (security fixes) and
           JS-78.11.0. Fixes

packages.ent

@@ -247 +247 @@
 <!-- Chapter 11 -->
 <!ENTITY asciidoc-version             "9.1.0">
+<!ENTITY asciidoctor-version          "2.0.15">
 <!ENTITY bogofilter-version           "1.2.5">
 <!ENTITY chrpath-version              "0.16">
@@ -374 +375 @@
 <!ENTITY ruby-patch-version           "1">
 <!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
+<!ENTITY ruby-gemdir                  "/usr/lib/ruby/gems/&ruby-minor-version;.0">
 <!ENTITY rust-version                 "1.52.0">
 <!ENTITY scons-version                "4.1.0">