Commit changes to release d-i Beta 3

CVS version numbers

danish/devel/debian-installer/index.wml: 1.112 -> 1.113 
english/donations.wml: 1.57 -> 1.58 
english/devel/debian-installer/errata.wml: 1.87 -> 1.88 
english/devel/debian-installer/images.data: 1.25 -> 1.26 
english/devel/debian-installer/index.wml: 1.175 -> 1.176 
english/devel/debian-installer/News/2006/20060811.wml: INITIAL -> 1.1 
german/devel/debian-installer/index.wml: 1.104 -> 1.105 
italian/devel/debian-installer/index.wml: 1.85 -> 1.86 
japanese/devel/debian-installer/index.wml: 1.83 -> 1.84 
portuguese/devel/debian-installer/index.wml: 1.69 -> 1.70 
spanish/devel/debian-installer/index.wml: 1.29 -> 1.30 
swedish/devel/debian-installer/index.wml: 1.37 -> 1.38

12 files changed, 300 insertions, 140 deletions

diff --git a/danish/devel/debian-installer/index.wml b/danish/devel/debian-installer/index.wml
index 82733cdcedf..2e87b857fc8 100644
--- a/danish/devel/debian-installer/index.wml
+++ b/danish/devel/debian-installer/index.wml
@@ -21,18 +21,18 @@
 </if-stable-release>	
 
 <p><strong>For at installere Debian testing</strong>, anbefaler vi at du 
-anvender etch beta 2-udgaven af installeringsprogrammet, efter at have kigget
+anvender etch beta 3-udgaven af installeringsprogrammet, efter at have kigget
 på dens <a href="errata">fejlside</a>.  Følgende aftryk er tilgængelige med
-beta 2:</p>
+beta 3:</p>
 
 <ul>
     <li>netinst-cd-aftryk (100-150 mb)<br>
 	<netinst-images />
     </li>
 
-#    <li>visitkorts-cd-aftryk (20-50 mb)<br>
-#	<businesscard-images />
-#    </li>
+     <li>visitkorts-cd-aftryk (20-50 mb)<br>
+ 	<businesscard-images />
+     </li>
 
     <li>komplette cd-sæt<br>
 	<full-cd-images />
