Making your Choice

Making your Choice @@ -201,7 +201,7 @@
Now we are going to write up a grub.conf. Below you'll find two possible grub.conf for the partitioning example we use -in this guide, with kernel image kernel-2.6.12-gentoo-r6. We've +in this guide, with kernel image kernel-2.6.12-gentoo-r10. We've only extensively commented the first grub.conf.
@@ -233,7 +233,7 @@ title=Gentoo Linux 2.6.12 # Partition where the kernel image (or operating system) is located root (hd0,0) -kernel /boot/kernel-2.6.12-gentoo-r6 root=/dev/hda3 +kernel /boot/kernel-2.6.12-gentoo-r10 root=/dev/hda3 # The next four lines are only if you dualboot with a Windows system. # In this case, Windows is hosted on /dev/hda6. @@ -248,10 +248,10 @@ timeout 30 splashimage=(hd0,0)/boot/grub/splash.xpm.gz -title=Gentoo Linux 2.6.12-gentoo-r6 +title=Gentoo Linux 2.6.12 root (hd0,0) -kernel /boot/kernel-2.6.12-gentoo-r6 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev -initrd /boot/initramfs-genkernel-amd64-2.6.12-gentoo-r6 +kernel /boot/kernel-2.6.12-gentoo-r10 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev +initrd /boot/initramfs-genkernel-amd64-2.6.12-gentoo-r10 # Only in case you want to dual-boot title=Windows XP @@ -357,7 +357,7 @@ in the right commands to install the GRUB boot record onto your hard drive.
+ # grub
 
 
@@ -389,7 +389,7 @@
 Now go on, configure GRUB, shall we? :-)
 
 
-+ grub> root (hd0,0)          (Specify where your /boot partition resides)
 grub> setup (hd0)           (Install GRUB in the MBR)
 grub> quit                  (Exit the GRUB shell)



1.6       +7 -7      xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-kernel.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-kernel.xml?rev=1.6&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-kernel.xml?rev=1.6&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-kernel.xml.diff?r1=1.5&r2=1.6&cvsroot=gentoo

Index: hb-install-amd64-kernel.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-kernel.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hb-install-amd64-kernel.xml	21 Nov 2005 15:37:13 -0000	1.5
+++ hb-install-amd64-kernel.xml	24 Nov 2005 17:26:11 -0000	1.6
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.3
-2005-11-21
+5.4
+2005-11-24
 
 
 Timezone
@@ -68,7 +68,7 @@
 
  # ls -l /usr/src/linux
-lrwxrwxrwx    1 root     root           12 Jul 28 11:04 /usr/src/linux -> linux-2.6.12-gentoo-r6
+lrwxrwxrwx    1 root    root       12 Jul 28 11:04 /usr/src/linux -> linux-2.6.12-gentoo-r10
 
 
 
@@ -79,7 +79,7 @@
 
 # rm /usr/src/linux
 # cd /usr/src
-# ln -s linux-2.6.12-gentoo-r6 linux
+# ln -s linux-2.6.12-gentoo-r10 linux
 
 
 
@@ -265,7 +265,7 @@
 
 
 -# cp arch/x86_64/boot/bzImage /boot/kernel-2.6.12-gentoo-r6
+# cp arch/x86_64/boot/bzImage /boot/kernel-2.6.12-gentoo-r10
 
 
 
@@ -274,7 +274,7 @@
 
 
 -# cp .config /boot/config-2.6.12-gentoo-r6
+# cp .config /boot/config-2.6.12-gentoo-r10
 
 
 



1.5       +7 -7      xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-medium.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-medium.xml?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-medium.xml?rev=1.5&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-medium.xml.diff?r1=1.4&r2=1.5&cvsroot=gentoo

Index: hb-install-amd64-medium.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-medium.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hb-install-amd64-medium.xml	21 Nov 2005 16:38:20 -0000	1.4
+++ hb-install-amd64-medium.xml	24 Nov 2005 17:26:11 -0000	1.5
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.1
-2005-11-11
+5.2
+2005-11-24
 
 

 Hardware Requirements
@@ -134,7 +134,7 @@
 You can download the Universal Installation CD (and, if you want to, the 
 Packages CD as well) from one of our mirrors. The Installation CD is located in 
-the releases/amd64/2005.1/installcd directory;
+the releases/amd64/2005.1-r1/installcd directory;
 the Package CD is located in the releases/amd64/2005.1/packagecd
 directory.
 
@@ -214,7 +214,7 @@
 
 
 
