1 |
nightmorph 07/03/19 21:19:49 |
2 |
|
3 |
Modified: handbook-amd64.xml handbook-x86.xml |
4 |
hb-install-about.xml |
5 |
Removed: hb-installer-about.xml |
6 |
Log: |
7 |
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. |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 xml/htdocs/doc/en/handbook/2007.0/handbook-amd64.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-amd64.xml?rev=1.2&view=markup |
13 |
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 |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-amd64.xml?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: handbook-amd64.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-amd64.xml,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- handbook-amd64.xml 19 Mar 2007 20:37:28 -0000 1.1 |
23 |
+++ handbook-amd64.xml 19 Mar 2007 21:19:49 -0000 1.2 |
24 |
@@ -1,15 +1,15 @@ |
25 |
<?xml version='1.0' encoding='UTF-8'?> |
26 |
<!DOCTYPE book SYSTEM "/dtd/book.dtd"> |
27 |
|
28 |
-<!-- $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 $ --> |
29 |
+<!-- $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 $ --> |
30 |
|
31 |
-<book link="/doc/en/handbook/2006.1/handbook-amd64.xml"> |
32 |
-<title>Gentoo Linux 2006.1 AMD64 Handbook</title> |
33 |
+<book link="/doc/en/handbook/2007.0/handbook-amd64.xml"> |
34 |
+<title>Gentoo Linux 2007.0 AMD64 Handbook</title> |
35 |
|
36 |
<values> |
37 |
<key id="arch">AMD64</key> |
38 |
- <key id="release-dir">releases/amd64/2006.1/</key> |
39 |
- <key id="online-book">2006.1/handbook-amd64.xml</key> |
40 |
+ <key id="release-dir">releases/amd64/2007.0/</key> |
41 |
+ <key id="online-book">2007.0/handbook-amd64.xml</key> |
42 |
</values> |
43 |
|
44 |
<author title="Author"> |
45 |
@@ -135,7 +135,7 @@ |
46 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
47 |
<license/> |
48 |
|
49 |
-<version>7.1</version> |
50 |
+<version>8.0</version> |
51 |
<date>2006-08-30</date> |
52 |
|
53 |
<part> |
54 |
@@ -150,7 +150,7 @@ |
55 |
Users not familiar with Gentoo do not always know that choice is what |
56 |
Gentoo is all about. |
57 |
</abstract> |
58 |
- <include href="hb-installer-about.xml"/> |
59 |
+ <include href="hb-install-about.xml"/> |
60 |
</chapter> |
61 |
|
62 |
<chapter> |
63 |
|
64 |
|
65 |
|
66 |
1.2 xml/htdocs/doc/en/handbook/2007.0/handbook-x86.xml |
67 |
|
68 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-x86.xml?rev=1.2&view=markup |
69 |
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 |
70 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-x86.xml?r1=1.1&r2=1.2 |
71 |
|
72 |
Index: handbook-x86.xml |
73 |
=================================================================== |
74 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/handbook-x86.xml,v |
75 |
retrieving revision 1.1 |
76 |
retrieving revision 1.2 |
77 |
diff -u -r1.1 -r1.2 |
78 |
--- handbook-x86.xml 19 Mar 2007 20:37:28 -0000 1.1 |
79 |
+++ handbook-x86.xml 19 Mar 2007 21:19:49 -0000 1.2 |
80 |
@@ -1,15 +1,15 @@ |
81 |
<?xml version='1.0' encoding='UTF-8'?> |
82 |
<!DOCTYPE book SYSTEM "/dtd/book.dtd"> |
83 |
|
84 |
-<!-- $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 $ --> |
85 |
+<!-- $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 $ --> |
86 |
|
87 |
-<book link="/doc/en/handbook/2006.1/handbook-x86.xml"> |
88 |
-<title>Gentoo Linux 2006.1 x86 Handbook</title> |
89 |
+<book link="/doc/en/handbook/2007.0/handbook-x86.xml"> |
90 |
+<title>Gentoo Linux 2007.0 x86 Handbook</title> |
91 |
|
92 |
<values> |
93 |
<key id="arch">x86</key> |
94 |
- <key id="release-dir">releases/x86/2006.1/</key> |
95 |
- <key id="online-book">2006.1/handbook-x86.xml</key> |
96 |
+ <key id="release-dir">releases/x86/2007.0/</key> |
97 |
+ <key id="online-book">2007.0/handbook-x86.xml</key> |
98 |
</values> |
99 |
|
100 |
<author title="Author"> |
101 |
@@ -133,7 +133,7 @@ |
102 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
103 |
<license/> |
104 |
|
105 |
-<version>7.1</version> |
106 |
+<version>8.0</version> |
107 |
<date>2006-08-30</date> |
108 |
|
109 |
<part> |
110 |
@@ -148,7 +148,7 @@ |
111 |
Users not familiar with Gentoo do not always know that choice is what |
112 |
Gentoo is all about. |
113 |
</abstract> |
114 |
- <include href="hb-installer-about.xml"/> |
115 |
+ <include href="hb-install-about.xml"/> |
116 |
</chapter> |
117 |
|
118 |
<chapter> |
119 |
|
120 |
|
121 |
|
122 |
1.3 xml/htdocs/doc/en/handbook/2007.0/hb-install-about.xml |
123 |
|
124 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-about.xml?rev=1.3&view=markup |
125 |
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 |
126 |
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 |
127 |
|
128 |
Index: hb-install-about.xml |
129 |
=================================================================== |
130 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-about.xml,v |
131 |
retrieving revision 1.2 |
132 |
retrieving revision 1.3 |
133 |
diff -u -r1.2 -r1.3 |
134 |
--- hb-install-about.xml 19 Mar 2007 20:55:18 -0000 1.2 |
135 |
+++ hb-install-about.xml 19 Mar 2007 21:19:49 -0000 1.3 |
136 |
@@ -4,7 +4,7 @@ |
137 |
<!-- The content of this document is licensed under the CC-BY-SA license --> |
138 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
139 |
|
140 |
-<!-- $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 $ --> |
141 |
+<!-- $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 $ --> |
142 |
|
143 |
<sections> |
144 |
|
145 |
@@ -44,7 +44,38 @@ |
146 |
|
147 |
</body> |
148 |
</subsection> |
149 |
-<subsection> |
150 |
+<!-- for all arches that DO have an installer liveCD --> |
151 |
+<subsection test="contains('AMD64 x86', func:keyval('arch'))"> |
152 |
+<title>How do I go about Installing Gentoo?</title> |
153 |
+<body> |
154 |
+ |
155 |
+<p> |
156 |
+Gentoo Linux comes with two versions of an easy to use Installer. A GTK+ based |
157 |
+installer (for use with an X based environment) and a Dialog based installer for |
158 |
+use on the console. Chapter 3 of the handbook deals with the GTK+ based |
159 |
+installer while Chapter 4 is for the Dialog based one. |
160 |
+</p> |
161 |
+ |
162 |
+<p> |
163 |
+Sometimes, you are given a certain choice in the handbook. We try our best to |
164 |
+explain what the pros and cons are. We will continue then with a default choice, |
165 |
+identified by "Default: " in the title. The other possibilities are |
166 |
+marked by "Alternative: ". Do <e>not</e> think that the default is |
167 |
+what we recommend. It is however what we believe most users will use. |
168 |
+</p> |
169 |
+ |
170 |
+<p> |
171 |
+Sometimes you can pursue an optional step. Such steps are marked as |
172 |
+"Optional: " and are therefore not needed to install Gentoo. |
173 |
+However, some optional steps are dependant on a previous decision you |
174 |
+made. We will inform you when this happens, both when you make the |
175 |
+decision, and right before the optional step is described. |
176 |
+</p> |
177 |
+ |
178 |
+</body> |
179 |
+</subsection> |
180 |
+<!-- for all arches that do NOT have an installer liveCD --> |
181 |
+<subsection test="not(contains('AMD64 x86', func:keyval('arch')))"> |
182 |
<title>How is the Installation Structured?</title> |
183 |
<body> |
184 |
|
185 |
|
186 |
|
187 |
|
188 |
-- |
189 |
gentoo-doc-cvs@g.o mailing list |