Merge trunk

chapter01/changelog.xml

@@ -51,7 +51,7 @@
           <para>[bdubbs] - Update to iana-etc-20250304. Addresses
           <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
         </listitem>
-        <listitem>
+        <listitem revision='sysv'>
           <para>[bdubbs] - Update to sysklogd-2.7.1. Fixes
           <ulink url='&lfs-ticket-root;5668'>#5668</ulink>.</para>
         </listitem>
@@ -87,7 +87,7 @@
           <para>[bdubbs] - Update to expat-2.7.0. Fixes
           <ulink url='&lfs-ticket-root;5675'>#5675</ulink>.</para>
         </listitem>
-        <listitem>
+        <listitem revision='systemd'>
           <para>[bdubbs] - Update to dbus-1.16.2. Fixes
           <ulink url='&lfs-ticket-root;5663'>#5663</ulink>.</para>
         </listitem>

stylesheets/lfs-xsl/pdf/lfs-mixed.xsl

@@ -80,6 +80,16 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template match="footnote/para[1]">
+  <!--A template with the same match (+others) exists in
+      {docbook-xsl}/pdf/footnote.xsl, so it is
+      only imported, and it has less precedence than the above one, which
+      matches para and does not account for footnote number.
+      We need this one at the same level, but just apply the
+      docbook-xsl one.-->
+    <xsl:apply-imports/>
+  </xsl:template>
+
     <!-- screen, literallayout:
           Self-made template that creates a fo:block wrapper with keep-together
           processing instruction support around the output generated by