-Now place the installation CD in the CD-ROM drive (duh) and reboot. You
+Now place the installation CD in the CD-ROM drive and reboot. You
 should see a boot prompt. At this
 screen, you can hit Enter to begin the boot process with the default
 boot options, or boot the Installation CD with custom boot options by specifying
@@ -288,8 +288,8 @@
 immediately press Alt-F1 to switch to verbose mode and follow the prompt. If no
 selection is made in 10 seconds, the default (US keyboard) will be accepted and
 the boot process will continue. Once the boot process completes, you will be
-automatically logged in to the "Live" Gentoo Linux as
-"root", the super user. You should have a root ("#") prompt
+automatically logged in to the "Live" Gentoo Linux as
+"root", the super user. You should have a root ("#") prompt
 on the current console and can also switch to other consoles by pressing Alt-F2,
 Alt-F3 and Alt-F4. Get back to the one you started on by pressing Alt-F1.
 



1.3       +16 -16    xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-bootloader.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-bootloader.xml?rev=1.3&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-bootloader.xml?rev=1.3&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-bootloader.xml.diff?r1=1.2&r2=1.3&cvsroot=gentoo

Index: hb-install-ppc64-bootloader.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-bootloader.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hb-install-ppc64-bootloader.xml	29 Oct 2005 07:29:55 -0000	1.2
+++ hb-install-ppc64-bootloader.xml	24 Nov 2005 17:26:11 -0000	1.3
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.0
-2005-08-08
+5.1
+2005-11-24
 
 
 Making your Choice
@@ -25,7 +25,7 @@
 
 
 
-On Linux/PPC64 we have only yaBoot as a bootloader untill grub2 is
+On Linux/PPC64 we have only yaBoot as a bootloader until grub2 is
 finished.
 
 
@@ -180,9 +180,9 @@
 
 #################
 ## This section can be duplicated if you have more than one kernel or set of
-## boot options - replace 2.6.12-gentoo-r4 with your kernel-version
+## boot options - replace 2.6.12-gentoo-r10 with your kernel-version
 #################
-image=/boot/kernel-2.6.12-gentoo-r4
+image=/boot/kernel-2.6.12-gentoo-r10
   label=Linux
   root=/dev/hda3
   partition=3
@@ -247,13 +247,13 @@
 device=disk:
 partition=2
 root=/dev/sda2
-default=2.6.12-gentoo-r4
+default=2.6.12-gentoo-r10
 timeout=50
 
-image=/boot/kernel-2.6.12-gentoo-r4
-      label=2.6.12-gentoo-r4
-    append="console=ttyS0,9600"
-    read-only
+image=/boot/kernel-2.6.12-gentoo-r10
+      label=2.6.12-gentoo-r10
+      append="console=ttyS0,9600"
+      read-only
 
 
 
@@ -265,11 +265,11 @@
 
 default = linux
 timeout = 100
-image=/boot/kernel-2.6.12-gentoo-r4
-        label=linux
-        read-only
-        root = /dev/sda2
-        append="root=/dev/sda2"
+image=/boot/kernel-2.6.12-gentoo-r10
+      label=linux
+      read-only
+      root = /dev/sda2
+      append="root=/dev/sda2"
 
 
 



1.5       +7 -8      xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-kernel.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-kernel.xml?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-kernel.xml?rev=1.5&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-kernel.xml.diff?r1=1.4&r2=1.5&cvsroot=gentoo

Index: hb-install-ppc64-kernel.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-kernel.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hb-install-ppc64-kernel.xml	21 Nov 2005 15:37:13 -0000	1.4
+++ hb-install-ppc64-kernel.xml	24 Nov 2005 17:26:11 -0000	1.5
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.3
-2005-11-21
+5.4
+2005-11-24
 
 

 Timezone
@@ -63,8 +63,7 @@
 
  # ls -l /usr/src/linux
-lrwxrwxrwx    1 root     root           12 Oct 13 11:04 /usr/src/linux
--> linux-2.6.12-gentoo-r4
+lrwxrwxrwx    1 root    root       12 Oct 13 11:04 /usr/src/linux -> linux-2.6.12-gentoo-r10
 
 
 
@@ -75,7 +74,7 @@
 
 # rm /usr/src/linux
 # cd /usr/src
-# ln -s linux-2.6.12-gentoo-r4 linux
+# ln -s linux-2.6.12-gentoo-r10 linux
 
 
 
@@ -250,7 +249,7 @@
 
 
 -# cp vmlinux /boot/kernel-2.6.12-gentoo-r4
