Changeset 229ed25 for BOOK/appendices/dependencies/x86.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (12 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/appendices/dependencies/x86.xml (modified) (2 diffs)

BOOK/appendices/dependencies/x86.xml

@@ -14 +14 @@
   <para>This page contains dependency information for packages specific to x86.</para>
 
-<!-- Begin GRUB dependency info -->
-  <bridgehead renderas="sect2" id="grub-dep">GRUB</bridgehead>
+<!-- Begin GRUB2 dependency info -->
+  <bridgehead renderas="sect2" id="grub2-dep">GRUB2</bridgehead>
 
       <segmentedlist>
@@ -21 +21 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep, Make,
-         Ncurses, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Bison Coreutils, Diffutils, EGLIBC, Gawk, GCC, Gettext,
+         Grep, Make, Ncurses, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>