neysx       06/08/02 21:15:52

  Modified:             hb-install-x86+amd64-bootloader.xml
                        hb-install-x86+amd64-disk.xml
                        hb-install-x86+amd64-kernel.xml
                        hb-install-x86+amd64-medium.xml
  Log:
  Merged x86 & amd64

Revision  Changes    Path
1.2                  
xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?r1=1.1&r2=1.2

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hb-install-x86+amd64-bootloader.xml 2 Aug 2006 21:15:02 -0000       1.1
+++ hb-install-x86+amd64-bootloader.xml 2 Aug 2006 21:15:52 -0000       1.2
@@ -4,12 +4,12 @@
 <!-- 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.1 2006/08/02 21:15:02 neysx Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v
 1.2 2006/08/02 21:15:52 neysx Exp $ -->
 
 <sections>
 
-<version>2.13</version>
-<date>2006-05-28</date>
+<version>3.0</version>
+<date>2006-07-26</date>
 
 <section>
 <title>Making your Choice</title>
@@ -21,12 +21,19 @@
 Now that your kernel is configured and compiled and the necessary system
 configuration files are filled in correctly, it is time to install a
 program that will fire up your kernel when you start the system. Such a
-program is called a <e>bootloader</e>. For x86, Gentoo Linux provides <uri
-link="#grub">GRUB</uri> and <uri link="#lilo">LILO</uri>. But before we
-install one of these two bootloaders, we inform you how to configure 
framebuffer
-(assuming you want it of course). With framebuffer you can run the Linux 
command
-line with (limited) graphical features (such as using the nice bootsplash
-image Gentoo provides).
+program is called a <e>bootloader</e>.
+</p>
+
+<p test="func:keyval('arch')='x86'">
+For x86, Gentoo Linux provides <uri
+link="#grub">GRUB</uri> and <uri link="#lilo">LILO</uri>.
+</p>
+
+<p>
+But before we install the bootloader, we inform you how to configure
+framebuffer (assuming you want it of course). With framebuffer you can run the
+Linux command line with (limited) graphical features (such as using the nice
+bootsplash image Gentoo provides).
 </p>
 
 </body>
@@ -37,18 +44,23 @@
 
 <p>
 <e>If</e> you have configured your kernel with framebuffer support (or you used
-<c>genkernel</c>'s default kernel configuration), you can activate it by adding
-a <c>vga</c> and/or a <c>video</c> statement to your bootloader configuration 
+<c>genkernel</c> default kernel configuration), you can activate it by adding a
+<c>vga</c> and/or a <c>video</c> statement to your bootloader configuration
 file.
 </p>
 
-<p>
-First of all you need to know what type of framebuffer device you're using. If
+<p test="func:keyval('arch')='x86'">
+First of all, you need to know what type of framebuffer device you're using. If
 you use a Gentoo patched kernel tree (such as <c>gentoo-sources</c>) you will
 have had the possibility of selecting <c>vesafb-tng</c> as the <e>VESA driver
 type</e> (which is default for these kernel sources). If this is the case, you
-are using <c>vesafb-tng</c> and do not need to set a <c>vga</c> statement.
-Otherwise you are using the <c>vesafb</c> driver and need to set the <c>vga</c>
+are using <c>vesafb-tng</c> and <e>do not need</e> to set a <c>vga</c>
+statement. Otherwise you are using the <c>vesafb</c> driver and <e>need</e> to
+set the <c>vga</c> statement.
+</p>
+
+<p test="func:keyval('arch')='AMD64'">
+64-bit systems must use the the <c>vesafb</c> driver, and need the <c>vga</c>
 statement.
 </p>
 
@@ -56,13 +68,14 @@
 The <c>vga</c> statement controls the resolution and color depth of your
 framebuffer screen for <c>vesafb</c>. As stated in
 <path>/usr/src/linux/Documentation/fb/vesafb.txt</path> (which gets installed
-when you install a kernel source package), you need to pass the VESA number 
+when you install a kernel source package), you need to pass the VESA number
 corresponding to the requested resolution and color depth to it.
 </p>
 
 <p>
-The following table lists the available resolutions and colordepths and matches
-those against the value that you need to pass on to the <c>vga</c> statement.
+The following table lists the available resolutions and color depths and
+matches those against the value that you need to pass on to the <c>vga</c>
+statement.
 </p>
 
 <table>
@@ -107,8 +120,9 @@
 The <c>video</c> statement controls framebuffer display options. It needs to be
 given the framebuffer driver (<c>vesafb</c> for 2.6 kernels, or <c>vesa</c> for
 2.4 kernels) followed by the control statements you wish to enable. All
-variables are listed in 
<path>/usr/src/linux/Documentation/fb/vesafb.txt</path>,
-but we'll inform you about three most-used options:
+variables are listed in
+<path>/usr/src/linux/Documentation/fb/vesafb.txt</path>. The most-used options
+are:
 </p>
 
 <table>
@@ -126,15 +140,15 @@
 <tr>
   <ti>mtrr:n</ti>
   <ti>
-    Setup MTRR registers. <c>n</c> can be:
-    0 - disabled
-    1 - uncachable
-    2 - write-back
-    3 - write-combining
+    Setup MTRR registers. <c>n</c> can be:<br/>
+    0 - disabled<br/>
+    1 - uncachable<br/>
+    2 - write-back<br/>
+    3 - write-combining<br/>
     4 - write-through
   </ti>
 </tr>
-<tr>
+<tr test="func:keyval('arch')='x86'">
   <ti><c>mode</c></ti>
   <ti>
     (<c>vesafb-tng</c> only)<br/>
@@ -145,11 +159,28 @@
 </tr>
 </table>
 
+</body>
+<body test="func:keyval('arch')='AMD64'">
+
+<p>
+The result of those two statements could be something like <c>vga=0x318
+video=vesafb:mtrr:3,ywrap</c>. Write this setting down; you will need it
+shortly.
+</p>
+
+<p>
+While LILO does work on AMD64, Gentoo only supports using GRUB. Now continue by
+its <uri link="#grub">installation</uri>.
+</p>
+
+</body>
+<body test="func:keyval('arch')='x86'">
+
 <p>
 The result of those two statements could be something like <c>vga=0x318
 video=vesafb:mtrr:3,ywrap</c> or