+# cp vmlinux /boot/kernel-2.6.12-gentoo-r10
 
 
 
@@ -259,7 +258,7 @@
 
 
 -# cp .config /boot/config-2.6.12
+# cp .config /boot/config-2.6.12-gentoo-r10
 
 
 



1.6       +4 -4      xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-medium.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-medium.xml?rev=1.6&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-medium.xml?rev=1.6&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-medium.xml.diff?r1=1.5&r2=1.6&cvsroot=gentoo

Index: hb-install-ppc64-medium.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-ppc64-medium.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hb-install-ppc64-medium.xml	21 Nov 2005 16:38:20 -0000	1.5
+++ hb-install-ppc64-medium.xml	24 Nov 2005 17:26:11 -0000	1.6
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.3
-2005-11-11
+5.4
+2005-11-24
 
 

 Hardware Requirements
@@ -139,7 +139,7 @@
 You can download the Universal Installation CD (and, if you want to, the
 Packages CD as well) from one of our mirrors. The Installation CDs are located 
-in the releases/ppc64/2005.1/installcd directory; 
+in the releases/ppc64/2005.1-r1/installcd directory; 
 the Package CDs are located in the releases/ppc64/2005.1/packagecd
 directory.
 



1.4       +5 -5      xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-bootloader.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-bootloader.xml?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-bootloader.xml?rev=1.4&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-bootloader.xml.diff?r1=1.3&r2=1.4&cvsroot=gentoo

Index: hb-install-sparc-bootloader.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-bootloader.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hb-install-sparc-bootloader.xml	23 Aug 2005 20:49:05 -0000	1.3
+++ hb-install-sparc-bootloader.xml	24 Nov 2005 17:26:11 -0000	1.4
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.1
-2005-08-23
+5.2
+2005-11-24
 
 
 Making your Choice
@@ -53,7 +53,7 @@
 
 Below you'll find an example silo.conf file. It uses the
 partitioning scheme we use throughout this book and
-kernel-2.4.29 as kernelimage.
+kernel-2.4.31 as kernelimage.
 
 
 @@ -61,7 +61,7 @@
 root = /dev/sda1      # Root partition
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /boot/kernel-2.4.29
+image = /boot/kernel-2.4.31
   label = linux
 
 



1.6       +8 -8      xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-kernel.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-kernel.xml?rev=1.6&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-kernel.xml?rev=1.6&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-kernel.xml.diff?r1=1.5&r2=1.6&cvsroot=gentoo

Index: hb-install-sparc-kernel.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-kernel.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hb-install-sparc-kernel.xml	21 Nov 2005 15:37:13 -0000	1.5
+++ hb-install-sparc-kernel.xml	24 Nov 2005 17:26:11 -0000	1.6
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.3
-2005-11-21
+5.4
+2005-11-24
 
 
 Timezone
@@ -73,7 +73,7 @@
 
  # ls -l /usr/src/linux
-lrwxrwxrwx    1 root     root           12 Oct 13 11:04 /usr/src/linux -> linux-2.4.29-sparc
+lrwxrwxrwx    1 root     root       12 Oct 13 11:04 /usr/src/linux -> linux-2.4.31-sparc
 
 
 
@@ -84,7 +84,7 @@
 
 # rm /usr/src/linux
 # cd /usr/src
-# ln -s linux-2.4.29-sparc linux
+# ln -s linux-2.4.31-sparc linux
 
 
 
@@ -294,10 +294,10 @@
 
 
 (sparc32)
-# cp vmlinux /boot/kernel-2.4.29
+# cp vmlinux /boot/kernel-2.4.31
 
 (sparc64)
-# cp arch/sparc64/boot/image /boot/kernel-2.4.29
+# cp arch/sparc64/boot/image /boot/kernel-2.4.31
 
 
 
@@ -306,7 +306,7 @@
 
 
 -# cp .config /boot/config-2.4.29
+# cp .config /boot/config-2.4.31
 
 
 



1.6       +4 -4      xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-medium.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-medium.xml?rev=1.6&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-medium.xml?rev=1.6&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-medium.xml.diff?r1=1.5&r2=1.6&cvsroot=gentoo

Index: hb-install-sparc-medium.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-sparc-medium.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hb-install-sparc-medium.xml	21 Nov 2005 16:38:20 -0000	1.5
+++ hb-install-sparc-medium.xml	24 Nov 2005 17:26:11 -0000	1.6
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.2
-2005-11-11
+5.3
+2005-11-24
 
 

 Hardware Requirements
