neysx       07/03/10 17:14:15

  Modified:             handbook-alpha.xml handbook-amd64.xml
                        handbook-hppa.xml handbook-ia64.xml
                        handbook-ppc.xml handbook-ppc64.xml
                        handbook-sparc.xml handbook-x86.xml
                        hb-install-stage.xml
  Log:
  Matched hb-install-stage.xml with handbook architecture

Revision  Changes    Path
1.132                xml/htdocs/doc/en/handbook/handbook-alpha.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-alpha.xml?rev=1.132&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-alpha.xml?rev=1.132&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-alpha.xml?r1=1.131&r2=1.132

Index: handbook-alpha.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-alpha.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- handbook-alpha.xml  29 Nov 2006 15:35:24 -0000      1.131
+++ handbook-alpha.xml  10 Mar 2007 17:14:15 -0000      1.132
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
 
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-alpha.xml,v 1.131 
2006/11/29 15:35:24 nightmorph Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-alpha.xml,v 1.132 
2007/03/10 17:14:15 neysx Exp $ -->
 
 <book link="/doc/en/handbook/handbook-alpha.xml">
 <title>Gentoo Linux Alpha Handbook</title>
@@ -9,6 +9,9 @@
 <values>
  <key id="arch">Alpha</key>
  <key id="/boot">/dev/sda1</key>
+ <key id="release-dir">releases/alpha/2006.1/</key>
+ <key id="stage3">stage3-alpha-2006.1.tar.bz2</key>
+ <key id="CFLAGS">-mieee -pipe -O2 -mcpu=ev6</key>
 </values>
 
 <author title="Author">
@@ -126,8 +129,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>7.1</version>
-<date>2006-08-30</date>
+<version>7.2</version>
+<date>2007-03-10</date>
 
 <part>
 <title>Installing Gentoo</title>



1.140                xml/htdocs/doc/en/handbook/handbook-amd64.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml?rev=1.140&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml?rev=1.140&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml?r1=1.139&r2=1.140

Index: handbook-amd64.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- handbook-amd64.xml  29 Nov 2006 15:35:24 -0000      1.139
+++ handbook-amd64.xml  10 Mar 2007 17:14:15 -0000      1.140
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
 
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml,v 1.139 
2006/11/29 15:35:24 nightmorph Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml,v 1.140 
2007/03/10 17:14:15 neysx Exp $ -->
 
 <book link="/doc/en/handbook/handbook-amd64.xml">
 <title>Gentoo Linux AMD64 Handbook</title>
@@ -19,6 +19,8 @@
  <key id="live-cd-name">livecd-amd64-installer-2006.1.iso</key>
  <key id="live-cd-size">696</key>
  <key id="release-dir">releases/amd64/2006.1/</key>
+ <key id="stage3">stage3-amd64-2006.1.tar.bz2</key>
+ <key id="CFLAGS">-march=k8 -O2 -pipe</key>
  <key id="online-book">handbook-amd64.xml</key>
 </values>
 
@@ -137,8 +139,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>7.2</version>
-<date>2006-10-24</date>
+<version>7.3</version>
+<date>2007-03-10</date>
 
 <part>
 <title>Installing Gentoo</title>



1.129                xml/htdocs/doc/en/handbook/handbook-hppa.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-hppa.xml?rev=1.129&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-hppa.xml?rev=1.129&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-hppa.xml?r1=1.128&r2=1.129

Index: handbook-hppa.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-hppa.xml,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- handbook-hppa.xml   29 Nov 2006 15:35:24 -0000      1.128
+++ handbook-hppa.xml   10 Mar 2007 17:14:15 -0000      1.129
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
 
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-hppa.xml,v 1.128 
2006/11/29 15:35:24 nightmorph Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-hppa.xml,v 1.129 
2007/03/10 17:14:15 neysx Exp $ -->
 
 <book link="/doc/en/handbook/handbook-hppa.xml">
 <title>Gentoo Linux HPPA Handbook</title>