-<c>video=vesafb:mtrr:3,ywrap,[EMAIL PROTECTED]</c>.  Remember (or write down) 
this
-setting; you will need it shortly.
+<c>video=vesafb:mtrr:3,ywrap,[EMAIL PROTECTED]</c>. Write this setting down; 
you
+will need it shortly.
 </p>
 
 <p>
@@ -171,24 +202,24 @@
 GRUB refers to hard drives and partitions. Your Linux partition
 <path>/dev/hda1</path> (for IDE drives) or <path>/dev/sda1</path> (for
 SATA/SCSI drives) will most likely be called <path>(hd0,0)</path> under GRUB.
-Notice the parenthesis around the <path>hd0,0</path> - they are required.
+Notice the parentheses around the <path>hd0,0</path> - they are required.
 </p>
 
 <p>
-Hard drives count from zero rather than "a" and partitions start at zero 
-rather than one. Be aware too that with the hd devices, only hard drives are 
-counted, not atapi-ide devices such as cdrom players and burners.  Also, the 
-same construct is used with SCSI drives. (Normally they get higher numbers 
+Hard drives count from zero rather than "a" and partitions start at zero
+rather than one. Be aware too that with the hd devices, only hard drives are
+counted, not atapi-ide devices such as cdrom players and burners.  Also, the
+same construct is used with SCSI drives. (Normally they get higher numbers
 than IDE drives except when the BIOS is configured to boot from SCSI devices.)
 When you ask the BIOS to boot from a different hard disk (for instance your
 primary slave), <e>that</e> harddisk is seen as <path>hd0</path>.
 </p>
 
 <p>
-Assuming you have a hard drive on <path>/dev/hda</path>, a cdrom player on 
-<path>/dev/hdb</path>, a burner on <path>/dev/hdc</path>, a second hard drive 
-on <path>/dev/hdd</path> and no SCSI hard drive, <path>/dev/hdd7</path> gets 
-translated to <path>(hd1,6)</path>. It might sound tricky and tricky it is 
+Assuming you have a hard drive on <path>/dev/hda</path>, a cdrom player on
+<path>/dev/hdb</path>, a burner on <path>/dev/hdc</path>, a second hard drive
+on <path>/dev/hdd</path> and no SCSI hard drive, <path>/dev/hdd7</path> gets
+translated to <path>(hd1,6)</path>. It might sound tricky and tricky it is
 indeed, but as we will see, GRUB offers a tab completion mechanism
 that comes handy for those of you having a lot of hard drives and
 partitions and who are a little lost in the GRUB numbering scheme.
@@ -214,7 +245,7 @@
 
 <p>
 Although GRUB is now installed, we still need to write up a
-configuration file for it and place GRUB in our MBR so that GRUB automatically 
+configuration file for it and place GRUB in our MBR so that GRUB automatically
 boots your newly created kernel. Create <path>/boot/grub/grub.conf</path> with
 <c>nano</c> (or, if applicable, another editor):
 </p>
@@ -224,17 +255,16 @@
 </pre>
 
 <p>
-Now we are going to write up a <path>grub.conf</path>. Below you'll
-find two possible <path>grub.conf</path> for the partitioning example we use 
-in this guide. We've 
-only extensively commented the first <path>grub.conf</path>. Make sure you use
-<e>your</e> kernel image filename and, if appropriate, <e>your</e> initrd image
-filename.
+Now we are going to write up a <path>grub.conf</path>. Below you'll find two
+possible <path>grub.conf</path> for the partitioning example we use in this
+guide. We've only extensively commented the first <path>grub.conf</path>. Make
+sure you use <e>your</e> kernel image filename and, if appropriate, <e>your</e>
+initrd image filename.
 </p>
 
 <ul>
   <li>
-    The first <path>grub.conf</path> is for people who have not used 
+    The first <path>grub.conf</path> is for people who have not used
     <c>genkernel</c> to build their kernel
   </li>
   <li>
@@ -257,10 +287,10 @@
 # Comment out if you don't have a graphics card installed</comment>
 splashimage=(hd0,0)/boot/grub/splash.xpm.gz
 
-title=Gentoo Linux 2.6.12-r10
+title=Gentoo Linux <keyval id="kernel-version"/>
 <comment># Partition where the kernel image (or operating system) is 
located</comment>
 root (hd0,0)
-kernel /boot/kernel-2.6.12-gentoo-r10 root=/dev/hda3
+kernel /boot/<keyval id="kernel-name"/> root=/dev/hda3
 
 <comment># The next four lines are only if you dualboot with a Windows 
system.</comment>
 <comment># In this case, Windows is hosted on /dev/hda6.</comment>
@@ -275,10 +305,10 @@
 timeout 30
 splashimage=(hd0,0)/boot/grub/splash.xpm.gz
 
-title=Gentoo Linux 2.6.12-r10
+title=Gentoo Linux <keyval id="kernel-version"/>
 root (hd0,0)
-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
+kernel /boot/<keyval id="genkernel-name"/> root=/dev/ram0 init=/linuxrc 
ramdisk=8192 real_root=/dev/hda3 udev
+initrd /boot/<keyval id="genkernel-initrd"/>
 
 <comment># Only in case you want to dual-boot</comment>
 title=Windows XP
@@ -314,8 +344,8 @@
 <p>
 If you need to pass any additional options to the kernel, simply add
 them to the end of the kernel command. We're already passing one option
-(<c>root=/dev/hda3</c> or <c>real_root=/dev/hda3</c>), but you can pass others 
-as well, such as the <c>video</c> and/or <c>vga</c> statements for framebuffer 
+(<c>root=/dev/hda3</c> or <c>real_root=/dev/hda3</c>), but you can pass others
+as well, such as the <c>video</c> and/or <c>vga</c> statements for framebuffer
 as we discussed previously.
 </p>
 
@@ -332,7 +362,7 @@
 </p>
 
 <p>
-Now save the <path>grub.conf</path> file and exit. You still need to install 
+Now save the <path>grub.conf</path> file and exit. You still need to install
 GRUB in the MBR (Master Boot Record) so that GRUB is automatically executed 
when
 you boot your system.
 </p>
@@ -379,8 +409,8 @@
 
 <p>
 If you have more questions regarding GRUB, please consult the <uri
-link="http://www.gnu.org/software/grub/grub-faq.html";>GRUB FAQ</uri> or the 
<uri
-link="http://www.gnu.org/software/grub/manual/";>GRUB Manual</uri>.
+link="http://www.gnu.org/software/grub/grub-faq.html";>GRUB FAQ</uri> or the
+<uri link="http://www.gnu.org/software/grub/manual/";>GRUB Manual</uri>.
 </p>
 
 <p>
@@ -395,7 +425,7 @@
 
 <p>
 To start configuring GRUB, you type in <c>grub</c>. You'll be presented
-with the <path>grub&gt;</path> grub command-line prompt. Now, you need to type 
+with the <path>grub&gt;</path> grub command-line prompt. Now, you need to type
 in the right commands to install the GRUB boot record onto your hard drive.
 </p>
 
@@ -405,17 +435,17 @@
 
 <note>
 If your system does not have any floppy drives, add the <c>--no-floppy</c>
-option to the above command to prevent grub from probing the (non-existing) 
+option to the above command to prevent grub from probing the (non-existing)
 floppy drives.
 </note>
 
 <p>
-In the example configuration we want to install GRUB so that it reads its 
-information from the boot-partition <path>/dev/hda1</path>, and installs the 
-GRUB boot record on the hard drive's MBR (master boot record) so that the first
-thing we see when we turn on the computer is the GRUB prompt. Of course, if you
-haven't followed the example configuration during the installation,
-change the commands accordingly.
+In the example configuration we want to install GRUB so that it reads its
+information from the boot partition <path><keyval id="/boot"/></path>, and
+installs the GRUB boot record on the hard drive's MBR (master boot record) so
+that the first thing we see when we turn on the computer is the GRUB prompt. Of
+course, if you haven't followed the example configuration during the
+installation, change the commands accordingly.
 </p>
 
 <p>
@@ -432,9 +462,9 @@
 </p>
 
 <pre caption="Installing GRUB in the MBR">
-grub&gt; <i>root (hd0,0)</i>          <comment>(Specify where your /boot 
partition resides)</comment>
-grub&gt; <i>setup (hd0)</i>           <comment>(Install GRUB in the 
MBR)</comment>
-grub&gt; <i>quit</i>                  <comment>(Exit the GRUB shell)</comment>
+grub&gt; <i>root (hd0,0)</i>    <comment>(Specify where your /boot partition 
resides)</comment>
+grub&gt; <i>setup (hd0)</i>     <comment>(Install GRUB in the MBR)</comment>
+grub&gt; <i>quit</i>            <comment>(Exit the GRUB shell)</comment>
 </pre>
 
 <note>
@@ -451,12 +481,6 @@
 link="http://www.gnu.org/software/grub/manual/";>GRUB Manual</uri>.
 </p>
 
-<note>
-When you reinstall a kernel, you do not need to copy over the files anymore.
-Just run <c>make install</c> after compiling the kernel; it will automatically
-copy the necessary files and adjust the GRUB configuration.
-</note>
-
 <p>
 Continue with <uri link="#reboot">Rebooting the System</uri>.
 </p>
@@ -464,7 +488,7 @@
 </body>
 </subsection>
 </section>
-<section id="lilo">
+<section id="lilo" test="func:keyval('arch')='x86'">
 <title>Alternative: Using LILO</title>
 <subsection>
 <title>Installing LILO</title>
@@ -484,7 +508,7 @@
 Installing LILO is a breeze; just use <c>emerge</c>.
 </p>
 
-<pre caption = "Installing LILO">
+<pre caption="Installing LILO">
 # <i>emerge lilo</i>
 </pre>
 
@@ -500,14 +524,14 @@
 consistency) and create the file.
 </p>
 
