Changeset 229ed25 for BOOK/introduction/x86_64/changelog.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/introduction/x86_64/changelog.xml (modified) (2 diffs)

BOOK/introduction/x86_64/changelog.xml

@@ -33 +33 @@
 
 -->
-
     <listitem>
-      <para>May 18, 2011</para>
+      <para>08 November 2013</para>
       <itemizedlist>
         <listitem>
-          <para>[Jonathan] - Updated Grub2 to 1.99.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-
-    <listitem>
-      <para>July 08, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added the 256-Byte Inode patch to Grub.</para>
+          <para>[William Harrington] - Add /tools/lib64 to ld search path for cross-tools Binutils.</para>
         </listitem>
       </itemizedlist>
@@ -54 +43 @@
 
     <listitem>
-      <para>November 17, 2007</para>
+      <para>24 October 2013</para>
       <itemizedlist>
         <listitem>
-          <para>[ken] - Put e2fsprogs libraries into /tools/lib64 in "if you are going to chroot".
-                Thanks to Jacek Herold for the report.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 05, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Remove sed for 64-bit gettext testsuite, no longer needed.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog..</para>
+          <para>[William Harrington] - Changelog restarted, see the 2.1.0 book for the old changelog.</para>
         </listitem>
       </itemizedlist>