swift 13/12/17 11:58:38 Modified: hb-install-x86+amd64-bootloader.xml Log: Fix bug #494526 - GRUB2 is now stable
Revision Changes Path 1.36 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.36&view=markup 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 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 Index: hb-install-x86+amd64-bootloader.xml =================================================================== RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- hb-install-x86+amd64-bootloader.xml 17 Dec 2013 11:55:40 -0000 1.35 +++ hb-install-x86+amd64-bootloader.xml 17 Dec 2013 11:58:38 -0000 1.36 @@ -4,11 +4,11 @@ <!-- The content of this document is licensed under the CC-BY-SA license --> <!-- See http://creativecommons.org/licenses/by-sa/2.5 --> -<!-- $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 $ --> +<!-- $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 $ --> <sections> -<version>19</version> +<version>20</version> <date>2013-12-17</date> <section> @@ -28,16 +28,10 @@ <body test="contains('AMD64 x86', func:keyval('arch'))"> <p> For <keyval id="arch"/>, Gentoo Linux provides <uri -link="#grub">GRUB</uri>, <uri link="#grub2">GRUB2</uri> and -<uri link="#lilo">LILO</uri>. +link="#grub2">GRUB2</uri>, <uri link="#lilo">LILO</uri> and +<uri link="#grub">GRUB Legacy</uri>. </p> -<note> -GRUB2 might not be stabilized at the moment of reading this. However, -stabilization is due very soon so we temporarily document both GRUB and GRUB2 -and will remove the GRUB instructions after stabilization of GRUB2. -</note> - </body> <body> <p> @@ -131,24 +125,11 @@ <body> <p> -GRUB2 is provided through the <c>sys-boot/grub</c> package. To deploy GRUB2, use -the <e>SLOT</e> notation to tell Portage to install GRUB2. SLOTs are a feature -of Gentoo Linux where multiple versions of the same package can be deployed -simultaneously on a system. In our case, this means that GRUB Legacy and GRUB2 -can be installed on a system (software-wise) at the same time. +GRUB2 is provided through the <c>sys-boot/grub</c> package. </p> -<note> -GRUB2 might still be marked as ~<keyval id="arch" />. If that is the case, you -can either wait and use <uri link="#grub">GRUB Legacy</uri> or unmask the -package. This is explained in <uri -link="handbook-amd64.xml?part=3&chap=3#doc_chap2">Mixing Stable with -Testing</uri>. Once GRUB2 is stabilized, the SLOT operator also is no longer -mandatory. -</note> - <pre caption="Installing GRUB2"> -# <i>emerge sys-boot/grub:2</i> +# <i>emerge sys-boot/grub</i> </pre> <p> @@ -365,14 +346,6 @@ version is now dubbed as "GRUB Legacy". </p> -<p> -We recommend to start with GRUB2 as soon as it is available. The migration of -GRUB to GRUB2 is <uri link="https://wiki.gentoo.org/wiki/GRUB2_Migration";>documented -online</uri>. The instructions in this section relate to "GRUB Legacy" and will -disappear from the book soon after the stabilization of <uri -link="#grub2">GRUB2</uri>. -</p> - </body> </subsection> <subsection> @@ -417,7 +390,7 @@ <body> <p> -To install GRUB, let's first emerge it: +To install GRUB Legacy, let's first emerge it: </p> <impo test="func:keyval('arch')='AMD64'">