-<pre caption = "Creating /etc/lilo.conf">
+<pre caption="Creating /etc/lilo.conf">
 # <i>nano -w /etc/lilo.conf</i>
 </pre>
 
 <p>
 Some sections ago we have asked you to remember the kernel-image name
 you have created. In the next example <path>lilo.conf</path> we use the
-example partitioning scheme. There are two separate parts: 
+example partitioning scheme. There are two separate parts:
 </p>
 
 <ul>
@@ -526,29 +550,29 @@
 
 <note>
 If your root filesystem is JFS, you <e>must</e> add a <c>append="ro"</c>
-line after each boot item since JFS needs to replay its log before it allows 
+line after each boot item since JFS needs to replay its log before it allows
 read-write mounting.
 </note>
 
-<pre caption = "Example /etc/lilo.conf">
+<pre caption="Example /etc/lilo.conf">
 boot=/dev/hda             <comment># Install LILO in the MBR</comment>
 prompt                    <comment># Give the user the chance to select 
another section</comment>
 timeout=50                <comment># Wait 5 (five) seconds before booting the 
default section</comment>
 default=gentoo            <comment># When the timeout has passed, boot the 
"gentoo" section</comment>
 
 <comment># For non-genkernel users</comment>
-image=/boot/kernel-2.6.12-gentoo-r10
+image=/boot/<keyval id="kernel-name"/>
   label=gentoo            <comment># Name we give to this section</comment>
   read-only               <comment># Start with a read-only root. Do not 
alter!</comment>
   root=/dev/hda3          <comment># Location of the root filesystem</comment>
 
 <comment># For genkernel users</comment>
-image=/boot/kernel-genkernel-x86-2.6.12-gentoo-r10
+image=/boot/<keyval id="genkernel-name"/>
   label=gentoo
   read-only
   root=/dev/ram0
   append="init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev"
-  initrd=/boot/initramfs-genkernel-2.6.12-gentoo-r10
+  initrd=/boot/<keyval id="genkernel-initrd"/>
 
 <comment># The next two lines are only if you dualboot with a Windows 
system.</comment>
 <comment># In this case, Windows is hosted on /dev/hda6.</comment>
@@ -573,8 +597,8 @@
 <c>video</c> statement to enable framebuffer:
 </p>
 
-<pre caption = "Using append to add kernel options">
-image=/boot/kernel-2.6.12-gentoo-r10
+<pre caption="Using append to add kernel options">
+image=/boot/<keyval id="kernel-name"/>
   label=gentoo
   read-only
   root=/dev/hda3
@@ -593,24 +617,22 @@
 should add <c>doscsi</c> as kernel option.
 </p>
 
-
 <p>
 Now save the file and exit. To finish up, you have to run <c>/sbin/lilo</c> so
 LILO can apply the <path>/etc/lilo.conf</path> to your system (i.e. install
-itself on the disk). Keep in mind that you'll also have to rerun
+itself on the disk). Keep in mind that you'll also have to run
 <c>/sbin/lilo</c> every time you install a new kernel or make any changes to
 the menu.
 </p>
 