@@ -147,7 +147,7 @@
 You can download the Universal Installation CD (and, if you want to, the 
 Packages CD as well) from one of our mirrors. The Installation CDs are located in 
-the releases/sparc/2005.1/sparc64/installcd 
+the releases/sparc/2005.1-r1/sparc64/installcd 
 directory; the Package CDs are located in the 
 releases/sparc/2005.1/sparc64/packagecd directory.
 



1.9       +21 -50    xml/htdocs/doc/en/handbook/2005.1/hb-install-stage.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-stage.xml?rev=1.9&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-stage.xml?rev=1.9&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-stage.xml.diff?r1=1.8&r2=1.9&cvsroot=gentoo

Index: hb-install-stage.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-stage.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hb-install-stage.xml	11 Nov 2005 17:27:16 -0000	1.8
+++ hb-install-stage.xml	24 Nov 2005 17:26:11 -0000	1.9
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.6
-2005-11-11
+5.7
+2005-11-24
 
 
 Installing a Stage Tarball
@@ -94,29 +94,20 @@
 
 
 We will now extract the stage tarball of your choice. We will do this with the
-GNU tar tool. Make sure you use the same options (-xvjpf)!  The
+tar tool. Make sure you use the same options (xvjpf)! The
 x stands for Extract, the v for Verbose to see what
 happens during the extraction process (this one is optional), the j for
 Decompress with bzip2, the p for Preserve permissions and
-the f to denote that we want to extract a file, not standard input.  In
+the f to denote that we want to extract a file, not standard input. In
 the next example, we extract the stage tarball
-stage3-<subarch>-2005.1.tar.bz2.  Be sure to substitute the
-tarball filename with your stage.
+stage3-<subarch>-2005.1-r1.tar.bz2. Be sure to substitute
+the tarball filename with your stage.
 
 
 -# tar -xvjpf /mnt/cdrom/stages/stage3-<subarch>-2005.1.tar.bz2
+# tar xvjpf /mnt/cdrom/stages/stage3-<subarch>-2005.1-r1.tar.bz2
 
 
-
-
-The stage3-athlon-xp-2005.1.tar.bz2,
-stage3-pentium3-2005.1.tar.bz2 and
-stage3-pentium4-2005.1.tar.bz2 files have a serious permission
-error. After extracting any of these, run chmod 0755 /mnt/gentoo to fix
-the error before continuing with the installation.
-
-
 
 Now that the stage is installed, continue with Installing Portage.
@@ -163,13 +154,13 @@
 
 
 
-Pick the releases/ directory, followed by your architecture (for 
-instance x86/) and the Gentoo version (2005.1/) 
-to finish up with the stages/ directory. There you should see all 
-available stage files for your architecture (they might be stored within
-subdirectories named to the individual sub architectures). Select one and 
-press D to download. When you're finished, press Q to quit the 
-browser.
+Pick the releases/ directory, followed by your architecture (for
+instance x86/) and the Gentoo version (2005.1/ or
+2005.1-r1/ if available) to finish up with the stages/
+directory. There you should see all available stage files for your architecture
+(they might be stored within subdirectories named to the individual sub
+architectures). Select one and press D to download. When you're
+finished, press Q to quit the browser.
 
 
 @@ -191,8 +182,8 @@
 
 
 -# md5sum -c stage3-x86-2005.1.tar.bz2.md5
-stage3-x86-2005.1.tar.bz2: OK
+# md5sum -c stage3-x86-2005.1-r1.tar.bz2.md5
+stage3-x86-2005.1-r1.tar.bz2: OK
 
 
 
@@ -202,31 +193,22 @@
 
 
 
-Now unpack your downloaded stage onto your system. We use GNU's tar to
-proceed as it is the easiest method:
+Now unpack your downloaded stage onto your system. We use tar to proceed
+as it is the easiest method:
 
 
 -# tar -xvjpf stage3-*.tar.bz2
+# tar xvjpf stage3-*.tar.bz2
 
 
 
-Make sure that you use the same options (-xvjpf). The x stands
+Make sure that you use the same options (xvjpf). The x stands
 for Extract, the v for Verbose to see what happens during
 the extraction process (this one is optional), the j for Decompress
 with bzip2, the p for Preserve permissions and the f
 to denote that we want to extract a file, not standard input.
 
 