@@ -9,6 +9,9 @@
 <values>
  <key id="arch">HPPA</key>
  <key id="/boot">/dev/sda2</key>
+ <key id="release-dir">releases/hppa/2006.1/hppa2.0/</key>
+ <key id="stage3">stage3-hppa2.0-2006.1.tar.bz2</key>
+ <key id="CFLAGS">-march=2.0 -O2 -pipe</key>
 </values>
 
 <author title="Author">
@@ -126,8 +129,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>7.1</version>
-<date>2006-08-30</date>
+<version>7.2</version>
+<date>2007-03-10</date>
 
 <part>
 <title>Installing Gentoo</title>



1.7                  xml/htdocs/doc/en/handbook/handbook-ia64.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-ia64.xml?rev=1.7&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-ia64.xml?rev=1.7&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-ia64.xml?r1=1.6&r2=1.7

Index: handbook-ia64.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ia64.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- handbook-ia64.xml   29 Nov 2006 15:35:24 -0000      1.6
+++ handbook-ia64.xml   10 Mar 2007 17:14:15 -0000      1.7
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
 
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ia64.xml,v 1.6 
2006/11/29 15:35:24 nightmorph Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ia64.xml,v 1.7 
2007/03/10 17:14:15 neysx Exp $ -->
 
 <book link="/doc/en/handbook/handbook-ia64.xml">
 <title>Gentoo Linux/IA64 Handbook</title>
@@ -15,6 +15,8 @@
  <key id="min-cd-name">install-ia64-minimal-2006.1.iso</key>
  <key id="min-cd-size">52</key>
  <key id="release-dir">releases/ia64/2006.1/</key>
+ <key id="stage3">stage3-ia64-2006.1.tar.bz2</key>
+ <key id="CFLAGS">-O2 -pipe</key>
  <key id="online-book">handbook-ia64.xml</key>
 </values>
 
@@ -140,8 +142,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>7.1</version>
-<date>2006-08-30</date>
+<version>7.2</version>
+<date>2007-03-10</date>
 
 <part>
 <title>Installing Gentoo</title>



1.150                xml/htdocs/doc/en/handbook/handbook-ppc.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc.xml?rev=1.150&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc.xml?rev=1.150&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc.xml?r1=1.149&r2=1.150

Index: handbook-ppc.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc.xml,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- handbook-ppc.xml    29 Nov 2006 15:35:24 -0000      1.149
+++ handbook-ppc.xml    10 Mar 2007 17:14:15 -0000      1.150
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
 
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc.xml,v 1.149 
2006/11/29 15:35:24 nightmorph Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc.xml,v 1.150 
2007/03/10 17:14:15 neysx Exp $ -->
 
 <book link="/doc/en/handbook/handbook-ppc.xml">
 <title>Gentoo Linux PPC Handbook</title>
@@ -9,6 +9,9 @@
 <values>
  <key id="arch">PPC</key>
  <key id="/boot">/dev/hda1</key>
+ <key id="release-dir">releases/ppc/2006.1/ppc32/</key>
+ <key id="stage3">stage3-ppc-2006.1.tar.bz2</key>
+ <key id="CFLAGS">-O2 -mcpu=powerpc -mtune=powerpc -fno-strict-aliasing 
-pipe</key>
 </values>
 
 <author title="Author">
@@ -132,8 +135,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>7.1</version>
-<date>2006-08-30</date>
+<version>7.2</version>
+<date>2007-03-10</date>
 
 <part>
 <title>Installing Gentoo</title>



1.71                 xml/htdocs/doc/en/handbook/handbook-ppc64.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc64.xml?rev=1.71&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc64.xml?rev=1.71&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc64.xml?r1=1.70&r2=1.71

Index: handbook-ppc64.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc64.xml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- handbook-ppc64.xml  29 Nov 2006 15:35:24 -0000      1.70
+++ handbook-ppc64.xml  10 Mar 2007 17:14:15 -0000      1.71
@@ -1,13 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
 
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc64.xml,v 1.70 
2006/11/29 15:35:24 nightmorph Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ppc64.xml,v 1.71 
2007/03/10 17:14:15 neysx Exp $ -->
 
 <book link="/doc/en/handbook/handbook-ppc64.xml">
 <title>Gentoo Linux PPC64 Handbook</title>
 
 <values>
  <key id="arch">PPC64</key>
