Changeset 6e9ca99

Timestamp:

06/17/2021 03:45:12 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

faab037

Parents:

dd79d3f (diff), f1f9fbe (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.

Message:

Automatic merge of trunk into multilib

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter08/util-linux.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -46 +46 @@
     -->
     <listitem>
-      <para>2021-05-15</para>
+      <para>2021-06-15</para>
       <itemizedlist>
         <listitem>

chapter08/util-linux.xml

@@ -105 +105 @@
   <para>Finally, install the man pages:</para>
 
-<screen><userinput remap="install">tar -xf ../util-linux-man-pages-&util-linux-version;.tar.xz \
---directory /usr/share/man --strip-components=1</userinput></screen>
+<screen><userinput remap="install">tar -xf ../util-linux-man-pages-&util-linux-version;.tar.xz --directory /usr/share/man --strip-components=1</userinput></screen>
 
   </sect2>

packages.ent

@@ -304 +304 @@
 <!ENTITY grub-version "2.06">
 <!ENTITY grub-size "6,428 KB">
-<!--<!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">-->
-<!ENTITY grub-url "https://alpha.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
+<!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
 <!ENTITY grub-md5 "cf0fd928b1e5479c8108ee52cb114363">
 <!ENTITY grub-home "&gnu-software;grub/">