Update of original English documents

29 files changed, 518 insertions, 420 deletions

diff --git a/fi/appendix/chroot-install.xml b/fi/appendix/chroot-install.xml
index cdd173363..5fc7b3f8e 100644
--- a/fi/appendix/chroot-install.xml
+++ b/fi/appendix/chroot-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 31190 untranslated -->
+<!-- original version: 33719 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -338,20 +338,6 @@ interface name (eth0, eth1, etc.) that you expect.
    </sect3>
 
    <sect3>
-   <title>Configure Timezone, Users, and APT</title>
-<para>
-
-Set your timezone, add a normal user, and choose your <command>apt</command>
-sources by running
-
-<informalexample><screen>
-# /usr/sbin/base-config new
-</screen></informalexample>
-
-</para>
-   </sect3>
-
-   <sect3>
    <title>Configure Locales</title>
 <para>
 
@@ -363,7 +349,8 @@ English, install the locales support package and configure it:
 # dpkg-reconfigure locales
 </screen></informalexample>
 
-NOTE: Apt must be configured before, ie. during the base-config phase.
+NOTE: Apt must be configured beforehand by creating a sources.list and
+running apt-get update.
 Before using locales with character sets other than ASCII or latin1,
 please consult the appropriate localization HOWTO.
 
diff --git a/fi/appendix/preseed.xml b/fi/appendix/preseed.xml
index f576cfd26..8b6b520a9 100644
--- a/fi/appendix/preseed.xml
+++ b/fi/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 32512 untranslated -->
+<!-- original version: 33796 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -12,7 +12,7 @@ attribute is in force that does not match the specified release or if an
 Currently only a single variant of the example file is generated (for i386).
 -->
 
-<appendix id="appendix-preseed" condition="etch">
+<appendix id="appendix-preseed">
 <title>Automating the installation using preseeding</title>
 
 <para>
@@ -31,16 +31,11 @@ example preseed file from &urlset-example-preseed;.
  <title>Introduction</title>
 <para>
 
-Preseeding provides a way to set answers to questions without having to manually
-enter the answers while the installation is running. This makes it possible to
-fully automate most types of installation and even offers some features not
-available during normal installations.
-
-</para><para>
-
-Using preseeding it is possible to fill in answers to questions asked during
-both the first stage of the installation (before the reboot into the new
-system) and the second stage.
+Preseeding provides a way to set answers to questions asked during the
+installation process, without having to manually enter the answers while
+the installation is running. This makes it possible to fully automate most
+types of installation and even offers some features not available during
+normal installations.
 
 </para>
 
@@ -225,16 +220,8 @@ See <xref linkend="preseed-shell"/> for details.
 </para></listitem>
 <listitem><para>
   <userinput>preseed/late_command</userinput>: is run just before the reboot
-  at the end of the first stage of the installation, but before the
-  <filename>/target</filename> filesystem has been unmounted
-</para></listitem>
-<listitem><para>
-  <userinput>base-config/early_command</userinput>: is run early in the second
-  stage of the installation when <command>base-config</command> is starting up
-</para></listitem>
-<listitem><para>
-  <userinput>base-config/late_command</userinput>: is run at the end of
-  <command>base-config</command>, just before the login prompt
+  at the end of the install, but before the <filename>/target</filename>
+  filesystem has been unmounted
 </para></listitem>
 </itemizedlist>
 
@@ -423,8 +410,8 @@ install, you can use the command <command>debconf-set-selections -c
 </para>
  </sect1>
 
- <sect1 id="preseed-stage1">
- <title>Preseeding the first stage of the installation</title>
+ <sect1 id="preseed-contents">
+ <title>Contents of the preseed file</title>
 <para>
 
 The configuration fragments used in this appendix are also available as an
@@ -670,7 +657,7 @@ d-i time/zone string US/Eastern
 
 Setup of the <filename>/etc/apt/sources.list</filename> and basic configuration
 options is fully automated based on your installation method and answers to
-earlier questions. Only the two variables below are relevant for preseeding.
+earlier questions. Only the three variables below are relevant for preseeding.
 
 </para>
 
@@ -678,6 +665,9 @@ earlier questions. Only the two variables below are relevant for preseeding.
 # You can choose to install non-free and contrib software.
 #d-i apt-setup/non-free boolean true
 #d-i apt-setup/contrib boolean true
+# To avoid adding security sources, or to use a different server
+# than security.debian.org.
+#d-i apt-setup/security_host string 
 </screen></informalexample>
 
   </sect2>
@@ -767,47 +757,7 @@ d-i grub-installer/with_other_os boolean true
 
   </sect2>
 
-  <sect2 id="preseed-finish">
-  <title>Finishing up the first stage install</title>
-
-<informalexample role="example"><screen>
-# Avoid that last message about the install being complete.
-d-i prebaseconfig/reboot_in_progress note
-
-# This will prevent the installer from ejecting the CD during the reboot,
-# which is useful in some situations.
-#d-i cdrom-detect/eject boolean false
-</screen></informalexample>
-
-  </sect2>
- </sect1>
-
- <sect1 id="preseed-stage2">
- <title>Preseeding the second stage of the installation</title>
-
-  <sect2 id="preseed-baseconfig">
-  <title>Base config</title>
-
-<informalexample role="example"><screen>
-# Avoid the introductory message.
-base-config base-config/intro note
-
-# Avoid the final message.
-base-config base-config/login note
-
-# If you installed a display manager, but don't want to start it immediately
-# after base-config finishes.
-#base-config base-config/start-display-manager boolean false
-
-# Some versions of the installer can report back on what you've installed.
-# The default is not to report back, but sending reports helps the project
-# determine what software is most popular and include it on CDs.
-#popularity-contest popularity-contest/participate boolean false
-</screen></informalexample>
-
-  </sect2>
-
-  <sect2 id="preseed-tasksel">
+  <sect2 id="preseed-pkgsel">
   <title>Package selection</title>
 <para>
 
@@ -844,22 +794,39 @@ Available tasks as of this writing include:
 <listitem><para>
   <userinput>Laptop</userinput>
 </para></listitem>
-<listitem><para>
-  <userinput>manual package selection</userinput>
-</para></listitem>
 </itemizedlist>
 
 <para>
 
-The last of these will run aptitude. You can also choose to install no tasks,
-and force the installation of a set of packages in some other way. We recommend
-always including the <userinput>Standard system</userinput> task.
+You can also choose to install no tasks, and force the installation of a
+set of packages in some other way. We recommend always including the
+<userinput>Standard system</userinput> task.
 
 </para>
 
 <informalexample role="example"><screen>
 tasksel tasksel/first multiselect Standard system, Desktop environment
 #tasksel tasksel/first multiselect Standard system, Web server