+ <key id="release-dir">releases/ppc/2006.1/ppc64/</key>
+ <key id="stage3">stage3-ppc64-64ul-2006.1.tar.bz2</key>
+ <key id="CFLAGS">-O2 -pipe</key>
 </values>
 
 <author title="Author">
@@ -125,8 +128,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>7.1</version>
-<date>2006-08-30</date>
+<version>7.2</version>
+<date>2007-03-10</date>
 
 <part>
 <title>Installing Gentoo</title>



1.132                xml/htdocs/doc/en/handbook/handbook-sparc.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml?rev=1.132&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml?rev=1.132&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml?r1=1.131&r2=1.132

Index: handbook-sparc.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- handbook-sparc.xml  29 Nov 2006 15:35:24 -0000      1.131
+++ handbook-sparc.xml  10 Mar 2007 17:14:15 -0000      1.132
@@ -1,13 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
 
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml,v 1.131 
2006/11/29 15:35:24 nightmorph Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml,v 1.132 
2007/03/10 17:14:15 neysx Exp $ -->
 
 <book link="/doc/en/handbook/handbook-sparc.xml">
 <title>Gentoo Linux SPARC Handbook</title>
 
 <values>
  <key id="arch">SPARC</key>
+ <key id="release-dir">releases/sparc/2006.1/sparc64/</key>
+ <key id="stage3">stage3-sparc64-2006.1.tar.bz2</key>
+ <key id="CFLAGS">-O2 -mcpu=v9 -pipe</key>
 </values>
 
 <author title="Author">
@@ -125,8 +128,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>7.1</version>
-<date>2006-08-30</date>
+<version>7.2</version>
+<date>2007-03-10</date>
 
 <part>
 <title>Installing Gentoo</title>



1.159                xml/htdocs/doc/en/handbook/handbook-x86.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml?rev=1.159&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml?rev=1.159&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml?r1=1.158&r2=1.159

Index: handbook-x86.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- handbook-x86.xml    29 Nov 2006 15:35:24 -0000      1.158
+++ handbook-x86.xml    10 Mar 2007 17:14:15 -0000      1.159
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
 
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml,v 1.158 
2006/11/29 15:35:24 nightmorph Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml,v 1.159 
2007/03/10 17:14:15 neysx Exp $ -->
 
 <book link="/doc/en/handbook/handbook-x86.xml">
 <title>Gentoo Linux x86 Handbook</title>
@@ -19,7 +19,9 @@
  <key id="live-cd-name">livecd-i686-installer-2006.1.iso</key>
  <key id="live-cd-size">697</key>
  <key id="release-dir">releases/x86/2006.1/</key>
+ <key id="stage3">stage3-i686-2006.1.tar.bz2</key>
  <key id="online-book">handbook-x86.xml</key>
+ <key id="CFLAGS">-O2 -march=i686 -pipe</key>
 </values>
 
 <author title="Author">
@@ -140,8 +142,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>7.2</version>
-<date>2006-09-07</date>
+<version>7.3</version>
+<date>2007-03-10</date>
 
 <part>
 <title>Installing Gentoo</title>



1.105                xml/htdocs/doc/en/handbook/hb-install-stage.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml?rev=1.105&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml?rev=1.105&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml?r1=1.104&r2=1.105

Index: hb-install-stage.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- hb-install-stage.xml        1 Nov 2006 21:40:28 -0000       1.104
+++ hb-install-stage.xml        10 Mar 2007 17:14:15 -0000      1.105
@@ -4,7 +4,7 @@
 <!-- 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-stage.xml,v 1.104 
2006/11/01 21:40:28 nightmorph Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml,v 1.105 
2007/03/10 17:14:15 neysx Exp $ -->
 
 <sections>
 
