Changeset 6e9ca99


Ignore:
Timestamp:
06/17/2021 03:45:12 AM (11 months 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:
3 edited

Legend:

Unmodified
Added
Removed
  • chapter01/changelog.xml

    rdd79d3f r6e9ca99  
    4646    -->
    4747    <listitem>
    48       <para>2021-05-15</para>
     48      <para>2021-06-15</para>
    4949      <itemizedlist>
    5050        <listitem>
  • chapter08/util-linux.xml

    rdd79d3f r6e9ca99  
    105105  <para>Finally, install the man pages:</para>
    106106
    107 <screen><userinput remap="install">tar -xf ../util-linux-man-pages-&util-linux-version;.tar.xz \
    108 --directory /usr/share/man --strip-components=1</userinput></screen>
     107<screen><userinput remap="install">tar -xf ../util-linux-man-pages-&util-linux-version;.tar.xz --directory /usr/share/man --strip-components=1</userinput></screen>
    109108
    110109  </sect2>
  • packages.ent

    rdd79d3f r6e9ca99  
    304304<!ENTITY grub-version "2.06">
    305305<!ENTITY grub-size "6,428 KB">
    306 <!--<!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">-->
    307 <!ENTITY grub-url "https://alpha.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
     306<!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
    308307<!ENTITY grub-md5 "cf0fd928b1e5479c8108ee52cb114363">
    309308<!ENTITY grub-home "&gnu-software;grub/">
Note: See TracChangeset for help on using the changeset viewer.