-<pre caption = "Finishing the LILO installation">
+<pre caption="Finishing the LILO installation">
 # <i>/sbin/lilo</i>
 </pre>
 
-<note>
-When you reinstall a kernel, you do not need to copy over the files anymore.
-Just run <c>make install</c> after compiling the kernel; it will automatically
-copy the necessary files and adjust the LILO configuration.
-</note>
+<p>
+If you have more questions regarding LILO, please consult its <uri
+link="http://en.wikipedia.org/wiki/LILO_(boot_loader)">wikipedia page</uri>.
+</p>
 
 <p>
 You can now continue with <uri link="#reboot">Rebooting the System</uri>.
@@ -625,7 +647,7 @@
 <body>
 
 <p>
-Exit the chrooted environment and unmount all mounted partitions. Then type in 
+Exit the chrooted environment and unmount all mounted partitions. Then type in
 that one magical command you have been waiting for: <c>reboot</c>.
 </p>
 



1.2                  xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml?r1=1.1&r2=1.2

Index: hb-install-x86+amd64-disk.xml
===================================================================
RCS file: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hb-install-x86+amd64-disk.xml       2 Aug 2006 21:15:02 -0000       1.1
+++ hb-install-x86+amd64-disk.xml       2 Aug 2006 21:15:52 -0000       1.2
@@ -4,12 +4,12 @@
 <!-- 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-disk.xml,v 
1.1 2006/08/02 21:15:02 neysx Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml,v 
1.2 2006/08/02 21:15:52 neysx Exp $ -->
 
 <sections>
 
-<version>2.5</version>
-<date>2006-01-01</date>
+<version>2.6</version>
+<date>2006-07-26</date>
 
 <section>
 <title>Introduction to Block Devices</title>
@@ -49,8 +49,8 @@
 <p>
 Although it is theoretically possible to use a full disk to house your Linux
 system, this is almost never done in practice. Instead, full disk block devices
-are split up in smaller, more manageable block devices. On x86 systems,
-these are called <e>partitions</e>. 
+are split up in smaller, more manageable block devices. On <keyval id="arch"/>
+systems, these are called <e>partitions</e>. 
 </p>
 
 <p>
@@ -86,10 +86,10 @@
 <body>
 
 <p>
-The x86 Installation CDs provide support for EVMS and LVM2. EVMS and LVM2 
-increase the flexibility offered by your partitioning setup. During the 
-installation instructions, we will focus on "regular" partitions, but it is 
-still good to know EVMS and LVM2 are supported as well.
+The <keyval id="arch"/> Installation CDs provide support for EVMS and LVM2.
+EVMS and LVM2 increase the flexibility offered by your partitioning setup.
+During the installation instructions, we will focus on "regular" partitions,
+but it is still good to know EVMS and LVM2 are supported as well.
 </p>
 
 </body>
@@ -185,10 +185,10 @@
 </ul>
 
 <p>
-However, multiple partitions have one big disadvantage: if not configured 
-properly, you might result in having a system with lots
-of free space on one partition and none on another. There is also a 
15-partition
-limit for SCSI and SATA.
+However, multiple partitions have one big disadvantage: if not configured
+properly, you might result in having a system with lots of free space on one
+partition and none on another. There is also a 15-partition limit for SCSI and
+SATA.
 </p>
 
 <p>
@@ -305,9 +305,9 @@
 </pre>
 
 <p>
-This particular disk is configured to house seven Linux filesystems (each with 
a
-corresponding partition listed as "Linux") as well as a swap partition (listed
-as "Linux swap"). 
+This particular disk is configured to house seven Linux filesystems (each with
+a corresponding partition listed as "Linux") as well as a swap partition
+(listed as "Linux swap"). 
 </p>
 
 </body>
@@ -463,7 +463,6 @@
 /dev/hda3         82      3876  28690200   83  Linux
 </pre>
 
-
 </body>
 </subsection>
 <subsection>
@@ -506,12 +505,19 @@
 <title>Filesystems?</title>
 <body>
 
-<p>
+<p test="func:keyval('arch')='x86'">
 The Linux kernel supports various filesystems. We'll explain ext2, ext3,
 ReiserFS, XFS and JFS as these are the most commonly used filesystems on Linux
 systems.
 </p>
 
+<p test="func:keyval('arch')='AMD64'">
+Several filesystems are available. Some of them are found stable on the amd64
+architecture, others aren't. The following filesystems are found to be stable:
+ext2 and ext3. jfs and reiserfs may work but need more testing. If you're
+really adventurous you can try the unsupported filesystems.
+</p>
+
 <p>
 <b>ext2</b> is the tried and true Linux filesystem but doesn't have metadata
 journaling, which means that routine ext2 filesystem checks at startup time can
@@ -580,7 +586,7 @@
 </tr>
 <tr>
   <ti>ext3</ti>
-  <ti><c>mke2fs -j</c></ti>
+  <ti><c>mke2fs -j -O dir_index</c></ti>
 </tr>
 <tr>
   <ti>reiserfs</ti>
@@ -604,7 +610,7 @@
 
 <pre caption="Applying a filesystem on a partition">
 # <i>mke2fs /dev/hda1</i>
-# <i>mke2fs -j /dev/hda3</i>
+# <i>mke2fs -j -O dir_index /dev/hda3</i>
 </pre>
 
 <p>



1.2                  xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml?r1=1.1&r2=1.2

Index: hb-install-x86+amd64-kernel.xml
===================================================================
RCS file: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hb-install-x86+amd64-kernel.xml     2 Aug 2006 21:15:02 -0000       1.1
+++ hb-install-x86+amd64-kernel.xml     2 Aug 2006 21:15:52 -0000       1.2
@@ -4,12 +4,12 @@
 <!-- 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-kernel.xml,v
 1.1 2006/08/02 21:15:02 neysx Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml,v
 1.2 2006/08/02 21:15:52 neysx Exp $ -->
 
 <sections>
 
-<version>3.13</version>
-<date>2006-07-20</date>
+<version>3.14</version>
+<date>2006-07-26</date>
 
 <section>
 <title>Timezone</title>
@@ -45,13 +45,19 @@
 Guide</uri>. 
 </p>
 