-
-
-The stage3-athlon-xp-2005.1.tar.bz2,
-stage3-pentium3-2005.1.tar.bz2 and
-stage3-pentium4-2005.1.tar.bz2 files have a serious permission
-error. After extracting any of these, run chmod 0755 /mnt/gentoo to fix
-the error before continuing with the installation.
-
-
 
 Now that the stage is installed, continue with Installing Portage.
@@ -257,15 +239,7 @@
 to see what snapshot is available:
 
 
-
-The Portage snapshot on the x86 universal CD is named
-/mnt/cdrom/snapshot/portage-2005.1.tar.bz2.
-
-
 -(x86 only)
-# ls /mnt/cdrom/snapshot
-(All other architectures)
 # ls /mnt/cdrom/snapshots
 
 
@@ -278,9 +252,6 @@
 
 
 -(x86 only)
-# tar -xvjf /mnt/cdrom/snapshot/portage-2005.1.tar.bz2 -C /mnt/gentoo/usr
-(All other architectures)
 # tar -xvjf /mnt/cdrom/snapshots/portage-<date>.tar.bz2 -C /mnt/gentoo/usr
 
 



1.6       +14 -14    xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-bootloader.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-bootloader.xml?rev=1.6&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-bootloader.xml?rev=1.6&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-bootloader.xml.diff?r1=1.5&r2=1.6&cvsroot=gentoo

Index: hb-install-x86-bootloader.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-bootloader.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hb-install-x86-bootloader.xml	21 Nov 2005 18:29:52 -0000	1.5
+++ hb-install-x86-bootloader.xml	24 Nov 2005 17:26:11 -0000	1.6
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.1
-2005-11-21
+5.2
+2005-11-24
 
 
 Making your Choice
@@ -250,10 +250,10 @@
 # Comment out if you don't have a graphics card installed
 splashimage=(hd0,0)/boot/grub/splash.xpm.gz
 
-title=Gentoo Linux 2.6.11-r11
+title=Gentoo Linux 2.6.12-r10
 # Partition where the kernel image (or operating system) is located
 root (hd0,0)
-kernel /boot/kernel-2.6.11-gentoo-r11 root=/dev/hda3
+kernel /boot/kernel-2.6.12-gentoo-r10 root=/dev/hda3
 
 # The next four lines are only if you dualboot with a Windows system.
 # In this case, Windows is hosted on /dev/hda6.
@@ -268,10 +268,10 @@
 timeout 30
 splashimage=(hd0,0)/boot/grub/splash.xpm.gz
 
-title=Gentoo Linux 2.6.11-r11
+title=Gentoo Linux 2.6.12-r10
 root (hd0,0)
-kernel /boot/kernel-genkernel-x86-2.6.11-gentoo-r11 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev
-initrd /boot/initramfs-genkernel-x86-2.6.11-gentoo-r11
+kernel /boot/kernel-genkernel-x86-2.6.12-gentoo-r10 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev
+initrd /boot/initramfs-genkernel-x86-2.6.12-gentoo-r10
 
 # Only in case you want to dual-boot
 title=Windows XP
@@ -515,25 +515,25 @@
 read-write mounting.
 
 
-+ boot=/dev/hda             # Install LILO in the MBR
 prompt                    # Give the user the chance to select another section
 timeout=50                # Wait 5 (five) seconds before booting the default section
 default=gentoo            # When the timeout has passed, boot the "gentoo" section
 
 # For non-genkernel users
-image=/boot/kernel-2.6.11-gentoo-r11
+image=/boot/kernel-2.6.12-gentoo-r10
   label=gentoo            # Name we give to this section
   read-only               # Start with a read-only root. Do not alter!
   root=/dev/hda3          # Location of the root filesystem
 
 # For genkernel users
-image=/boot/kernel-genkernel-x86-2.6.11-gentoo-r11
+image=/boot/kernel-genkernel-x86-2.6.12-gentoo-r10
   label=gentoo
   read-only
   root=/dev/ram0
   append="init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev"
-  initrd=/boot/initramfs-genkernel-x86-2.6.11-gentoo-r11
+  initrd=/boot/initramfs-genkernel-x86-2.6.12-gentoo-r10
 
 # The next two lines are only if you dualboot with a Windows system.
 # In this case, Windows is hosted on /dev/hda6.
@@ -552,8 +552,8 @@
 video statement to enable framebuffer:
 
 
--image=/boot/kernel-2.6.11-gentoo-r11
++image=/boot/kernel-2.6.12-gentoo-r10
   label=gentoo
   read-only
   root=/dev/hda3