+
+# Some versions of the installer can report back on what software you have
+# installed, and what software you use. The default is not to report back,
+# but sending reports helps the project determine what software is most
+# popular and include it on CDs.
+#popularity-contest popularity-contest/participate boolean false
+</screen></informalexample>
+
+  </sect2>
+
+  <sect2 id="preseed-finish">
+  <title>Finishing up the first stage install</title>
+
+<informalexample role="example"><screen>
+# Avoid that last message about the install being complete.
+d-i prebaseconfig/reboot_in_progress note
+
+# This will prevent the installer from ejecting the CD during the reboot,
+# which is useful in some situations.
+#d-i cdrom-detect/eject boolean false
 </screen></informalexample>
 
   </sect2>
@@ -953,17 +920,10 @@ xserver-xfree86 xserver-xfree86/config/monitor/mode-list \
 #d-i preseed/early_command string anna-install some-udeb
 
 # This command is run just before the install finishes, but when there is
-# still a usable /target directory.
-#d-i preseed/late_command string echo foo > /target/etc/bar
-
-# This command is run just as base-config is starting up.
-#base-config base-config/early_command string echo hi mom
-
-# This command is run after base-config is done, just before the login:
-# prompt. This is a good way to install a set of packages you want, or to
-# tweak the configuration of the system.
-#base-config base-config/late_command \
-#      string apt-get install zsh; chsh -s /bin/zsh
+# still a usable /target directory. You can chroot to /target and use it
+# directly, or use the apt-install and in-target commands to easily install
+# packages and run commands in the target system.
+#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh
 </screen></informalexample>
 
   </sect2>
diff --git a/fi/appendix/random-bits.xml b/fi/appendix/random-bits.xml
index 4d39d21cd..4d3fff8f9 100644
--- a/fi/appendix/random-bits.xml
+++ b/fi/appendix/random-bits.xml
@@ -1,9 +1,8 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 29687 untranslated -->
+<!-- original version: 33719 untranslated -->
 
 <appendix id="random-bits"><title>Random Bits</title>
 
-&example-preseed.xml;
 &files.xml;
 &chroot-install.xml;
 &plip.xml;
diff --git a/fi/boot-installer/i386.xml b/fi/boot-installer/i386.xml
index 01f694f23..ab9e91b25 100644
--- a/fi/boot-installer/i386.xml
+++ b/fi/boot-installer/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 31616 untranslated -->
+<!-- original version: 33725 untranslated -->
 
   <sect2 arch="i386"><title>Booting from a CD-ROM</title>
 
@@ -9,7 +9,7 @@
 <!--
 CD #1 of official Debian CD-ROM sets for &arch-title; will present a
 <prompt>boot:</prompt> prompt on most hardware. Press
-<keycap>F3</keycap> to see the list of kernel options available
+<keycap>F4</keycap> to see the list of kernel options available
 from which to boot. Just type your chosen flavor name (idepci,
 vanilla, compact, bf24) at the <prompt>boot:</prompt> prompt
 followed by &enterkey;.
@@ -157,7 +157,7 @@ image=/boot/newinstall/vmlinuz
        label=newinstall
        initrd=/boot/newinstall/initrd.gz
        root=/dev/ram0
-       append="<phrase condition="sarge">devfs=mount,dall </phrase>ramdisk_size=12000"
+       append="ramdisk_size=12000"
 </screen></informalexample>
 
 For more details, refer to the
@@ -180,9 +180,7 @@ kernel (hd0,0)/boot/newinstall/vmlinuz root=/dev/ram0 ramdisk_size=12000
 initrd (hd0,0)/boot/newinstall/initrd.gz
 </screen></informalexample>
 
-and reboot. <phrase condition="sarge">If the boot fails, you can try adding
-<userinput>devfs=mount,dall</userinput> to the <quote>kernel</quote> line.
-</phrase>
+and reboot.
 
 </para><para>
 
@@ -342,8 +340,7 @@ parameters.
 
 Information on available boot methods and on boot parameters which might
 be useful can be found by pressing <keycap>F2</keycap> through
-<phrase condition="sarge"><keycap>F7</keycap></phrase><phrase
-condition="etch"><keycap>F8</keycap></phrase>. If you add any parameters to
+<keycap>F8</keycap>. If you add any parameters to
 the boot command line, be sure to type the boot method (the default is
 <userinput>linux</userinput>) and a space before the first parameter (e.g.,
 <userinput>linux debconf/priority=medium</userinput>).
diff --git a/fi/boot-installer/m68k.xml b/fi/boot-installer/m68k.xml
index 1dc18c6ec..83fcced23 100644
--- a/fi/boot-installer/m68k.xml
+++ b/fi/boot-installer/m68k.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 30283 untranslated -->
+<!-- original version: 33725 untranslated -->
 
   <sect2 arch="m68k"><title>Choosing an Installation Method</title>
 
@@ -11,23 +11,13 @@ linux kernel. The installer should also require less memory when using
 a 2.4.x linux kernel as 2.2.x support requires a fixed-sized ramdisk
 and 2.4.x uses tmpfs.
 
-</para><para condition="etch">
+</para><para>
 
 If you are using a 2.2.x linux kernel, then you need to use the &ramdisksize;
 kernel parameter.
 
 </para><para>
 
-</para><para condition="sarge">
-
-Also, if you are using a 2.2.x linux kernel, then you must make sure you
-are using a ramdisk built to accommodate it, see the
-<ulink url="&disturl;/main/installer-&architecture;/current/images/MANIFEST">MANIFEST</ulink>.
-In general, this means you need to use the initrd22.gz ramdisk from the respective
-directory.
-
-</para><para>
-
 Make sure <userinput>root=/dev/ram</userinput> is one of your kernel
 parameters.
 
diff --git a/fi/boot-installer/parameters.xml b/fi/boot-installer/parameters.xml
index 5cd71f381..5367bf52b 100644
--- a/fi/boot-installer/parameters.xml
+++ b/fi/boot-installer/parameters.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 30084 untranslated -->
+<!-- original version: 33725 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -77,9 +77,8 @@ The installation system recognizes a few additional boot parameters<footnote>
 Note that the kernel accepts a maximum of 8 command line options and
 8 environment options (including any options added by default for the
 installer). If these numbers are exceeded, 2.4 kernels will drop any
-excess options and 2.6 kernels will panic.
-<phrase condition="etch">With kernel 2.6.9 or newer, you can use 32
-command line options and 32 environment options.</phrase>
+excess options and 2.6 kernels will panic. With kernel 2.6.9 or newer,
+you can use 32 command line options and 32 environment options.
 
 </para>
 
@@ -305,7 +304,7 @@ automating the install. See <xref linkend="automatic-install"/>.
 </para></listitem>
 </varlistentry>
 