-<p>
+<p test="func:keyval('arch')='x86'">
 For x86-based systems we have, amongst other kernels, <c>vanilla-sources</c>
 (the default kernel source as developed by the linux-kernel developers),
 <c>gentoo-sources</c> (kernel source patched with performance-enhancing
 features), ...
 </p>
 
+<p test="func:keyval('arch')='AMD64'">
+For AMD64-based systems we have <c>gentoo-sources</c> (kernel v2.6 source
+patched with amd64 specific fixes for stability, performance and hardware
+support).
+</p>
+
 <p>
 Choose your kernel source and install it using <c>emerge</c>. The
 <c>USE="-doc"</c> is necessary to avoid installing xorg-x11 or other
@@ -67,20 +73,20 @@
 <p>
 When you take a look in <path>/usr/src</path> you should see a symlink called
 <path>linux</path> pointing to your kernel source. In this case, the installed
-kernel source points to <c>gentoo-sources-2.6.12-r10</c>. Your version may be
-different, so keep this in mind.
+kernel source points to <c>gentoo-sources-<keyval id="kernel-version"/></c>.
+Your version may be different, so keep this in mind.
 </p>
 
 <pre caption="Viewing the kernel source symlink">
 # <i>ls -l /usr/src/linux</i>
-lrwxrwxrwx    1 root     root      12 Oct 13 11:04 /usr/src/linux -&gt; 
linux-2.6.12-gentoo-r10
+lrwxrwxrwx    1 root   root    12 Oct 13 11:04 /usr/src/linux -&gt; 
linux-<keyval id="kernel-version"/>
 </pre>
 
 <p>
-Now it is time to configure and compile your kernel source. You 
-can use <c>genkernel</c> for this, which will build a generic kernel as used 
-by the Installation CD. We explain the "manual" configuration first though, as 
-it is the best way to optimize your environment.
+Now it is time to configure and compile your kernel source. You can use
+<c>genkernel</c> for this, which will build a generic kernel as used by the
+Installation CD. We explain the "manual" configuration first though, as it is
+the best way to optimize your environment.
 </p>
 
 <p>
@@ -144,7 +150,7 @@
 You need this, otherwise some very important code/drivers won't show up:
 </p>
 
-<pre caption="Selecting experimental code/drivers, General setup">
+<pre caption="Selecting experimental code/drivers">
 Code maturity level options ---&gt;
   [*] Prompt for development and/or incomplete code/drivers
 </pre>
@@ -155,6 +161,30 @@
 otherwise your system will not be able to boot completely.
 </p>
 
+</body>
+<body test="func:keyval('arch')='AMD64'">
+
+<p>
+We shall then select the exact processor type. The x86_64 kernel maintainer
+strongly recommends users enable MCE features so that they are able to be
+notified of any hardware problems. On x86_64, these errors are not printed to
+<c>dmesg</c> like on other architectures, but to <path>/dev/mcelog</path>. This
+requires the <c>app-admin/mcelog</c> package.
+</p>
+
+<pre caption="Selecting processor type and features">
+Processor type and features  --->
+   [ ] Intel MCE Features
+   [ ] AMD MCE Features
+  Processor family (AMD-Opteron/Athlon64)  --->
+    ( ) AMD-Opteron/Athlon64
+    ( ) Intel EM64T
+    ( ) Generic-x86-64
+</pre>
+
+</body>
+<body test="func:keyval('arch')='x86'">
+
 <p>
 Now select the correct processor family:
 </p>
@@ -165,11 +195,21 @@
   (<i>Athlon/Duron/K7</i>) Processor family
 </pre>
 
+</body>
+<body>
+
 <p>
 Now go to <c>File Systems</c> and select support for the filesystems you use.
 <e>Don't</e> compile them as modules, otherwise your Gentoo system will not be
 able to mount your partitions. Also select <c>Virtual memory</c> and <c>/proc
-file system</c>. If you are using a 2.4 kernel, you need to select <c>/dev file
+file system</c>.
+</p>
+
+</body>
+<body test="func:keyval('arch')='x86'">
+
+<p>
+If you are using a 2.4 kernel, you need to select <c>/dev file
 system</c> as 2.4 kernels do not support <c>udev</c>.
 </p>
 
@@ -197,9 +237,9 @@
 </pre>
 
 <p>
-If your BIOS can't handle large harddrives and you jumpered the harddrive to
-report a limited size you have to enable the following option to gain access
-to your whole harddrive:
+If your BIOS can't handle large hard drives and you jumpered the hard drive to
+report a limited size you have to enable the following option to gain access to
+your whole hard drive:
 </p>
 
 <pre caption="Selecting autogeometry resizing support">
@@ -211,6 +251,26 @@
     [*]     Auto-Geometry Resizing support
 </pre>
 
+</body>
+<body test="func:keyval('arch')='AMD64'">
+
+<pre caption="Selecting necessary file systems">
+File systems ---&gt;
+  Pseudo Filesystems ---&gt;
+    [*] /proc file system support
+    [*] Virtual memory file system support (former shm fs)
+
+<comment>(Select one or more of the following options as needed by your 
system)</comment>
+  &lt;*&gt; Reiserfs support
+  &lt;*&gt; Ext3 journalling file system support
+  &lt;*&gt; JFS filesystem support
+  &lt;*&gt; Second extended fs support
+  &lt;*&gt; XFS filesystem support
+</pre>
+
+</body>
+<body>
+
 <p>
 Do not forget to enable DMA for your drives:
 </p>
@@ -227,7 +287,15 @@
 modem, you will need the following options in the kernel:
 </p>
 
-<pre caption="Selecting PPPoE necessary drivers">
+<pre caption="Selecting PPPoE necessary drivers" 
test="func:keyval('arch')='AMD64'">
+Device Drivers ---&gt;
+  Networking Support ---&gt;
+    &lt;*&gt; PPP (point-to-point protocol) support
+    &lt;*&gt;   PPP support for async serial ports
+    &lt;*&gt;   PPP support for sync tty ports
+</pre>
+
+<pre caption="Selecting PPPoE necessary drivers" 
test="func:keyval('arch')='x86'">
 <comment>(With a 2.4.x kernel)</comment>
 Network device support ---&gt;
   &lt;*&gt; PPP (point-to-point protocol) support
@@ -253,11 +321,16 @@
 ethernet card.
 </p>
 
-<p>
+<p test="func:keyval('arch')='x86'">
 If you have an Intel CPU that supports HyperThreading (tm), or you have a
 multi-CPU system, you should activate "Symmetric multi-processing support":
 </p>
 
