summaryrefslogtreecommitdiff
path: root/fi/using-d-i
diff options
context:
space:
mode:
Diffstat (limited to 'fi/using-d-i')
-rw-r--r--fi/using-d-i/components.xml43
-rw-r--r--fi/using-d-i/modules/apt-setup.xml41
-rw-r--r--fi/using-d-i/modules/base-installer.xml8
-rw-r--r--fi/using-d-i/modules/clock-setup.xml34
-rw-r--r--fi/using-d-i/modules/localechooser.xml4
-rw-r--r--fi/using-d-i/modules/lvmcfg.xml39
-rw-r--r--fi/using-d-i/modules/mdcfg.xml10
-rw-r--r--fi/using-d-i/modules/os-prober.xml13
-rw-r--r--fi/using-d-i/modules/pkgsel.xml161
-rw-r--r--fi/using-d-i/modules/save-logs.xml9
-rw-r--r--fi/using-d-i/modules/tzsetup.xml16
-rw-r--r--fi/using-d-i/modules/user-setup.xml69
-rw-r--r--fi/using-d-i/using-d-i.xml104
13 files changed, 426 insertions, 125 deletions
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>