@@ -13,8 +13,8 @@
 describe how you extract the stage3 archive and configure Portage.
 </abstract>
 
-<version>7.4</version>
-<date>2006-11-01</date>
+<version>7.5</version>
+<date>2007-03-10</date>
 
 <section>
 <title>Installing a Stage Tarball</title>
@@ -55,20 +55,23 @@
 <body>
 
 <p>
-The next step you need to perform is to install the <e>stage3</e> tarball 
-onto your system. You have the option of downloading the required
-tarball from the Internet or, if you are booted from one of the Gentoo
-Universal Installation CDs, copy it over from the CD itself. If you have a 
-Universal CD and the stage you want to use is on the CD, downloading it from 
-the Internet is just a waste of bandwidth as the stage files are the same. In 
-most cases, the command <c>uname -m</c> can be used to help you decide which 
-stage file to download. 
+The next step you need to perform is to install the <e>stage3</e> tarball onto
+your system. You have the option of downloading the required tarball from the
+Internet or, if you booted one of the Gentoo Universal CDs, copy it over from
+the CD itself. If you have a Universal CD and the stage you want to use is on
+the CD, downloading it from the Internet is just a waste of bandwidth as the
+stage files are the same. In most cases, the command <c>uname -m</c> can be
+used to help you decide which stage file to download.
 </p>
 
-<ul>
+<p>
+Minimal CDs, LiveCDs and LiveDVDs do not contain any stage3 archive.
+</p>
+
+<ul test="not(contains('AMD64 x86', func:keyval('arch')))">
 <li><uri link="#doc_chap2">Default: Using a Stage from the Internet</uri></li>
 <li>
-  <uri link="#doc_chap3">Alternative: Using a Stage from the Installation 
CD</uri>
+  <uri link="#doc_chap3">Alternative: Using a Stage from the Universal CD</uri>
 </li>
 </ul>
 
@@ -113,12 +116,21 @@
 </p>
 
 <p>
-Pick the <path>releases/</path> directory, followed by your architecture (for
-instance <path>x86/</path>) and the Gentoo version (<path>2006.1/</path>) to
-finish up with the <path>stages/</path> directory. There you should see all
-available stage files for your architecture (they might be stored within
-subdirectories named to the individual subarchitectures). Select one and press
-<c>D</c> to download. When you're finished, press <c>Q</c> to quit the browser.
+Move to the <path><keyval id="release-dir"/>stages/</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')">
+Most PC users should use the <b><keyval id="stage3"/></b> stage3 archive. All
+modern PCs are considered i686. If you use an old machine, you can check the
+<uri link="http://en.wikipedia.org/wiki/I686";>list of i686-compatible
+processors</uri> on Wikipedia. Old processors such as the Pentium, K5, K6, or
+Via C3 and similar require the <b>i586</b> stage3. Only very old processors
+such as the 80386 and 80486 require the generic <b>x86</b> stage3 (and a huge
+amount of patience.)
 </p>
 
 <pre caption="Surfing to the mirror listing with links">
@@ -140,8 +152,8 @@
 </p>
 
 <pre caption="Example checking integrity of a stage tarball">
-# <i>md5sum -c stage3-x86-2006.1.tar.bz2.DIGESTS</i>
-stage3-x86-2006.1.tar.bz2: OK
+# <i>md5sum -c <keyval id="stage3"/>.DIGESTS</i>
+<keyval id="stage3"/>: OK
 </pre>
 
 </body>
@@ -167,11 +179,13 @@
 want to extract a file, not standard input.
 </p>
 
+<!-- MIPS uses its own hb-install-stage.xml file, any other arch?
 <note>
 Some architectures (e.g. MIPS) Installation CDs and boot images rely upon the
 <c>tar</c> built into BusyBox which doesn't currently support the <c>v</c>
 option. Use the <c>xjpf</c> options instead.
 </note>
+-->
 
 <p>
 Now that the stage is installed, continue with <uri