+<p test="func:keyval('arch')='AMD64'">
+If you have a multi-CPU Opteron or a multi-core (e.g. AMD64 X2) system, you
+should activate "Symmetric multi-processing support":
+</p>
+
 <pre caption="Activating SMP support">
 Processor type and features  ---&gt;
   [*] Symmetric multi-processing support
@@ -273,10 +346,14 @@
 </p>
 
 <pre caption="Activating USB Support for Input Devices">
-USB Support ---&gt;
-  &lt;*&gt;   USB Human Interface Device (full HID) support
+Device Drivers ---&gt;
+  USB Support ---&gt;
+    &lt;*&gt;   USB Human Interface Device (full HID) support
 </pre>
 
+</body>
+<body test="func:keyval('arch')='x86'">
+
 <p>
 Laptop-users who want PCMCIA support should <e>not</e> use the PCMCIA drivers 
if
 they choose to use a 2.4 kernel. More recent drivers are available through the
@@ -321,7 +398,7 @@
 the configuration and start the compilation process:
 </p>
 
-<pre caption="Compiling the kernel">
+<pre caption="Compiling the kernel" test="func:keyval('arch')='x86'">
 <comment>(For 2.4 kernel)</comment>
 # <i>make dep &amp;&amp; make bzImage modules modules_install</i>
 
@@ -329,16 +406,20 @@
 # <i>make &amp;&amp; make modules_install</i>
 </pre>
 
+<pre caption="Compiling the kernel" test="func:keyval('arch')='AMD64'">
+# <i>make &amp;&amp; make modules_install</i>
+</pre>
+
 <p>
 When the kernel has finished compiling, copy the kernel image to
 <path>/boot</path>. Use whatever name you feel is appropriate for your kernel
 choice and remember it as you will need it later on when you configure your
-bootloader. Remember to replace <path>&lt;kernel-version&gt;</path> with the 
name and
-version of your kernel.
+bootloader. Remember to replace <c><keyval id="kernel-name"/></c> with the
+name and version of your kernel.
 </p>
 
 <pre caption="Installing the kernel">
-# <i>cp arch/i386/boot/bzImage /boot/&lt;kernel-version&gt;</i>
+# <i>cp arch/<keyval id="arch-sub"/>/boot/bzImage /boot/<keyval 
id="kernel-name"/></i>
 </pre>
 
 <p>
@@ -376,6 +457,9 @@
 # <i>emerge genkernel</i>
 </pre>
 
+</body>
+<body test="func:keyval('arch')='x86'">
+
 <p>
 Next, if you are going to configure a 2.6 kernel, copy over the kernel 
 configuration used by the Installation CD to the location where genkernel 
@@ -387,6 +471,9 @@
 # <i>zcat /proc/config.gz &gt; /usr/share/genkernel/x86/kernel-config-2.6</i>
 </pre>
 
+</body>
+<body>
+
 <p>
 Now, compile your kernel sources by running <c>genkernel all</c>. Be aware
 though, as <c>genkernel</c> compiles a kernel that supports almost all
@@ -439,34 +526,37 @@
 <title>Configuring the Modules</title>
 <body>
 
+<note test="func:keyval('arch')='x86'">
+If you chose a kernel 2.4, replace occurrences of <c>2.6</c> with <c>2.4</c> in
+this section.
+</note>
+
 <p>
-You should list the modules you want automatically loaded in 
-<path>/etc/modules.autoload.d/kernel-2.4</path> (or <path>kernel-2.6</path>). 
-You can add extra options to the modules too if you want.
+You should list the modules you want automatically loaded in
+<path>/etc/modules.autoload.d/kernel-2.6</path>. You can add extra options to
+the modules too if you want.
 </p>
 
 <p>
 To view all available modules, run the following <c>find</c> command. Don't
-forget to substitute "&lt;kernel version&gt;" with the version of the kernel 
you
-just compiled:
+forget to substitute <c><keyval id="kernel-version"/></c> with the version of
+the kernel you just compiled:
 </p>
 
 <pre caption="Viewing all available modules">
-# <i>find /lib/modules/&lt;kernel version&gt;/ -type f -iname '*.o' -or -iname 
'*.ko'</i>
+# <i>find /lib/modules/<keyval id="kernel-version"/>/ -type f -iname '*.o' -or 
-iname '*.ko'</i>
 </pre>
 
 <p>
 For instance, to automatically load the <c>3c59x.o</c> module, edit the
-<path>kernel-2.4</path> or <path>kernel-2.6</path> file and enter the module
-name in it.
+<path>kernel-2.6</path> file and enter the module name in it.
 </p>
 
-<pre caption="Editing /etc/modules.autoload.d/kernel-2.4">
-<comment>(Example for 2.4 kernels)</comment>
-# <i>nano -w /etc/modules.autoload.d/kernel-2.4</i>
+<pre caption="Editing /etc/modules.autoload.d/kernel-2.6">
+# <i>nano -w /etc/modules.autoload.d/kernel-2.6</i>
 </pre>
 
-<pre caption="/etc/modules.autoload.d/kernel-2.4 or kernel-2.6">
+<pre caption="/etc/modules.autoload.d/kernel-2.6">
 3c59x
 </pre>
 



1.2                  xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml?r1=1.1&r2=1.2

Index: hb-install-x86+amd64-medium.xml
===================================================================
RCS file: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hb-install-x86+amd64-medium.xml     2 Aug 2006 21:15:02 -0000       1.1
+++ hb-install-x86+amd64-medium.xml     2 Aug 2006 21:15:52 -0000       1.2
@@ -4,12 +4,12 @@
 <!-- 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-medium.xml,v
 1.1 2006/08/02 21:15:02 neysx Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml,v
 1.2 2006/08/02 21:15:52 neysx Exp $ -->
 
 <sections>
 
-<version>2.11</version>
-<date>2006-07-19</date>
+<version>2.12</version>
+<date>2006-07-26</date>
 
 <section>
 <title>Hardware Requirements</title>
@@ -26,7 +26,7 @@
 </subsection>
 <subsection>
 <title>Hardware Requirements</title>
-<body>
+<body test="func:keyval('arch')='x86'">
 
 <table>
 <tr>
@@ -55,6 +55,33 @@
 </table>
 
 </body>
