Changeset 03e6a40 for BOOK/final-system/x86/grub.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/x86/grub.xml (modified) (2 diffs)

BOOK/final-system/x86/grub.xml

@@ -26 +26 @@
     <note os="n1">
       <para>If you would like use a different bootloader than this
-      one you can go to the following link for alterative bootloaders
+      one you can go to the following link for alternative bootloaders
       and the instructions to use them. 
       <ulink url="http://trac.cross-lfs.org/wiki/bootloaders"/></para>
@@ -39 +39 @@
     </note>
 
-    <para os="s1">EGLIBC-&eglibc-version; does not declare gets():</para>
+    <para os="s1">GLIBC-&glibc-version; does not declare gets():</para>
 
 <screen os="s2"><userinput>sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h</userinput></screen>