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-sparc.xml hb-install-sparc-bootloader.xml hb-install-sparc-disk.xml hb-install-sparc-kernel.xml hb-install-sparc-medium.xml
Date: Tue, 20 Jul 2010 08:29:53
Message-Id: 20100720082937.A832A2CE3C@corvid.gentoo.org
1 nightmorph 10/07/20 08:29:37
2
3 Modified: handbook-sparc.xml hb-install-sparc-bootloader.xml
4 hb-install-sparc-disk.xml
5 hb-install-sparc-kernel.xml
6 hb-install-sparc-medium.xml
7 Log:
8 Update the Sparc handbook for the autobuilds. Major version bump for this release. Fixes bug 260403, bug 292726, and bug 234310.
9
10 Revision Changes Path
11 1.141 xml/htdocs/doc/en/handbook/handbook-sparc.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml?rev=1.141&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml?rev=1.141&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml?r1=1.140&r2=1.141
16
17 Index: handbook-sparc.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml,v
20 retrieving revision 1.140
21 retrieving revision 1.141
22 diff -u -r1.140 -r1.141
23 --- handbook-sparc.xml 26 Jan 2009 08:47:04 -0000 1.140
24 +++ handbook-sparc.xml 20 Jul 2010 08:29:37 -0000 1.141
25 @@ -1,19 +1,21 @@
26 <?xml version='1.0' encoding='UTF-8'?>
27 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
28 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml,v 1.140 2009/01/26 08:47:04 nightmorph Exp $ -->
29 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-sparc.xml,v 1.141 2010/07/20 08:29:37 nightmorph Exp $ -->
30
31 <book>
32 <title>Gentoo Linux SPARC Handbook</title>
33
34 <values>
35 <key id="arch">SPARC</key>
36 - <key id="kernel-name">kernel-2.6.24-gentoo-r5</key>
37 - <key id="kernel-version">2.6.24-r5</key>
38 - <key id="online-book">handbook-sparc.xml</key>
39 - <key id="release-dir">releases/sparc/2008.0/sparc64/</key>
40 - <key id="stage3">stage3-sparc64-2008.0.tar.bz2</key>
41 - <key id="profile">default/linux/sparc/2008.0</key>
42 + <key id="kernel-name">kernel-2.6.33-gentoo-r2</key>
43 + <key id="kernel-version">2.6.33-r2</key>
44 + <key id="min-cd-name">install-sparc64-minimal-&lt;release&gt;.iso</key>
45 + <key id="min-cd-size">57</key>
46 + <key id="profile">default/linux/sparc/10.0</key>
47 + <key id="release-dir">releases/sparc/autobuilds/</key>
48 + <key id="stage3">stage3-sparc64-&lt;release&gt;.tar.bz2</key>
49 <key id="CFLAGS">-O2 -mcpu=ultrasparc -pipe</key>
50 + <key id="online-book">handbook-sparc.xml</key>
51 </values>
52
53 <author title="Author">
54 @@ -134,8 +136,8 @@
55 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
56 <license/>
57
58 -<version>9.4</version>
59 -<date>2009-01-26</date>
60 +<version>10.0</version>
61 +<date>2010-07-20</date>
62
63 <part>
64 <title>Installing Gentoo</title>
65
66
67
68 1.22 xml/htdocs/doc/en/handbook/hb-install-sparc-bootloader.xml
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-bootloader.xml?rev=1.22&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-bootloader.xml?rev=1.22&content-type=text/plain
72 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-bootloader.xml?r1=1.21&r2=1.22
73
74 Index: hb-install-sparc-bootloader.xml
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-bootloader.xml,v
77 retrieving revision 1.21
78 retrieving revision 1.22
79 diff -u -r1.21 -r1.22
80 --- hb-install-sparc-bootloader.xml 1 Apr 2008 08:53:46 -0000 1.21
81 +++ hb-install-sparc-bootloader.xml 20 Jul 2010 08:29:37 -0000 1.22
82 @@ -4,12 +4,12 @@
83 <!-- The content of this document is licensed under the CC-BY-SA license -->
84 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
85
86 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-bootloader.xml,v 1.21 2008/04/01 08:53:46 nightmorph Exp $ -->
87 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-bootloader.xml,v 1.22 2010/07/20 08:29:37 nightmorph Exp $ -->
88
89 <sections>
90
91 -<version>3.0</version>
92 -<date>2008-04-01</date>
93 +<version>4.0</version>
94 +<date>2010-07-20</date>
95
96 <section>
97 <title>Making your Choice</title>
98 @@ -37,7 +37,7 @@
99 LOader.
100 </p>
101
102 -<pre caption = "Installing SILO">
103 +<pre caption="Installing SILO">
104 # <i>emerge silo</i>
105 </pre>
106
107 @@ -46,7 +46,7 @@
108 create <path>/etc/silo.conf</path>.
109 </p>
110
111 -<pre caption = "Creating /etc/silo.conf">
112 +<pre caption="Creating /etc/silo.conf">
113 # <i>nano -w /etc/silo.conf</i>
114 </pre>
115
116 @@ -56,7 +56,7 @@
117 <path>kernel-<keyval id="kernel-version"/></path> as kernelimage.
118 </p>
119
120 -<pre caption = "Example /etc/silo.conf">
121 +<pre caption="Example /etc/silo.conf">
122 partition = 1 <comment># Boot partition (= root partition)</comment>
123 root = /dev/sda1 <comment># Root partition</comment>
124 timeout = 150 <comment># Wait 15 seconds before booting the default section</comment>
125 @@ -78,7 +78,7 @@
126 configuration file to <path>/boot</path> and run <c>/sbin/silo</c>:
127 </p>
128
129 -<pre caption = "Only if /boot and the SILO destination are not on the same disk">
130 +<pre caption="Only if /boot and the SILO destination are not on the same disk">
131 # <i>cp /etc/silo.conf /boot</i>
132 # <i>/sbin/silo -C /boot/silo.conf</i>
133 /boot/silo.conf appears to be valid
134 @@ -88,7 +88,7 @@
135 Otherwise just run <c>/sbin/silo</c>:
136 </p>
137
138 -<pre caption = "Run silo">
139 +<pre caption="Run silo">
140 # <i>/sbin/silo</i>
141 /etc/silo.conf appears to be valid
142 </pre>
143
144
145
146 1.35 xml/htdocs/doc/en/handbook/hb-install-sparc-disk.xml
147
148 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-disk.xml?rev=1.35&view=markup
149 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-disk.xml?rev=1.35&content-type=text/plain
150 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-disk.xml?r1=1.34&r2=1.35
151
152 Index: hb-install-sparc-disk.xml
153 ===================================================================
154 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-disk.xml,v
155 retrieving revision 1.34
156 retrieving revision 1.35
157 diff -u -r1.34 -r1.35
158 --- hb-install-sparc-disk.xml 3 Mar 2010 02:58:47 -0000 1.34
159 +++ hb-install-sparc-disk.xml 20 Jul 2010 08:29:37 -0000 1.35
160 @@ -4,12 +4,12 @@
161 <!-- The content of this document is licensed under the CC-BY-SA license -->
162 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
163
164 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-disk.xml,v 1.34 2010/03/03 02:58:47 nightmorph Exp $ -->
165 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-disk.xml,v 1.35 2010/07/20 08:29:37 nightmorph Exp $ -->
166
167 <sections>
168
169 -<version>5.1</version>
170 -<date>2008-05-02</date>
171 +<version>6.0</version>
172 +<date>2010-07-20</date>
173
174 <section>
175 <title>Introduction to Block Devices</title>
176 @@ -74,62 +74,62 @@
177 <th>Description</th>
178 </tr>
179 <tr>
180 - <ti>/dev/sda1</ti>
181 - <ti>ext3</ti>
182 - <ti>&lt;2 GByte</ti>
183 - <ti>/</ti>
184 - <ti>
185 - Root partition. For SPARC64 systems with older OBP versions, this
186 - <e>must</e> be less than 2 GBytes in size, and the first partition on the
187 - disk.
188 - </ti>
189 -</tr>
190 -<tr>
191 - <ti>/dev/sda2</ti>
192 - <ti>swap</ti>
193 - <ti>512 MBytes</ti>
194 - <ti>none</ti>
195 - <ti>
196 - Swap partition. For bootstrap and certain larger compiles, at least 512
197 - MBytes of RAM (including swap) is required.
198 - </ti>
199 -</tr>
200 -<tr>
201 - <ti>/dev/sda3</ti>
202 - <ti>none</ti>
203 - <ti>Whole disk</ti>
204 - <ti>none</ti>
205 - <ti>Whole disk partition. This is required on SPARC systems.</ti>
206 + <ti>/dev/sda1</ti>
207 + <ti>ext3</ti>
208 + <ti>&lt;2 GB</ti>
209 + <ti>/</ti>
210 + <ti>
211 + Root partition. For SPARC64 systems with older OBP versions, this
212 + <e>must</e> be less than 2 GB in size, and the first partition on the
213 + disk.
214 + </ti>
215 +</tr>
216 +<tr>
217 + <ti>/dev/sda2</ti>
218 + <ti>swap</ti>
219 + <ti>512 MB</ti>
220 + <ti>none</ti>
221 + <ti>
222 + Swap partition. For bootstrap and certain larger compiles, at least 512
223 + MB of RAM (including swap) is required.
224 + </ti>
225 +</tr>
226 +<tr>
227 + <ti>/dev/sda3</ti>
228 + <ti>none</ti>
229 + <ti>Whole disk</ti>
230 + <ti>none</ti>
231 + <ti>Whole disk partition. This is required on SPARC systems.</ti>
232 </tr>
233 <tr>
234 - <ti>/dev/sda4</ti>
235 - <ti>ext3</ti>
236 - <ti>at least 2 GBytes</ti>
237 - <ti>/usr</ti>
238 - <ti>
239 - /usr partition. Applications are installed here. By default this partition
240 - is also used for Portage data (which takes around 500 Mbyte excluding
241 - source code).
242 - </ti>
243 + <ti>/dev/sda4</ti>
244 + <ti>ext3</ti>
245 + <ti>at least 2 GB</ti>
246 + <ti>/usr</ti>
247 + <ti>
248 + /usr partition. Applications are installed here. By default this partition
249 + is also used for Portage data (which takes around 500 MB excluding
250 + source code).
251 + </ti>
252 </tr>
253 <tr>
254 - <ti>/dev/sda5</ti>
255 - <ti>ext3</ti>
256 - <ti>at least 1GByte</ti>
257 - <ti>/var</ti>
258 - <ti>
259 - /var partition. Used for program-generated data. By default Portage uses
260 - this partition for temporary space whilst compiling. Certain larger
261 - applications such as Mozilla and OpenOffice.org can require over 1 GByte
262 - of temporary space here when building.
263 - </ti>
264 + <ti>/dev/sda5</ti>
265 + <ti>ext3</ti>
266 + <ti>at least 1 GB</ti>
267 + <ti>/var</ti>
268 + <ti>
269 + /var partition. Used for program-generated data. By default Portage uses
270 + this partition for temporary space whilst compiling. Certain larger
271 + applications such as Mozilla and OpenOffice.org can require over 1 GB
272 + of temporary space here when building.
273 + </ti>
274 </tr>
275 <tr>
276 - <ti>/dev/sda6</ti>
277 - <ti>ext3</ti>
278 - <ti>remaining space</ti>
279 - <ti>/home</ti>
280 - <ti>/home partition. Used for users' home directories.</ti>
281 + <ti>/dev/sda6</ti>
282 + <ti>ext3</ti>
283 + <ti>remaining space</ti>
284 + <ti>/home</ti>
285 + <ti>/home partition. Used for users' home directories.</ti>
286 </tr>
287 </table>
288
289 @@ -180,7 +180,7 @@
290
291 <p>
292 Change the partition layout as required. Remember to keep the root partition
293 -entirely within the first 2 GBytes of the disk for older systems. There is also
294 +entirely within the first 2 GB of the disk for older systems. There is also
295 a 15-partition limit for SCSI and SATA.
296 </p>
297
298 @@ -228,11 +228,11 @@
299 <p>
300 Note the <c>Sun disk label</c> in the output. If this is missing, the disk is
301 using the DOS-partitioning, not the Sun partitioning. In this case, use <c>s</c>
302 -to ensure that the disk has a sun partition table:
303 +to ensure that the disk has a Sun partition table:
304 </p>
305
306 <pre caption="Creating a Sun Disklabel">
307 -Command (m for help): s
308 +Command (m for help): <i>s</i>
309 Building a new sun disklabel. Changes will remain in memory only,
310 until you decide to write them. After that, of course, the previous
311 content won't be recoverable.
312 @@ -332,8 +332,8 @@
313 We're ready to create the root partition. To do this, type <c>n</c> to create a
314 new partition, then type <c>1</c> to create the partition. When prompted for
315 the first cylinder, hit enter. When prompted for the last cylinder, type
316 -<c>+512M</c> to create a partition <c>512MBytes</c> in size. Make sure that the
317 -entire root partition fits within the first 2GBytes of the disk. You can see
318 +<c>+512M</c> to create a partition <c>512 MB</c> in size. Make sure that the
319 +entire root partition fits within the first 2 GB of the disk. You can see
320 output from these steps below:
321 </p>
322
323 @@ -369,7 +369,7 @@
324 Next, let's create the swap partition. To do this, type <c>n</c> to create a new
325 partition, then <c>2</c> to create the second partition, <path>/dev/sda2</path>
326 in our case. When prompted for the first cylinder, hit enter. When prompted for
327 -the last cylinder, type <c>+512M</c> to create a partition 512MB in size. After
328 +the last cylinder, type <c>+512M</c> to create a partition 512 MB in size. After
329 you've done this, type <c>t</c> to set the partition type, and then type in
330 <c>82</c> to set the partition type to "Linux Swap". After completing these
331 steps, typing <c>p</c> should display a partition table that looks similar to
332 @@ -399,7 +399,7 @@
333 type <c>n</c> to create a new partition, then type <c>4</c> to create the
334 third partition, <path>/dev/sda4</path> in our case. When prompted for the
335 first cylinder, hit enter. When prompted for the last cylinder, enter
336 -<c>+2048M</c> to create a partition 2 GBytes in size. Repeat this process
337 +<c>+2048M</c> to create a partition 2 GB in size. Repeat this process
338 for <path>sda5</path> and <path>sda6</path>, using the desired sizes. Once
339 you're done, you should see something like this:
340 </p>
341
342
343
344 1.39 xml/htdocs/doc/en/handbook/hb-install-sparc-kernel.xml
345
346 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-kernel.xml?rev=1.39&view=markup
347 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-kernel.xml?rev=1.39&content-type=text/plain
348 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-kernel.xml?r1=1.38&r2=1.39
349
350 Index: hb-install-sparc-kernel.xml
351 ===================================================================
352 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-kernel.xml,v
353 retrieving revision 1.38
354 retrieving revision 1.39
355 diff -u -r1.38 -r1.39
356 --- hb-install-sparc-kernel.xml 29 Dec 2009 18:56:22 -0000 1.38
357 +++ hb-install-sparc-kernel.xml 20 Jul 2010 08:29:37 -0000 1.39
358 @@ -4,12 +4,12 @@
359 <!-- The content of this document is licensed under the CC-BY-SA license -->
360 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
361
362 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-kernel.xml,v 1.38 2009/12/29 18:56:22 nightmorph Exp $ -->
363 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-kernel.xml,v 1.39 2010/07/20 08:29:37 nightmorph Exp $ -->
364
365 <sections>
366
367 -<version>9.4</version>
368 -<date>2009-12-29</date>
369 +<version>10.0</version>
370 +<date>2010-07-20</date>
371
372 <section>
373 <title>Timezone</title>
374 @@ -47,12 +47,12 @@
375 </p>
376
377 <p>
378 -For sparc-based systems we have <c>gentoo-sources</c> (recommended 2.6 kernel
379 -sources).
380 +For <keyval id="arch"/>-based systems we have <c>gentoo-sources</c>
381 +(kernel source patched for extra features).
382 </p>
383
384 <p>
385 -In the next example we install <c>gentoo-sources</c>.
386 +Choose your kernel source and install it using <c>emerge</c>.
387 </p>
388
389 <pre caption="Installing a kernel source">
390 @@ -215,7 +215,7 @@
391 </p>
392
393 <p>
394 -If you're using a qla2xxx disk controller, you'll need to be a 2.6.27 kernel or
395 +If you're using a qla2xxx disk controller, you'll need to use a 2.6.27 kernel or
396 newer, and you'll also need to emerge <c>sys-block/qla-fc-firmware</c>. Next,
397 run <c>make menuconfig</c> and navigate to the Device Drivers section. You'll
398 need to add support for loading external firmware.
399
400
401
402 1.50 xml/htdocs/doc/en/handbook/hb-install-sparc-medium.xml
403
404 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-medium.xml?rev=1.50&view=markup
405 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-medium.xml?rev=1.50&content-type=text/plain
406 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-medium.xml?r1=1.49&r2=1.50
407
408 Index: hb-install-sparc-medium.xml
409 ===================================================================
410 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-medium.xml,v
411 retrieving revision 1.49
412 retrieving revision 1.50
413 diff -u -r1.49 -r1.50
414 --- hb-install-sparc-medium.xml 3 Mar 2010 01:40:45 -0000 1.49
415 +++ hb-install-sparc-medium.xml 20 Jul 2010 08:29:37 -0000 1.50
416 @@ -4,12 +4,12 @@
417 <!-- The content of this document is licensed under the CC-BY-SA license -->
418 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
419
420 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-medium.xml,v 1.49 2010/03/03 01:40:45 nightmorph Exp $ -->
421 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-sparc-medium.xml,v 1.50 2010/07/20 08:29:37 nightmorph Exp $ -->
422
423 <sections>
424
425 -<version>9.3</version>
426 -<date>2010-03-02</date>
427 +<version>10.0</version>
428 +<date>2010-07-20</date>
429
430 <section>
431 <title>Hardware Requirements</title>
432 @@ -77,18 +77,16 @@
433
434 <p>
435 All Installation CDs allow you to boot, set up networking, initialize your
436 -partitions and start installing Gentoo from the Internet. We currently provide
437 -two Installation CDs which are equally suitable to install Gentoo from, as long
438 -as you're planning on performing an Internet-based installation using the latest
439 -version of the available packages.
440 +partitions and start installing Gentoo from the Internet.
441 </p>
442 -
443 -<p>
444 +<!--
445 +<impo>
446 If you wish to install Gentoo without a working Internet connection, please use
447 the installation instructions described in the <uri
448 link="2008.0/index.xml">Gentoo 2008.0 Handbooks</uri>.
449 -</p>
450 -
451 +</impo>
452 +-->
453 +<!--
454 <p>
455 The two Installation CDs that we currently provide are:
456 </p>
457 @@ -110,19 +108,20 @@
458 To help you decide which Installation CD you need, we have written down the
459 major advantages and disadvantages of each Installation CD.
460 </p>
461 -
462 +-->
463 </body>
464 </subsection>
465 <subsection>
466 -<title>Gentoo's Minimal Installation CD</title>
467 +<title>Gentoo Minimal Installation CD</title>
468 <body>
469
470 <p>
471 -The Minimal Installation CD is called <c>install-sparc64-minimal-2008.0.iso</c>
472 -and takes up only 44 MB of diskspace. You can use this Installation CD to
473 -install Gentoo, but always with a working Internet connection only.
474 +The Minimal Installation CD is called <c><keyval id="min-cd-name"/></c> and
475 +takes up only <keyval id="min-cd-size"/> MB of diskspace. You can use this
476 +Installation CD to install Gentoo, but <e>only</e> with a working Internet
477 +connection.
478 </p>
479 -
480 +<!--
481 <table>
482 <tr>
483 <th>Minimal Installation CD</th>
484 @@ -171,7 +170,8 @@
485 <ti>Huge download</ti>
486 </tr>
487 </table>
488 -
489 +-->
490 +<!--
491 </body>
492 </subsection>
493 <subsection>
494 @@ -191,7 +191,7 @@
495 If you intend to use the Packages CD to quickly install additional software,
496 make sure that you use the same subarchitecture as the stage3 tarball you use.
497 </p>
498 -
499 +-->
500 </body>
501 </subsection>
502 <subsection>
503 @@ -209,6 +209,13 @@
504 Using a Stage1 or Stage2 Tarball?</uri>
505 </p>
506
507 +<p>
508 +Stage3 tarballs can be downloaded from <path><keyval
509 +id="release-dir"/>current-stage3/</path> on any of the <uri
510 +link="/main/en/mirrors.xml">Official Gentoo Mirrors</uri> and are not provided
511 +on the LiveCD.
512 +</p>
513 +
514 </body>
515 </subsection>
516 <subsection>
517 @@ -244,10 +251,9 @@
518 </p>
519
520 <p>
521 -You can download any of the Installation CDs (and, if you want to, a Packages CD
522 -as well) from one of our <uri link="/main/en/mirrors.xml">mirrors</uri>. The
523 -Installation CDs are located in the <path><keyval
524 -id="release-dir"/>installcd</path> directory.
525 +You can download any of the Installation CDs from one of our <uri
526 +link="/main/en/mirrors.xml">mirrors</uri>. The Installation CDs are located in
527 +the <path><keyval id="release-dir"/>current-iso/</path> directory.
528 </p>
529
530 <p>
531 @@ -256,9 +262,9 @@
532 </p>
533
534 <p>
535 -In case you wonder if your downloaded file is corrupted or not, you can check its
536 -MD5 checksum and compare it with the MD5 checksum we provide (such as
537 -<path>install-sparc64-minimal-2008.0.iso.DIGESTS</path>). You can check the MD5
538 +In case you wonder if your downloaded file is corrupted or not, you can check
539 +its MD5 checksum and compare it with the MD5 checksum we provide (such as
540 +<path><keyval id="min-cd-name"/>.DIGESTS</path>). You can check the MD5
541 checksum with the <c>md5sum</c> tool under Linux/Unix or <uri
542 link="http://www.etree.org/md5com.html">md5sum</uri> for Windows.
543 </p>
544 @@ -270,15 +276,18 @@
545 </p>
546
547 <pre caption="Obtaining the public key">
548 -$ <i>gpg --keyserver subkeys.pgp.net --recv-keys 17072058</i>
549 +$ <i>gpg --keyserver subkeys.pgp.net --recv-keys 2D182910</i>
550 </pre>
551
552 <p>
553 Now verify the signature:
554 </p>
555
556 -<pre caption="Verify the cryptographic signature">
557 -$ <i>gpg --verify &lt;signature file&gt; &lt;downloaded iso&gt;</i>
558 +<pre caption="Verify the files">
559 +<comment>(Verify the cryptographic signature)</comment>
560 +$ <i>gpg --verify &lt;downloaded iso.DIGESTS.asc&gt;</i>
561 +<comment>(Verify the checksum)</comment>
562 +$ <i>sha1sum -c &lt;downloaded iso.DIGESTS.asc&gt;</i>
563 </pre>
564
565 <p>