+<body test="func:keyval('arch')='AMD64'">
+
+<table>
+<tr>
+  <th>CPU</th>
+  <ti>Any AMD64 CPU</ti>
+</tr>
+<tr>
+  <th>Memory</th>
+  <ti>64 MB</ti>
+</tr>
+<tr>
+  <th>Diskspace</th>
+  <ti>1.5 GB (excluding swap space)</ti>
+</tr>
+<tr>
+  <th>Swap space</th>
+  <ti>At least 256 MB</ti>
+</tr>
+</table>
+
+<p>
+You should check the <uri link="/proj/en/base/amd64/">Gentoo
+AMD64 Project Page</uri> before proceeding.
+</p>
+
+</body>
 </subsection>
 </section>
 <!-- This part can be propagated to the other architectures as well. -->
@@ -80,15 +107,21 @@
 latest version of the available packages.
 </p>
 
-<impo>
+<impo test="func:keyval('arch')='x86'">
 If you wish to install Gentoo without a working Internet connection or would
 like to use one of the provided installers, please use the installation
-instructions described in the <uri link="2006.0/index.xml">Gentoo 2006.0
+instructions described in the <uri link="2006.0/">Gentoo 2006.0
 Handbooks</uri>.
 </impo>
 
+<impo test="func:keyval('arch')='AMD64'">
+If you wish to install Gentoo without a working Internet connection, please use
+the installation instructions described in the <uri link="2006.0/">Gentoo
+2006.0 Handbooks</uri>.
+</impo>
+
 <p>
-The two Installation CDs that we currently provide are:
+The Installation CDs that we currently provide are:
 </p>
 
 <ul>
@@ -97,12 +130,17 @@
     CD which sole purpose is to boot the system, prepare the networking and 
     continue with the Gentoo installation.
   </li>
-  <li>
+  <li test="func:keyval('arch')='x86'">
     The Gentoo <e>Installer LiveCD</e> contains everything you need to install
     Gentoo. It provides a graphical environment, a graphical as well as console
     based installer which automatically carries out the installation for you,
     and of course, the installation instructions for your architecture.
   </li>
+  <li test="func:keyval('arch')='AMD64'">
+    The Gentoo <e>Universal</e> Installation CD, a bootable CD with the same
+    abilities as the Minimal Installation CD. Additionally, it contains the
+    stage3 tarball. 
+  </li>
 </ul>
 
 <p>
@@ -113,13 +151,14 @@
 </body>
 </subsection>
 <subsection>
-<title>Gentoo's Minimal Installation CD</title>
+<title>Gentoo Minimal Installation CD</title>
 <body>
 
 <p>
-The Minimal Installation CD is called <c>install-x86-minimal-2006.0.iso</c> 
-and takes up only 49 MB of diskspace. You can use this Installation CD to 
-install Gentoo, but always with a working Internet connection only.
+The Minimal Installation CD is called <c><keyval id="min-cd-name"/></c> and
+takes up only <keyval id="min-cd-size"/> MB of diskspace. You can use this
+Installation CD to install Gentoo, but <e>only</e> with a working Internet
+connection.
 </p>
 
 <table>
@@ -134,24 +173,24 @@
 <tr>
   <th>-</th>
   <ti>
-    Contains no stage3 tarball, no Portage snapshot, no prebuilt packages and 
is
-    therefore not suitable for networkless installation
+    Contains no stage3 tarball, no Portage snapshot, no prebuilt packages and
+    is therefore not suitable for networkless installation
   </ti>
 </tr>
 </table>
 
 </body>
 </subsection>
-<subsection>
-<title>Gentoo's Installer LiveCD</title>
+<subsection test="func:keyval('arch')='x86'">
+<title>Gentoo Installer LiveCD</title>
 <body>
 
 <p>
-The Installer LiveCD is called
-<c>livecd-i686-installer-2006.0.iso</c> and takes up 697 MB. You can use
-this Installation CD to install Gentoo, and you can even use it to install
-Gentoo without a working internet connection, just in case you want to bring
-Gentoo to another PC than the one you are currently installing Gentoo on :)
+The Installer LiveCD is called <c><keyval id="live-cd-name"/></c> and takes up
+<keyval id="live-cd-size"/> MB. You can use this Installation CD to install
+Gentoo, and you can even use it to install Gentoo without a working internet
+connection, just in case you want to bring Gentoo to another PC than the one
+you are currently installing Gentoo on.
 </p>
 
 <table>
@@ -174,8 +213,39 @@
 
 </body>
 </subsection>
-<!-- PackageCDs on x86 are outdated
-<subsection>
+<subsection test="func:keyval('arch')='AMD64'">
+<title>Gentoo Universal Installation CD</title>
+<body>
+
+<p>
+The Universal Installation CD is called <c><keyval id="uni-cd-name"/></c> and
+takes up <keyval id="uni-cd-size"/> MB. You can use this Installation CD to
+install Gentoo, and you can even use it to install Gentoo without a working
+internet connection, just in case you want to bring Gentoo to another PC than
+the one you are currently installing Gentoo on.
+</p>
+
+<table>
+<tr>
+  <th>Universal Installation CD</th>
+  <th>Pros and Cons</th>
+</tr>
+<tr>
+  <th>+</th>
+  <ti>
+    Contains everything you need. You can even install without a network
+    connection.
+  </ti>
+</tr>
+<tr>
+  <th>-</th>
+  <ti>Huge download</ti>
+</tr>
+</table>
+
+</body>
+</subsection>
+<subsection test="func:keyval('arch')='AMD64'">
 <title>Other CDs</title>
 <body>
 
@@ -194,16 +264,16 @@
 </p>
 
 </body>
-</subsection>-->
+</subsection>
 <subsection>
 <title>The Stage3 Tarball</title>
 <body>
 
 <p>
-A stage3 tarball is an archive containing a minimal Gentoo environment, 
suitable
-to continue the Gentoo installation using the instructions in this manual.
-Previously, the Gentoo Handbook described the installation using one of three 
-stage tarballs. While Gentoo still offers stage1 and stage2 tarballs, the 
+A stage3 tarball is an archive containing a minimal Gentoo environment,
+suitable to continue the Gentoo installation using the instructions in this
+manual. Previously, the Gentoo Handbook described the installation using one of
+three stage tarballs. While Gentoo still offers stage1 and stage2 tarballs, the
 official installation method uses the stage3 tarball. If you are interested in
 performing a Gentoo installation using a stage1 or stage2 tarball, please read
 the Gentoo FAQ on <uri link="/doc/en/faq.xml#stage12">How do I Install Gentoo