@@ -181,18 +195,12 @@
 </body>
 </subsection>
 </section>
-<section>
-<title>Alternative: Using a Stage from the Installation CD</title>
+<section test="not(contains('AMD64 x86', func:keyval('arch')))">
+<title>Alternative: Using a Stage from the Universal CD</title>
 <subsection>
 <title>Extracting the Stage Tarball</title>
 <body>
 
-<impo test="contains('AMD64 x86', func:keyval('arch'))">
-If you are on <keyval id="arch"/> and using the Installer LiveCD, you will
-<e>not</e> have stages on your CD. You will have to follow instructions for
-<uri link="#doc_chap2">Using a Stage Tarball from the Internet</uri>.
-</impo>
-
 <p>
 The stages on the CD reside in the <path>/mnt/cdrom/stages</path> directory. To
 see a listing of available stages, use <c>ls</c>:
@@ -390,32 +398,24 @@
 </p>
 
 <p>
-A first setting is the <c>-march=</c> flag, which specifies the name of the
-target architecture. Possible options are described in the
-<path>make.conf.example</path> file (as comments). For instance, for the x86 
-Athlon XP architecture:
+A first setting is the <c>-march=</c> or <c>-mcpu=</c> flag, which specifies
+the name of the target architecture. Possible options are described in the
+<path>make.conf.example</path> file (as comments).
 </p>
 
-<pre caption="The GCC march setting">
--march=athlon-xp
-</pre>
-
 <p>
 A second one is the <c>-O</c> flag (that is a capital O, not a zero),
 which specifies the <c>gcc</c> optimization
 class flag. Possible classes are <c>s</c> (for size-optimized),
 <c>0</c> (zero - for no optimizations), <c>1</c>, <c>2</c> or <c>3</c> for more
 speed-optimization flags (every class has the same flags as the one before, 
plus
-some extras). For instance, for a class-2 optimization:
+some extras). <c>-O2</c> is the recommended default.
 </p>
 
-<pre caption="The GCC O setting">
--O2
-</pre>
-
 <p>
 Another popular optimization flag is <c>-pipe</c> (use pipes rather than
 temporary files for communication between the various stages of compilation).
+It has no impact on the generated code.
 </p>
 
 <p>
@@ -426,18 +426,20 @@
 
 <p>
 When you define the <c>CFLAGS</c> and <c>CXXFLAGS</c>, you should combine
-several optimization flags, like in the following example:
+several optimization flags. The default values contained in the stage3 archived
+you unpacked should be good enough. The following example is just an example:
 </p>
 
-<pre test="contains('Alpha arm HPPA IA64 MIPS PPC PPC64 SPARC x86', 
func:keyval('arch'))" caption="Defining the CFLAGS and CXXFLAGS variable">
-CFLAGS="-march=athlon-xp -pipe -O2"
-CXXFLAGS="${CFLAGS}"                  <comment># Use the same settings for 
both variables</comment>
+<pre test="not(func:keyval('arch')='AMD64')" caption="Defining the CFLAGS and 
CXXFLAGS variable">
+CFLAGS="<keyval id="CFLAGS"/>"
+<comment># Use the same settings for both variables</comment>
+CXXFLAGS="${CFLAGS}"
 </pre>
 
 <pre test="func:keyval('arch')='AMD64'" caption="Defining the CFLAGS and 
CXXFLAGS variable">
-CFLAGS="-march=athlon-xp -pipe -O2"   <comment># AMD64 users who want a native 
64-bit system should use -march=athlon64</comment>
-                                     <comment># EM64T users should use 
-march=nocona</comment>
-CXXFLAGS="${CFLAGS}"                 <comment># Use the same settings for both 
variables</comment>
+CFLAGS="<keyval id="CFLAGS"/>"   <comment># EM64T users should use 
-march=nocona</comment>
+<comment># Use the same settings for both variables</comment>
+CXXFLAGS="${CFLAGS}"
 </pre>
 
 </body>



-- 
[email protected] mailing list

Reply via email to