-<varlistentry condition="etch">
+<varlistentry>
 <term>cdrom-detect/eject</term>
 <listitem><para>
 
@@ -335,7 +334,7 @@ If you are using a 2.2.x kernel, you may need to set &ramdisksize;.
 </para></listitem>
 </varlistentry>
 
-<varlistentry condition="etch">
+<varlistentry>
 <term>rescue/enable</term>
 <listitem><para>
 
diff --git a/fi/boot-installer/trouble.xml b/fi/boot-installer/trouble.xml
index 11769486f..6413f4833 100644
--- a/fi/boot-installer/trouble.xml
+++ b/fi/boot-installer/trouble.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 32427 untranslated -->
+<!-- original version: 33725 untranslated -->
 
  <sect1 id="boot-troubleshooting">
  <title>Troubleshooting the Installation Process</title>
@@ -199,15 +199,9 @@ custom kernel later (see <xref linkend="kernel-baking"/>).
 
 If you get through the initial boot phase but cannot complete the
 install, the bug reporter menu choice may be helpful.
-<phrase condition="sarge">
-It copies system error logs and configuration information to a user-supplied
-floppy.
-</phrase>
-<phrase condition="etch">
 It lets you store system error logs and configuration information from the
 installer to a floppy, or download them in a web browser.
-</phrase>
-	
+
 This information may provide clues as to what went wrong and how to
 fix it.  If you are submitting a bug report you may want to attach
 this information to the bug report.
@@ -216,7 +210,7 @@ this information to the bug report.
 
 Other pertinent installation messages may be found in
 <filename>/var/log/</filename> during the
-installation, and <filename>/var/log/debian-installer/</filename>
+installation, and <filename>/var/log/installer/</filename>
 after the computer has been booted into the installed system.
 
 </para>
@@ -231,7 +225,7 @@ encourage installation reports to be sent even if the installation is
 successful, so that we can get as much information as possible on the largest
 number of hardware configurations. 
 
-</para><para condition="etch">
+</para><para>
 
 If you have a working Debian system, the easiest way to send an installation
 report is to install the installation-report and reportbug packages
diff --git a/fi/boot-new/boot-new.xml b/fi/boot-new/boot-new.xml
index 6205f5a68..e5c7d5f9d 100644
--- a/fi/boot-new/boot-new.xml
+++ b/fi/boot-new/boot-new.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28730 untranslated -->
+<!-- original version: 33725 untranslated -->
 
 <chapter id="boot-new">
  <title>Booting Into Your New Debian System</title>
@@ -19,10 +19,8 @@ you will probably need to add some boot arguments like
 <userinput>root=<replaceable>root</replaceable></userinput>, where
 <replaceable>root</replaceable> is your root partition, such as
 <filename>/dev/sda1</filename>.
-<phrase condition="etch">
 Alternatively, see <xref linkend="rescue"/> for instructions on using
 the installer's built-in rescue mode.
-</phrase>
 
 </para>
 
@@ -189,47 +187,14 @@ for more information.
    </sect2>
  </sect1>
 
- <sect1 id="base-config">
- <title>Debian Post-Boot (Base) Configuration</title>
-
-<para>
-
-After booting, you will be prompted to complete the configuration of
-your basic system, and then to select what additional packages you
-wish to install.  The application which guides you through this
-process is called <classname>base-config</classname>. Its concept is
-very similar to the &d-i; from the first stage.  Indeed,
-<classname>base-config</classname> consists of a number of specialized
-components, where each component handles one configuration task,
-contains <quote>hidden menu in the background</quote> and also uses
-the same navigation system.
-
-</para><para>
-
-If you wish to re-run the <classname>base-config</classname> at any
-point after installation is complete, as root run
-<userinput>base-config</userinput>.
-
-</para>
-
-&module-bc-timezone.xml;
-&module-bc-shadow.xml;
-&module-bc-ppp.xml;
-&module-bc-apt.xml;
-&module-bc-packages.xml;
-&module-bc-install.xml;
-&module-bc-mta.xml;
-
- </sect1>
-
  <sect1 id="login">
  <title>Log In</title>
 
 <para>
 
-After you've installed packages, you'll be presented with the login
+Once your system boots, you'll be presented with the login
 prompt.  Log in using the personal login and password you
-selected. Your system is now ready to use.
+selected during the installation process. Your system is now ready to use.
 
 </para><para>
 
diff --git a/fi/install-methods/automatic-install.xml b/fi/install-methods/automatic-install.xml
index 48c4970f0..9410b23fe 100644
--- a/fi/install-methods/automatic-install.xml
+++ b/fi/install-methods/automatic-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 32424 untranslated -->
+<!-- original version: 33725 untranslated -->
 
  <sect1 id="automatic-install">
  <title>Automatic Installation</title>
@@ -24,76 +24,11 @@ files. A preconfiguration file can be loaded from the network or from
 removable media, and used to fill in answers to questions asked during the
 installation process.
 
-</para><para condition="etch">
+</para><para>
 
 Full documentation on preseeding including a working example that you can
 edit is in <xref linkend="appendix-preseed"/>.
 
-</para><para condition="sarge">
-
-Although most dialogs used by &d-i; can be preseeded using this method,
-there are some notable exceptions. You can (re)partition an entire disk
-or use available free space on a disk; it is not possible to use existing
-partitions. You currently cannot use preseeding to set up RAID and LVM.
-Also, with the exception of network driver modules, it is not possible
-to preconfigure kernel module parameters.
-
-</para><para condition="sarge">
-
-The preconfiguration file is in the format used by the
-debconf-set-selections command. A well documented and working example
-that you can edit is in <xref linkend="example-preseed"/>.
-
-</para><para condition="sarge">
-
-Alternatively, one way to get a complete file listing
-all the values that can be preseeded is to do a manual install,
-and then use <filename>debconf-get-selections</filename>,
-from the <classname>debconf-utils</classname> package,
-to dump both the debconf database and the cdebconf
-database in /var/log/debian-installer/cdebconf to a single file:
-
-<informalexample><screen>
-$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>
-$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>
-</screen></informalexample>
-
-However, a file generated in this manner will have some items that should
-not be preseeded, and the file in <xref linkend="example-preseed"/> is a
-better starting place for most users.
-
-</para><para condition="sarge">
-
-Once you have a preconfiguration file, you can edit it if necessary, and
-place it on a web server, or copy it onto the installer's boot media. Wherever
-you place the file, you need to pass a parameter to the installer at boot
-time to tell it to use the file.
-
-</para><para condition="sarge">
-
-To make the installer use a preconfiguration file downloaded from the
-network, add preseed/url=http://url/to/preseed.cfg to the kernel boot
-parameters. Of course the preconfiguration will not take effect until the
-installer manages to set up the network to download the file, so this is
-most useful if the installer can set up the network via DHCP without asking
-any questions. You may want to set the installation priority to critical to
-avoid any questions while the network is being configured. See
-<xref linkend="installer-args"/>.
-
-</para><para condition="sarge">
-
-To place a preconfiguration file on a CD, you would need to remaster the
-ISO image to include your preconfiguration file. See the manual page for
-mkisofs for details. Alternatively, put the preseed file on a floppy, and
-use preseed/file=/floppy/preseed.cfg
-
-</para><para arch="i386" condition="sarge">
-
-If you'll be booting from a USB memory stick, then you can simply copy your
-preconfiguration file onto the memory stick's filesystem, and edit the
-syslinux.cfg file to add preseed/file=/hd-media/preseed.cfg to the kernel boot
-parameters.
-
 </para>
   </sect2>
  </sect1>