@@ -211,9 +281,10 @@
 </p>
 
 <p>
-Stage3 tarballs can be downloaded from <path>releases/x86/2006.0/stages/</path>
-on any of the <uri link="/main/en/mirrors.xml">Official Gentoo Mirrors</uri>
-and are not provided on the LiveCD.
+Stage3 tarballs can be downloaded from <path><keyval
+id="release-dir"/>stages/</path> on any of the <uri
+link="/main/en/mirrors.xml">Official Gentoo Mirrors</uri> and are not provided
+on the LiveCD.
 </p>
 
 </body>
@@ -232,11 +303,17 @@
 the several available Installation CDs, but where can you find them? 
 </p>
 
-<p>
+<p test="func:keyval('arch')='x86'">
+You can download any of the Installation CDs from one of our <uri
+link="/main/en/mirrors.xml">mirrors</uri>. The Installation CDs are located in
+the <path><keyval id="release-dir"/>installcd/</path> directory.
+</p>
+
+<p test="func:keyval('arch')='AMD64'">
 You can download any of the Installation CDs (and, if you want to, a Packages
 CD as well) from one of our <uri link="/main/en/mirrors.xml">mirrors</uri>. The
-Installation CDs are located in the <path>releases/x86/2006.0/installcd</path> 
-directory.
+Installation CDs are located in the <path><keyval
+id="release-dir"/>installcd/</path> directory.
 </p>
 
 <p>
@@ -247,7 +324,7 @@
 <p>
 In case you wonder if your downloaded file is corrupted or not, you can check
 its MD5 checksum and compare it with the MD5 checksum we provide (such as
-<path>install-x86-minimal-2006.0.iso.DIGESTS</path>). You can check the MD5
+<path><keyval id="min-cd-name"/>.DIGESTS</path>). You can check the MD5
 checksum with the <c>md5sum</c> tool under Linux/Unix or <uri
 link="http://www.etree.org/md5com.html";>md5sum</uri> for Windows.
 </p>
@@ -296,13 +373,8 @@
 <title>Booting the Installation CD</title>
 <body>
 
-<impo>
-Read this whole subsection before continuing, as you will probably not have the
-opportunity to read it before doing things later.
-</impo>
-
 <p>
-Once you have burned your installation CD, it is time to boot it.
+Once you have burnt your installation CD, it is time to boot it.
 Remove all CDs from your CD drives, reboot your system and enter the BIOS. 
 This is usually done by hitting DEL, F1 or ESC, depending on your BIOS. Inside 
 the BIOS, change the boot order so that the CD-ROM is tried before the hard 
@@ -311,11 +383,10 @@
 </p>
 
 <p>
-Now place the installation CD in the CD-ROM drive (duh) 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
-hitting Enter.
+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 hitting Enter.
 </p>
 
 <p>
@@ -328,6 +399,9 @@
 Below you'll find a short overview on the available kernels:
 </p>
 
+</body>
+<body test="func:keyval('arch')='x86'">
+
 <table>
 <tr>
   <th>Kernel</th>
@@ -347,6 +421,26 @@
 </tr>
 </table>
 
+</body>
+<body test="func:keyval('arch')='AMD64'">
+<table>
+<tr>
+  <th>Kernel</th>
+  <th>Description</th>
+</tr>
+<tr>
+  <ti>gentoo</ti>
+  <ti>Default kernel with support for K8 CPUs with NUMA</ti>
+</tr>
+<tr>
+  <ti>gentoo-nofb</ti>
+  <ti>Same as <c>gentoo</c> but without framebuffer support</ti>
+</tr>
+</table>
+
+</body>
+<body>
+
 <p>
 You can also provide kernel options. They represent optional settings you can
 (de)activate at will. The following list is the same as the one you receive
@@ -388,15 +482,15 @@
 </pre>
 
 <p>
-You will then be greeted with a boot screen and progress bar. If you are 
+You will then be greeted with a boot screen and progress bar. If you are
 installing Gentoo on a system with a non-US keyboard, make sure you 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
+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 &quot;Live&quot; Gentoo Linux as
-&quot;root&quot;, the super user. You should have a root (&quot;#&quot;) 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.
+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.
 </p>
 
 <p>
@@ -410,12 +504,12 @@
 <body>
 
 <p>
-When the Installation CD boots, it tries to detect all your hardware devices 
and
-loads the appropriate kernel modules to support your hardware. In the
-vast majority of cases, it does a very good job. However, in some cases
-it may not auto-load the kernel modules you need. If the PCI auto-detection 
-missed some of your system's hardware, you will have to load the appropriate
-kernel modules manually. 
+When the Installation CD boots, it tries to detect all your hardware devices
+and loads the appropriate kernel modules to support your hardware. In the vast
+majority of cases, it does a very good job. However, in some cases it may not
+auto-load the kernel modules you need. If the PCI auto-detection missed some of
+your system's hardware, you will have to load the appropriate kernel modules
+manually. 
 </p>
 
 <p>
@@ -459,8 +553,11 @@
 </p>
 
 <pre caption="Tweaking hard disk performance">
-<comment>Activate DMA:</comment>                       # <i>hdparm -d 1 
/dev/hda</i>
-<comment>Activate Safe Performance Options:</comment>  # <i>hdparm -d 1 -A 1 
-m 16 -u 1 -a 64 /dev/hda</i>
+<comment>(Activate DMA:)</comment>
+# <i>hdparm -d 1 /dev/hda</i>
+
+<comment>(Activate Safe Performance Options:)</comment>
+# <i>hdparm -d 1 -A 1 -m 16 -u 1 -a 64 /dev/hda</i>
 </pre>
 
 </body>
@@ -489,7 +586,7 @@
 <p>
 To create a user account, we first enter their credentials, followed by
 its password. We use <c>useradd</c> and <c>passwd</c> for these tasks.
-In the next example, we create a user called &quot;john&quot;.
+In the next example, we create a user called "john".
 </p>
 
 <pre caption="Creating a user account">
@@ -539,7 +636,7 @@
 </p>
 
 <pre caption="Viewing the Online Documentation">
-# <i>links http://www.gentoo.org/doc/en/handbook/handbook-x86.xml</i>
+# <i>links http://www.gentoo.org/doc/en/handbook/<keyval id="online-book"/></i>
 </pre>
 
 <p>



-- 
[email protected] mailing list

Reply via email to