| 1 |
swift 13/12/17 11:58:38 |
| 2 |
|
| 3 |
Modified: hb-install-x86+amd64-bootloader.xml |
| 4 |
Log: |
| 5 |
Fix bug #494526 - GRUB2 is now stable |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.36 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.36&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.36&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.35&r2=1.36 |
| 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.35 |
| 18 |
retrieving revision 1.36 |
| 19 |
diff -u -r1.35 -r1.36 |
| 20 |
--- hb-install-x86+amd64-bootloader.xml 17 Dec 2013 11:55:40 -0000 1.35 |
| 21 |
+++ hb-install-x86+amd64-bootloader.xml 17 Dec 2013 11:58:38 -0000 1.36 |
| 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.35 2013/12/17 11:55:40 swift Exp $ --> |
| 27 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v 1.36 2013/12/17 11:58:38 swift Exp $ --> |
| 28 |
|
| 29 |
<sections> |
| 30 |
|
| 31 |
-<version>19</version> |
| 32 |
+<version>20</version> |
| 33 |
<date>2013-12-17</date> |
| 34 |
|
| 35 |
<section> |
| 36 |
@@ -28,16 +28,10 @@ |
| 37 |
<body test="contains('AMD64 x86', func:keyval('arch'))"> |
| 38 |
<p> |
| 39 |
For <keyval id="arch"/>, Gentoo Linux provides <uri |
| 40 |
-link="#grub">GRUB</uri>, <uri link="#grub2">GRUB2</uri> and |
| 41 |
-<uri link="#lilo">LILO</uri>. |
| 42 |
+link="#grub2">GRUB2</uri>, <uri link="#lilo">LILO</uri> and |
| 43 |
+<uri link="#grub">GRUB Legacy</uri>. |
| 44 |
</p> |
| 45 |
|
| 46 |
-<note> |
| 47 |
-GRUB2 might not be stabilized at the moment of reading this. However, |
| 48 |
-stabilization is due very soon so we temporarily document both GRUB and GRUB2 |
| 49 |
-and will remove the GRUB instructions after stabilization of GRUB2. |
| 50 |
-</note> |
| 51 |
- |
| 52 |
</body> |
| 53 |
<body> |
| 54 |
<p> |
| 55 |
@@ -131,24 +125,11 @@ |
| 56 |
<body> |
| 57 |
|
| 58 |
<p> |
| 59 |
-GRUB2 is provided through the <c>sys-boot/grub</c> package. To deploy GRUB2, use |
| 60 |
-the <e>SLOT</e> notation to tell Portage to install GRUB2. SLOTs are a feature |
| 61 |
-of Gentoo Linux where multiple versions of the same package can be deployed |
| 62 |
-simultaneously on a system. In our case, this means that GRUB Legacy and GRUB2 |
| 63 |
-can be installed on a system (software-wise) at the same time. |
| 64 |
+GRUB2 is provided through the <c>sys-boot/grub</c> package. |
| 65 |
</p> |
| 66 |
|
| 67 |
-<note> |
| 68 |
-GRUB2 might still be marked as ~<keyval id="arch" />. If that is the case, you |
| 69 |
-can either wait and use <uri link="#grub">GRUB Legacy</uri> or unmask the |
| 70 |
-package. This is explained in <uri |
| 71 |
-link="handbook-amd64.xml?part=3&chap=3#doc_chap2">Mixing Stable with |
| 72 |
-Testing</uri>. Once GRUB2 is stabilized, the SLOT operator also is no longer |
| 73 |
-mandatory. |
| 74 |
-</note> |
| 75 |
- |
| 76 |
<pre caption="Installing GRUB2"> |
| 77 |
-# <i>emerge sys-boot/grub:2</i> |
| 78 |
+# <i>emerge sys-boot/grub</i> |
| 79 |
</pre> |
| 80 |
|
| 81 |
<p> |
| 82 |
@@ -365,14 +346,6 @@ |
| 83 |
version is now dubbed as "GRUB Legacy". |
| 84 |
</p> |
| 85 |
|
| 86 |
-<p> |
| 87 |
-We recommend to start with GRUB2 as soon as it is available. The migration of |
| 88 |
-GRUB to GRUB2 is <uri link="https://wiki.gentoo.org/wiki/GRUB2_Migration">documented |
| 89 |
-online</uri>. The instructions in this section relate to "GRUB Legacy" and will |
| 90 |
-disappear from the book soon after the stabilization of <uri |
| 91 |
-link="#grub2">GRUB2</uri>. |
| 92 |
-</p> |
| 93 |
- |
| 94 |
</body> |
| 95 |
</subsection> |
| 96 |
<subsection> |
| 97 |
@@ -417,7 +390,7 @@ |
| 98 |
<body> |
| 99 |
|
| 100 |
<p> |
| 101 |
-To install GRUB, let's first emerge it: |
| 102 |
+To install GRUB Legacy, let's first emerge it: |
| 103 |
</p> |
| 104 |
|
| 105 |
<impo test="func:keyval('arch')='AMD64'"> |
Archives