[gentoo-doc-cvs] cvs commit: handbook-x86.xml

[Shyam Mani]

fox2mike    06/02/10 20:11:59

  Modified:    xml/htdocs/doc/en/handbook/draft/2006.0 handbook-x86.xml
                        hb-install-about.xml hb-install-network.xml
  Removed:     xml/htdocs/doc/en/handbook/draft/2006.0
                        hb-install-x86-about.xml hb-install-x86-network.xml
  Log:
  More x86 fixes to make sure we don't go back by 2 years

Revision  Changes    Path
1.5       +3 -3      xml/htdocs/doc/en/handbook/draft/2006.0/handbook-x86.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/draft/2006.0/handbook-x86.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/draft/2006.0/handbook-x86.xml?rev=1.5&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/draft/2006.0/handbook-x86.xml.diff?r1=1.4&r2=1.5&cvsroot=gentoo

Index: handbook-x86.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/2006.0/handbook-x86.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- handbook-x86.xml	10 Feb 2006 17:45:04 -0000	1.4
+++ handbook-x86.xml	10 Feb 2006 20:11:59 -0000	1.5
@@ -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/draft/2006.0/handbook-x86.xml,v 1.4 2006/02/10 17:45:04 fox2mike Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/2006.0/handbook-x86.xml,v 1.5 2006/02/10 20:11:59 fox2mike Exp $ -->
 
 <book link="handbook-x86.xml">
 <title>Gentoo Linux 2006.0 x86 Handbook</title>
@@ -139,7 +139,7 @@
 Users not familiar with Gentoo do not always know that choice is what
 Gentoo is all about. 
 </abstract>
-  <include href="hb-install-x86-about.xml"/>
+  <include href="hb-install-about.xml"/>
 </chapter>
 
 <chapter>
@@ -157,7 +157,7 @@
 If you need networking, this is the place where the network (and Internet
 connection) is configured.
 </abstract>
-  <include href="hb-install-x86-network.xml"/>
+  <include href="hb-install-network.xml"/>
 </chapter>
 
 <chapter>



1.4       +12 -5     xml/htdocs/doc/en/handbook/draft/2006.0/hb-install-about.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/draft/2006.0/hb-install-about.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/draft/2006.0/hb-install-about.xml?rev=1.4&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/draft/2006.0/hb-install-about.xml.diff?r1=1.3&r2=1.4&cvsroot=gentoo

Index: hb-install-about.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/2006.0/hb-install-about.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hb-install-about.xml	10 Feb 2006 17:46:25 -0000	1.3
+++ hb-install-about.xml	10 Feb 2006 20:11:59 -0000	1.4
@@ -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.0 -->
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/2006.0/hb-install-about.xml,v 1.3 2006/02/10 17:46:25 fox2mike Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/2006.0/hb-install-about.xml,v 1.4 2006/02/10 20:11:59 fox2mike Exp $ -->
 
 <sections>
 
@@ -125,9 +125,15 @@
 </p>
 
 <p>
-This document covers the installation using the Installer LiveCD, a 
+This document covers the installation using a Gentoo Linux Installation CD, a 
 bootable CD that contains everything you need to get Gentoo Linux up and 
-running.
+running.  There are two types of Installation CDs, the InstallCD and the
+Installer LiveCD.  The InstallCD is a minimal environment which contains only
+those packages necessary for installing Gentoo Linux. The LiveCD is a complete
+Gentoo Linux environment and can be used for multiple tasks, one of which is
+installing Gentoo Linux. The LiveCD is not available on all architectures at
+this time. If your architecture does not have a LiveCD, then this document will
+refer to the Universal InstallCD for you.
 </p>
 
 <p>
@@ -276,7 +282,7 @@
   </li>
   <li>
     The <b>x86</b> architecture (athlon, athlon-xp, athlon-mp, pentium-pro,
-    pentium2, pentium3, pentium4 and pentium-m) Note: The packages are for x86
+    pentium2, pentium3, pentium4 and pentium-m) Note: The packages are for i686
     and are available on the Installer LiveCD.
   </li>
 </ul>
@@ -288,7 +294,8 @@
 
 <p>
 Now that this introduction is over, let's continue with <uri
-link="?part=1&amp;chap=2">Booting the Universal Installation CD</uri>.
+link="?part=1&amp;chap=2">Booting the Universal InstallCD/Installer
+LiveCD</uri>.
 </p>
 
 </body>



1.2       +23 -13    xml/htdocs/doc/en/handbook/draft/2006.0/hb-install-network.xml

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

Index: hb-install-network.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/2006.0/hb-install-network.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hb-install-network.xml	1 Feb 2006 18:38:17 -0000	1.1
+++ hb-install-network.xml	10 Feb 2006 20:11:59 -0000	1.2
@@ -4,7 +4,7 @@
 <!-- The content of this document is licensed under the CC-BY-SA license -->
 <!-- See http://creativecommons.org/licenses/by-sa/1.0 -->
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/2006.0/hb-install-network.xml,v 1.1 2006/02/01 18:38:17 fox2mike Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/2006.0/hb-install-network.xml,v 1.2 2006/02/10 20:11:59 fox2mike Exp $ -->
 
 <sections>
 
@@ -19,21 +19,25 @@
 
 <p>
 Generally, you don't need a working network connection to install Gentoo using
-the Universal Installation CD. However, there are some circumstances where you
-do want to have a working Internet connection:
+either the Universal InstallCD or the Installer LiveCD. However, there are some
+circumstances where you do want to have a working Internet connection:
 </p>
 
 <ul>
   <li>
-    The stage3 files that are stored in the Universal Installation CD do not 
+    The stage3 files that are stored in the Universal InstallCD do not 
+    match your architecture and you need to download the correct stage3 file
+  </li>
+  <li>
+    The stage3 file that is generated by the Installer LiveCD does not
     match your architecture and you need to download the correct stage3 file
   </li>
   <li>
     You need to install a specific networking application that will allow you to
-    connect to the Internet which isn't available on the Universal Installation 
-    CD but is supported by the Installation CD (i.e. you can connect to the 
-    Internet using the Installation CD but the necessary sources are not 
-    available on the Installation CD)
+    connect to the Internet which isn't available on the Universal InstallCD or
+    the Installer LiveCD, but is supported by the CD (i.e. you can connect to
+    the Internet using the CD but the necessary sources are not available on
+    the CD)
   </li>
   <li>
     You want remote assistance during the installation (using SSH or through
@@ -48,14 +52,20 @@
 <body>
 
 <p>
-To find out if the stage3 file for your architecture is available, take a look
-inside <path>/mnt/cdrom/stages</path> and check if one of the available stages
-matches your architecture. If not, you can still opt for a stage3 file of an
-architecture compatible with yours.
+To find out if the stage3 file for your architecture is available and you are
+using an Universal InstallCD, take a look inside <path>/mnt/cdrom/stages</path>
+and check if one of the available stages matches your architecture. If not, you
+can still opt for a stage3 file of an architecture compatible with yours.
+</p>
+
+<p>
+The stage3 file built by the x86 Installer LiveCD is optimized for i686 or
+better and uses NPTL.  The stage3 file built by the amd64 Installer LiveCD is
+optimized for generic amd64 usage and uses NPTL.
 </p>
 
 <p>
-If you on the other hand want to use a stage3 file optimized for your
+If you, on the other hand, want to use a stage3 file optimized for your
 architecture and the stage3 file of your choice is not available, then you will
 need networking to download the appropriate stage3 file.
 </p>



-- 
gentoo-doc-cvs@g.o mailing list