[gentoo-doc-cvs] cvs commit: handbook-amd64.xml handbook-x86.xml hb-install-about.xml hb-installer-about.xml

[gentoo-doc-cvs] cvs commit: handbook-amd64.xml handbook-x86.xml hb-install-about.xml hb-installer-about.xml

[Josh Saddler]

nightmorph    07/03/19 21:19:49

  Modified:             handbook-amd64.xml handbook-x86.xml
                        hb-install-about.xml
  Removed:              hb-installer-about.xml
  Log:
  removed the separate hb-installer-about handbook, as I just used conditional keyvals to deal with the single subsection added by the installer-about. so now all arches use the existing hb-install-about, with a little magic to make sure that amd64 and x86 see the right subsection.

Revision  Changes    Path
1.2                  xml/htdocs/doc/en/handbook/2007.0/handbook-amd64.xml

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

Index: handbook-amd64.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-amd64.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- handbook-amd64.xml	19 Mar 2007 20:37:28 -0000	1.1
+++ handbook-amd64.xml	19 Mar 2007 21:19:49 -0000	1.2
@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-amd64.xml,v 1.1 2007/03/19 20:37:28 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-amd64.xml,v 1.2 2007/03/19 21:19:49 nightmorph Exp $ -->
 
-<book link="/doc/en/handbook/2006.1/handbook-amd64.xml">
-<title>Gentoo Linux 2006.1 AMD64 Handbook</title>
+<book link="/doc/en/handbook/2007.0/handbook-amd64.xml">
+<title>Gentoo Linux 2007.0 AMD64 Handbook</title>
 
 <values>
  <key id="arch">AMD64</key>
- <key id="release-dir">releases/amd64/2006.1/</key>
- <key id="online-book">2006.1/handbook-amd64.xml</key>
+ <key id="release-dir">releases/amd64/2007.0/</key>
+ <key id="online-book">2007.0/handbook-amd64.xml</key>
 </values>
 
 <author title="Author">
@@ -135,7 +135,7 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>7.1</version>
+<version>8.0</version>
 <date>2006-08-30</date>
 
 <part>
@@ -150,7 +150,7 @@
 Users not familiar with Gentoo do not always know that choice is what
 Gentoo is all about.
 </abstract>
-  <include href="hb-installer-about.xml"/>
+  <include href="hb-install-about.xml"/>
 </chapter>
 
 <chapter>



1.2                  xml/htdocs/doc/en/handbook/2007.0/handbook-x86.xml

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

Index: handbook-x86.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-x86.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- handbook-x86.xml	19 Mar 2007 20:37:28 -0000	1.1
+++ handbook-x86.xml	19 Mar 2007 21:19:49 -0000	1.2
@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-x86.xml,v 1.1 2007/03/19 20:37:28 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-x86.xml,v 1.2 2007/03/19 21:19:49 nightmorph Exp $ -->
 
-<book link="/doc/en/handbook/2006.1/handbook-x86.xml">
-<title>Gentoo Linux 2006.1 x86 Handbook</title>
+<book link="/doc/en/handbook/2007.0/handbook-x86.xml">
+<title>Gentoo Linux 2007.0 x86 Handbook</title>
 
 <values>
  <key id="arch">x86</key>
- <key id="release-dir">releases/x86/2006.1/</key>
- <key id="online-book">2006.1/handbook-x86.xml</key>
+ <key id="release-dir">releases/x86/2007.0/</key>
+ <key id="online-book">2007.0/handbook-x86.xml</key>
 </values>
 
 <author title="Author">
@@ -133,7 +133,7 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>7.1</version>
+<version>8.0</version>
 <date>2006-08-30</date>
 
 <part>
@@ -148,7 +148,7 @@
 Users not familiar with Gentoo do not always know that choice is what
 Gentoo is all about.
 </abstract>
-  <include href="hb-installer-about.xml"/>
+  <include href="hb-install-about.xml"/>
 </chapter>
 
 <chapter>



1.3                  xml/htdocs/doc/en/handbook/2007.0/hb-install-about.xml

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

Index: hb-install-about.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-about.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hb-install-about.xml	19 Mar 2007 20:55:18 -0000	1.2
+++ hb-install-about.xml	19 Mar 2007 21:19:49 -0000	1.3
@@ -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/2007.0/hb-install-about.xml,v 1.2 2007/03/19 20:55:18 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-about.xml,v 1.3 2007/03/19 21:19:49 nightmorph Exp $ -->
 
 <sections>
 
@@ -44,7 +44,38 @@
 
 </body>
 </subsection>
-<subsection>
+<!-- for all arches that DO have an installer liveCD -->
+<subsection test="contains('AMD64 x86', func:keyval('arch'))">
+<title>How do I go about Installing Gentoo?</title>
+<body>
+
+<p>
+Gentoo Linux comes with two versions of an easy to use Installer. A GTK+ based
+installer (for use with an X based environment) and a Dialog based installer for
+use on the console. Chapter 3 of the handbook deals with the GTK+ based
+installer while Chapter 4 is for the Dialog based one.
+</p>
+
+<p>
+Sometimes, you are given a certain choice in the handbook. We try our best to
+explain what the pros and cons are. We will continue then with a default choice,
+identified by &quot;Default: &quot; in the title. The other possibilities are
+marked by &quot;Alternative: &quot;. Do <e>not</e> think that the default is
+what we recommend. It is however what we believe most users will use.
+</p>
+
+<p>
+Sometimes you can pursue an optional step. Such steps are marked as
+&quot;Optional: &quot; and are therefore not needed to install Gentoo.
+However, some optional steps are dependant on a previous decision you
+made. We will inform you when this happens, both when you make the
+decision, and right before the optional step is described.
+</p>
+
+</body>
+</subsection>
+<!-- for all arches that do NOT have an installer liveCD -->
+<subsection test="not(contains('AMD64 x86', func:keyval('arch')))">
 <title>How is the Installation Structured?</title>
 <body>
 



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