diff --git a/fi/install-methods/usb-setup/i386.xml b/fi/install-methods/usb-setup/i386.xml
index 9355ee888..220f69dae 100644
--- a/fi/install-methods/usb-setup/i386.xml
+++ b/fi/install-methods/usb-setup/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 32141 untranslated -->
+<!-- original version: 33725 untranslated -->
 
    <sect3 arch="i386">
    <title>USB stick partitioning on &arch-title;</title>
@@ -92,10 +92,6 @@ append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw
 
 Please note that the <userinput>ramdisk_size</userinput> parameter
 may need to be increased, depending on the image you are booting.
-<phrase condition="sarge">
-If the boot fails, you can try adding <userinput>devfs=mount,dall</userinput>
-to the <quote>append</quote> line.
-</phrase>
 
 </para>
    </sect3>
diff --git a/fi/install-methods/usb-setup/powerpc.xml b/fi/install-methods/usb-setup/powerpc.xml
index 36c572fa4..fc64d7eb6 100644
--- a/fi/install-methods/usb-setup/powerpc.xml
+++ b/fi/install-methods/usb-setup/powerpc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 27345 untranslated -->
+<!-- original version: 33725 untranslated -->
 
    <sect3 arch="powerpc">
    <title>USB stick partitioning on &arch-title;</title>
@@ -99,8 +99,7 @@ message=/boot.msg
 image=/vmlinux
         label=install
         initrd=/initrd.gz
-        initrd-size=10000<phrase condition="sarge">
-        append="devfs=mount,dall --"</phrase>
+        initrd-size=10000
         read-only
 </screen></informalexample>
 
diff --git a/fi/partitioning/tree.xml b/fi/partitioning/tree.xml
index 873976905..39646f550 100644
--- a/fi/partitioning/tree.xml
+++ b/fi/partitioning/tree.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33417 untranslated -->
+<!-- original version: 33773 untranslated -->
 
 
  <sect1 id="directory-tree">
@@ -141,7 +141,7 @@ into a subdirectory of this directory. Its size depends on how many
 users will be using the system and what files are to be stored in
 their directories.  Depending on your planned usage you should reserve
 about 100 MB for each user, but adapt this value to your needs. Reserve
-a lot more space if you plan to save a lot of multimedia files (MP3, movies)
+a lot more space if you plan to save a lot of multimedia files (pictures, MP3, movies)
 in your home directory.
 
 </para></listitem>
diff --git a/fi/post-install/kernel-baking.xml b/fi/post-install/kernel-baking.xml
index 1c8f06300..12b2bd09b 100644
--- a/fi/post-install/kernel-baking.xml
+++ b/fi/post-install/kernel-baking.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 31905 untranslated -->
+<!-- original version: 33725 untranslated -->
 
  <sect1 id="kernel-baking"><title>Compiling a New Kernel</title>
 <para>
@@ -181,9 +181,8 @@ above step may have produced, then <userinput>shutdown -r now</userinput>.
 
 </para><para>
 
-<phrase condition="etch">For more information on Debian kernels and kernel
-compilation, see the <ulink url="&url-kernel-handbook;">Debian Linux Kernel
-Handbook</ulink>.</phrase>
+For more information on Debian kernels and kernel compilation, see the
+<ulink url="&url-kernel-handbook;">Debian Linux Kernel Handbook</ulink>.
 For more information on <classname>kernel-package</classname>, read
 the fine documentation in <filename>/usr/share/doc/kernel-package</filename>.
 
diff --git a/fi/post-install/rescue.xml b/fi/post-install/rescue.xml
index f785258fd..1ec1fd1b6 100644
--- a/fi/post-install/rescue.xml
+++ b/fi/post-install/rescue.xml
@@ -1,7 +1,7 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28732 untranslated -->
+<!-- original version: 33725 untranslated -->
 
- <sect1 id="rescue" condition="etch">
+ <sect1 id="rescue">
  <title>Recovering a Broken System</title>
 <para>
 
diff --git a/fi/preparing/install-overview.xml b/fi/preparing/install-overview.xml
index 0b2f57a41..35702d938 100644
--- a/fi/preparing/install-overview.xml
+++ b/fi/preparing/install-overview.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 33719 untranslated -->
 
  <sect1 id="install-overview">
  <title>Overview of the Installation Process</title>
@@ -119,19 +119,7 @@ which can start up &debian; and/or your existing system.
 </para></listitem>
 <listitem><para>
 
-Load the newly installed system for the first time, and make some
-initial system settings.
-
-</para></listitem>
-<listitem arch="s390"><para>
-
-Open a ssh connection to the new system.
-
-</para></listitem>
-<listitem><para>
-
-Install additional software (<firstterm>tasks</firstterm>
-and/or <firstterm>packages</firstterm>), at your discretion.
+Load the newly installed system for the first time.
 
 </para></listitem>
 </orderedlist>
@@ -154,24 +142,18 @@ you load the new system for the first time.
 
 </para><para>
 
-Upon loading the new base system, <classname>base-config</classname>
-supervises adding users, setting a time zone (via
-<classname>tzsetup</classname>), and setting up the
-package installation system (using <classname>apt-setup</classname>). It then
-launches <classname>tasksel</classname> which can be used to select large
-groups of related programs, and in turn can run <classname>aptitude</classname>
-which allows you to choose individual software packages.
+To tune the system to your needs, <classname>tasksel</classname> allows you
+to choose to install various predefined bundles of software like a Web
+server or a Desktop environment.
 
 </para><para>
 
 When <classname>debian-installer</classname> finishes, before the
 first system load, you have only a very basic command line driven
 system. The graphical interface which displays windows on your monitor
