Gentoo Archives: gentoo-doc-cvs

From: "Sven Vermeulen (swift)" <swift@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: Tue, 17 Dec 2013 11:04:54
Message-Id: 20131217110450.E7BBF2004B@flycatcher.gentoo.org
1 swift 13/12/17 11:04:50
2
3 Modified: hb-install-x86+amd64-bootloader.xml
4 Log:
5 Bug 489782 - Update paragraph on GRUB/GRUB2 for no-multilib
6
7 Revision Changes Path
8 1.34 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.34&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.34&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?r1=1.33&r2=1.34
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.33
18 retrieving revision 1.34
19 diff -u -r1.33 -r1.34
20 --- hb-install-x86+amd64-bootloader.xml 17 Dec 2013 10:38:05 -0000 1.33
21 +++ hb-install-x86+amd64-bootloader.xml 17 Dec 2013 11:04:50 -0000 1.34
22 @@ -4,11 +4,11 @@
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.33 2013/12/17 10:38:05 swift Exp $ -->
27 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v 1.34 2013/12/17 11:04:50 swift Exp $ -->
28
29 <sections>
30
31 -<version>17</version>
32 +<version>18</version>
33 <date>2013-12-17</date>
34
35 <section>
36 @@ -193,10 +193,10 @@
37
38 <impo test="func:keyval('arch')='AMD64'">
39 If you are using a non-multilib <uri
40 -link="?part=1&amp;chap=6#doc_chap2">profile</uri>, you should <b>not</b> emerge
41 -<c>grub</c>, but instead you should emerge <c>grub-static</c>. If you plan to
42 -use a non-multilib profile <e>and</e> you have <b>disabled</b> IA-32 emulation
43 -in your kernel, then you should use <c>lilo</c>.
44 +link="?part=1&amp;chap=6#doc_chap2">profile</uri> and still intend to use the
45 +GRUB Legacy (instead of GRUB2), you should <b>not</b> emerge
46 +<c>grub:0</c>, but instead you should emerge <c>grub-static</c> (only possible
47 +if you have enabled IA-32 emulation).
48 </impo>
49
50 <pre caption="Installing GRUB">