[patch] Combined patchset

handbook.patch (text/plain), 9.12 KB, created by Sven Vermeulen on 2011-06-02 19:02:49 UTC

Index: hb-install-alpha-kernel.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-alpha-kernel.xml,v
retrieving revision 1.46
diff -u -t -r1.46 hb-install-alpha-kernel.xml
--- hb-install-alpha-kernel.xml	1 Apr 2008 08:53:46 -0000	1.46
+++ hb-install-alpha-kernel.xml	2 Jun 2011 18:56:44 -0000
@@ -319,7 +319,7 @@
 
 <p>
 Once <c>genkernel</c> completes, a kernel, full set of modules and <e>initial
-root disk</e> (initrd) will be created. We will use the kernel and initrd when
+ram disk</e> (initrd) will be created. We will use the kernel and initrd when
 configuring a boot loader later in this document. Write down the names of the
 kernel and initrd as you will need it when writing the bootloader configuration
 file. The initrd will be started immediately after booting to perform hardware
Index: hb-install-bootconfig.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-bootconfig.xml,v
retrieving revision 1.5
diff -u -t -r1.5 hb-install-bootconfig.xml
--- hb-install-bootconfig.xml	28 Aug 2010 23:52:33 -0000	1.5
+++ hb-install-bootconfig.xml	2 Jun 2011 18:56:44 -0000
@@ -108,7 +108,7 @@
 <p>
 If you want to view the Gentoo Handbook during the installation, make sure you
 have created a user account (see <uri link="#useraccounts">Optional: User
-Accounts</uri>). Then press <c>Alt-F2</c> to go to a new terminal and log in.
+Accounts</uri>). Then press <c>Alt-F2</c> to go to a new terminal.
 </p>
 
 <p>
Index: hb-install-hppa-kernel.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-hppa-kernel.xml,v
retrieving revision 1.47
diff -u -t -r1.47 hb-install-hppa-kernel.xml
--- hb-install-hppa-kernel.xml	20 Jul 2010 00:05:24 -0000	1.47
+++ hb-install-hppa-kernel.xml	2 Jun 2011 18:56:44 -0000
@@ -318,7 +318,7 @@
 
 <p>
 Once <c>genkernel</c> completes, a kernel, full set of modules and 
-<e>initial root disk</e> (initrd) will be created. We will use the kernel 
+<e>initial ram disk</e> (initrd) will be created. We will use the kernel 
 and initrd when configuring a boot loader later in this document. Write
 down the names of the kernel and initrd as you will need it when writing
 the bootloader configuration file. The initrd will be started immediately after 
Index: hb-install-ia64-kernel.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-ia64-kernel.xml,v
retrieving revision 1.20
diff -u -t -r1.20 hb-install-ia64-kernel.xml
--- hb-install-ia64-kernel.xml	20 Jul 2010 05:14:55 -0000	1.20
+++ hb-install-ia64-kernel.xml	2 Jun 2011 18:56:44 -0000
@@ -310,7 +310,7 @@
 
 <p>
 Once <c>genkernel</c> completes, a kernel, full set of modules and 
-<e>initial root disk</e> (initrd) will be created. We will use the kernel 
+<e>initial ram disk</e> (initrd) will be created. We will use the kernel 
 and initrd when configuring a boot loader later in this document. Write
 down the names of the kernel and initrd as you will need it when writing
 the bootloader configuration file. The initrd will be started immediately after 
Index: hb-install-kernelmodules.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-kernelmodules.xml,v
retrieving revision 1.2
diff -u -t -r1.2 hb-install-kernelmodules.xml
--- hb-install-kernelmodules.xml	28 Mar 2009 09:15:34 -0000	1.2
+++ hb-install-kernelmodules.xml	2 Jun 2011 18:56:44 -0000
@@ -13,7 +13,7 @@
 
 <p>
 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
+<path>/etc/conf.d/modules</path>. You can add extra options to
 the modules too if you want.
 </p>
 
@@ -28,16 +28,14 @@
 </pre>
 
 <p>
-For instance, to automatically load the <c>3c59x.ko</c> module, edit the
-<path>kernel-2.6</path> file and enter the module name in it.
+For instance, to automatically load the <c>3c59x.ko</c> module (which is the
+driver for a specific 3Com network card family), edit the
+<path>/etc/conf.d/modules</path> file and enter the module name in it.
 </p>
 
-<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.6">
-3c59x
+<pre caption="Editing /etc/conf.d/modules">
+# <i>nano -w /etc/conf.d/modules</i>
+modules_2_6="<i>3c59x</i>"
 </pre>
 
 <p>