-will not be installed unless you select it during the final steps,
-with either <classname>tasksel</classname> or
-<classname>aptitude</classname>.  It's optional because many &debian;
-systems are servers which don't really have any need for a graphical
-user interface to do their job.
+will not be installed unless you select it with <classname>tasksel</classname>.
+It's optional because many &debian; systems are servers which don't really
+have any need for a graphical user interface to do their job.
 
 </para><para arch="not-s390">
 
diff --git a/fi/using-d-i/components.xml b/fi/using-d-i/components.xml
index 3b4cb9c17..e619cdcdc 100644
--- a/fi/using-d-i/components.xml
+++ b/fi/using-d-i/components.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 29895 untranslated -->
+<!-- original version: 33730 untranslated -->
 
  <sect1 id="module-details">
  <title>Using Individual Components</title>
@@ -40,8 +40,6 @@ hardware detection needs to be repeated later in the process.
 </para>
 
 &module-lowmem.xml;
-&module-languagechooser.xml;
-&module-countrychooser.xml;
 &module-localechooser.xml;
 &module-kbd-chooser.xml;
 &module-s390-netdevice.xml;
@@ -77,21 +75,50 @@ like LVM or RAID devices.
 &module-lvmcfg.xml;
 &module-mdcfg.xml;
   </sect2>
+  
+  <sect2 id="di-system-setup">
+  <title>Setting up the System</title>
+<para>
+
+After partitioning the installer asks a few more questions that will be
+used to set up the system it is about to install.
+	
+</para>
+
+&module-tzsetup.xml;
+&module-clock-setup.xml;
+&module-user-setup.xml;
+</sect2>
 
   <sect2 id="di-install-base">
   <title>Installing the Base System</title>
 <para>
 
-Although this stage is the least problematic, it consumes most time of
-the install because it downloads, verifies and unpacks the whole base
-system. If you have a slow computer or network connection, this could
+Although this stage is the least problematic, it consumes a significant
+fraction of the install because it downloads, verifies and unpacks the whole
+base system. If you have a slow computer or network connection, this could
 take some time.
 
 </para>
 
 &module-base-installer.xml;
   </sect2>
+  
+  <sect2 id="di-install-software">
+  <title>Installing Additional Software</title>
+<para>
+
+After the base system is installed, you have a usable but limited system.
+Most users will want to add additional software to the system to tune it to
+their needs, and the installer lets you do so. This step can take even
+longer than installing the base system if you have a slow computer or
+network.
 
+</para>
+&module-apt-setup.xml;
+&module-pkgsel.xml;
+  </sect2>
+	
   <sect2 id="di-make-bootable">
   <title>Making Your System Bootable</title>
 
@@ -130,10 +157,10 @@ documentation for more information.
   </sect2>
 
   <sect2 id="di-finish">
-  <title>Finishing the First Stage</title>
+  <title>Finishing the Installation</title>
 <para>
 
-These are the last bits to do before rebooting to your new Debian. It
+These are the last bits to do before rebooting to your new system. It
 mostly consists of tidying up after the &d-i;.
 
 </para>
diff --git a/fi/using-d-i/modules/apt-setup.xml b/fi/using-d-i/modules/apt-setup.xml
new file mode 100644
index 000000000..4f9d7d465
--- /dev/null
+++ b/fi/using-d-i/modules/apt-setup.xml
@@ -0,0 +1,41 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- original version: 33814 untranslated -->
+
+   <sect3 id="apt-setup">
+   <title>Configuring apt</title>
+
+<para>
+
+The main means that people use to install packages on their system is
+via a program called <command>apt-get</command>, from the
+<classname>apt</classname> package.<footnote>
+
+<para>
+
+Note that the actual program that installs packages is called
+<command>dpkg</command>.  However, this program is more of a low-level
+tool.  <command>apt-get</command> is a higher-level tool as it will
+invoke <command>dpkg</command> as appropriate and also because it knows
+to install other packages which are required for the package you're
+trying to install, as well as how to retrieve the package from your
+CD, the network, or wherever.
+
+</para>
+</footnote>
+Other front-ends for package management, like <command>aptitude</command>
+and <command>synaptic</command> are also in use and depend on
+<command>apt-get</command>. These front-ends are recommended for new users,
+since they integrate some additional features (package searching and status checks)
+in a nice user interface.
+
+</para><para>
+
+<command>apt</command> must be configured so that it knows where to retrieve
+packages from. The installer largely takes care of this automatically based on
+what it knows about your installation medium. The results of this configuration
+are written to the file /etc/apt/sources.list, and you can examine and edit
+it to your liking after the install is complete.
+
+</para>
+
+   </sect3>
diff --git a/fi/using-d-i/modules/base-installer.xml b/fi/using-d-i/modules/base-installer.xml
index a6dbfe615..cbc6d3bca 100644
--- a/fi/using-d-i/modules/base-installer.xml
+++ b/fi/using-d-i/modules/base-installer.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 33720 untranslated -->
 
    <sect3 id="base-installer">
    <title>Base System Installation</title>
@@ -7,9 +7,9 @@
 <para>
 
 During the Base installation, package unpacking and setup messages are
-redirected to <userinput>tty3</userinput>.  You can access this
+redirected to <userinput>tty4</userinput>.  You can access this
 terminal by pressing
-<keycombo><keycap>Left Alt</keycap><keycap>F3</keycap></keycombo>;
+<keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></keycombo>;
 get back to the main installer process with
 <keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>.
 
@@ -17,7 +17,7 @@ get back to the main installer process with
 </para><para>
 
 The unpack/setup messages generated by the base installation are saved in
-<filename>/var/log/messages</filename> when the installation is
+<filename>/var/log/syslog</filename> when the installation is
 performed over a serial console.
 
 </para><para>
diff --git a/fi/using-d-i/modules/clock-setup.xml b/fi/using-d-i/modules/clock-setup.xml
new file mode 100644
index 000000000..864b594a8
--- /dev/null
+++ b/fi/using-d-i/modules/clock-setup.xml
@@ -0,0 +1,34 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- original version: 33814 untranslated -->
+
+   <sect3 id="clock-setup">
+   <title>Configuring the Clock</title>
+
+<para>
+
+The installer might ask you if the computer's clock is set to UTC. Normally
+this question is avoided if possible and the installer tries to work out
+whether the clock is set to UTC based on things like what other operating
+systems are installed. 
+
+</para><para>
+
+In expert mode you will always be able to choose
+whether or not the clock is set to UTC.
+<phrase arch="m68k;powerpc">Macintosh hardware clocks are normally
+set to local time. If you want to dual-boot, select local time instead of
+GMT.</phrase>
+<phrase arch="i386">Systems that (also) run Dos or Windows are normally
+set to local time. If you want to dual-boot, select local time
+instead of GMT.</phrase>
+
+</para><para>
+
+Note that the installer does not currently allow you to actually set the
+time in the computer's clock. You can set the clock to the current time
+after you have installed, if it is incorrect or if it was previously not
+set to UTC.
+
+</para>
+
+   </sect3>
diff --git a/fi/using-d-i/modules/localechooser.xml b/fi/using-d-i/modules/localechooser.xml
index 6886acd83..bd4c50342 100644
--- a/fi/using-d-i/modules/localechooser.xml
+++ b/fi/using-d-i/modules/localechooser.xml
@@ -1,8 +1,8 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28856 untranslated -->
+<!-- original version: 33725 untranslated -->
 
 
-   <sect3 id="localechooser" condition="etch">
+   <sect3 id="localechooser">
    <title>Selecting Localization Options</title>
 
 <para>
