Gentoo Archives: gentoo-doc-cvs

From: "Joshua Saddler (nightmorph)" <nightmorph@g.o>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en/handbook: handbook-amd64.xml handbook-x86.xml hb-install-stage.xml hb-install-system.xml hb-install-x86+amd64-kernel.xml hb-install-x86+amd64-medium.xml
Date: Sun, 04 Oct 2009 18:37:45
Message-Id: E1MuVxn-0006JL-DQ@stork.gentoo.org
1 nightmorph 09/10/04 18:37:43
2
3 Modified: handbook-amd64.xml handbook-x86.xml
4 hb-install-stage.xml hb-install-system.xml
5 hb-install-x86+amd64-kernel.xml
6 hb-install-x86+amd64-medium.xml
7 Log:
8 Quick fixes for autobuilds and all stuff (i think) found on the autobuilds tracker bug -- x86 and amd64 only at this time. should be good for Gentoo's 10th anniversary on these two arches
9
10 Revision Changes Path
11 1.151 xml/htdocs/doc/en/handbook/handbook-amd64.xml
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml?rev=1.151&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml?rev=1.151&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml?r1=1.150&r2=1.151
16
17 Index: handbook-amd64.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml,v
20 retrieving revision 1.150
21 retrieving revision 1.151
22 diff -u -r1.150 -r1.151
23 --- handbook-amd64.xml 7 Jul 2008 21:15:42 -0000 1.150
24 +++ handbook-amd64.xml 4 Oct 2009 18:37:42 -0000 1.151
25 @@ -1,7 +1,7 @@
26 <?xml version='1.0' encoding='UTF-8'?>
27 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
28
29 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml,v 1.150 2008/07/07 21:15:42 nightmorph Exp $ -->
30 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-amd64.xml,v 1.151 2009/10/04 18:37:42 nightmorph Exp $ -->
31
32 <book>
33 <title>Gentoo Linux AMD64 Handbook</title>
34 @@ -10,17 +10,15 @@
35 <key id="arch">AMD64</key>
36 <key id="arch-sub">x86_64</key>
37 <key id="/boot">/dev/sda1</key>
38 - <key id="kernel-version">2.6.24-r5</key>
39 - <key id="kernel-name">kernel-2.6.24-gentoo-r5</key>
40 - <key id="genkernel-name">kernel-genkernel-amd64-2.6.24-gentoo-r5</key>
41 - <key id="genkernel-initrd">initramfs-genkernel-amd64-2.6.24-gentoo-r5</key>
42 - <key id="min-cd-name">install-amd64-minimal-2008.0.iso</key>
43 + <key id="kernel-version">2.6.30-r5</key>
44 + <key id="kernel-name">kernel-2.6.30-gentoo-r5</key>
45 + <key id="genkernel-name">kernel-genkernel-amd64-2.6.30-gentoo-r5</key>
46 + <key id="genkernel-initrd">initramfs-genkernel-amd64-2.6.30-gentoo-r5</key>
47 + <key id="min-cd-name">install-amd64-minimal-&lt;release&gt;.iso</key>
48 <key id="min-cd-size">50</key>
49 - <key id="live-cd-name">livecd-amd64-installer-2008.0-r1.iso</key>
50 - <key id="live-cd-size">701</key>
51 - <key id="release-dir">releases/amd64/2008.0/</key>
52 - <key id="stage3">stage3-amd64-2008.0.tar.bz2</key>
53 - <key id="profile">default/linux/amd64/2008.0</key>
54 + <key id="release-dir">releases/amd64/autobuilds/</key>
55 + <key id="stage3">stage3-amd64-&lt;release&gt;.tar.bz2</key>
56 + <key id="profile">default/linux/amd64/10.0</key>
57 <key id="CFLAGS">-march=k8 -O2 -pipe</key>
58 <key id="online-book">handbook-amd64.xml</key>
59 </values>
60 @@ -143,8 +141,8 @@
61 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
62 <license/>
63
64 -<version>9.6</version>
65 -<date>2008-07-07</date>
66 +<version>10.0</version>
67 +<date>2009-10-04</date>
68
69 <part>
70 <title>Installing Gentoo</title>
71
72
73
74 1.172 xml/htdocs/doc/en/handbook/handbook-x86.xml
75
76 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml?rev=1.172&view=markup
77 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml?rev=1.172&content-type=text/plain
78 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml?r1=1.171&r2=1.172
79
80 Index: handbook-x86.xml
81 ===================================================================
82 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml,v
83 retrieving revision 1.171
84 retrieving revision 1.172
85 diff -u -r1.171 -r1.172
86 --- handbook-x86.xml 7 Jul 2008 21:15:42 -0000 1.171
87 +++ handbook-x86.xml 4 Oct 2009 18:37:42 -0000 1.172
88 @@ -1,7 +1,7 @@
89 <?xml version='1.0' encoding='UTF-8'?>
90 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
91
92 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml,v 1.171 2008/07/07 21:15:42 nightmorph Exp $ -->
93 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-x86.xml,v 1.172 2009/10/04 18:37:42 nightmorph Exp $ -->
94
95 <book>
96 <title>Gentoo Linux x86 Handbook</title>
97 @@ -10,17 +10,15 @@
98 <key id="arch">x86</key>
99 <key id="arch-sub">i386</key>
100 <key id="/boot">/dev/sda1</key>
101 - <key id="kernel-version">2.6.24-r5</key>
102 - <key id="kernel-name">kernel-2.6.24-gentoo-r5</key>
103 - <key id="genkernel-name">kernel-genkernel-x86-2.6.24-gentoo-r5</key>
104 - <key id="genkernel-initrd">initramfs-genkernel-x86-2.6.24-gentoo-r5</key>
105 - <key id="min-cd-name">install-x86-minimal-2008.0.iso</key>
106 + <key id="kernel-version">2.6.30-r6</key>
107 + <key id="kernel-name">kernel-2.6.30-gentoo-r6</key>
108 + <key id="genkernel-name">kernel-genkernel-x86-2.6.30-gentoo-r6</key>
109 + <key id="genkernel-initrd">initramfs-genkernel-x86-2.6.30-gentoo-r6</key>
110 + <key id="min-cd-name">install-x86-minimal-&lt;release&gt;.iso</key>
111 <key id="min-cd-size">57</key>
112 - <key id="live-cd-name">livecd-i686-installer-2008.0-r1.iso</key>
113 - <key id="live-cd-size">655</key>
114 - <key id="release-dir">releases/x86/2008.0/</key>
115 - <key id="stage3">stage3-i686-2008.0.tar.bz2</key>
116 - <key id="profile">default/linux/x86/2008.0</key>
117 + <key id="release-dir">releases/x86/autobuilds/</key>
118 + <key id="stage3">stage3-i686-&lt;release&gt;.tar.bz2</key>
119 + <key id="profile">default/linux/x86/10.0</key>
120 <key id="online-book">handbook-x86.xml</key>
121 <key id="CFLAGS">-O2 -march=i686 -pipe</key>
122 </values>
123 @@ -143,8 +141,8 @@
124 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
125 <license/>
126
127 -<version>9.6</version>
128 -<date>2008-07-07</date>
129 +<version>10.0</version>
130 +<date>2009-10-04</date>
131
132 <part>
133 <title>Installing Gentoo</title>
134
135
136
137 1.117 xml/htdocs/doc/en/handbook/hb-install-stage.xml
138
139 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml?rev=1.117&view=markup
140 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml?rev=1.117&content-type=text/plain
141 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml?r1=1.116&r2=1.117
142
143 Index: hb-install-stage.xml
144 ===================================================================
145 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml,v
146 retrieving revision 1.116
147 retrieving revision 1.117
148 diff -u -r1.116 -r1.117
149 --- hb-install-stage.xml 22 Jul 2009 05:05:19 -0000 1.116
150 +++ hb-install-stage.xml 4 Oct 2009 18:37:42 -0000 1.117
151 @@ -4,7 +4,7 @@
152 <!-- The content of this document is licensed under the CC-BY-SA license -->
153 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
154
155 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml,v 1.116 2009/07/22 05:05:19 nightmorph Exp $ -->
156 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml,v 1.117 2009/10/04 18:37:42 nightmorph Exp $ -->
157
158 <sections>
159
160 @@ -13,8 +13,8 @@
161 describe how you extract the stage3 archive and configure Portage.
162 </abstract>
163
164 -<version>9.2</version>
165 -<date>2009-07-21</date>
166 +<version>10.0</version>
167 +<date>2009-10-04</date>
168
169 <section>
170 <title>Installing a Stage Tarball</title>
171 @@ -232,14 +232,14 @@
172 <p>
173 We will now extract the stage tarball of your choice. We will do this with
174 <c>tar</c>. Make sure you use the same options (<c>xvjpf</c>). The <c>v</c>
175 -argument is optional and not supported in some <c>tar</c> versions. In the
176 -next example, we extract the stage tarball
177 -<path>stage3-&lt;subarch&gt;-2008.0.tar.bz2</path>. Be sure to substitute
178 -the tarball filename with your stage.
179 +argument is optional and not supported in some <c>tar</c> versions. In the next
180 +example, we extract the stage tarball
181 +<path>stage3-&lt;subarch&gt;-&lt;release&gt;.tar.bz2</path>. Be sure to
182 +substitute the tarball filename with your stage.
183 </p>
184
185 <pre caption="Extracting the stage tarball">
186 -# <i>tar xvjpf /mnt/cdrom/stages/stage3-&lt;subarch&gt;-2008.0.tar.bz2</i>
187 +# <i>tar xvjpf /mnt/cdrom/stages/stage3-&lt;subarch&gt;-&lt;release&gt;.tar.bz2</i>
188 </pre>
189
190 <p>
191 @@ -334,8 +334,9 @@
192
193 <note>
194 A commented listing of all possible variables can be found in
195 -<path>/mnt/gentoo/etc/make.conf.example</path>. For a successful Gentoo
196 -installation you'll only need to set the variables which are mentioned beneath.
197 +<path>/mnt/gentoo/usr/share/portage/config/make.conf.example</path>. For a
198 +successful Gentoo installation you'll only need to set the variables which are
199 +mentioned beneath.
200 </note>
201
202 <p>
203 @@ -357,19 +358,6 @@
204 </body>
205 </subsection>
206 <subsection>
207 -<title>CHOST</title>
208 -<body>
209 -
210 -<p>
211 -The <c>CHOST</c> variable declares the target build host for your system. This
212 -variable should already be set to the correct value. <brite>Do not edit
213 -it</brite> as that might break your system. If the <c>CHOST</c> variable does
214 -not look correct to you, you might be using the wrong stage3 tarball.
215 -</p>
216 -
217 -</body>
218 -</subsection>
219 -<subsection>
220 <title>CFLAGS and CXXFLAGS</title>
221 <body>
222
223
224
225
226 1.112 xml/htdocs/doc/en/handbook/hb-install-system.xml
227
228 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml?rev=1.112&view=markup
229 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml?rev=1.112&content-type=text/plain
230 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml?r1=1.111&r2=1.112
231
232 Index: hb-install-system.xml
233 ===================================================================
234 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml,v
235 retrieving revision 1.111
236 retrieving revision 1.112
237 diff -u -r1.111 -r1.112
238 --- hb-install-system.xml 15 May 2008 06:56:48 -0000 1.111
239 +++ hb-install-system.xml 4 Oct 2009 18:37:42 -0000 1.112
240 @@ -4,7 +4,7 @@
241 <!-- The content of this document is licensed under the CC-BY-SA license -->
242 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
243
244 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml,v 1.111 2008/05/15 06:56:48 nightmorph Exp $ -->
245 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml,v 1.112 2009/10/04 18:37:42 nightmorph Exp $ -->
246
247 <sections>
248
249 @@ -14,8 +14,8 @@
250 to progress to that state.
251 </abstract>
252
253 -<version>9.2</version>
254 -<date>2008-05-14</date>
255 +<version>10.0</version>
256 +<date>2009-10-04</date>
257
258 <section>
259 <title>Chrooting</title>
260 @@ -194,7 +194,7 @@
261
262 <p>
263 A profile is a building block for any Gentoo system. Not only does it specify
264 -default values for CHOST, CFLAGS and other important variables, it also locks
265 +default values for USE, CFLAGS and other important variables, it also locks
266 the system to a certain range of package versions. This is all maintained by the
267 Gentoo developers.
268 </p>
269 @@ -209,8 +209,11 @@
270 </p>
271
272 <pre caption="Verifying system profile">
273 -# <i>ls -FGg /etc/make.profile</i>
274 -lrwxrwxrwx 1 48 Apr 8 18:51 /etc/make.profile -> ../usr/portage/profiles/<keyval id="profile"/>
275 +# <i>eselect profile list</i>
276 +Available profile symlink targets:
277 + [1] <keyval id="profile"/> *
278 + [2] <keyval id="profile"/>/desktop
279 + [3] <keyval id="profile"/>/server
280 </pre>
281
282 <p>
283 @@ -220,18 +223,17 @@
284
285 <p>
286 There are also <c>desktop</c> and <c>server</c> subprofiles available for some
287 -architectures. Look inside the <path>2008.0/</path> profile to see if there is
288 -one available for your architecture. You may wish to view the <c>desktop</c>
289 -profile's <path>make.defaults</path> to determine if it fits your needs.
290 +architectures. Running <c>eselect profile list</c> will show all available
291 +profiles.
292 </p>
293
294 <p>
295 -After viewing the available profiles for your architecture in
296 -<path>/usr/portage/profiles/</path>, you can use a different one if you wish:
297 +After viewing the available profiles for your architecture, you can use a
298 +different one if you wish:
299 </p>
300
301 <pre caption="Changing profiles">
302 -# <i>ln -snf /usr/portage/profiles/&lt;profile name&gt; /etc/make.profile</i>
303 +# <i>eselect profile set 2</i>
304 </pre>
305
306 <p test="func:keyval('arch')='AMD64'">
307 @@ -240,7 +242,21 @@
308 </p>
309
310 <pre test="func:keyval('arch')='AMD64'" caption="Switching to a non-multilib profile">
311 -# <i>ln -snf /usr/portage/profiles/default/linux/amd64/2008.0/no-multilib /etc/make.profile</i>
312 +# <i>eselect profile list</i>
313 +Available profile symlink targets:
314 + [1] <keyval id="profile"/> *
315 + [2] <keyval id="profile"/>/desktop
316 + [3] <keyval id="profile"/>/no-multilib
317 + [4] <keyval id="profile"/>/server
318 +<comment>(Choose the no-multilib profile)</comment>
319 +# <i>eselect profile set 3</i>
320 +<comment>(Verify the change)</comment>
321 +# <i>eselect profile list</i>
322 +Available profile symlink targets:
323 + [1] <keyval id="profile"/>
324 + [2] <keyval id="profile"/>/desktop
325 + [3] <keyval id="profile"/>/no-multilib *
326 + [4] <keyval id="profile"/>/server
327 </pre>
328
329 <note>
330
331
332
333 1.28 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml
334
335 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml?rev=1.28&view=markup
336 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml?rev=1.28&content-type=text/plain
337 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml?r1=1.27&r2=1.28
338
339 Index: hb-install-x86+amd64-kernel.xml
340 ===================================================================
341 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml,v
342 retrieving revision 1.27
343 retrieving revision 1.28
344 diff -u -r1.27 -r1.28
345 --- hb-install-x86+amd64-kernel.xml 30 Jul 2009 20:13:19 -0000 1.27
346 +++ hb-install-x86+amd64-kernel.xml 4 Oct 2009 18:37:42 -0000 1.28
347 @@ -4,7 +4,7 @@
348 <!-- The content of this document is licensed under the CC-BY-SA license -->
349 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
350
351 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml,v 1.27 2009/07/30 20:13:19 nightmorph Exp $ -->
352 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml,v 1.28 2009/10/04 18:37:42 nightmorph Exp $ -->
353
354 <sections>
355
356 @@ -13,8 +13,8 @@
357 explains how to configure your kernel.
358 </abstract>
359
360 -<version>6.5</version>
361 -<date>2009-07-30</date>
362 +<version>7.0</version>
363 +<date>2009-10-04</date>
364
365 <section>
366 <title>Timezone</title>
367 @@ -369,7 +369,7 @@
368 </p>
369
370 <pre caption="Copying over the Installation CD kernel config">
371 -# <i>zcat /proc/config.gz &gt; /usr/share/genkernel/x86/kernel-config-2.6</i>
372 +# <i>zcat /proc/config.gz &gt; /usr/share/genkernel/arch/x86/kernel-config-2.6</i>
373 </pre>
374
375 </body>
376
377
378
379 1.17 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml
380
381 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml?rev=1.17&view=markup
382 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml?rev=1.17&content-type=text/plain
383 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml?r1=1.16&r2=1.17
384
385 Index: hb-install-x86+amd64-medium.xml
386 ===================================================================
387 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml,v
388 retrieving revision 1.16
389 retrieving revision 1.17
390 diff -u -r1.16 -r1.17
391 --- hb-install-x86+amd64-medium.xml 26 Jan 2009 07:51:05 -0000 1.16
392 +++ hb-install-x86+amd64-medium.xml 4 Oct 2009 18:37:42 -0000 1.17
393 @@ -4,7 +4,7 @@
394 <!-- The content of this document is licensed under the CC-BY-SA license -->
395 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
396
397 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml,v 1.16 2009/01/26 07:51:05 nightmorph Exp $ -->
398 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml,v 1.17 2009/10/04 18:37:42 nightmorph Exp $ -->
399
400 <sections>
401
402 @@ -14,8 +14,8 @@
403 Installer LiveCD is possible as well.
404 </abstract>
405
406 -<version>6.5</version>
407 -<date>2009-01-25</date>
408 +<version>7.0</version>
409 +<date>2009-10-04</date>
410
411 <section>
412 <title>Hardware Requirements</title>
413 @@ -117,19 +117,18 @@
414
415 <p>
416 All Installation CDs allow you to boot, set up networking, initialize your
417 -partitions and start installing Gentoo from the Internet. We currently provide
418 -two Installation CDs which are equally suitable to install Gentoo from, as long
419 -as you're planning on performing an Internet-based installation using the
420 -latest version of the available packages.
421 +partitions and start installing Gentoo from the Internet.
422 </p>
423
424 +<!--
425 <impo>
426 If you wish to install Gentoo without a working Internet connection, or would
427 like to use one of the provided installers, please use the installation
428 instructions described in the <uri link="2008.0/">Gentoo 2008.0
429 Handbooks</uri>.
430 </impo>
431 -
432 +-->
433 +<!--
434 <p>
435 The Installation CDs that we currently provide are:
436 </p>
437 @@ -152,7 +151,7 @@
438 To help you decide which Installation CD you need, we have written down the
439 major advantages and disadvantages of each Installation CD.
440 </p>
441 -
442 +-->
443 </body>
444 </subsection>
445 <subsection>
446 @@ -165,7 +164,7 @@
447 Installation CD to install Gentoo, but <e>only</e> with a working Internet
448 connection.
449 </p>
450 -
451 +<!--
452 <table>
453 <tr>
454 <th>Minimal Installation CD</th>
455 @@ -183,9 +182,10 @@
456 </ti>
457 </tr>
458 </table>
459 -
460 +-->
461 </body>
462 </subsection>
463 +<!--
464 <subsection>
465 <title>Gentoo Installer LiveCD</title>
466 <body>
467 @@ -217,6 +217,7 @@
468
469 </body>
470 </subsection>
471 +-->
472 <subsection>
473 <title>The Stage3 Tarball</title>
474 <body>
475 @@ -234,7 +235,7 @@
476
477 <p>
478 Stage3 tarballs can be downloaded from <path><keyval
479 -id="release-dir"/>stages/</path> on any of the <uri
480 +id="release-dir"/>current-stage3/</path> on any of the <uri
481 link="/main/en/mirrors.xml">Official Gentoo Mirrors</uri> and are not provided
482 on the LiveCD.
483 </p>
484 @@ -258,7 +259,7 @@
485 <p>
486 You can download any of the Installation CDs from one of our <uri
487 link="/main/en/mirrors.xml">mirrors</uri>. The Installation CDs are located in
488 -the <path><keyval id="release-dir"/>installcd/</path> directory.
489 +the <path><keyval id="release-dir"/>current-iso/</path> directory.
490 </p>
491
492 <p>