diff --git a/english/devel/debian-installer/News/2006/20060811.wml b/english/devel/debian-installer/News/2006/20060811.wml
new file mode 100644
index 00000000000..b8b64e93fd0
--- /dev/null
+++ b/english/devel/debian-installer/News/2006/20060811.wml
@@ -0,0 +1,166 @@
+<define-tag pagetitle>Debian Installer etch beta 3</define-tag>
+<define-tag release_date>2006-08-11</define-tag>
+#use wml::debian::news
+
+<p>
+The Debian Installer <a href="http://wiki.debian.org/DebianInstaller/Team">\
+team</a> is proud to announce the third beta release of the installer
+for Debian GNU/Linux Etch.
+</p>
+
+<h2>Major new features introduced with this release</h2>
+<ul>
+<li>Option to install using a <a href="#g-i">graphical user interface</a> on
+    i386 and amd64. For powerpc this option is experimental.</li>
+<li>Support for setting up <a href="#crypto">encrypted partitions</a> during
+    installation.</li>
+</ul>
+
+<p>
+Both these features currently have some limitations. See the
+<a href="#g-i">sections below</a> for additional information!
+</p>
+
+<h2>Other improvements in the installer</h2>
+<ul>
+<li>First release to install the amd64 architecture from official Debian
+    mirrors.</li>
+<li>The installer now has brltty support in regular images for i386,
+    amd64 and powerpc which improves accessibility for visually
+    handicapped people.</li>
+<li>This new version of the installer uses and installs the 2.6.16
+    kernel.</li>
+<li>In addition to the architectures that already made the switch, 2.6
+    is now the default kernel for sparc, mips, mipsel and S/390.</li>
+<li>Improved installation from CD-ROM. Installation is again possible
+    without also automatically including a network mirror as source.</li>
+<li>Improved checks during mirror selection to determine if the mirror is
+    valid for the architecture being installed.</li>
+<li>For expert or preseeded installations it is now possible to set up
+    the system with sudo instead of a root password.</li>
+<li>Module parameters can be passed from the boot prompt using the format
+    '&lt;module name&gt;.&lt;parameter&gt;=&lt;value&gt;'. Parameters passed
+    this way will be retained for the installed system.</li>
+<li>For some common boot options, a short form can now be
+    used<sup><a href="#n1">1)</sup></a>.<br/>Examples:
+    <ul>
+    <li>'fb=false' for 'debian-installer/framebuffer=false'</li>
+    <li>'priority=medium' for 'debconf/priority=medium'</li>
+    </ul>
+<li>Usability improvements in LVM and software RAID
+    setup<sup><a href="#n1">1)</sup></a>.</li>
+<li>Automatic partitioning using LVM can now be
+    preseeded<sup><a href="#n1">1)</sup></a>.</li>
+<li>Architecture specific:</li>
+    <ul>
+    <li>sparc: automatic detection of sbus devices</li>
+    <li>sparc: sofware RAID support</li>
+    </ul>
+<li>Added the following languages: Irish.</li>
+<li>Additional languages supported only in the graphical installer:
+    Bengali, Dzongkha, Georgian, Hindi, Khmer, Nepali, Punjabi (Gurmukhi),
+    Tamil and Thai.</li>
+</ul>
+
+<h2>Known issues in this release</h2>
+<ul>
+<li>Partition resizing using partman may result in data loss if the
+    starting sector of the partition is not at the start of a cylinder.<br/>
+    This has been observed in particular for NTFS partitions created
+    during installation of Windows Vista Beta 2. Resizing of NTFS
+    partitions created by earlier Windows versions should still work.</li>
+<li>No support for installation from floppy disk for i386. Work to support
+    installation from floppy using 2.6 kernels is in progress.</li>
+<li>Minimum USB stick capacity for hd-media installs is now 256 MB.</li>
+<li>There are some usability issues for S/390 installs.</li>
+<li>There are still various issues for some powerpc subarchitectures.</li>
+</ul>
+
+<p>
+See the <a href="$(DEVEL)/debian-installer/errata">errata</a> for details and
+a full list of known issues.
+</p>
+
+<p>
+Our thanks to everybody who has contributed to this release. This time in 
+particular to Bastian Blank for his work to switch S/390 to a 2.6 kernel.
+</p>
+
+<p>
+Installation CDs, other media, errata and everything else you'll need are
+available from our <a href="$(DEVEL)/debian-installer">web site</a>.
+</p>
+
+<p><strong>Notes</strong></p>
+<ol>
+<li><a name="n1"/>These changes are documented in the development version
+    of the <a href="http://d-i.alioth.debian.org/manual/">installation
+    guide</a>.</li>
+</ol>
+
+<hr size="2">
+
+<h2><a name="g-i"/>Graphical user interface</h2>
+
+<p>
+For i386 and amd64 the graphical installer is available on all CD images
+and for hd-media installations. To use it, you need to boot the installer
+with <tt>installgui</tt>.<br/>
+In addition, special <tt>mini.iso</tt> images are available which boot the
+graphical installer by default (look for <tt>gtk-miniiso</tt> from the links
+to <q>other images</q>).
+</p>
+
+<p>
+For powerpc and powerpc64 the graphical installer is only available as an
+experimental <tt>mini.iso</tt> image. Main reason for this is that tests have
+shown problems on various machines and we feel it is not yet stable enough
+for general use.
+</p>
+
+<p>
+The graphical installer is functionally identical to the regular installer,
+with exception of encryption support (see below). One of its real advantages
+is that it allows installation in nine new languages that cannot be displayed
+in the regular installer.<br/>
+We are aware that the graphical installer still needs polishing. Part of this
+is planned immediately after this release: an update to newer libraries will
+allow better theming.
+</p>
+
+<p>
+The graphical user interface runs on VT5. To switch consoles from the graphical
+user interface, you need to use <tt>ctrl+alt+F2</tt> (for the debug shell), just
+like when switching consoles from X. To switch back, use <tt>alt-F5</tt>.<br/>
+Note that for amd64 switching consoles is <strong>not</strong> possible as it
+will crash the frontend. This is a known bug that we hope to solve before the
+release of Etch.
+</p>
+
+<h2><a name="crypto"/>Setting up encrypted partitions</h2>
+
+<p>
+How to set up encrypted partitions during installation is documented in the
+<a href="http://d-i.alioth.debian.org/manual/">installation guide</a>.
+</p>
+
+<p>
+As this is the first release to include support for encrypted partitions, you
+are requested to use this option with caution and make sure the resulting
+system is set up correctly before trusting any important data to it.
+</p>
+
+<p>Please take note of the following known issues:</p>
+<ul>
+<li>The graphical installer provides only limited encryption support.
+    In particular, random keys cannot be used for dm-crypt and GnuPG keyfiles
+    cannot be used for loop-AES. Other parts should be possible but are largely
+    untested for graphical installations.</li>
+<li>When installing with a non-English locale, non-ASCII characters entered as
+    part of a passphrase are not correctly handled. The installed system uses a
+    different keymap and won't be able to recognize those characters.</li>
+<li>The installer does not prevent the setup of unencrypted swap space after
+    encrypted volumes have been configured. This kind of setup should be avoided
+    as it could compromise the encryption by causing encryption keys to be leaked
+    to disk.</li>
+</ul>
diff --git a/english/devel/debian-installer/errata.wml b/english/devel/debian-installer/errata.wml
index 78253c8ad68..d05601a5918 100644
--- a/english/devel/debian-installer/errata.wml
+++ b/english/devel/debian-installer/errata.wml
@@ -1,75 +1,71 @@
 #use wml::debian::template title="Debian-Installer errata"
 #use wml::debian::recent_list
 