diff --git a/fi/using-d-i/modules/lvmcfg.xml b/fi/using-d-i/modules/lvmcfg.xml
index f5ea056bb..4c680ab58 100644
--- a/fi/using-d-i/modules/lvmcfg.xml
+++ b/fi/using-d-i/modules/lvmcfg.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 30207 untranslated -->
+<!-- original version: 33725 untranslated -->
 
    <sect3 id="lvmcfg">
    <title>Configuring Logical Volume Manager (LVM)</title>
@@ -47,43 +47,6 @@ volume groups (VG)</guimenuitem> menu. After that, you should create
 logical volumes on the top of volume groups from the menu
 <guimenuitem>Modify logical volumes (LV)</guimenuitem>.
 
-<note arch="powerpc" condition="sarge"><para>
-
-There is no widely accepted standard to identify partitions containing
-LVM data on Apple Power Macintosh hardware. On this particular
-hardware, the above procedure for creating physical volumes and volume
-groups will not work. There is a good workaround for this limitation,
-provided you are familiar with the underlying LVM tools.
-
-</para><para>
-
-To install using logical volumes on Power Macintosh hardware you
-should create all the disk partitions for your logical volumes as
-usual. In the <guimenu>Partition settings</guimenu> menu you should
-choose <menuchoice><guimenu>Use as:</guimenu> <guimenuitem>Do Not
-Use</guimenuitem></menuchoice> for these partitions (you will not be
-offered the option to use the partition as a physical volume). When
-you are done with creating all your partitions, you should start the
-logical volume manager as usual. However, since no physical volumes
-have been created you must now access the command shell available on
-the second virtual terminal (see <xref linkend="shell"/>) and create
-them manually.
-
-</para><para>
-
-Use the <command>pvcreate</command> command at the shell command prompt
-to create a physical volume on each of your chosen partitions. Then use
-the <command>vgcreate</command> command to create each volume group
-you want. You can safely ignore any errors about incorrect metadata
-area header checksums and fsync failures while doing this. When you
-have finished creating all your volume groups, you should go back to
-the first virtual terminal and skip directly to the
-<command>lvmcfg</command> menu items for logical volume
-management. You will see your volume groups and you can create the
-logical volumes you need as usual.
-
-</para></note>
-
 </para><para>
 
 After returning from <command>lvmcfg</command> back to
diff --git a/fi/using-d-i/modules/mdcfg.xml b/fi/using-d-i/modules/mdcfg.xml
index 049fb21ea..04f76a6d4 100644
--- a/fi/using-d-i/modules/mdcfg.xml
+++ b/fi/using-d-i/modules/mdcfg.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 30377 untranslated -->
+<!-- original version: 33725 untranslated -->
 
    <sect3 id="mdcfg">
    <title>Configuring Multidisk Device (Software RAID)</title>
@@ -146,14 +146,6 @@ To sum it up:
 If you want to know the whole truth about Software RAID, have a look
 at <ulink url="&url-software-raid-howto;">Software RAID HOWTO</ulink>.
 
-<note arch="powerpc" condition="sarge"><para>
-
-There is no widely accepted standard to identify partitions containing
-RAID data on Apple Power Macintosh hardware. This means that &d-i;
-currently does not support setting up RAID on this platform.
-
-</para></note>
-
 </para><para>
 
 To create a MD device, you need to have the desired partitions it
diff --git a/fi/using-d-i/modules/os-prober.xml b/fi/using-d-i/modules/os-prober.xml
index 4928d5769..9b248eacc 100644
--- a/fi/using-d-i/modules/os-prober.xml
+++ b/fi/using-d-i/modules/os-prober.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 27596 untranslated -->
+<!-- original version: 33725 untranslated -->
 
    <sect3 id="os-prober">
    <title>Detecting other operating systems</title>
@@ -23,15 +23,4 @@ boot manager's documentation for more information.
 <!-- TODO: Maybe include some arch-dependent tables with supported OS'es here -->
 
 </para>
-
-<note condition="sarge"><para>
-
-The installer may fail to detect other operating systems if the partitions on
-which they reside are mounted when the detection takes place. This may occur if
-you select a mountpoint (e.g. /win) for a partition containing another operating
-system in <command>partman</command>, or if you have mounted partitions manually
-from a console.
-
-</para></note>
-
    </sect3>