1.6       +10 -10    xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-kernel.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-kernel.xml?rev=1.6&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-kernel.xml?rev=1.6&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-kernel.xml.diff?r1=1.5&r2=1.6&cvsroot=gentoo

Index: hb-install-x86-kernel.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-kernel.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hb-install-x86-kernel.xml	21 Nov 2005 15:37:13 -0000	1.5
+++ hb-install-x86-kernel.xml	24 Nov 2005 17:26:11 -0000	1.6
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.3
-2005-11-21
+5.4
+2005-11-24
 
 
 Timezone
@@ -73,24 +73,24 @@
 
 When you take a look in /usr/src you should see a symlink called
 linux pointing to your kernel source. We will assume the kernel
-source installed is gentoo-sources-2.6.11-r3:
+source installed is gentoo-sources-2.6.12-r10:
 
 
  # ls -l /usr/src/linux
-lrwxrwxrwx    1 root     root           12 Oct 13 11:04 /usr/src/linux -> linux-2.6.11-gentoo-r3
+lrwxrwxrwx    1 root    root     12 Oct 13 11:04 /usr/src/linux -> linux-2.6.12-gentoo-r10
 
 
 
 If the symlink doesn't point to the kernel source of your choice (note that
-linux-2.6.11-gentoo-r3 is merely an example) you should change it to the
+linux-2.6.12-gentoo-r10 is merely an example) you should change it to the
 right kernel:
 
 
  # rm /usr/src/linux
 # cd /usr/src
-# ln -s linux-2.6.11-gentoo-r3 linux
+# ln -s linux-2.6.12-gentoo-r10 linux
 
 
 
@@ -296,13 +296,13 @@
 

 When the kernel has finished compiling, copy the kernel image to
 /boot. From here onwards we assume that the kernel you are
-installing is the 2.6.11-r3 version of the gentoo-sources. Use whatever
+installing is the 2.6.12-r10 version of the gentoo-sources. Use whatever
 name you feel is appropriate for your choice and remember it as you will need
 it later on when you configure your bootloader.
 
 
 -# cp arch/i386/boot/bzImage /boot/kernel-2.6.11-gentoo-r3
+# cp arch/i386/boot/bzImage /boot/kernel-2.6.12-gentoo-r10
 
 
 
@@ -311,7 +311,7 @@
 
 
 -# cp .config /boot/config-2.6.11-gentoo-r3
+# cp .config /boot/config-2.6.12-gentoo-r10
 
 
 



1.7       +7 -7      xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-medium.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-medium.xml?rev=1.7&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-medium.xml?rev=1.7&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-medium.xml.diff?r1=1.6&r2=1.7&cvsroot=gentoo

Index: hb-install-x86-medium.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-x86-medium.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hb-install-x86-medium.xml	21 Nov 2005 16:38:20 -0000	1.6
+++ hb-install-x86-medium.xml	24 Nov 2005 17:26:11 -0000	1.7
@@ -4,12 +4,12 @@
 
 
 
-
+
 
 
 
-5.3
-2005-11-12
+5.4
+2005-11-24
 
 

 Hardware Requirements
@@ -130,7 +130,7 @@
 You can download the Universal Installation CDs (and, if you want to, the 
 Packages CD as well) from one of our mirrors. The Installation CDs are located in 
-the releases/x86/2005.1/installcd directory;
+the releases/x86/2005.1-r1/installcd directory;
 the Package CDs are located in the releases/x86/2005.1/packagecd
 directory.
 
@@ -219,7 +219,7 @@
 
 
 
-Now place the installation CD in the CD-ROM drive (duh) and reboot. You
+Now place the installation CD in the CD-ROM drive and reboot. You
 should see a boot prompt. At this screen, you can hit Enter to begin the 
 boot process with the default boot options, or boot the Installation CD with 
 custom boot options by specifying a kernel followed by boot options and then
@@ -301,8 +301,8 @@
 immediately press Alt-F1 to switch to verbose mode and follow the prompt. If no
 selection is made in 10 seconds the default (US keyboard) will be accepted and
 the boot process will continue. Once the boot process completes, you will be
-automatically logged in to the "Live" Gentoo Linux as
-"root", the super user. You should have a root ("#") prompt
+automatically logged in to the "Live" Gentoo Linux as
+"root", the super user. You should have a root ("#") prompt
 on the current console and can also switch to other consoles by pressing Alt-F2,
 Alt-F3 and Alt-F4. Get back to the one you started on by pressing Alt-F1.
 



-- 
gentoo-doc-cvs@gentoo.org mailing list