-<h1 id="etch-beta2">Errata for etch beta 2</h1>
+<h1 id="etch-beta3">Errata for etch beta 3</h1>
 
 <p>
-This is a list of known problems in the etch beta 2 release of the
+This is a list of known problems in the etch beta 3 release of the
 Debian-Installer. If you do not see your problem listed here,
 please send us an <a href="report-template">installation report</a>
 describing the problem.
 </p>
 
 <dl class="gloss">
-	<dt>Network and disk devices may change on reboot</dt>
-	<dd>
-	On systems with multiple disk or network controllers, the kernel/udev
-	may assign a different device node on reboot of the system than was
-	used during installation due to difference in load order of drivers.<br>
-	This can lead to failure to boot the system or to the network not
-	coming up automatically. In most cases this can be rectified changing
-	the bootloader configuration and /etc/fstab, or /etc/network/interfaces,
-	possibly using the rescue mode of the installer.<br>
+	<dt>Disk devices may change on reboot</dt>
+	<dd>
+	On systems with multiple diskcontrollers, the kernel/udev may assign
+	a different device node on reboot of the system than was used during
+	installation due to difference in load order of drivers.<br>
+	This can lead to failure to boot the system. In most cases this can be
+	rectified changing the bootloader configuration and /etc/fstab,
+	possibly using the rescue mode of the installer.<br/>
 	Note however that this problem may occur again on subsequent boots.
 	Fixing this issue has priority for the next release of Debian installer.
 	</dd>
 
-	<dt>Use of network mirrors during CD/DVD installs</dt>
+	<dt>Danger of data loss from resizing partitions</dt>
 	<dd>
-	By default a network mirror will be added to your sources list, even when
-	you install from a full CD or DVD. This means that, after task selection,
-	packages for which a newer version is available on the mirror will be
-	downloaded over the network instead of being read from CD/DVD.<br />
-	It is possible to work around this by using the &lt;Go back&gt; button when
-	you are asked to select a mirror and skipping to the next installation
-	step when you get to the menu. When you are asked once more if you want
-	to use a mirror later in the installation, select the option <q>Ignore</q>.<br />
-	Note: the security mirror may still be used.<br />
+	Partition resizing using partman may result in data loss if the
+	starting sector of the partition is not at the start of a cylinder.
+	See bug report <a href="http://bugs.debian.org/379835">#379835</a>
+	for a detailed analysis.<br/>
+	This has been observed in particular for NTFS partitions created
+	during installation of Windows Vista Beta 2. Resizing of NTFS
+	partitions created by earlier Windows versions should still work.
 	</dd>
 
-	<dt>Issues during package installation for some languages</dt>
+	<dt>CD-ROM drives connected to SATA controllers not detected</dt>
 	<dd>