diff --git a/fi/using-d-i/modules/pkgsel.xml b/fi/using-d-i/modules/pkgsel.xml
new file mode 100644
index 000000000..c1796aa44
--- /dev/null
+++ b/fi/using-d-i/modules/pkgsel.xml
@@ -0,0 +1,161 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- original version: 33814 untranslated -->
+
+   <sect3 id="pkgsel">
+   <title>Selecting and Installing Software</title>
+
+<para>
+
+During the installation process, you are given the opportunity to select
+additional software to install. Rather than picking individual software
+packages from the &num-of-distrib-pkgs; available packages, this stage of
+the installation process focuses on selecting and installing predefined
+collections of software to quickly set up your computer to perform various
+tasks.
+
+</para><para>
+
+So, you have the ability to choose <emphasis>tasks</emphasis> first,
+and then add on more individual packages later.  These tasks loosely
+represent a number of different jobs or things you want to do with
+your computer, such as <quote>Desktop environment</quote>,
+<quote>Web server</quote>, or <quote>Print server</quote><footnote>
+
+<para>
+
+You should know that to present this list, the installer is merely
+invoking the <command>tasksel</command> program. It can be
+run at any time after installation to install (or remove) more
+packages, or you can use a more fine-grained tool such as <command>aptitude</command>.
+If you are looking for a specific single package, after
+installation is complete, simply run <userinput>aptitude install
+<replaceable>package</replaceable></userinput>, where
+<replaceable>package</replaceable> is the name of the package you are
+looking for.
+
+</para>
+
+</footnote>. <xref linkend="tasksel-size-list"/> lists the space
+requirements for the available tasks.
+
+</para><para>
+
+Once you've selected your tasks, select
+<guibutton>Ok</guibutton>. At this point,
+<command>aptitude</command> will install the packages you've
+selected.
+
+<note><para>
+
+In the standard user interface of the installer, you can use the space bar
+to toggle selection of a task.
+
+</para></note>
+
+<note><para>
+
+Note that some tasks may be pre-selected based on the characteristics of the
+computer you are installing. If you disagree with these selections you can
+un-select the tasks. You can even opt to install no tasks at all at this point.
+
+</para></note>
+
+</para><para>
+
+Each package you selected with <command>tasksel</command> is downloaded,
+unpacked and then installed in turn by the <command>apt-get</command> and
+<command>dpkg</command> programs. If a particular program needs more
+information from the user, it will prompt you during this process.
+
+</para>
+ <sect4 id="config-mta">
+ <title>Configuring Your Mail Transport Agent</title>
+
+<para>
+
+Today, email is a very important part of many people's life, so it's
+no surprise Debian lets you configure your mail system right as a part
+of the installation process. The standard mail transport agent in
+Debian is <command>exim4</command>, which is relatively small,
+flexible, and easy to learn.
+
+</para><para>
+
+You may ask if this is needed even if your computer is not connected
+to any network. The short answer is: Yes. The longer explanation: Some
+system utilities (like <command>cron</command>,
+<command>quota</command>, <command>aide</command>, &hellip;) may send
+you important notices via email.
+
+</para><para>
+
+So on the first screen you will be presented with several common mail
+scenarios. Choose the one that most closely resembles your needs:
+
+</para>
+
+<variablelist>
+<varlistentry>
+<term>internet site</term>
+<listitem><para>
+
+Your system is connected to a network and your mail is sent and
+received directly using SMTP. On the following screens you will be
+asked a few basic questions, like your machine's mail name, or a list of
+domains for which you accept or relay mail.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>mail sent by smarthost</term>
+<listitem><para>
+
+In this scenario is your outgoing mail forwarded to another machine,
+called a <quote>smarthost</quote>, which does the actual job for
+you. Smarthost also usually stores incoming mail addressed to your
+computer, so you don't need to be permanently online. That also means
+you have to download your mail from the smarthost via programs like
+fetchmail. This option is suitable for dial-up users.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>local delivery only</term>
+<listitem><para>
+
+Your system is not on a network and mail is sent or received only
+between local users. Even if you don't plan to send any messages, this
+option is highly recommended, because some system utilities may send
+you various alerts from time to time (e.g. beloved <quote>Disk quota
+exceeded</quote>). This option is also convenient for new users,
+because it doesn't ask any further questions.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>no configuration at this time</term>
+<listitem><para>
+
+Choose this if you are absolutely convinced you know what you are
+doing. This will leave you with an unconfigured mail system &mdash;
+until you configure it, you won't be able to send or receive any mail
+and you may miss some important messages from your system utilities.
+
+</para></listitem>
+</varlistentry>
+</variablelist>
+
+<para>
+
+If none of these scenarios suits your needs, or if you need a finer
+setup, you will need to edit configuration files under the
+<filename>/etc/exim4</filename> directory after the installation is
+complete. More information about <command>exim4</command> may be found
+under <filename>/usr/share/doc/exim4</filename>.
+
+</para>
+ </sect4>
+   </sect3>
diff --git a/fi/using-d-i/modules/save-logs.xml b/fi/using-d-i/modules/save-logs.xml
index 497a4628b..361a23579 100644
--- a/fi/using-d-i/modules/save-logs.xml
+++ b/fi/using-d-i/modules/save-logs.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 33725 untranslated -->
 
    <sect3 id="save-logs">
    <title>Saving the installation logs</title>
@@ -8,15 +8,14 @@
 
 If the installation is successful, the logfiles created during
 the installation process will be automatically saved to
-<filename>/var/log/debian-installer/</filename> on your new
+<filename>/var/log/installer/</filename> on your new
 Debian system.
 
 </para><para>
 
 Choosing <guimenuitem>Save debug logs</guimenuitem> from the main
-menu allows you to save the log files to a floppy
-disk<phrase condition="etch">, network, hard disk, or other
-media</phrase>. This can be useful if you encounter fatal problems
+menu allows you to save the log files to a floppy disk, network, hard
+disk, or other media. This can be useful if you encounter fatal problems
 during the installation and wish to study the logs on another system
 or attach them to an installation report.
 
diff --git a/fi/using-d-i/modules/tzsetup.xml b/fi/using-d-i/modules/tzsetup.xml
new file mode 100644
index 000000000..6dcba28b1
--- /dev/null
+++ b/fi/using-d-i/modules/tzsetup.xml
@@ -0,0 +1,16 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- original version: 33814 untranslated -->
+
+   <sect3 id="tzsetup">
+   <title>Configuring Your Time Zone</title>
+
+<para>
+
+Depending on the location selected at the beginning of the installation
+process, you might be shown a list of timezones relevant for that location.
+If your location has only one time zone, you will not be asked anything and
+the system will assume that time zone.
+
+</para>
+
+   </sect3>
diff --git a/fi/using-d-i/modules/user-setup.xml b/fi/using-d-i/modules/user-setup.xml
new file mode 100644
index 000000000..b2494caad
--- /dev/null
+++ b/fi/using-d-i/modules/user-setup.xml
@@ -0,0 +1,69 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- original version: 33814 untranslated -->
+
+   <sect3 id="user-setup">
+   <title>Setting Up Users And Passwords</title>
+
+    <sect4 id="user-setup-root">
+    <title>Set the Root Password</title>
+
+<para>
+
+The <emphasis>root</emphasis> account is also called the
+<emphasis>super-user</emphasis>; it is a login that bypasses all
+security protection on your system. The root account should only be
+used to perform system administration, and only used for as short
+a time as possible.
+
+</para><para>
+
+Any password you create should contain at least 6 characters, and
+should contain both upper- and lower-case characters, as well as
+punctuation characters.  Take extra care when setting your root
+password, since it is such a powerful account.  Avoid dictionary
+words or use of any personal information which could be guessed.
+
+</para><para>
+
+If anyone ever tells you they need your root password, be extremely
+wary. You should normally never give your root password out, unless you
+are administering a machine with more than one system administrator.
+
+</para>
+   </sect4>
+
+   <sect4 id="make-normal-user">
+   <title>Create an Ordinary User</title>
+
+<para>
+
+The system will ask you whether you wish to create an ordinary user
+account at this point.  This account should be your main personal
+log-in.  You should <emphasis>not</emphasis> use the root account for
+daily use or as your personal login.
+
+</para><para>
+
+Why not?  Well, one reason to avoid using root's privileges is that it
+is very easy to do irreparable damage as root.  Another reason is that
+you might be tricked into running a <emphasis>Trojan-horse</emphasis>
+program &mdash; that is a program that takes advantage of your
+super-user powers to compromise the security of your system behind
+your back. Any good book on Unix system administration will cover this
+topic in more detail &mdash; consider reading one if it is new to you.
+
+</para><para>
+
+You will first be prompted for the user's full name. Then you'll be asked
+for a name for the user account; generally your first name or something
+similar will suffice and indeed will be the default. Finally, you will be
+prompted for a password for this account.
+
+</para><para>
+
+If at any point after installation you would like to create another
+account, use the <command>adduser</command> command.
+
+</para>
+    </sect4>
+   </sect3>
diff --git a/fi/using-d-i/using-d-i.xml b/fi/using-d-i/using-d-i.xml
index 49ac8f70f..079985749 100644
--- a/fi/using-d-i/using-d-i.xml
+++ b/fi/using-d-i/using-d-i.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 33725 untranslated -->
 
 
  <chapter id="d-i-intro"><title>Using the Debian Installer</title>
