Gentoo Archives: gentoo-doc-cvs

From: "Joshua Saddler (nightmorph)" <nightmorph@g.o>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en/handbook: hb-install-x86+amd64-bootloader.xml
Date: Wed, 15 Apr 2009 07:24:00
Message-Id: E1LtzTR-0006VX-Or@stork.gentoo.org
1 nightmorph 09/04/15 07:23:57
2
3 Modified: hb-install-x86+amd64-bootloader.xml
4 Log:
5 updated lilo info for the AMD64 handbook, bug 245419
6
7 Revision Changes Path
8 1.13 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.13&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.13&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?r1=1.12&r2=1.13
13
14 Index: hb-install-x86+amd64-bootloader.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v
17 retrieving revision 1.12
18 retrieving revision 1.13
19 diff -u -r1.12 -r1.13
20 --- hb-install-x86+amd64-bootloader.xml 10 Sep 2008 23:40:52 -0000 1.12
21 +++ hb-install-x86+amd64-bootloader.xml 15 Apr 2009 07:23:57 -0000 1.13
22 @@ -4,12 +4,12 @@
23 <!-- The content of this document is licensed under the CC-BY-SA license -->
24 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
25
26 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v 1.12 2008/09/10 23:40:52 nightmorph Exp $ -->
27 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v 1.13 2009/04/15 07:23:57 nightmorph Exp $ -->
28
29 <sections>
30
31 -<version>6.2</version>
32 -<date>2008-09-10</date>
33 +<version>6.3</version>
34 +<date>2009-04-15</date>
35
36 <section>
37 <title>Making your Choice</title>
38 @@ -31,10 +31,6 @@
39 link="#grub">GRUB</uri> and <uri link="#lilo">LILO</uri>.
40 </p>
41
42 -<warn test="func:keyval('arch')='AMD64'">
43 -Using LILO on the AMD64 architecture is not recommended.
44 -</warn>
45 -
46 </body>
47 <body>
48 <p>
49 @@ -229,7 +225,9 @@
50 <impo test="func:keyval('arch')='AMD64'">
51 If you are using a non-multilib <uri
52 link="?part=1&amp;chap=6#doc_chap2">profile</uri>, you should <b>not</b> emerge
53 -grub, but instead you should emerge <c>grub-static</c>.
54 +grub, but instead you should emerge <c>grub-static</c>. If you plan to use a
55 +non-multilib profile <e>and</e> you have <b>disabled</b> IA-32 emulation in your
56 +kernel, then you should use <c>lilo</c>.
57 </impo>
58
59 <pre caption="Installing GRUB">
60 @@ -492,10 +490,6 @@
61 <title>Installing LILO</title>
62 <body>
63
64 -<warn test="func:keyval('arch')='AMD64'">
65 -Using LILO on the AMD64 architecture is not recommended.
66 -</warn>
67 -
68 <p>
69 LILO, the LInuxLOader, is the tried and true workhorse of Linux
70 bootloaders. However, it lacks some features that GRUB has (which is