-	Languages that have not been set to use UTF-8 by default will see
-	garbled text during package installation because of character encoding
-	problems (mojibake). This is a known issue for installations in Russian.
+	Cause for the drives not being detected is that libata ATAPI support
+	is not enabled in the kernel as the upstream kernel developers do not
+	yet consider it mature. It is expected to be enabled in 2.6.16 kernels.<br/>
+	A <a href="http://wiki.debian.org/DebianInstaller/SataAtapiHowto">\
+	workaround is available</a> that will allow users to enable ATAPI
+	support manually for the installation and the installed system.
+	</dd>
+
+	<dt>Incomplete installation of Desktop task from full CD</dt>
+	<dd>
+	The full CD image is too small to contain all packages needed to
+	install the complete Desktop task. This means that if you only use the
+	CD as a source, only part of the Desktop task will be installed.<br/>
+	You can resolve this either <em>during the installation</em> by choosing
+	to use a network mirror as a source to install packages in addition to the
+	CD (not recommended if you don't have a decent internet connection), or
+	<em>after you have rebooted</em> into the installed system by using
+	<tt>apt-cdrom</tt> to load additional CDs and then selecting the Desktop
+	task again in <tt>aptitude</tt>.
 	</dd>
 
 	<dt>General issues after reboot because of UTF-8 default</dt>
 	<dd>
 	The installed system is now set to UTF-8 by default. However, not all
 	applications properly support UTF-8 yet, which may result in minor or
-	major problems when using them.
-	<dd>
+	major problems when using them.<br/>
 	Please check if such problems have been reported yet and, if not, file
 	a bug report against the relevant package (not the installer).
 	</dd>
 
-	<dt>Non i386 installs: mirror list may not be correct</dt>
-	<dd>
-	Debian is currently undergoing a restructuring of its archive mirrors.
-	In practice this means that archives which previously supported all
-	(or most) architectures may no longer do so. The installer includes a
-	static list of which mirrors support which architectures and, because
-	of this change, this list may be outdated.<br>The mirror selection
-	component in the installer <strong>does not</strong> check if an architecture is
-	actually available on a mirror, but only if the mirror supports the
-	release being installed. If a mirror has dropped the architecture,
-	this may result in errors during download of d-i components or during
-	package installation.<br> The solution of course is to find a mirror
-	that does support your architecture and to use that. This issue only
-	affects architectures other than i386.
-	</dd>
-
 	<dt>Limited localization of installed system</dt>
 	<dd>
 	For the Sarge version of the installer the package localization-config was
@@ -82,54 +78,26 @@ describing the problem.
 
 	<dt>Installation of Sarge not supported</dt>
 	<dd>
-	As a result of some structural changes in this release of the installer,
-	installation of Sarge (stable) is not supported. We expect to make this
-	possible again in the next release.
-	</dd>
-
-	<dt>CD-ROM drives connected to SATA controllers not detected</dt>
-	<dd>
-	Cause for the drives not being detected is that libata ATAPI support
-	is not enabled in the kernel as the upstream kernel developers do not
-	yet consider it mature. It is expected to be enabled in 2.6.16 kernels.<br>
-	A <a href="http://wiki.debian.org/DebianInstaller/SataAtapiHowto">\
-	workaround is available</a> that will allow users to enable ATAPI
-	support manually for the installation and the installed system.
+	As a result of some structural changes in the installer, installation of
+	Sarge (stable) is not supported.
 	</dd>
 
 	<dt>Several issues for PowerPC</dt>
 	<dd>
 	The PowerPC port has several issues in this release:
 	<ul>
-		<li>support for prep partitions in partman is broken</li>
-		<li>tg3 driver not available during installation</li>
 		<li>floppy installations for powerpc are broken because no
 		    device node is created for the swim3 module</li>
-	        <li>Oldworld powerpc boot floppies will not work as miboot
+		<li>Oldworld powerpc boot floppies will not work as miboot
 		    is not included</li>
+		<li>Airport Extreme driver is reported to be broken in 2.6.16
+		    (<a href="http://bugs.debian.org/358833">#358833</a>)</li>
+		<li>the snd-powermac module is no longer loaded by default as
+		    it will lock up some systems; you will need to add it to
+		    <tt>/etc/modules</tt> manually</li>
 	</ul>
 	</dd>
 
-	<dt>amd64: packages may be missing from CD images</dt>
-	<dd>
-	At the time of the release, the AMD64 etch archive was known to be
-	missing some packages due to a reversed migration from unstable. This
-	has resulted in KDE not being included on full CD images for AMD64
-	(because of missing libcupsys2). Other packages may be affected as well.
-	</dd>
-
-	<dt>arm: CATS cdrom images missing essential drivers</dt>
-	<dd>
-	Please use netboot or daily (sid_d-i) images instead.
-	</dd>
-
-	<dt>i386: netinst iso too large for USB stick installs</dt>
-	<dd>
-	The netinst iso is too large to fit on a 128 mb USB stick. It will
-	work as a regular CD image or on larger USB sticks for a USB
-	install.
-	</dd>
-
 <!-- leaving this in for possible future use...
 	<dt>i386: more than 32 mb of memory is needed to install</dt>
 	<dd>
@@ -140,21 +108,34 @@ describing the problem.
 	</dd>
 -->
 
-	<dt>mips: installations via SSH broken for Cobalt</dt>
+	<dt>amd64: [graphical installer] console switching not possible</dt>
 	<dd>
-	This was going to be a new feature for the release, but a bug was
-	discovered at the last minute. A fixed image is available for
-	<a href="http://people.debian.org/~tbm/cobalt/etch-beta2/nfsroot.tar.gz">download</a>.
+	If you try to switch to a different console from the graphical installer
+	on amd64, the frontend will crash. This means there is no shell available
+	during the installation. Logs can be viewed using the <q>Save debug logs</q>
+	option from the main menu.
 	</dd>
 
-	<dt>sparc: 2.4 netboot images need special parameter to boot</dt>
+	<dt>mipsel/cobalt: error in network boot configuration</dt>
 	<dd>
-	The netboot image needs to be passed ramdisk_size=16000 to boot the 2.4
-	kernel properly.
+	The release provides for mipsel/cobalt a set of files for booting
+	over network. The kernel image name is vmlinux-2.6.16-2-r5k-cobalt,
+	but <tt>default.colo</tt> still records vmlinux-2.6.16-1-r5k-cobalt.<br/>
+	As a workaround, edit the file <tt>default.colo</tt> in the NFS root
+	to expect vmlinux-2.6.16-2-r5k-cobalt as kernel file name.
 	</dd>
 
-	<dt>sparc32: 2.6 kernel not supported</dt>
+	<dt>s390: usability issues</dt>
 	<dd>
-	Only the 2.4 kernel works with the sparc32 subarchitecture.
+	Various components were rewritten in order to support 2.6 based
+	installations and still have a few rough edges.
+	<ul>
+	<li>during network device selection, devices that have already been
+	    selected are not removed from the list of available devices</li>
+	<li>during dasd selection, the dialog does not show which dasds have
+	    already been selected and which not</li>
+	<li>the dasd selection component does not yet support formatting a new
+	    dasd; use <tt>dasdfmt</tt> from a shell as a workaround</li>
+	</ul>
 	</dd>
 </dl>
diff --git a/english/devel/debian-installer/images.data b/english/devel/debian-installer/images.data
index 49d826d9f3f..e55105de574 100644
--- a/english/devel/debian-installer/images.data
+++ b/english/devel/debian-installer/images.data
@@ -1,36 +1,36 @@
 #include wml::debian::installer
 
 <define-tag netinst-images>
-<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta2/@ARCH@/iso-cd/debian-testing-@ARCH@-netinst.iso" arch="<strip-arches "<devel-images-arches />" "amd64 s390 source" />" />
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta3/@ARCH@/iso-cd/debian-testing-@ARCH@-netinst.iso" arch="<strip-arches "<devel-images-arches />" "s390 source" />" />
 </define-tag>
 
 <define-tag businesscard-images>
-<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta2/@ARCH@/iso-cd/debian-testing-@ARCH@-businesscard.iso" arch="<strip-arches "<devel-images-arches />" "amd64 s390 source" />" />
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta3/@ARCH@/iso-cd/debian-testing-@ARCH@-businesscard.iso" arch="<strip-arches "<devel-images-arches />" "s390 source" />" />
 </define-tag>
 
 <define-tag full-cd-images>
-<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta2/@ARCH@/iso-cd" arch="<devel-images-arches />" />
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta3/@ARCH@/iso-cd" arch="<devel-images-arches />" />
 </define-tag>
 <define-tag full-dvd-images>
-<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta2/@ARCH@/iso-dvd" arch="<devel-images-arches />" />
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta3/@ARCH@/iso-dvd" arch="<devel-images-arches />" />
 </define-tag>
 
 <define-tag full-cd-jigdo>
-<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta2/@ARCH@/jigdo-cd" arch="<devel-images-arches />" />
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta3/@ARCH@/jigdo-cd" arch="<devel-images-arches />" />
 </define-tag>
 <define-tag full-dvd-jigdo>
-<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta2/@ARCH@/jigdo-dvd" arch="<devel-images-arches />" />
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta3/@ARCH@/jigdo-dvd" arch="<devel-images-arches />" />
 </define-tag>
 
 <define-tag full-cd-torrent>
-<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta2/@ARCH@/bt-cd" arch="<devel-images-arches />" />
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta3/@ARCH@/bt-cd" arch="<devel-images-arches />" />
 </define-tag>
 <define-tag full-dvd-torrent>
-<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta2/@ARCH@/bt-dvd" arch="<devel-images-arches />" />
+<images-list url="http://cdimage.debian.org/cdimage/etch_di_beta3/@ARCH@/bt-dvd" arch="<devel-images-arches />" />
 </define-tag>
 
 <define-tag other-images>
-<images-list url="http://ftp.nl.debian.org/debian/dists/testing/main/installer-@ARCH@/beta2/images/" arch="<strip-arches "<devel-images-arches />" "amd64 source" />" />
+<images-list url="http://ftp.nl.debian.org/debian/dists/testing/main/installer-@ARCH@/beta3/images/" arch="<strip-arches "<devel-images-arches />" "source" />" />
 </define-tag>
 
 
diff --git a/english/devel/debian-installer/index.wml b/english/devel/debian-installer/index.wml
index 84ea1a856fe..8be9182974f 100644
--- a/english/devel/debian-installer/index.wml
+++ b/english/devel/debian-installer/index.wml
@@ -23,17 +23,17 @@ information</b>, see
 
 <p>
 <b>To install Debian testing</b>, we recommend you use
-the etch beta 2 release of the installer, after checking its
+the etch beta 3 release of the installer, after checking its
 <a href="errata">errata</a>. The following images are available for
-beta 2:
+beta 3:
 </p>
 <ul>
 	<li>netinst CD image (100-150 MB)<br>
 	<netinst-images />
 	</li>
-#	<li>businesscard CD image (20-50 MB)<br>
-#	<businesscard-images />
-#	</li>
+	<li>businesscard CD image (20-50 MB)<br>
+	<businesscard-images />
+	</li>
 	<li>full CD sets<br>
 	<full-cd-images />
 	</li>
@@ -46,9 +46,9 @@ beta 2:
 	<li>full DVD sets (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)<br>
 	<full-dvd-jigdo />
 	</li>
-#	<li>other images (netboot, usb stick, floppy, etc)<br>
-#	<other-images />
-#	</li>
+	<li>other images (netboot, usb stick, floppy, etc)<br>
+	<other-images />
+	</li>
 </ul>
 
 <p>
diff --git a/english/donations.wml b/english/donations.wml
index 28211b1641b..d4985fd939a 100644
--- a/english/donations.wml
+++ b/english/donations.wml
@@ -32,6 +32,19 @@ it can be.
 Make sure to specify that the money is intended for Debian. Since SPI
 is a non-profit organization we can issue receipts for tax purposes.
 
+<p>For some parts of the world it may be easier to make the donation to
+one of the partner organizations of Software in the Public Interest
+(check the <a href="http://www.spi-inc.org/donations">SPI donation page</a>
+for current information):
+
+<ul>
+   <li>Europe: <a href="http://www.ffis.de/Verein/spi-en.html">\
+       Verein zur Förderung Freier Informationen und Software e.V.</a>
+       (ffis) in Germany
+   <li>Italy: <a href="http://www.softwarelibero.it/news/20030719-01.shtml">\
+       Associazione Software Libero</a>
+</ul>
+
 <h2 id="equipment_donations">Donations of equipment and services</h2>
 
 <P>Given the small budget Debian runs on it is not possible, at this time,
diff --git a/german/devel/debian-installer/index.wml b/german/devel/debian-installer/index.wml
index ee0262634ea..87eea62048a 100644
--- a/german/devel/debian-installer/index.wml
+++ b/german/devel/debian-installer/index.wml
@@ -25,18 +25,18 @@
 
 <p>
 <b>Um Debian-Testing zu installieren</b>,
-empfehlen wir Ihnen die Verwendung der Etch Beta 2-Veröffentlichung
+empfehlen wir Ihnen die Verwendung der Etch Beta 3-Veröffentlichung
 des Installers, nachdem Sie dessen <a href="errata">\
 Fehlerseite</a> überprüft haben. Die folgenden Images sind für
-Beta 2 verfügbar:
+Beta 3 verfügbar:
 </p>
 <ul>
 	<li>Netzwerkinstallations-CD-Image (100&ndash;150 MB)<br />
 	<netinst-images />
 	</li>
-#	<li>Visitenkarten-CD-Image (20&ndash;50 MB)<br />
-#	<businesscard-images />
-#	</li>
+	<li>Visitenkarten-CD-Image (20&ndash;50 MB)<br />
+	<businesscard-images />
+	</li>
 	<li>Vollständige CD-Sätze<br />
 	<full-cd-images />
 	</li>
@@ -52,9 +52,9 @@ Beta 2 verfügbar:
 	  <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)<br />
 	<full-dvd-jigdo />
 	</li>
-#	<li>Weitere Images (Netzboot, USB-Stick, Diskette, etc.)<br />
-#	<other-images />
-#	</li>
+	<li>Weitere Images (Netzboot, USB-Stick, Diskette, etc.)<br />
+	<other-images />
+	</li>
 </ul>
 
 <p>
diff --git a/italian/devel/debian-installer/index.wml b/italian/devel/debian-installer/index.wml
index 699ee3254bf..d51f7c25ddf 100644
--- a/italian/devel/debian-installer/index.wml
+++ b/italian/devel/debian-installer/index.wml
@@ -23,9 +23,9 @@
 </if-stable-release>
 
 <p><b>Per installare Debian testing</b>, suggeriamo l'uso della
-versione chiamata "etch beta 2 release" dell'installatore, dopo aver
+versione chiamata "etch beta 3 release" dell'installatore, dopo aver
 controllato l'<a href="errata">errata</a>. Le seguenti immagini sono quelle
-disponibili per la beta 2:</p>
+disponibili per la beta 3:</p>
 
 <ul>
 	<li>Immagine del CD "netinst" per l'installazione via rete (100-150&nbsp;Mb)<br>
diff --git a/japanese/devel/debian-installer/index.wml b/japanese/devel/debian-installer/index.wml
index 3baef9f33bf..7def47491a4 100644
--- a/japanese/devel/debian-installer/index.wml
+++ b/japanese/devel/debian-installer/index.wml
@@ -24,16 +24,16 @@
 <p>
 <b>Debian ¤Î¥Æ¥¹¥ÈÈÇ (testing) ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï</b>¡¢
 ¤Þ¤º <a href="errata">Àµ¸í¥Ú¡¼¥¸</a>¤ò³Îǧ¤·¤Æ¤«¤é¡¢etch
-¥Ù¡¼¥¿ 2 ¥ê¥ê¡¼¥¹¤Î¥¤¥ó¥¹¥È¡¼¥é¤ò»È¤¦¤è¤¦¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£
-¥Ù¡¼¥¿ 2 ¤Ç¤Ï¡¢°Ê²¼¤Î¥¤¥á¡¼¥¸¤¬ÍøÍѲÄǽ¤Ç¤¹:
+¥Ù¡¼¥¿ 3 ¥ê¥ê¡¼¥¹¤Î¥¤¥ó¥¹¥È¡¼¥é¤ò»È¤¦¤è¤¦¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£
+¥Ù¡¼¥¿ 3 ¤Ç¤Ï¡¢°Ê²¼¤Î¥¤¥á¡¼¥¸¤¬ÍøÍѲÄǽ¤Ç¤¹:
 </p>
 <ul>
 	<li>netinst CD ¥¤¥á¡¼¥¸ (100-150 MB)<br>
 	<netinst-images />
 	</li>
-#	<li>̾»É¥µ¥¤¥º¤Î CD ¥¤¥á¡¼¥¸ (20-50 MB)<br>
-#	<businesscard-images />
-#	</li>
+	<li>̾»É¥µ¥¤¥º¤Î CD ¥¤¥á¡¼¥¸ (20-50 MB)<br>
+	<businesscard-images />
+	</li>
 	<li>´°Á´¤Ê CD ¥»¥Ã¥È<br>
 	<full-cd-images />
 	</li>
@@ -46,9 +46,9 @@
 	<li>´°Á´¤Ê DVD ¥»¥Ã¥È (<a href="$(HOME)/CD/jigdo-cd">jigdo</a> ¤òÍøÍÑ)<br>
 	<full-dvd-jigdo />
 	</li>
-#	<li>¤½¤Î¾¤Î¥Ö¡¼¥È¥¤¥á¡¼¥¸ (¥Í¥Ã¥È¥Ö¡¼¥È¡¢USB ¥á¥â¥ê¡¢¥Õ¥í¥Ã¥Ô¡¼¤Ê¤É)<br>
-#	<other-images />
-#	</li>
+	<li>¤½¤Î¾¤Î¥Ö¡¼¥È¥¤¥á¡¼¥¸ (¥Í¥Ã¥È¥Ö¡¼¥È¡¢USB ¥á¥â¥ê¡¢¥Õ¥í¥Ã¥Ô¡¼¤Ê¤É)<br>
+	<other-images />
+	</li>
 </ul>
 
 <p>
diff --git a/portuguese/devel/debian-installer/index.wml b/portuguese/devel/debian-installer/index.wml
index 81884780ce6..599f334f70f 100644
--- a/portuguese/devel/debian-installer/index.wml
+++ b/portuguese/devel/debian-installer/index.wml
@@ -24,9 +24,9 @@
 
 <p>
 <b>Para instalar Debian "testing"</b>, recomendamos que você use
-a versão etch beta 2 do instalador, após verificar sua
+a versão etch beta 3 do instalador, após verificar sua
 <a href="errata">errata</a>. As seguintes imagens estão disponíveis
-para o beta 2:
+para o beta 3:
 </p>
 <ul>
 	<li>imagem de CD "netinst" (100-150 MB)<br>
diff --git a/spanish/devel/debian-installer/index.wml b/spanish/devel/debian-installer/index.wml
index 9bfd1954cb1..3e16cc91e13 100644
--- a/spanish/devel/debian-installer/index.wml
+++ b/spanish/devel/debian-installer/index.wml
@@ -22,10 +22,10 @@ versión oficial de Debian GNU/Linux <current_release_sarge> consulte
 </if-stable-release>
 
 <p>
-<b>Le recomendamos que utilice la versión etch beta 2 del instalador
+<b>Le recomendamos que utilice la versión etch beta 3 del instalador
 para instalar Debian <em>en pruebas</em></b>, después de revisar la 
 <a href="errata">fe de erratas</a>. Disponemos de las siguientes imágenes de
-la versión beta 2:
+la versión beta 3:
 </p>
 
 <ul>
diff --git a/swedish/devel/debian-installer/index.wml b/swedish/devel/debian-installer/index.wml
index fec95f84314..8c7d20cda36 100644
--- a/swedish/devel/debian-installer/index.wml
+++ b/swedish/devel/debian-installer/index.wml
@@ -25,17 +25,17 @@ information</b>, se
 
 <p>
 <b>För att installera uttestningsutgåvan</b> rekommenderar vi att du
-använder Etch beta 2-utgåvan av installationsprogrammet, efter att ha
+använder Etch beta 3-utgåvan av installationsprogrammet, efter att ha
 läst dess <a href="errata">errata</a>.
-Följande avbildningar är tillgängliga för beta 2:
+Följande avbildningar är tillgängliga för beta 3:
 </p>
 <ul>
 	<li>Nätverksinstallations-cd (100-150 Mbyte)<br>
 	<netinst-images />
 	</li>
-#	<li>Visitkorts-cd (20-50 Mbyte)<br>
-#	<businesscard-images />
-#	</li>
+	<li>Visitkorts-cd (20-50 Mbyte)<br>
+	<businesscard-images />
+	</li>
 	<li>Kompletta cd-uppsättningar<br>
 	<full-cd-images />
 	</li>
@@ -51,9 +51,9 @@ Följande avbildningar är tillgängliga för beta 2:
 	(via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)<br>
 	<full-dvd-jigdo />
 	</li>
-#	<li>Andra avbildningar (netboot, usb-minne, diskett, osv.)<br>
-#	<other-images />
-#	</li>
+	<li>Andra avbildningar (netboot, usb-minne, diskett, osv.)<br>
+	<other-images />
+	</li>
 </ul>
 
 <p>