@@ -81,22 +81,22 @@ ssh session to view the logs described below.
 
 </para><para>
 
-Error messages are redirected to the third console.
+Error messages and logs are redirected to the fourth console.
 You can access this console by
-pressing <keycombo><keycap>Left Alt</keycap><keycap>F3</keycap></keycombo>
+pressing <keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></keycombo>
 (hold the left <keycap>Alt</keycap> key while pressing the
-<keycap>F3</keycap> function key); get back to
+<keycap>F4</keycap> function key); get back to
 the main installer process with
 <keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>.
 
 </para><para>
 
 These messages can also be found in
-<filename>/var/log/messages</filename>.  After installation, this log
-is copied to <filename>/var/log/debian-installer/messages</filename> on your
+<filename>/var/log/syslog</filename>.  After installation, this log
+is copied to <filename>/var/log/installer/syslog</filename> on your
 new system. Other installation messages may be found in
 <filename>/var/log/</filename> during the
-installation, and <filename>/var/log/debian-installer/</filename>
+installation, and <filename>/var/log/debian/</filename>
 after the computer has been booted into the installed system.
 
 </para>
@@ -132,27 +132,7 @@ repeatedly to back all the way out of the currently running component.
 
 </para></listitem>
 </varlistentry>
-<varlistentry condition="sarge">
-
-<term>languagechooser</term><listitem><para>
-
-Shows a list of languages and language variants. The installer will
-display messages in the chosen language, unless the translation for
-that language is not complete. When a translation is not complete,
-English messages are shown.
-
-</para></listitem>
-</varlistentry>
-<varlistentry condition="sarge">
-
-<term>countrychooser</term><listitem><para>
-
-Shows a list of countries. The user may choose the country he lives
-in.
-
-</para></listitem>
-</varlistentry>
-<varlistentry condition="etch">
+<varlistentry>
 
 <term>localechooser</term><listitem><para>
 
@@ -306,6 +286,30 @@ newer motherboards.
 </para></listitem>
 </varlistentry>
 <varlistentry>
+	
+<term>tzsetup</term><listitem><para>
+
+Selects the time zone, based on the location selected earlier
+		
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
+<term>clock-setup</term><listitem><para>
+
+Determines whether the clock is set to UTC or not.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+	
+<term>user-setup</term><listitem><para>
+
+Sets up the root password, and adds a non-root user.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
 
 <term>base-installer</term><listitem><para>
 
@@ -315,7 +319,24 @@ the computer to operate under Linux when rebooted.
 </para></listitem>
 </varlistentry>
 <varlistentry>
+	
+<term>apt-setup</term><listitem><para>
+
+Configures apt, mostly automatically, based on what media the installer is
+running from.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+	
+<term>pkgsel</term><listitem><para>
 
+Uses tasksel to select and install additional software.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+	
 <term>os-prober</term><listitem><para>
 
 Detects currently installed operating systems on the computer and
@@ -330,20 +351,10 @@ which operating system to start.
 
 <term>bootloader-installer</term><listitem><para>
 
-Installs a boot loader program on the hard disk, which is necessary
-for the computer to start up using Linux without using a floppy or
-CD-ROM.  Many boot loaders allow the user to choose an alternate
-operating system each time the computer boots.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
-<term>base-config</term><listitem><para>
-
-Provides dialogs for setting up the base system packages according
-to user preferences. This is normally done after rebooting the
-computer; it is the <quote>first run</quote> of the new Debian system.
+The various bootloader installers each install a boot loader program on the
+hard disk, which is necessary for the computer to start up using Linux
+without using a floppy or CD-ROM.  Many boot loaders allow the user to
+choose an alternate operating system each time the computer boots.
 
 </para></listitem>
 </varlistentry>
@@ -358,12 +369,11 @@ console.
 </varlistentry>
 <varlistentry>
 
-<term condition="sarge">bugreporter</term><term condition="etch">save-logs</term><listitem><para>
+<term>save-logs</term><listitem><para>
 
-Provides a way for the user to record information on a floppy
-disk<phrase condition="etch">, network, hard disk, or other media</phrase>
-when trouble is encountered, in order to accurately report installer
-software problems to Debian developers later.
+Provides a way for the user to record information on a floppy disk, network,
+hard disk, or other media when trouble is encountered, in order to accurately
+report installer software problems to Debian developers later.
 
 </para></listitem>
 </varlistentry>
diff --git a/fi/welcome/doc-organization.xml b/fi/welcome/doc-organization.xml
index f3832aa7e..326a33669 100644
--- a/fi/welcome/doc-organization.xml
+++ b/fi/welcome/doc-organization.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 33772 untranslated -->
 
  <sect1 id="doc-organization">
  <title>Organization of This Document</title>
@@ -60,23 +60,18 @@ Perform the actual installation according to
 configuring peripheral driver modules, configuring your network
 connection, so that remaining installation files can be obtained
 directly from a Debian server (if you are not installing from a CD),
-partitioning your hard drives and installation of minimal working
-system.
+partitioning your hard drives and installation of a base system, then
+selection and installation of tasks.
 (Some background about setting up the partitions for your Debian
 system is explained in <xref linkend="partitioning"/>.)
 
 </para></listitem>
 <listitem><para>
 
-Boot into your newly installed base system and run through some
-additional configuration tasks, from <xref linkend="boot-new"/>.
+Boot into your newly installed base system, from <xref linkend="boot-new"/>.
 
-</para></listitem>
-<listitem><para>
-
-Install additional software in <xref linkend="install-packages"/>.
-
-</para></listitem>
+</para>
+</listitem>
 </orderedlist>
 
 </para><para>