Index: hb-install-ppc-kernel.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-ppc-kernel.xml,v
retrieving revision 1.64
diff -u -t -r1.64 hb-install-ppc-kernel.xml
--- hb-install-ppc-kernel.xml	5 Sep 2010 01:57:09 -0000	1.64
+++ hb-install-ppc-kernel.xml	2 Jun 2011 18:56:44 -0000
@@ -406,7 +406,7 @@
 
 <p>
 Once <c>genkernel</c> completes, a kernel, full set of modules and
-<e>initial root disk</e> (initrd) will be created. We will use the kernel
+<e>initial ram disk</e> (initrd) will be created. We will use the kernel
 and initrd when configuring a boot loader later in this document. Write
 down the names of the kernel and initrd as you will need them when writing
 the bootloader configuration file. The initrd will be started immediately after
Index: hb-install-stage.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml,v
retrieving revision 1.122
diff -u -t -r1.122 hb-install-stage.xml
--- hb-install-stage.xml	28 Aug 2010 23:42:23 -0000	1.122
+++ hb-install-stage.xml	2 Jun 2011 18:56:45 -0000
@@ -95,7 +95,8 @@
 Depending on your installation medium, you have a couple of tools available to
 download a stage. If you have <c>links</c> available, then you can immediately
 surf to <uri link="/main/en/mirrors.xml">the Gentoo mirrorlist</uri> and 
-choose a mirror close to you.
+choose a mirror close to you: type <c>links http://www.gentoo.org/main/en/mirrors.xml</c>
+and press enter.
 </p>
 
 <p>
@@ -114,11 +115,12 @@
 </p>
 
 <p>
-Move to the <path><keyval id="release-dir"/></path> directory. There you
-should see all available stage files for your architecture (they might be
-stored within subdirectories named after the individual subarchitectures).
-Select one and press <c>D</c> to download. When you're finished, press <c>Q</c>
-to quit the browser.
+Select a mirror closeby. Usually HTTP mirrors suffice, but other protocols are
+available as well. Move to the <path><keyval id="release-dir"/></path>
+directory. There you should see all available stage files for your architecture
+(they might be stored within subdirectories named after the individual
+subarchitectures). Select one and press <c>D</c> to download. When you're
+finished, press <c>Q</c> to quit the browser.
 </p>
 
 <p test="'x86'=func:keyval('arch')">
Index: hb-install-system.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml,v
retrieving revision 1.118
diff -u -t -r1.118 hb-install-system.xml
--- hb-install-system.xml	16 Mar 2011 07:43:58 -0000	1.118
+++ hb-install-system.xml	2 Jun 2011 18:56:45 -0000
@@ -30,7 +30,9 @@
 our <uri link="/main/en/mirrors.xml">mirror list</uri> and search
 for a mirror (or mirrors) close to you (as those are most frequently the 
 fastest ones), but we provide a nice tool called <c>mirrorselect</c> which
-provides you with a nice interface to select the mirrors you want.
+provides you with a nice interface to select the mirrors you want. Just 
+navigate to the mirrors of choice and press spacebar to select one or more
+mirrors.
 </p>
   
 <pre caption="Using mirrorselect for the GENTOO_MIRRORS variable">
@@ -89,6 +91,12 @@
 <body>
 
 <p>
+In a few moments, we will change the Linux root towards the new location. To
+make sure that the new environment works properly, we need to make certain file
+systems available there as well.
+</p>
+
+<p>
 Mount the <path>/proc</path> filesystem on <path>/mnt/gentoo/proc</path> to
 allow the installation to use the kernel-provided information within the
 chrooted environment, and then mount-bind the <path>/dev</path> filesystem.
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.35
diff -u -t -r1.35 hb-install-x86+amd64-kernel.xml
--- hb-install-x86+amd64-kernel.xml	21 Jul 2010 00:13:54 -0000	1.35
+++ hb-install-x86+amd64-kernel.xml	2 Jun 2011 18:56:45 -0000
@@ -403,7 +403,7 @@
 
 <p>
 Once <c>genkernel</c> completes, a kernel, full set of modules and 
-<e>initial root disk</e> (initrd) will be created. We will use the kernel 
+<e>initial ram disk</e> (initrd) will be created. We will use the kernel 
 and initrd when configuring a boot loader later in this document. Write
 down the names of the kernel and initrd as you will need it when writing
 the bootloader configuration file. The initrd will be started immediately after