Update of original English documents

3 files changed, 47 insertions, 101 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;